From patchwork Fri May 4 08:55:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Basil Gor X-Patchwork-Id: 156822 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7B114B6FD8 for ; Fri, 4 May 2012 18:56:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753916Ab2EDI4T (ORCPT ); Fri, 4 May 2012 04:56:19 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:36173 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753610Ab2EDI4R (ORCPT ); Fri, 4 May 2012 04:56:17 -0400 Received: by mail-bk0-f46.google.com with SMTP id ji2so2013904bkc.19 for ; Fri, 04 May 2012 01:56:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=Lzw+Bu+FA0SDe1kqcwAqsB0MCNz05mnDoL0ABZ0LIa0=; b=OD6PyU4CljVfOHbWanG9uWvEx1NoGokRZ/1UyQQgmezPnoeqFt3CeQVt85gR2X5kLH c/cl3iFaFoiZF2ZVIMFXJA7SbQbDr2ZWIxyuA9nCVZBwjBSlar5fR9pVAO6lxBK/yV+g rzpJy2HMdVTTv3Ehxw7kOkodGsrRXK01RTGZBpb41A22VIm3JOSwG7BmS/FNFulHgL6R TsKQ6SicXN0WcHs13ripu6phi1FqH29WGF4N513ooDBXCORAL83y7/2hypRKxXE3rfDD 1QrOBoc5keJ15LLdaa0NymLF+m8beS4taAY9nGfdLdEHfNSOLXNn+OgfUKgbUDmKSzwd qCZQ== Received: by 10.205.121.130 with SMTP id gc2mr1832636bkc.10.1336121777192; Fri, 04 May 2012 01:56:17 -0700 (PDT) Received: from localhost.localdomain (deibp9eh1--blueice2n2.emea.ibm.com. [195.212.29.172]) by mx.google.com with ESMTPS id z17sm15418667bkw.12.2012.05.04.01.56.15 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 May 2012 01:56:16 -0700 (PDT) From: Basil Gor To: "Michael S. Tsirkin" Cc: "Eric W. Biederman" , "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH v4 2/2] macvtap: restore vlan header on user read Date: Fri, 4 May 2012 12:55:24 +0400 Message-Id: <1336121724-31902-2-git-send-email-basil.gor@gmail.com> X-Mailer: git-send-email 1.7.6.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Ethernet vlan header is not on the packet and kept in the skb->vlan_tci when it comes from lower dev. This patch inserts vlan header in user buffer during skb copy on user read. Signed-off-by: Basil Gor Acked-by: Michael S. Tsirkin --- 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,