From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1ECA7C2BA2B for ; Thu, 16 Apr 2020 06:11:19 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D22EB20771 for ; Thu, 16 Apr 2020 06:11:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="Mzvh1yHY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D22EB20771 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6ED3C8E0088; Thu, 16 Apr 2020 02:11:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 69CD78E0001; Thu, 16 Apr 2020 02:11:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B2AC8E0088; Thu, 16 Apr 2020 02:11:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0008.hostedemail.com [216.40.44.8]) by kanga.kvack.org (Postfix) with ESMTP id 404B78E0001 for ; Thu, 16 Apr 2020 02:11:18 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id F0D03180AD815 for ; Thu, 16 Apr 2020 06:11:17 +0000 (UTC) X-FDA: 76712695794.27.dirt76_4584567715353 X-HE-Tag: dirt76_4584567715353 X-Filterd-Recvd-Size: 3780 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Thu, 16 Apr 2020 06:11:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=V1wMHJ2x48pyw+NR7zdN4GOKdt2x+SXrmagOcNfJte4=; b=Mzvh1yHYOTLa3L3LaVPa5JXfPS Rf9pgkQMbfyhlhjMqkSjUZVyD+TtqIhOyr9qQc/XoeVGxWHqJWpL4kg8L52u9EK4YgmdL8f1aUPIv I222yD1U2T2e0X/oiXB/1infIrckH515ONIedvsmoLFoS9gx28SxhOeKj9d8YaRe/YeX5h0B0gUJi xyxehntxUIVxmCX23CATwOPcWuptTLPJBImxRolnY6jZpCtOFqY9JGAJdywGFUmkLk6cFlPhXP+LA OVVpENRirSjFP7obaAFks1nWIIh9E5caWZ32HZXLcxPFiY53WGqclwB25hklE9P6LkDkw/1gJ79cq +qKexh9A==; Received: from hch by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOxjc-0004DX-QD; Thu, 16 Apr 2020 06:10:48 +0000 Date: Wed, 15 Apr 2020 23:10:48 -0700 From: Christoph Hellwig To: Luis Chamberlain Cc: Christoph Hellwig , Alan Jenkins , 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 , Hannes Reinecke , Michal Hocko Subject: Re: [PATCH 4/5] mm/swapfile: refcount block and queue before using blkcg_schedule_throttle() Message-ID: <20200416061048.GA1342@infradead.org> References: <20200414041902.16769-1-mcgrof@kernel.org> <20200414041902.16769-5-mcgrof@kernel.org> <20200414154447.GC25765@infradead.org> <20200415054234.GQ11244@42.do-not-panic.com> <20200415072712.GB21099@infradead.org> <20200415073443.GA21036@infradead.org> <20200415131915.GV11244@42.do-not-panic.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200415131915.GV11244@42.do-not-panic.com> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Apr 15, 2020 at 01:19:15PM +0000, Luis Chamberlain wrote: > > 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); > > } > > Sorry, its not clear to me who calls the respective blk_put_queue() > here? If you look at blkcg_schedule_throttle, it only puts the queue that was in current->throttle_queue. But mem_cgroup_throttle_swaprate exits early when current->throttle_queue is non-zero (first two lines quote above). So when called from mem_cgroup_throttle_swaprate, blkcg_schedule_throttle should never actually put a queue. Open coding the few relevant lines from blkcg_schedule_throttle in mem_cgroup_throttle_swaprate makes that obvious.