Commit ad1978db authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-6.10/io_uring' into net-accept-more 

* for-6.10/io_uring: (97 commits)
  io_uring: support to inject result for NOP
  io_uring: fail NOP if non-zero op flags is passed in
  io_uring/net: add IORING_ACCEPT_POLL_FIRST flag
  io_uring/net: add IORING_ACCEPT_DONTWAIT flag
  io_uring/filetable: don't unnecessarily clear/reset bitmap
  io_uring/io-wq: Use set_bit() and test_bit() at worker->flags
  io_uring/msg_ring: cleanup posting to IOPOLL vs !IOPOLL ring
  io_uring: Require zeroed sqe->len on provided-buffers send
  io_uring/notif: disable LAZY_WAKE for linked notifs
  io_uring/net: fix sendzc lazy wake polling
  io_uring/msg_ring: reuse ctx->submitter_task read using READ_ONCE instead of re-reading it
  io_uring/rw: reinstate thread check for retries
  io_uring/notif: implement notification stacking
  io_uring/notif: simplify io_notif_flush()
  net: add callback for setting a ubuf_info to skb
  net: extend ubuf_info callback to ops structure
  io_uring/net: support bundles for recv
  io_uring/net: support bundles for send
  io_uring/kbuf: add helpers for getting/peeking multiple buffers
  io_uring/net: add provided buffer support for IORING_OP_SEND
  ...
parents cf87f46f deb1e496

drivers/net/tap.c

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control, 
		skb_zcopy_init(skb, msg_control);

	} else if (msg_control) {

		struct ubuf_info *uarg = msg_control;

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

		uarg->ops->complete(NULL, uarg, false);

	}



	dev_queue_xmit(skb);

drivers/net/tun.c

+1 −1
Original line number Diff line number Diff line
@@ -1906,7 +1906,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, 
		skb_zcopy_init(skb, msg_control);

	} else if (msg_control) {

		struct ubuf_info *uarg = msg_control;

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

		uarg->ops->complete(NULL, uarg, false);

	}



	skb_reset_network_header(skb);

drivers/net/xen-netback/common.h

+2 −3
Original line number Diff line number Diff line
@@ -390,9 +390,8 @@ bool 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 sk_buff *skb, struct ubuf_info *ubuf,

			      bool zerocopy_success);

/* Callbacks from stack when TX packet can be released */

extern const struct ubuf_info_ops xenvif_ubuf_ops;



static inline pending_ring_idx_t nr_pending_reqs(struct xenvif_queue *queue)

{

drivers/net/xen-netback/interface.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ int xenvif_init_queue(struct xenvif_queue *queue) 


	for (i = 0; i < MAX_PENDING_REQS; i++) {

		queue->pending_tx_info[i].callback_struct = (struct ubuf_info_msgzc)

			{ { .callback = xenvif_zerocopy_callback },

			{ { .ops = &xenvif_ubuf_ops },

			  { { .ctx = NULL,

			      .desc = i } } };

		queue->grant_tx_handle[i] = NETBACK_INVALID_HANDLE;

drivers/net/xen-netback/netback.c

+8 −3
Original line number Diff line number Diff line
@@ -1156,7 +1156,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(NULL, uarg, true);

	uarg->ops->complete(NULL, uarg, true);

	skb_shinfo(skb)->destructor_arg = NULL;



	/* Fill the skb with the new (local) frags. */
@@ -1278,7 +1278,8 @@ static int xenvif_tx_submit(struct xenvif_queue *queue) 
	return work_done;

}



void xenvif_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *ubuf_base,

static void xenvif_zerocopy_callback(struct sk_buff *skb,

				     struct ubuf_info *ubuf_base,

				     bool zerocopy_success)

{

	unsigned long flags;
@@ -1312,6 +1313,10 @@ void xenvif_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *ubuf_base, 
	xenvif_skb_zerocopy_complete(queue);

}



const struct ubuf_info_ops xenvif_ubuf_ops = {

	.complete = xenvif_zerocopy_callback,

};



static inline void xenvif_tx_dealloc_action(struct xenvif_queue *queue)

{

	struct gnttab_unmap_grant_ref *gop;