Commit 58334e75 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'generic-zcopy_-functions' 

Jonathan Lemon says:

====================
Generic zcopy_* functions

This is set of cleanup patches for zerocopy which are intended
to allow a introduction of a different zerocopy implementation.

The top level API will use the skb_zcopy_*() functions, while
the current TCP specific zerocopy ends up using msg_zerocopy_*()
calls.

There should be no functional changes from these patches.
====================

Link: https://lore.kernel.org/r/20210106221841.1880536-1-jonathan.lemon@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7cd1de76 8e044917

drivers/net/tap.c

+2 −4
Original line number Diff line number Diff line
@@ -722,12 +722,10 @@ 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)->tx_flags |= SKBTX_DEV_ZEROCOPY;

		skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG;

		skb_zcopy_init(skb, msg_control);

	} 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

+2 −4
Original line number Diff line number Diff line
@@ -1814,12 +1814,10 @@ 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)->tx_flags |= SKBTX_DEV_ZEROCOPY;

		skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG;

		skb_zcopy_init(skb, msg_control);

	} 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/interface.c

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
/* Number of bytes allowed on the internal guest Rx queue. */

#define XENVIF_RX_QUEUE_BYTES (XEN_NETIF_RX_RING_SIZE/2 * PAGE_SIZE)



/* This function is used to set SKBTX_DEV_ZEROCOPY as well as

/* This function is used to set SKBFL_ZEROCOPY_ENABLE as well as

 * increasing the inflight counter. We need to increase the inflight

 * counter because core driver calls into xenvif_zerocopy_callback

 * which calls xenvif_skb_zerocopy_complete.
@@ -55,7 +55,7 @@ 
void xenvif_skb_zerocopy_prepare(struct xenvif_queue *queue,

				 struct sk_buff *skb)

{

	skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY;

	skb_shinfo(skb)->flags |= SKBFL_ZEROCOPY_ENABLE;

	atomic_inc(&queue->inflight_packets);

}

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;