linux-stable.git/drivers/net/macvtap.c, branch linux-3.13.y

macvtap: signal truncated packets

2013-12-11T20:23:06+00:00

macvtap_put_user() never return a value grater than iov length, this in fact
bypasses the truncated checking in macvtap_recvmsg(). Fix this by always
returning the size of packet plus the possible vlan header to let the trunca
checking work.

Cc: Vlad Yasevich 
Cc: Zhi Yong Wu 
Cc: Michael S. Tsirkin 
Signed-off-by: Jason Wang 
Acked-by: Vlad Yasevich 
Acked-by: Michael S. Tsirkin 
Signed-off-by: David S. Miller

net: Revert macvtap/tun truncation signalling changes.

2013-12-11T03:10:21+00:00

Jason Wang and Michael S. Tsirkin are still discussing how
to properly fix this.

Signed-off-by: David S. Miller

macvtap: signal truncated packets

2013-12-11T03:06:49+00:00

macvtap_put_user() never return a value grater than iov length, this in fact
bypasses the truncated checking in macvtap_recvmsg(). Fix this by always
returning the size of packet plus the possible vlan header to let the truncated
checking work.

Cc: Vlad Yasevich 
Cc: Zhi Yong Wu 
Signed-off-by: Jason Wang 
Signed-off-by: David S. Miller

macvtap: update file current position

2013-12-06T17:42:14+00:00

Signed-off-by: Zhi Yong Wu 
Signed-off-by: David S. Miller

macvtap: Do not double-count received packets

2013-11-29T21:07:08+00:00

Currently macvlan will count received packets after calling each
vlans receive handler.   Macvtap attempts to count the packet
yet again when the user reads the packet from the tap socket.
This code doesn't do this consistently either.  Remove the
counting from macvtap and let only macvlan count received
packets.

Signed-off-by: Vlad Yasevich 
Acked-by: Michael S. Tsirkin 
Acked-by: Jason Wang 
Signed-off-by: David S. Miller

macvtap: fix tx_dropped counting error

2013-11-28T23:32:22+00:00

After commit 8ffab51b3dfc54876f145f15b351c41f3f703195
(macvlan: lockless tx path), tx stat counter were converted to percpu stat
structure. So we need use to this also for tx_dropped in macvtap. Otherwise, the
management won't notice the dropping packet in macvtap tx path.

Cc: Michael S. Tsirkin 
Cc: Vlad Yasevich 
Cc: Eric Dumazet 
Signed-off-by: Jason Wang 
Acked-by: Michael S. Tsirkin 
Acked-by: Vlad Yasevich 
Signed-off-by: David S. Miller

macvtap: limit head length of skb allocated

2013-11-14T21:05:27+00:00

We currently use hdr_len as a hint of head length which is advertised by
guest. But when guest advertise a very big value, it can lead to an 64K+
allocating of kmalloc() which has a very high possibility of failure when host
memory is fragmented or under heavy stress. The huge hdr_len also reduce the
effect of zerocopy or even disable if a gso skb is linearized in guest.

To solves those issues, this patch introduces an upper limit (PAGE_SIZE) of the
head, which guarantees an order 0 allocation each time.

Cc: Stefan Hajnoczi 
Cc: Michael S. Tsirkin 
Signed-off-by: Jason Wang 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-08-26T20:37:08+00:00

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

Signed-off-by: David S. Miller

macvtap: Ignore tap features when VNET_HDR is off

2013-08-20T20:09:12+00:00

When the user turns off VNET_HDR support on the
macvtap device, there is no way to provide any
offload information to the user.  So, it's safer
to ignore offload setting then depend on the user
setting them correctly.

Signed-off-by: Vlad Yasevich 
Signed-off-by: David S. Miller

macvtap: Correctly set tap features when IFF_VNET_HDR is disabled.

2013-08-20T20:09:11+00:00

When the user turns off IFF_VNET_HDR flag, attempts to change
offload features via TUNSETOFFLOAD do not work.  This could cause
GSO packets to be delivered to the user when the user is
not prepared to handle them.

To solve, allow processing of TUNSETOFFLOAD when IFF_VNET_HDR is
disabled.

Signed-off-by: Vlad Yasevich 
Signed-off-by: David S. Miller