[5/9,v1,RFC] skbuff: Add skb parameter to the ubuf zerocopy callback

Message ID	20201218201633.2735367-6-jonathan.lemon@gmail.com
State	Superseded
Headers	show Return-Path: <netdev-owner@kernel.org> From: Jonathan Lemon <jonathan.lemon@gmail.com> To: <netdev@vger.kernel.org>, <edumazet@google.com>, <willemdebruijn.kernel@gmail.com> CC: <kernel-team@fb.com> Subject: [PATCH 5/9 v1 RFC] skbuff: Add skb parameter to the ubuf zerocopy callback Date: Fri, 18 Dec 2020 12:16:29 -0800 Message-ID: <20201218201633.2735367-6-jonathan.lemon@gmail.com> In-Reply-To: <20201218201633.2735367-1-jonathan.lemon@gmail.com> References: <20201218201633.2735367-1-jonathan.lemon@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain Precedence: bulk
Series	Generic zcopy_* functions \| expand [0/9,v1,RFC] Generic zcopy_* functions [1/9,v1,RFC] net: group skb_shinfo zerocopy related bits together. [2/9,v1,RFC] skbuff: remove unused skb_zcopy_abort function [3/9,v1,RFC] skbuff: replace sock_zerocopy_put() with skb_zcopy_put() [4/9,v1,RFC] skbuff: replace sock_zerocopy_get with skb_zcopy_get [5/9,v1,RFC] skbuff: Add skb parameter to the ubuf zerocopy callback [6/9,v1,RFC] skbuff: Call sock_zerocopy_put_abort from skb_zcopy_put_abort [7/9,v1,RFC] skbuff: add zc_flags to ubuf_info for ubuf setup [8/9,v1,RFC] tap/tun: use skb_zcopy_set() instead of open coded assignment [9/9,v1,RFC] skbuff: Call skb_zcopy_clear() before unref'ing fragments

diff --git a/drivers/net/tap.c b/drivers/net/tap.c index 3e9fb753ce88..c2bcbf9218dc 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -726,7 +726,7 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control, skb_shinfo(skb)->zc_flags |= SKBZC_FRAGMENTS; } else if (msg_control) { struct ubuf_info *uarg = msg_control; - uarg->callback(uarg, false); + uarg->callback(NULL, uarg, false); } if (tap) { diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 80cb3bef3afd..bad4b0229584 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1818,7 +1818,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, skb_shinfo(skb)->zc_flags |= SKBZC_FRAGMENTS; } else if (msg_control) { struct ubuf_info *uarg = msg_control; - uarg->callback(uarg, false); + uarg->callback(NULL, uarg, false); } skb_reset_network_header(skb); diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h index 8ee24e351bdc..4df001e960ca 100644 --- a/drivers/net/xen-netback/common.h +++ b/drivers/net/xen-netback/common.h @@ -399,7 +399,8 @@ void xenvif_rx_queue_tail(struct xenvif_queue *queue, struct sk_buff *skb); void xenvif_carrier_on(struct xenvif *vif); /* Callback from stack when TX packet can be released */ -void xenvif_zerocopy_callback(struct ubuf_info *ubuf, bool zerocopy_success); +void xenvif_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *ubuf, + bool success); /* Unmap a pending page and release it back to the guest */ void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx); diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index bc3421d14576..49288ae2c4dd 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -1091,7 +1091,7 @@ static int xenvif_handle_frag_list(struct xenvif_queue *queue, struct sk_buff *s uarg = skb_shinfo(skb)->destructor_arg; /* increase inflight counter to offset decrement in callback */ atomic_inc(&queue->inflight_packets); - uarg->callback(uarg, true); + uarg->callback(NULL, uarg, true); skb_shinfo(skb)->destructor_arg = NULL; /* Fill the skb with the new (local) frags. */ @@ -1228,7 +1228,8 @@ static int xenvif_tx_submit(struct xenvif_queue *queue) return work_done; } -void xenvif_zerocopy_callback(struct ubuf_info *ubuf, bool zerocopy_success) +void xenvif_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *ubuf, + bool success) { unsigned long flags; pending_ring_idx_t index; @@ -1253,7 +1254,7 @@ void xenvif_zerocopy_callback(struct ubuf_info *ubuf, bool zerocopy_success) } while (ubuf); spin_unlock_irqrestore(&queue->callback_lock, flags); - if (likely(zerocopy_success)) + if (likely(success)) queue->stats.tx_zerocopy_success++; else queue->stats.tx_zerocopy_fail++; diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 531a00d703cd..bf28d0b75c1b 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -381,7 +381,8 @@ static void vhost_zerocopy_signal_used(struct vhost_net *net, } } -static void vhost_zerocopy_callback(struct ubuf_info *ubuf, bool success) +static void vhost_zerocopy_callback(struct sk_buff *skb, + struct ubuf_info *ubuf, bool success) { struct vhost_net_ubuf_ref *ubufs = ubuf->ctx; struct vhost_virtqueue *vq = ubufs->vq; diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 638feaf98f17..64ae6f3adcd5 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -458,13 +458,13 @@ enum { /* * The callback notifies userspace to release buffers when skb DMA is done in * lower device, the skb last reference should be 0 when calling this. - * The zerocopy_success argument is true if zero copy transmit occurred, - * false on data copy or out of memory error caused by data copy attempt. + * The success argument is true if zero copy transmit occurred, false on + * data copy or out of memory error caused by data copy attempt. * The ctx field is used to track device context. * The desc field is used to track userspace buffer index. */ struct ubuf_info { - void (*callback)(struct ubuf_info *, bool zerocopy_success); + void (*callback)(struct sk_buff *, struct ubuf_info *, bool success); union { struct { unsigned long desc; @@ -501,7 +501,8 @@ static inline void skb_zcopy_get(struct ubuf_info *uarg) void sock_zerocopy_put_abort(struct ubuf_info *uarg, bool have_uref); -void sock_zerocopy_callback(struct ubuf_info *uarg, bool success); +void sock_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *uarg, + bool success); int skb_zerocopy_iter_dgram(struct sk_buff *skb, struct msghdr *msg, int len); int skb_zerocopy_iter_stream(struct sock *sk, struct sk_buff *skb, @@ -1476,7 +1477,7 @@ static inline void *skb_zcopy_get_nouarg(struct sk_buff *skb) static inline void skb_zcopy_put(struct ubuf_info *uarg) { if (uarg) - uarg->callback(uarg, true); + uarg->callback(NULL, uarg, true); } /* Release a reference on a zerocopy structure */ @@ -1486,7 +1487,7 @@ static inline void skb_zcopy_clear(struct sk_buff *skb, bool succsss) if (uarg) { if (!skb_zcopy_is_nouarg(skb)) - uarg->callback(uarg, succsss); + uarg->callback(skb, uarg, succsss); skb_shinfo(skb)->zc_flags &= ~SKBZC_FRAGMENTS; } diff --git a/net/core/skbuff.c b/net/core/skbuff.c index fbf0a145467a..328385cd141e 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1242,7 +1242,8 @@ static void __sock_zerocopy_callback(struct ubuf_info *uarg) sock_put(sk); } -void sock_zerocopy_callback(struct ubuf_info *uarg, bool success) +void sock_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *uarg, + bool success) { uarg->zerocopy = uarg->zerocopy & success;

[5/9,v1,RFC] skbuff: Add skb parameter to the ubuf zerocopy callback

Commit Message

Patch