From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: [PATCH v3 2/2] macvtap: restore vlan header on user read Date: Fri, 4 May 2012 02:30:29 +0300 Message-ID: <20120503233029.GA31083@redhat.com> References: <1335373316-612-1-git-send-email-basil.gor@gmail.com> <20120503130751.GB26366@redhat.com> <20120503143108.GA20969@redhat.com> <20120503152225.GA25579@nanobar> <20120503231152.GA8602@nanobar> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: "Eric W. Biederman" , "David S. Miller" , netdev@vger.kernel.org To: Basil Gor Return-path: Received: from mx1.redhat.com ([209.132.183.28]:12676 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756403Ab2ECXaZ (ORCPT ); Thu, 3 May 2012 19:30:25 -0400 Content-Disposition: inline In-Reply-To: <20120503231152.GA8602@nanobar> Sender: netdev-owner@vger.kernel.org List-ID: On Fri, May 04, 2012 at 03:11:52AM +0400, Basil Gor wrote: > Below is a bit reworked version I've tested. Will review thanks. Can you add the signature according to the rules pls? > --- > drivers/net/macvtap.c | 43 ++++++++++++++++++++++++++++++++++++++----- > 1 files changed, 38 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c > index 0427c65..cb8fd50 100644 > --- a/drivers/net/macvtap.c > +++ b/drivers/net/macvtap.c > @@ -1,5 +1,6 @@ > #include > #include > +#include > #include > #include > #include > @@ -759,6 +760,8 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, > struct macvlan_dev *vlan; > int ret; > int vnet_hdr_len = 0; > + int vlan_offset = 0; > + int copied; > > if (q->flags & IFF_VNET_HDR) { > struct virtio_net_hdr vnet_hdr; > @@ -773,18 +776,48 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, > if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr))) > return -EFAULT; > } > + copied = vnet_hdr_len; > + > + if (!vlan_tx_tag_present(skb)) > + len = min_t(int, skb->len, len); > + else { > + int copy; > + struct { > + __be16 h_vlan_proto; > + __be16 h_vlan_TCI; > + } veth; > + veth.h_vlan_proto = htons(ETH_P_8021Q); > + veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb)); > + > + vlan_offset = offsetof(struct vlan_ethhdr, h_vlan_proto); > + len = min_t(int, skb->len + VLAN_HLEN, len); > + > + copy = min_t(int, vlan_offset, len); > + ret = skb_copy_datagram_const_iovec(skb, 0, iv, copied, copy); > + len -= copy; > + copied += copy; > + if (ret || !len) > + goto done; > + > + copy = min_t(int, sizeof(veth), len); > + ret = memcpy_toiovecend(iv, (void *)&veth, copied, copy); > + len -= copy; > + copied += copy; > + if (ret || !len) > + goto done; > + } > > - len = min_t(int, skb->len, len); > - > - ret = skb_copy_datagram_const_iovec(skb, 0, iv, vnet_hdr_len, len); > + ret = skb_copy_datagram_const_iovec(skb, vlan_offset, iv, copied, len); > + copied += len; > > +done: > rcu_read_lock_bh(); > vlan = rcu_dereference_bh(q->vlan); > if (vlan) > - macvlan_count_rx(vlan, len, ret == 0, 0); > + macvlan_count_rx(vlan, copied - vnet_hdr_len, ret == 0, 0); > rcu_read_unlock_bh(); > > - return ret ? ret : (len + vnet_hdr_len); > + return ret ? ret : copied; > } > > static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb, > -- > 1.7.6.5