Commit 36177832 authored by Jonathan Lemon's avatar Jonathan Lemon Committed by Jakub Kicinski
Browse files

skbuff: Add skb parameter to the ubuf zerocopy callback 



Add an optional skb parameter to the zerocopy callback parameter,
which is passed down from skb_zcopy_clear().  This gives access
to the original skb, which is needed for upcoming RX zero-copy
error handling.

Signed-off-by: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e76d46cf

drivers/net/tap.c

+1 −1
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control, 
		skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG;

	} else if (msg_control) {

		struct ubuf_info *uarg = msg_control;

		uarg->callback(uarg, false);

		uarg->callback(NULL, uarg, false);

	}



	if (tap) {

drivers/net/tun.c

+1 −1
Original line number Diff line number Diff line
@@ -1819,7 +1819,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, 
		skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG;

	} else if (msg_control) {

		struct ubuf_info *uarg = msg_control;

		uarg->callback(uarg, false);

		uarg->callback(NULL, uarg, false);

	}



	skb_reset_network_header(skb);

drivers/net/xen-netback/common.h

+2 −1
Original line number Diff line number Diff line
@@ -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 zerocopy_success);



/* Unmap a pending page and release it back to the guest */

void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx);

drivers/net/xen-netback/netback.c

+3 −2
Original line number Diff line number Diff line
@@ -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 zerocopy_success)

{

	unsigned long flags;

	pending_ring_idx_t index;

drivers/vhost/net.c

+2 −1
Original line number Diff line number Diff line
@@ -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;