From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: Jason Wang <jasowang@redhat.com>
Cc: davem@davemloft.net, mst@redhat.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Basil Gor <basil.gor@gmail.com>
Subject: Re: [PATCH net-next] tuntap: hardware vlan tx support
Date: Tue, 23 Jul 2013 16:12:49 +0400 [thread overview]
Message-ID: <51EE7341.4060404@cogentembedded.com> (raw)
In-Reply-To: <1374563748-38821-1-git-send-email-jasowang@redhat.com>
Hello.
On 23-07-2013 11:15, Jason Wang wrote:
> Inspired by commit f09e2249c4f5c7c13261ec73f5a7807076af0c8e (macvtap: restore
> vlan header on user read). This patch adds hardware vlan tx support for
> tuntap. This is done by copying vlan header directly into userspace in
> tun_put_user() instead of doing it through __vlan_put_tag() in
> dev_hard_start_xmit(). This eliminates one unnecessary memove in
s/memove/memmove/?
> vlan_insert_tag() for 802.1ad and 802.1q traffic.
> pktgen test shows about 20% improvement for 802.1q traffic:
> Before:
> 662149pps 317Mb/sec (317831520bps) errors: 0
> After:
> 801033pps 384Mb/sec (384495840bps) errors: 0
> Cc: Basil Gor <basil.gor@gmail.com>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> ---
> drivers/net/tun.c | 39 +++++++++++++++++++++++++++++++++++----
> 1 files changed, 35 insertions(+), 4 deletions(-)
> diff --git a/drivers/net/tun.c b/drivers/net/tun.c
> index a72d141..66e265d 100644
> --- a/drivers/net/tun.c
> +++ b/drivers/net/tun.c
[...]
> @@ -1328,11 +1330,39 @@ static ssize_t tun_put_user(struct tun_struct *tun,
> total += tun->vnet_hdr_sz;
> }
>
> - len = min_t(int, skb->len, len);
> + if (!vlan_tx_tag_present(skb))
> + len = min_t(int, skb->len, len);
> + else {
According to Documentation/CodingStyle chapter 3, both arms of an *if*
statement should have {} if one arm has it.
> + int copy, ret;
> + struct {
> + __be16 h_vlan_proto;
> + __be16 h_vlan_TCI;
> + } veth;
Empty line wouldn't hurt here, after declarations...
> + veth.h_vlan_proto = skb->vlan_proto;
> + veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb));
[...]
WBR, Sergei
next prev parent reply other threads:[~2013-07-23 12:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-23 7:15 [PATCH net-next] tuntap: hardware vlan tx support Jason Wang
2013-07-23 12:12 ` Sergei Shtylyov [this message]
2013-07-24 3:19 ` Jason Wang
2013-07-23 15:17 ` Stephen Hemminger
2013-07-23 15:27 ` Michael S. Tsirkin
2013-07-24 4:41 ` Jason Wang
2013-07-23 15:53 ` Stephen Hemminger
2013-07-24 5:55 ` Jason Wang
2013-07-24 15:11 ` Stephen Hemminger
2013-07-25 3:31 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51EE7341.4060404@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=basil.gor@gmail.com \
--cc=davem@davemloft.net \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).