From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: [email protected], Jens Axboe <[email protected]>,
[email protected], Kanchan Joshi <[email protected]>,
Ming Lei <[email protected]>
Subject: [PATCH v3 13/13] io_uring: clean up io_lockdep_assert_cq_locked
Date: Mon, 18 Mar 2024 22:00:35 +0000 [thread overview]
Message-ID: <bbf33c429c9f6d7207a8fe66d1a5866ec2c99850.1710799188.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Move CONFIG_PROVE_LOCKING checks inside of io_lockdep_assert_cq_locked()
and kill the else branch.
Signed-off-by: Pavel Begunkov <[email protected]>
---
io_uring/io_uring.h | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h
index f694e7e6fb25..bae8c1e937c1 100644
--- a/io_uring/io_uring.h
+++ b/io_uring/io_uring.h
@@ -119,9 +119,9 @@ enum {
void io_eventfd_ops(struct rcu_head *rcu);
void io_activate_pollwq(struct io_ring_ctx *ctx);
-#if defined(CONFIG_PROVE_LOCKING)
static inline void io_lockdep_assert_cq_locked(struct io_ring_ctx *ctx)
{
+#if defined(CONFIG_PROVE_LOCKING)
lockdep_assert(in_task());
if (ctx->flags & IORING_SETUP_IOPOLL) {
@@ -140,12 +140,8 @@ static inline void io_lockdep_assert_cq_locked(struct io_ring_ctx *ctx)
else
lockdep_assert(current == ctx->submitter_task);
}
-}
-#else
-static inline void io_lockdep_assert_cq_locked(struct io_ring_ctx *ctx)
-{
-}
#endif
+}
static inline void io_req_task_work_add(struct io_kiocb *req)
{
--
2.44.0
next prev parent reply other threads:[~2024-03-18 22:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-18 22:00 [PATCH v3 00/13] Remove aux CQE caches Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 01/13] io_uring/cmd: move io_uring_try_cancel_uring_cmd() Pavel Begunkov
2024-03-19 1:29 ` Ming Lei
2024-03-18 22:00 ` [PATCH v3 02/13] io_uring/cmd: kill one issue_flags to tw conversion Pavel Begunkov
2024-03-19 1:33 ` Ming Lei
2024-03-18 22:00 ` [PATCH v3 03/13] io_uring/cmd: fix tw <-> issue_flags conversion Pavel Begunkov
2024-03-19 1:37 ` Ming Lei
2024-03-18 22:00 ` [PATCH v3 04/13] io_uring/cmd: introduce io_uring_cmd_complete Pavel Begunkov
2024-03-19 1:39 ` Ming Lei
2024-03-18 22:00 ` [PATCH v3 05/13] nvme/io_uring: don't hard code IO_URING_F_UNLOCKED Pavel Begunkov
2024-03-19 1:40 ` Ming Lei
2024-03-18 22:00 ` [PATCH v3 06/13] io_uring/rw: avoid punting to io-wq directly Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 07/13] io_uring: force tw ctx locking Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 08/13] io_uring: remove struct io_tw_state::locked Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 09/13] io_uring: refactor io_fill_cqe_req_aux Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 10/13] io_uring: get rid of intermediate aux cqe caches Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 11/13] io_uring: remove current check from complete_post Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 12/13] io_uring: refactor io_req_complete_post() Pavel Begunkov
2024-03-18 22:00 ` Pavel Begunkov [this message]
2024-03-19 1:42 ` [PATCH v3 00/13] Remove aux CQE caches Ming Lei
2024-03-19 2:19 ` 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=bbf33c429c9f6d7207a8fe66d1a5866ec2c99850.1710799188.git.asml.silence@gmail.com \
[email protected] \
[email protected] \
[email protected] \
[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