From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Paolo Valente <paolo.valente@linaro.org>, Jan Kara <jack@suse.cz>,
Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>,
Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>,
linux-block@vger.kernel.org, linux-rdma@vger.kernel.org
Subject: [PATCH 09/14] block: remove get_io_context_active
Date: Fri, 26 Nov 2021 12:58:12 +0100 [thread overview]
Message-ID: <20211126115817.2087431-10-hch@lst.de> (raw)
In-Reply-To: <20211126115817.2087431-1-hch@lst.de>
Fold it into it's only caller, and remove a lof of the debug checks
that are not needed.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-ioc.c | 8 +++-----
include/linux/iocontext.h | 16 ----------------
2 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index 3ba15c867dfa6..cc4eb2ba87f74 100644
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -173,7 +173,7 @@ EXPORT_SYMBOL_GPL(put_io_context);
* put_io_context_active - put active reference on ioc
* @ioc: ioc of interest
*
- * Undo get_io_context_active(). If active reference reaches zero after
+ * Put an active reference to an ioc. If active reference reaches zero after
* put, @ioc can never issue further IOs and ioscheds are notified.
*/
static void put_io_context_active(struct io_context *ioc)
@@ -333,11 +333,9 @@ int __copy_io(unsigned long clone_flags, struct task_struct *tsk)
* Share io context with parent, if CLONE_IO is set
*/
if (clone_flags & CLONE_IO) {
- get_io_context_active(ioc);
-
- WARN_ON_ONCE(atomic_read(&ioc->nr_tasks) <= 0);
+ atomic_long_inc(&ioc->refcount);
+ atomic_inc(&ioc->active_ref);
atomic_inc(&ioc->nr_tasks);
-
tsk->io_context = ioc;
} else if (ioprio_valid(ioc->ioprio)) {
new_ioc = get_task_io_context(tsk, GFP_KERNEL, NUMA_NO_NODE);
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 3ba45953d5228..c1229fbd6691c 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -113,22 +113,6 @@ struct io_context {
struct work_struct release_work;
};
-/**
- * get_io_context_active - get active reference on ioc
- * @ioc: ioc of interest
- *
- * Only iocs with active reference can issue new IOs. This function
- * acquires an active reference on @ioc. The caller must already have an
- * active reference on @ioc.
- */
-static inline void get_io_context_active(struct io_context *ioc)
-{
- WARN_ON_ONCE(atomic_long_read(&ioc->refcount) <= 0);
- WARN_ON_ONCE(atomic_read(&ioc->active_ref) <= 0);
- atomic_long_inc(&ioc->refcount);
- atomic_inc(&ioc->active_ref);
-}
-
struct task_struct;
#ifdef CONFIG_BLOCK
void put_io_context(struct io_context *ioc);
--
2.30.2
next prev parent reply other threads:[~2021-11-26 12:36 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-26 11:58 cleanup I/O context handling Christoph Hellwig
2021-11-26 11:58 ` [PATCH 01/14] RDMA/qib: rename copy_io to qib_copy_io Christoph Hellwig
2021-11-26 11:58 ` [PATCH 02/14] fork: move copy_io to block/blk-ioc.c Christoph Hellwig
2021-11-26 11:58 ` [PATCH 03/14] bfq: simplify bfq_bic_lookup Christoph Hellwig
2021-11-26 11:58 ` [PATCH 04/14] bfq: use bfq_bic_lookup in bfq_limit_depth Christoph Hellwig
2021-11-29 16:09 ` Jan Kara
2021-11-30 6:39 ` Christoph Hellwig
2021-11-30 10:26 ` Jan Kara
2021-11-26 11:58 ` [PATCH 05/14] Revert "block: Provide blk_mq_sched_get_icq()" Christoph Hellwig
2021-11-26 11:58 ` [PATCH 06/14] block: mark put_io_context_active static Christoph Hellwig
2021-11-26 11:58 ` [PATCH 07/14] block: move blk_mq_sched_assign_ioc to blk-ioc.c Christoph Hellwig
2021-11-26 11:58 ` [PATCH 08/14] block: move the remaining elv.icq handling to the I/O scheduler Christoph Hellwig
2021-11-26 11:58 ` Christoph Hellwig [this message]
2021-11-26 11:58 ` [PATCH 10/14] block: factor out a alloc_io_context helper Christoph Hellwig
2021-11-26 11:58 ` [PATCH 11/14] block: use alloc_io_context in __copy_io Christoph Hellwig
2021-11-26 11:58 ` [PATCH 12/14] block: return the io_context from create_task_io_context Christoph Hellwig
2021-11-26 11:58 ` [PATCH 13/14] block: simplify ioc_create_icq Christoph Hellwig
2021-11-26 11:58 ` [PATCH 14/14] block: simplify ioc_lookup_icq Christoph Hellwig
2021-11-27 13:40 ` cleanup I/O context handling Jens Axboe
2021-11-30 11:09 ` Jan Kara
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=20211126115817.2087431-10-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=dennis.dalessandro@cornelisnetworks.com \
--cc=jack@suse.cz \
--cc=linux-block@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=mike.marciniszyn@cornelisnetworks.com \
--cc=paolo.valente@linaro.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.