From: "Michael S. Tsirkin" <mst@redhat.com>
To: Jason Wang <jasowang@redhat.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net-next] tuntap: XDP_TX can use native XDP
Date: Wed, 14 Mar 2018 05:37:40 +0200 [thread overview]
Message-ID: <20180314053424-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <1520997820-8289-1-git-send-email-jasowang@redhat.com>
On Wed, Mar 14, 2018 at 11:23:40AM +0800, Jason Wang wrote:
> Now we have ndo_xdp_xmit, switch to use it instead of the slow generic
> XDP TX routine. XDP_TX on TAP gets ~20% improvements from ~1.5Mpps to
> ~1.8Mpps on 2.60GHz Core(TM) i7-5600U.
>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> drivers/net/tun.c | 19 ++++++++-----------
> 1 file changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/tun.c b/drivers/net/tun.c
> index 475088f..baeafa0 100644
> --- a/drivers/net/tun.c
> +++ b/drivers/net/tun.c
> @@ -1613,7 +1613,6 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,
> unsigned int delta = 0;
> char *buf;
> size_t copied;
> - bool xdp_xmit = false;
> int err, pad = TUN_RX_PAD;
>
> rcu_read_lock();
> @@ -1671,8 +1670,14 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,
> preempt_enable();
> return NULL;
> case XDP_TX:
> - xdp_xmit = true;
> - /* fall through */
> + get_page(alloc_frag->page);
> + alloc_frag->offset += buflen;
> + if (tun_xdp_xmit(tun->dev, &xdp))
> + goto err_redirect;
> + tun_xdp_flush(tun->dev);
Why do we have to flush here though?
It might be a good idea to document the reason in a code comment.
> + rcu_read_unlock();
> + preempt_enable();
> + return NULL;
> case XDP_PASS:
> delta = orig_data - xdp.data;
> break;
> @@ -1699,14 +1704,6 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,
> get_page(alloc_frag->page);
> alloc_frag->offset += buflen;
>
> - if (xdp_xmit) {
> - skb->dev = tun->dev;
> - generic_xdp_tx(skb, xdp_prog);
> - rcu_read_unlock();
> - preempt_enable();
> - return NULL;
> - }
> -
> rcu_read_unlock();
> preempt_enable();
>
> --
> 2.7.4
next prev parent reply other threads:[~2018-03-14 3:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-14 3:23 [PATCH net-next] tuntap: XDP_TX can use native XDP Jason Wang
2018-03-14 3:37 ` Michael S. Tsirkin [this message]
2018-03-15 8:39 ` Jason Wang
2018-03-15 13:32 ` Michael S. Tsirkin
2018-03-16 6:46 ` Jason Wang
2018-03-14 17:21 ` David Miller
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=20180314053424-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--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).