From: Jonathan Lemon <jonathan.lemon@gmail.com>
To: <netdev@vger.kernel.org>, <davem@davemloft.net>,
<kuba@kernel.org>, <willemdebruijn.kernel@gmail.com>,
<edumazet@google.com>, <dsahern@gmail.com>
Cc: <kernel-team@fb.com>
Subject: [PATCH net-next v1 12/13] tap/tun: add skb_zcopy_init() helper for initialization.
Date: Tue, 5 Jan 2021 14:07:05 -0800 [thread overview]
Message-ID: <20210105220706.998374-13-jonathan.lemon@gmail.com> (raw)
In-Reply-To: <20210105220706.998374-1-jonathan.lemon@gmail.com>
From: Jonathan Lemon <bsd@fb.com>
Replace direct assignments with skb_zcopy_init() for zerocopy
cases where a new skb is initialized, without changing the
reference counts.
Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
---
drivers/net/tap.c | 3 +--
drivers/net/tun.c | 3 +--
drivers/vhost/net.c | 1 +
include/linux/skbuff.h | 9 +++++++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index f7a19d9b7c27..3c652c8ac5ba 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -722,8 +722,7 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control,
tap = rcu_dereference(q->tap);
/* copy skb_ubuf_info for callback when skb has no error */
if (zerocopy) {
- skb_shinfo(skb)->destructor_arg = msg_control;
- skb_shinfo(skb)->flags |= SKBFL_ZEROCOPY_FRAG;
+ skb_zcopy_init(skb, msg_control);
} else if (msg_control) {
struct ubuf_info *uarg = msg_control;
uarg->callback(NULL, uarg, false);
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index dd9edbd72ae8..7414e0584729 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1814,8 +1814,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
/* copy skb_ubuf_info for callback when skb has no error */
if (zerocopy) {
- skb_shinfo(skb)->destructor_arg = msg_control;
- skb_shinfo(skb)->flags |= SKBFL_ZEROCOPY_FRAG;
+ skb_zcopy_init(skb, msg_control);
} else if (msg_control) {
struct ubuf_info *uarg = msg_control;
uarg->callback(NULL, uarg, false);
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index bf28d0b75c1b..5c722c4179a9 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -904,6 +904,7 @@ static void handle_tx_zerocopy(struct vhost_net *net, struct socket *sock)
ubuf->callback = vhost_zerocopy_callback;
ubuf->ctx = nvq->ubufs;
ubuf->desc = nvq->upend_idx;
+ ubuf->flags = SKBFL_ZEROCOPY_FRAG;
refcount_set(&ubuf->refcnt, 1);
msg.msg_control = &ctl;
ctl.type = TUN_MSG_UBUF;
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 58010df9d183..3ec8b83aca3e 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1448,6 +1448,12 @@ static inline void skb_zcopy_get(struct ubuf_info *uarg)
refcount_inc(&uarg->refcnt);
}
+static inline void skb_zcopy_init(struct sk_buff *skb, struct ubuf_info *uarg)
+{
+ skb_shinfo(skb)->destructor_arg = uarg;
+ skb_shinfo(skb)->flags |= uarg->flags;
+}
+
static inline void skb_zcopy_set(struct sk_buff *skb, struct ubuf_info *uarg,
bool *have_ref)
{
@@ -1456,8 +1462,7 @@ static inline void skb_zcopy_set(struct sk_buff *skb, struct ubuf_info *uarg,
*have_ref = false;
else
skb_zcopy_get(uarg);
- skb_shinfo(skb)->destructor_arg = uarg;
- skb_shinfo(skb)->flags |= uarg->flags;
+ skb_zcopy_init(skb, uarg);
}
}
--
2.24.1
next prev parent reply other threads:[~2021-01-05 22:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 22:06 [PATCH net-next v1 00/13] Generic zcopy_* functions Jonathan Lemon
2021-01-05 22:06 ` [PATCH net-next v1 01/13] skbuff: remove unused skb_zcopy_abort function Jonathan Lemon
2021-01-05 22:06 ` [PATCH net-next v1 02/13] skbuff: simplify sock_zerocopy_put Jonathan Lemon
2021-01-05 22:06 ` [PATCH net-next v1 03/13] skbuff: Push status and refcounts into sock_zerocopy_callback Jonathan Lemon
2021-01-05 22:06 ` [PATCH net-next v1 04/13] skbuff: replace sock_zerocopy_put() with skb_zcopy_put() Jonathan Lemon
2021-01-05 22:06 ` [PATCH net-next v1 05/13] skbuff: replace sock_zerocopy_get with skb_zcopy_get Jonathan Lemon
2021-01-05 22:06 ` [PATCH net-next v1 06/13] skbuff: Add skb parameter to the ubuf zerocopy callback Jonathan Lemon
2021-01-05 22:07 ` [PATCH net-next v1 07/13] skbuff: Call sock_zerocopy_put_abort from skb_zcopy_put_abort Jonathan Lemon
2021-01-05 22:07 ` [PATCH net-next v1 08/13] skbuff: Call skb_zcopy_clear() before unref'ing fragments Jonathan Lemon
2021-01-05 22:07 ` [PATCH net-next v1 09/13] skbuff: rename sock_zerocopy_* to msg_zerocopy_* Jonathan Lemon
2021-01-05 22:07 ` [PATCH net-next v1 10/13] net: group skb_shinfo zerocopy related bits together Jonathan Lemon
2021-01-05 22:07 ` [PATCH net-next v1 11/13] skbuff: add flags to ubuf_info for ubuf setup Jonathan Lemon
2021-01-05 22:07 ` Jonathan Lemon [this message]
2021-01-05 22:07 ` [PATCH net-next v1 13/13] skbuff: Rename skb_zcopy_{get|put} to net_zcopy_{get|put} Jonathan Lemon
2021-01-05 23:11 ` [PATCH net-next v1 00/13] Generic zcopy_* functions Florian Fainelli
2021-01-05 23:40 ` Jonathan Lemon
2021-01-05 23:45 ` Florian Fainelli
2021-01-06 0:25 ` Jonathan Lemon
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=20210105220706.998374-13-jonathan.lemon@gmail.com \
--to=jonathan.lemon@gmail.com \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=edumazet@google.com \
--cc=kernel-team@fb.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=willemdebruijn.kernel@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.