From: Jason Wang <jasowang@redhat.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org,
mst@redhat.com, jasowang@redhat.com
Subject: [PATCH net-next V2 04/11] tuntap: simplify error handling in tun_build_skb()
Date: Wed, 12 Sep 2018 11:17:02 +0800 [thread overview]
Message-ID: <20180912031709.14112-5-jasowang@redhat.com> (raw)
In-Reply-To: <20180912031709.14112-1-jasowang@redhat.com>
There's no need to duplicate page get logic in each action. So this
patch tries to get page and calculate the offset before processing XDP
actions (except for XDP_DROP), and undo them when meet errors (we
don't care the performance on errors). This will be used for factoring
out XDP logic.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/tun.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 372caf7d67d9..257cf7342d54 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1701,17 +1701,13 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,
xdp_do_flush_map();
if (err)
goto err_redirect;
- rcu_read_unlock();
- local_bh_enable();
- return NULL;
+ goto out;
case XDP_TX:
get_page(alloc_frag->page);
alloc_frag->offset += buflen;
if (tun_xdp_tx(tun->dev, &xdp) < 0)
goto err_redirect;
- rcu_read_unlock();
- local_bh_enable();
- return NULL;
+ goto out;
case XDP_PASS:
delta = orig_data - xdp.data;
len = xdp.data_end - xdp.data;
@@ -1742,7 +1738,7 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,
err_redirect:
put_page(alloc_frag->page);
-err_xdp:
+out:
rcu_read_unlock();
local_bh_enable();
this_cpu_inc(tun->pcpu_stats->rx_dropped);
--
2.17.1
next prev parent reply other threads:[~2018-09-12 3:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-12 3:16 [PATCH net-next V2 00/11] vhost_net TX batching Jason Wang
2018-09-12 3:16 ` [PATCH net-next V2 01/11] net: sock: introduce SOCK_XDP Jason Wang
2018-09-12 3:17 ` [PATCH net-next V2 02/11] tuntap: switch to use XDP_PACKET_HEADROOM Jason Wang
2018-09-12 3:17 ` [PATCH net-next V2 03/11] tuntap: enable bh early during processing XDP Jason Wang
2018-09-12 3:17 ` Jason Wang [this message]
2018-09-12 3:17 ` [PATCH net-next V2 05/11] tuntap: tweak on the path of skb XDP case in tun_build_skb() Jason Wang
2018-09-12 3:17 ` [PATCH net-next V2 06/11] tuntap: split out XDP logic Jason Wang
2018-09-12 3:17 ` [PATCH net-next V2 07/11] tuntap: move XDP flushing out of tun_do_xdp() Jason Wang
2018-09-12 3:17 ` [PATCH net-next V2 08/11] tun: switch to new type of msg_control Jason Wang
2018-09-12 3:17 ` [PATCH net-next V2 09/11] tuntap: accept an array of XDP buffs through sendmsg() Jason Wang
2018-09-12 3:17 ` [PATCH net-next V2 10/11] tap: " Jason Wang
2018-09-12 3:17 ` [PATCH net-next V2 11/11] vhost_net: batch submitting XDP buffers to underlayer sockets Jason Wang
2018-09-13 18:04 ` Michael S. Tsirkin
2018-09-14 3:11 ` Jason Wang
2018-09-13 16:28 ` [PATCH net-next V2 00/11] vhost_net TX batching David Miller
2018-09-13 18:02 ` Michael S. Tsirkin
2018-09-13 18:05 ` 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=20180912031709.14112-5-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.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).