From: Christoph Hellwig <hch@infradead.org>
To: Luis Chamberlain <mcgrof@kernel.org>
Cc: Christoph Hellwig <hch@infradead.org>,
Alan Jenkins <alan.christopher.jenkins@gmail.com>,
axboe@kernel.dk, viro@zeniv.linux.org.uk, bvanassche@acm.org,
gregkh@linuxfoundation.org, rostedt@goodmis.org,
mingo@redhat.com, jack@suse.cz, ming.lei@redhat.com,
nstange@suse.de, akpm@linux-foundation.org, mhocko@suse.com,
yukuai3@huawei.com, linux-block@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, Omar Sandoval <osandov@fb.com>,
Hannes Reinecke <hare@suse.com>, Michal Hocko <mhocko@kernel.org>
Subject: Re: [PATCH 4/5] mm/swapfile: refcount block and queue before using blkcg_schedule_throttle()
Date: Wed, 15 Apr 2020 00:34:43 -0700 [thread overview]
Message-ID: <20200415073443.GA21036@infradead.org> (raw)
In-Reply-To: <20200415072712.GB21099@infradead.org>
On Wed, Apr 15, 2020 at 12:27:12AM -0700, Christoph Hellwig wrote:
> On Wed, Apr 15, 2020 at 05:42:34AM +0000, Luis Chamberlain wrote:
> > > I don't understand the atomic part of the comment. How does
> > > bdgrab/bdput help us there?
> >
> > The commit log above did a better job at explaining this in terms of our
> > goal to use the request_queue and how this use would prevent the risk of
> > releasing the request_queue, which could sleep.
>
> So bdput eventually does and iput, but what leads to an out of context
> offload?
>
> But anyway, isn't the original problem better solved by simply not
> releasing the queue from atomic context to start with? There isn't
> really any good reason we keep holding the spinlock once we have a
> reference on the queue, so something like this (not even compile tested)
> should do the work:
Actually - mem_cgroup_throttle_swaprate already checks for a non-NULL
current->throttle_queue above, so we should never even call
blk_put_queue here. Was this found by code inspection, or was there
a real report?
In the latter case we need to figure out what protects >throttle_queue,
as the way blkcg_schedule_throttle first put the reference and only then
assign a value to it already looks like it introduces a tiny race
window.
Otherwise just open coding the applicable part ofblkcg_schedule_throttle
in mem_cgroup_throttle_swaprate seems easiest:
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 5871a2aa86a5..e16051ef074c 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -3761,15 +3761,20 @@ void mem_cgroup_throttle_swaprate(struct mem_cgroup *memcg, int node,
*/
if (current->throttle_queue)
return;
+ if (unlikely(current->flags & PF_KTHREAD))
+ return;
spin_lock(&swap_avail_lock);
plist_for_each_entry_safe(si, next, &swap_avail_heads[node],
avail_lists[node]) {
- if (si->bdev) {
- blkcg_schedule_throttle(bdev_get_queue(si->bdev),
- true);
- break;
+ if (!si->bdev)
+ continue;
+ if (blk_get_queue(dev_get_queue(si->bdev))) {
+ current->throttle_queue = dev_get_queue(si->bdev);
+ current->use_memdelay = true;
+ set_notify_resume(current);
}
+ break;
}
spin_unlock(&swap_avail_lock);
}
next prev parent reply other threads:[~2020-04-15 7:35 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-14 4:18 [PATCH 0/5] blktrace: fix use after free Luis Chamberlain
2020-04-14 4:18 ` [PATCH 1/5] block: move main block debugfs initialization to its own file Luis Chamberlain
2020-04-14 7:35 ` Greg KH
2020-04-15 2:44 ` Bart Van Assche
2020-04-14 4:18 ` [PATCH 2/5] blktrace: fix debugfs use after free Luis Chamberlain
2020-04-14 7:37 ` Greg KH
2020-04-14 15:38 ` Christoph Hellwig
2020-04-15 2:46 ` Bart Van Assche
2020-04-15 17:38 ` Eric Sandeen
2020-04-15 21:48 ` Bart Van Assche
2020-04-16 0:56 ` Luis Chamberlain
2020-04-16 1:02 ` Eric Sandeen
2020-04-16 1:20 ` Luis Chamberlain
2020-04-16 2:10 ` Ming Lei
2020-04-16 5:25 ` Luis Chamberlain
2020-04-16 5:47 ` Ming Lei
2020-04-16 6:09 ` Ming Lei
2020-04-16 6:22 ` Luis Chamberlain
2020-04-16 6:20 ` Luis Chamberlain
2020-04-16 6:28 ` Ming Lei
2020-04-17 4:09 ` Luis Chamberlain
2020-04-14 4:19 ` [PATCH 3/5] blktrace: refcount the request_queue during ioctl Luis Chamberlain
2020-04-14 15:40 ` Christoph Hellwig
2020-04-15 6:16 ` Luis Chamberlain
2020-04-15 7:14 ` Christoph Hellwig
2020-04-15 12:34 ` Luis Chamberlain
2020-04-15 12:39 ` Christoph Hellwig
2020-04-15 13:25 ` Luis Chamberlain
2020-04-15 14:18 ` Bart Van Assche
2020-04-16 1:12 ` Luis Chamberlain
2020-04-16 3:43 ` Bart Van Assche
2020-04-16 5:29 ` Luis Chamberlain
2020-04-15 14:45 ` Bart Van Assche
2020-04-16 1:17 ` Luis Chamberlain
2020-04-16 2:31 ` Ming Lei
2020-04-16 5:36 ` Luis Chamberlain
2020-04-14 4:19 ` [PATCH 4/5] mm/swapfile: refcount block and queue before using blkcg_schedule_throttle() Luis Chamberlain
2020-04-14 15:44 ` Christoph Hellwig
2020-04-15 5:42 ` Luis Chamberlain
2020-04-15 7:27 ` Christoph Hellwig
2020-04-15 7:34 ` Christoph Hellwig [this message]
2020-04-15 13:19 ` Luis Chamberlain
2020-04-16 6:10 ` Christoph Hellwig
2020-04-16 6:22 ` Ming Lei
2020-04-16 6:25 ` Luis Chamberlain
2020-04-16 6:34 ` Ming Lei
2020-04-14 4:19 ` [PATCH 5/5] block: revert back to synchronous request_queue removal Luis Chamberlain
2020-04-14 15:47 ` Christoph Hellwig
2020-04-14 20:58 ` Luis Chamberlain
2020-04-15 6:46 ` Christoph Hellwig
2020-04-15 13:20 ` Luis Chamberlain
2020-04-16 2:36 ` Ming Lei
2020-04-14 7:38 ` [PATCH 0/5] blktrace: fix use after free Greg KH
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=20200415073443.GA21036@infradead.org \
--to=hch@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=alan.christopher.jenkins@gmail.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=gregkh@linuxfoundation.org \
--cc=hare@suse.com \
--cc=jack@suse.cz \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mcgrof@kernel.org \
--cc=mhocko@kernel.org \
--cc=mhocko@suse.com \
--cc=ming.lei@redhat.com \
--cc=mingo@redhat.com \
--cc=nstange@suse.de \
--cc=osandov@fb.com \
--cc=rostedt@goodmis.org \
--cc=viro@zeniv.linux.org.uk \
--cc=yukuai3@huawei.com \
/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).