io_uring: use IO_REQ_LINK_FLAGS more
PATCH 1/1 io_uring: use IO_REQ_LINK_FLAGS more
Replace the 2 instances of REQ_F_LINK | REQ_F_HARDLINK with the more commonly used IO_REQ_LINK_FLAGS.
--- io_uring/io_uring.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
io_uring/io_uring.c +4 -3
@@ -108,15 +108,17 @@ IOSQE_IO_HARDLINK | IOSQE_ASYNC)#define SQE_VALID_FLAGS (SQE_COMMON_FLAGS | IOSQE_BUFFER_SELECT | \ IOSQE_IO_DRAIN | IOSQE_CQE_SKIP_SUCCESS) +#define IO_REQ_LINK_FLAGS (REQ_F_LINK | REQ_F_HARDLINK) +#define IO_REQ_CLEAN_FLAGS (REQ_F_BUFFER_SELECTED | REQ_F_NEED_CLEANUP | \ REQ_F_POLLED | REQ_F_INFLIGHT | REQ_F_CREDS | \ REQ_F_ASYNC_DATA) -#define IO_REQ_CLEAN_SLOW_FLAGS (REQ_F_REFCOUNT | REQ_F_LINK | REQ_F_HARDLINK |\ +#define IO_REQ_CLEAN_SLOW_FLAGS (REQ_F_REFCOUNT | IO_REQ_LINK_FLAGS | \ REQ_F_REISSUE | IO_REQ_CLEAN_FLAGS)#define IO_TCTX_REFS_CACHE_NR (1U << 10)#define IO_COMPL_BATCH 32
@@ -129,11 +131,10 @@ struct io_defer_entry {u32 seq; };/* requests with any of those set should undergo io_disarm_next() */ #define IO_DISARM_MASK (REQ_F_ARM_LTIMEOUT | REQ_F_LINK_TIMEOUT | REQ_F_FAIL) -#define IO_REQ_LINK_FLAGS (REQ_F_LINK | REQ_F_HARDLINK)/* * No waiters. It's larger than any valid value of the tw counter * so that tests against ->cq_wait_nr would fail and skip wake_up(). */
@@ -1155,11 +1156,11 @@ static inline void io_req_local_work_add(struct io_kiocb *req,/* * We don't know how many reuqests is there in the link and whether * they can even be queued lazily, fall back to non-lazy. */ -if (req->flags & (REQ_F_LINK |REQ_F_HARDLINK )) +if (req->flags &IO_REQ_LINK_FLAGS ) flags &= ~IOU_F_TWQ_LAZY_WAKE ;guard (rcu)(); head =READ_ONCE (ctx->work_llist.first);
Signature · 1 line
2.45.2
Hi,
Quoted 69 lines
-----Original Message-----
From: Caleb Sander Mateos <[email protected]>
Sent: Wednesday, February 12, 2025 4:20 AM
To: Jens Axboe <[email protected]>; Pavel Begunkov <[email protected]>
Cc: Caleb Sander Mateos <[email protected]>; io- [email protected]; [email protected]
Subject: [PATCH]io_uring: useIO_REQ_LINK_FLAGSmoreReplace the 2 instances of
REQ_F_LINK|REQ_F_HARDLINKwith the more commonly usedIO_REQ_LINK_FLAGS.Signed-off-by Caleb Sander Mateos <[email protected]>--- io_uring/io_uring.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)io_uring/io_uring.c index renamed from io_uring/io_uring.c +0
-0
ec98a0ec6f34..8bb8c099c3e1100644io_uring/io_uring.c +3
-1@@ -108,15 +108,17 @@ IOSQE_IO_HARDLINK | IOSQE_ASYNC)#define SQE_VALID_FLAGS (SQE_COMMON_FLAGS | IOSQE_BUFFER_SELECT | \ IOSQE_IO_DRAIN | IOSQE_CQE_SKIP_SUCCESS) +#define IO_REQ_LINK_FLAGS (REQ_F_LINK | REQ_F_HARDLINK) +#define IO_REQ_CLEAN_FLAGS (REQ_F_BUFFER_SELECTED |REQ_F_NEED_CLEANUP | \REQ_F_POLLED |REQ_F_INFLIGHT |REQ_F_CREDS | \ REQ_F_ASYNC_DATA) -#define IO_REQ_CLEAN_SLOW_FLAGS (REQ_F_REFCOUNT | REQ_F_LINK | REQ_F_HARDLINK |\ +#define IO_REQ_CLEAN_SLOW_FLAGS (REQ_F_REFCOUNT | IO_REQ_LINK_FLAGS | \io_uring/io_uring.c +0
-0REQ_F_REISSUE | IO_REQ_CLEAN_FLAGS)#define IO_TCTX_REFS_CACHE_NR (1U << 10)#define IO_COMPL_BATCH 32@@ -129,11 +131,10 @@ struct io_defer_entry {u32 seq; }; /* requests with any of those set should undergo io_disarm_next() */ #define
IO_DISARM_MASK(REQ_F_ARM_LTIMEOUT|REQ_F_LINK_TIMEOUT|REQ_F_FAIL) -#defineIO_REQ_LINK_FLAGS(REQ_F_LINK|REQ_F_HARDLINK)/*
* No waiters. It's larger than any valid value of the tw counter
* so that tests against ->cq_wait_nr would fail and skipwake_up(). */io_uring/io_uring.c +1
-1@@ -1155,11 +1156,11 @@ static inline void io_req_local_work_add(struct io_kiocb *req,/* * We don't know how many reuqests is there in the link and whether * they can even be queued lazily, fall back to non-lazy. */ - if (req->flags & (REQ_F_LINK | REQ_F_HARDLINK)) + if (req->flags & IO_REQ_LINK_FLAGS) flags &= ~IOU_F_TWQ_LAZY_WAKE;guard (rcu)();
Quoted 4 lines
head =
READ_ONCE(ctx->work_llist.first);
--
2.45.2
---
Li Zetao
Quoted 4 lines · Caleb Sander Mateos
Replace the 2 instances of
REQ_F_LINK|REQ_F_HARDLINKwith the more commonly usedIO_REQ_LINK_FLAGS.
Applied, thanks!
[1/1] io_uring: use IO_REQ_LINK_FLAGS more
commit: fddceb353d686cf377d8b630ff6e3cdcb69ef4fb
Best regards,
Signature · 1 line
Jens Axboe