GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-07 07:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: Revert macvtap/tun truncation signalling changes.

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

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2013-12-10 22:10:21 -05:00
parent 730054da38
commit bbd37626e6
2 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/net/macvtap.c
View file

@ -767,14 +767,10 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
const struct sk_buff *skb, const struct sk_buff *skb,
const struct iovec *iv, int len) const struct iovec *iv, int len)
{ {
int ret, off; int ret;
int vnet_hdr_len = 0; int vnet_hdr_len = 0;
int vlan_offset = 0; int vlan_offset = 0;
int copied; int copied;
struct {
__be16 h_vlan_proto;
__be16 h_vlan_TCI;
} veth;
if (q->flags & IFF_VNET_HDR) { if (q->flags & IFF_VNET_HDR) {
struct virtio_net_hdr vnet_hdr; struct virtio_net_hdr vnet_hdr;
@ -789,13 +785,16 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr))) if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr)))
return -EFAULT; return -EFAULT;
} }
off = copied = vnet_hdr_len; copied = vnet_hdr_len;
if (!vlan_tx_tag_present(skb)) if (!vlan_tx_tag_present(skb))
len = min_t(int, skb->len, len); len = min_t(int, skb->len, len);
else { else {
int copy; int copy;
struct {
__be16 h_vlan_proto;
__be16 h_vlan_TCI;
} veth;
veth.h_vlan_proto = skb->vlan_proto; veth.h_vlan_proto = skb->vlan_proto;
veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb)); veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb));
@ -803,22 +802,22 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
len = min_t(int, skb->len + VLAN_HLEN, len); len = min_t(int, skb->len + VLAN_HLEN, len);
copy = min_t(int, vlan_offset, len); copy = min_t(int, vlan_offset, len);
ret = skb_copy_datagram_const_iovec(skb, 0, iv, off, copy); ret = skb_copy_datagram_const_iovec(skb, 0, iv, copied, copy);
len -= copy; len -= copy;
off += copy; copied += copy;
if (ret || !len) if (ret || !len)
goto done; goto done;
copy = min_t(int, sizeof(veth), len); copy = min_t(int, sizeof(veth), len);
ret = memcpy_toiovecend(iv, (void *)&veth, off, copy); ret = memcpy_toiovecend(iv, (void *)&veth, copied, copy);
len -= copy; len -= copy;
off += copy; copied += copy;
if (ret || !len) if (ret || !len)
goto done; goto done;
} }
ret = skb_copy_datagram_const_iovec(skb, vlan_offset, iv, off, len); ret = skb_copy_datagram_const_iovec(skb, vlan_offset, iv, copied, len);
copied += skb->len + (vlan_offset ? sizeof(veth) : 0); copied += len;
done: done:
return ret ? ret : copied; return ret ? ret : copied;
@ -876,7 +875,7 @@ static ssize_t macvtap_aio_read(struct kiocb *iocb, const struct iovec *iv,
} }
ret = macvtap_do_read(q, iocb, iv, len, file->f_flags & O_NONBLOCK); ret = macvtap_do_read(q, iocb, iv, len, file->f_flags & O_NONBLOCK);
ret = min_t(ssize_t, ret, len); ret = min_t(ssize_t, ret, len); /* XXX copied from tun.c. Why? */
if (ret > 0) if (ret > 0)
iocb->ki_pos = ret; iocb->ki_pos = ret;
out: out:

23
drivers/net/tun.c
View file

@ -1183,11 +1183,7 @@ static ssize_t tun_put_user(struct tun_struct *tun,
const struct iovec *iv, int len) const struct iovec *iv, int len)
{ {
struct tun_pi pi = { 0, skb->protocol }; struct tun_pi pi = { 0, skb->protocol };
struct { ssize_t total = 0;
__be16 h_vlan_proto;
__be16 h_vlan_TCI;
} veth;
ssize_t total = 0, off = 0;
int vlan_offset = 0; int vlan_offset = 0;
if (!(tun->flags & TUN_NO_PI)) { if (!(tun->flags & TUN_NO_PI)) {
@ -1252,11 +1248,14 @@ static ssize_t tun_put_user(struct tun_struct *tun,
total += tun->vnet_hdr_sz; total += tun->vnet_hdr_sz;
} }
off = total;
if (!vlan_tx_tag_present(skb)) { if (!vlan_tx_tag_present(skb)) {
len = min_t(int, skb->len, len); len = min_t(int, skb->len, len);
} else { } else {
int copy, ret; int copy, ret;
struct {
__be16 h_vlan_proto;
__be16 h_vlan_TCI;
} veth;
veth.h_vlan_proto = skb->vlan_proto; veth.h_vlan_proto = skb->vlan_proto;
veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb)); veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb));
@ -1265,22 +1264,22 @@ static ssize_t tun_put_user(struct tun_struct *tun,
len = min_t(int, skb->len + VLAN_HLEN, len); len = min_t(int, skb->len + VLAN_HLEN, len);
copy = min_t(int, vlan_offset, len); copy = min_t(int, vlan_offset, len);
ret = skb_copy_datagram_const_iovec(skb, 0, iv, off, copy); ret = skb_copy_datagram_const_iovec(skb, 0, iv, total, copy);
len -= copy; len -= copy;
off += copy; total += copy;
if (ret || !len) if (ret || !len)
goto done; goto done;
copy = min_t(int, sizeof(veth), len); copy = min_t(int, sizeof(veth), len);
ret = memcpy_toiovecend(iv, (void *)&veth, off, copy); ret = memcpy_toiovecend(iv, (void *)&veth, total, copy);
len -= copy; len -= copy;
off += copy; total += copy;
if (ret || !len) if (ret || !len)
goto done; goto done;
} }
skb_copy_datagram_const_iovec(skb, vlan_offset, iv, off, len); skb_copy_datagram_const_iovec(skb, vlan_offset, iv, total, len);
total += skb->len + (vlan_offset ? sizeof(veth) : 0); total += len;
done: done:
tun->dev->stats.tx_packets++; tun->dev->stats.tx_packets++;