From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH for-next 5/7] io_uring/net: inline io_notif_flush()
Date: Fri, 4 Nov 2022 10:59:44 +0000 [thread overview]
Message-ID: <332359e7bd124138dfe51340bbec829c9b265c18.1667557923.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
io_notif_flush() is pretty simple, we can inline it.
Signed-off-by: Pavel Begunkov <[email protected]>
---
io_uring/notif.c | 10 ----------
io_uring/notif.h | 11 ++++++++++-
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/io_uring/notif.c b/io_uring/notif.c
index 5b0e7bb1198f..c287adf24e66 100644
--- a/io_uring/notif.c
+++ b/io_uring/notif.c
@@ -67,13 +67,3 @@ struct io_kiocb *io_alloc_notif(struct io_ring_ctx *ctx)
refcount_set(&nd->uarg.refcnt, 1);
return notif;
}
-
-void io_notif_flush(struct io_kiocb *notif)
- __must_hold(&slot->notif->ctx->uring_lock)
-{
- struct io_notif_data *nd = io_notif_to_data(notif);
-
- /* drop slot's master ref */
- if (refcount_dec_and_test(&nd->uarg.refcnt))
- io_req_task_work_add(notif);
-}
diff --git a/io_uring/notif.h b/io_uring/notif.h
index 4ae696273c78..7f00176020d3 100644
--- a/io_uring/notif.h
+++ b/io_uring/notif.h
@@ -18,7 +18,6 @@ struct io_notif_data {
bool zc_copied;
};
-void io_notif_flush(struct io_kiocb *notif);
struct io_kiocb *io_alloc_notif(struct io_ring_ctx *ctx);
static inline struct io_notif_data *io_notif_to_data(struct io_kiocb *notif)
@@ -26,6 +25,16 @@ static inline struct io_notif_data *io_notif_to_data(struct io_kiocb *notif)
return io_kiocb_to_cmd(notif, struct io_notif_data);
}
+static inline void io_notif_flush(struct io_kiocb *notif)
+ __must_hold(¬if->ctx->uring_lock)
+{
+ struct io_notif_data *nd = io_notif_to_data(notif);
+
+ /* drop slot's master ref */
+ if (refcount_dec_and_test(&nd->uarg.refcnt))
+ io_req_task_work_add(notif);
+}
+
static inline int io_notif_account_mem(struct io_kiocb *notif, unsigned len)
{
struct io_ring_ctx *ctx = notif->ctx;
--
2.38.0
next prev parent reply other threads:[~2022-11-04 11:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-04 10:59 [PATCH for-next 0/7] small zc improvements Pavel Begunkov
2022-11-04 10:59 ` [PATCH for-next 1/7] io_uring: move kbuf put out of generic tw complete Pavel Begunkov
2022-11-04 10:59 ` [PATCH for-next 2/7] io_uring/net: remove extra notif rsrc setup Pavel Begunkov
2022-11-04 10:59 ` [PATCH for-next 3/7] io_uring/net: preset notif tw handler Pavel Begunkov
2022-11-04 10:59 ` [PATCH for-next 4/7] io_uring/net: rename io_uring_tx_zerocopy_callback Pavel Begunkov
2022-11-04 10:59 ` Pavel Begunkov [this message]
2022-11-04 10:59 ` [PATCH for-next 6/7] io_uring: move zc reporting from the hot path Pavel Begunkov
2022-11-04 10:59 ` [PATCH for-next 7/7] io_uring/net: move mm accounting to a slower path Pavel Begunkov
2022-11-05 15:20 ` [PATCH for-next 0/7] small zc improvements Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=332359e7bd124138dfe51340bbec829c9b265c18.1667557923.git.asml.silence@gmail.com \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox