From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org,
linux-kernel@vger.kernel.org,
Pavel Begunkov <asml.silence@gmail.com>
Subject: [PATCH 3/3] io_uring: Convert advanced XArray uses to the normal API
Date: Fri, 9 Oct 2020 13:49:53 +0100 [thread overview]
Message-ID: <20201009124954.31830-3-willy@infradead.org> (raw)
In-Reply-To: <20201009124954.31830-1-willy@infradead.org>
There are no bugs here that I've spotted, it's just easier to use the
normal API and there are no performance advantages to using the more
verbose advanced API.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/io_uring.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index bcef6210bf67..1a894df526da 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -8615,27 +8615,17 @@ static int io_uring_add_task_file(struct file *file)
static void io_uring_del_task_file(struct file *file)
{
struct io_uring_task *tctx = current->io_uring;
- XA_STATE(xas, &tctx->xa, (unsigned long) file);
if (tctx->last == file)
tctx->last = NULL;
-
- xas_lock(&xas);
- file = xas_store(&xas, NULL);
- xas_unlock(&xas);
-
+ file = xa_erase(&tctx->xa, (unsigned long)file);
if (file)
fput(file);
}
static void __io_uring_attempt_task_drop(struct file *file)
{
- XA_STATE(xas, ¤t->io_uring->xa, (unsigned long) file);
- struct file *old;
-
- rcu_read_lock();
- old = xas_load(&xas);
- rcu_read_unlock();
+ struct file *old = xa_load(¤t->io_uring->xa, (unsigned long)file);
if (old == file)
io_uring_del_task_file(file);
--
2.28.0
next prev parent reply other threads:[~2020-10-09 12:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 12:49 [PATCH 1/3] io_uring: Fix use of XArray in __io_uring_files_cancel Matthew Wilcox (Oracle)
2020-10-09 12:49 ` [PATCH 2/3] io_uring: Fix XArray usage in io_uring_add_task_file Matthew Wilcox (Oracle)
2020-10-09 14:57 ` Jens Axboe
2020-10-09 17:36 ` Matthew Wilcox
2020-10-10 9:41 ` [io_uring] b166b25674: BUG:KASAN:null-ptr-deref_in_i kernel test robot
2020-10-10 10:07 ` Pavel Begunkov
2020-10-09 12:49 ` Matthew Wilcox (Oracle) [this message]
2020-10-09 12:57 ` [PATCH 1/3] io_uring: Fix use of XArray in __io_uring_files_cancel Pavel Begunkov
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=20201009124954.31830-3-willy@infradead.org \
--to=willy@infradead.org \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).