public inbox for [email protected]
 help / color / mirror / Atom feed
* [PATCH for-next 1/1] io_uring/notif: add constant for ubuf_info flags
@ 2023-04-15 13:20 Pavel Begunkov
  2023-04-15 20:37 ` Jens Axboe
  0 siblings, 1 reply; 2+ messages in thread
From: Pavel Begunkov @ 2023-04-15 13:20 UTC (permalink / raw)
  To: io-uring; +Cc: Jens Axboe, asml.silence

Add a constant IO_NOTIF_UBUF_FLAGS for struct ubuf_info flags that
notifications use. That should minimise merge conflicts for planned
changes touching both io_uring and net at the same time.

Signed-off-by: Pavel Begunkov <[email protected]>
---
 io_uring/notif.c | 2 +-
 io_uring/notif.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/io_uring/notif.c b/io_uring/notif.c
index e1846a25dde1..d3e703c37aba 100644
--- a/io_uring/notif.c
+++ b/io_uring/notif.c
@@ -79,7 +79,7 @@ struct io_kiocb *io_alloc_notif(struct io_ring_ctx *ctx)
 	notif->io_task_work.func = io_req_task_complete;
 
 	nd = io_notif_to_data(notif);
-	nd->uarg.flags = SKBFL_ZEROCOPY_FRAG | SKBFL_DONT_ORPHAN;
+	nd->uarg.flags = IO_NOTIF_UBUF_FLAGS;
 	nd->uarg.callback = io_tx_ubuf_callback;
 	refcount_set(&nd->uarg.refcnt, 1);
 	return notif;
diff --git a/io_uring/notif.h b/io_uring/notif.h
index 6dd1b30a468f..86d32bd9f856 100644
--- a/io_uring/notif.h
+++ b/io_uring/notif.h
@@ -7,6 +7,7 @@
 
 #include "rsrc.h"
 
+#define IO_NOTIF_UBUF_FLAGS	(SKBFL_ZEROCOPY_FRAG | SKBFL_DONT_ORPHAN)
 #define IO_NOTIF_SPLICE_BATCH	32
 
 struct io_notif_data {
-- 
2.40.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH for-next 1/1] io_uring/notif: add constant for ubuf_info flags
  2023-04-15 13:20 [PATCH for-next 1/1] io_uring/notif: add constant for ubuf_info flags Pavel Begunkov
@ 2023-04-15 20:37 ` Jens Axboe
  0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2023-04-15 20:37 UTC (permalink / raw)
  To: Pavel Begunkov, io-uring

On 4/15/23 7:20 AM, Pavel Begunkov wrote:
> Add a constant IO_NOTIF_UBUF_FLAGS for struct ubuf_info flags that
> notifications use. That should minimise merge conflicts for planned
> changes touching both io_uring and net at the same time.

Applied, thanks.

-- 
Jens Axboe



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-04-15 20:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-15 13:20 [PATCH for-next 1/1] io_uring/notif: add constant for ubuf_info flags Pavel Begunkov
2023-04-15 20:37 ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox