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=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 27E76C2D0A3 for ; Wed, 4 Nov 2020 14:29:18 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7A7E0206F4 for ; Wed, 4 Nov 2020 14:29:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hcLhPdVR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A7E0206F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D2D906B0036; Wed, 4 Nov 2020 09:29:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CDE546B005D; Wed, 4 Nov 2020 09:29:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA6426B0068; Wed, 4 Nov 2020 09:29:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0049.hostedemail.com [216.40.44.49]) by kanga.kvack.org (Postfix) with ESMTP id 8F3AB6B0036 for ; Wed, 4 Nov 2020 09:29:16 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 2B96D8249980 for ; Wed, 4 Nov 2020 14:29:16 +0000 (UTC) X-FDA: 77446968312.29.war92_49011ac272c1 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id C47E01801FA5C for ; Wed, 4 Nov 2020 14:17:53 +0000 (UTC) X-HE-Tag: war92_49011ac272c1 X-Filterd-Recvd-Size: 8485 Received: from mail-il1-f196.google.com (mail-il1-f196.google.com [209.85.166.196]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Wed, 4 Nov 2020 14:17:53 +0000 (UTC) Received: by mail-il1-f196.google.com with SMTP id z2so19423170ilh.11 for ; Wed, 04 Nov 2020 06:17:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Xebe9mZ8DB5irhboCX8vCKD1a9LqZ8XcyxjHuCXnZxw=; b=hcLhPdVRSs44m978omUttG/O0Ao4AXMdsw7AxyjOhEMMufKcz8qdX+HtsVjCSiTrlB zZHnIZ5anDIlHNS1oLJaLa22xjbYhh1Cp4MLw7qguONX9ZeyGIFWeJGI/XiqzQInQuFQ 2CqfkYLZKDbs9R1eJLCp4uw0ur+TpAl+VKQWsD8p0qmWsR59AdhG900FHnHBoCGI9mej taGs9US0AfQn+cHsri+cfgFuY2ODwzJkqge8jEWm0Iu/NGvs4iqihRXOlsbacukzV4JC 4Qh26zfA8mECEzpLkCnXMy+Cx1vRerEdG914kZVYZbBe7QfZl/Er002DIkJbEIjXLSOl BEIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Xebe9mZ8DB5irhboCX8vCKD1a9LqZ8XcyxjHuCXnZxw=; b=hgnvonxhggYFuRSkb8rFk6mae/aO9ULp+Tk8o+JYXs0l+jHdjg/H3SywM0jY2o/iE+ 0f+gyT5Br+RpuaEgt9B3PzRvZiv4s5rEot7C0jiD7/twcYAvAuzc/brFnHEQL6LBWCHa eWK5UFXcV0T5/rjNayJ4eOcoNDB19drh/K+uXEhoLK1iPRdsylyQ+kUu3Fra/gfPitbo QqqmpkV9j4xmgAwhTkuac4xzAO8benDPHV0q3poIa9jF4DGJsyRMqvGCYjJFU450eR8H X7czxiuXcE2OonyXFkJIuwaPmkmKgYGL47tVa1jHnGeW4w6VJhAc99w9Lozg+6/eTgdF 6XBQ== X-Gm-Message-State: AOAM5337KCy97gxZ5JW1lcW4HHXMSWQU+FameixmUyEzypaMl9tzrom8 pEdxym1Jn45eHt6W397WNJyEZ5ZNMDayKK81p70= X-Google-Smtp-Source: ABdhPJwU1Nu1VvYjapXwx/rqdQ4611QoTnLt4nyVafc9SCay46WwUSgmwQZgj0FZBBBMaQHORBlnThoHzpR+7bq1vqM= X-Received: by 2002:a92:1307:: with SMTP id 7mr18654189ilt.142.1604499472652; Wed, 04 Nov 2020 06:17:52 -0800 (PST) MIME-Version: 1.0 References: <20201103131754.94949-1-laoar.shao@gmail.com> <20201103131754.94949-2-laoar.shao@gmail.com> <20201103194819.GM7123@magnolia> In-Reply-To: <20201103194819.GM7123@magnolia> From: Yafang Shao Date: Wed, 4 Nov 2020 22:17:16 +0800 Message-ID: Subject: Re: [PATCH v8 resend 1/2] mm: Add become_kswapd and restore_kswapd To: "Darrick J. Wong" Cc: Andrew Morton , Dave Chinner , Christoph Hellwig , Matthew Wilcox , Michal Hocko , Linux MM , linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org Content-Type: text/plain; charset="UTF-8" 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, Nov 4, 2020 at 3:48 AM Darrick J. Wong wrote: > > On Tue, Nov 03, 2020 at 09:17:53PM +0800, Yafang Shao wrote: > > From: "Matthew Wilcox (Oracle)" > > > > Since XFS needs to pretend to be kswapd in some of its worker threads, > > create methods to save & restore kswapd state. Don't bother restoring > > kswapd state in kswapd -- the only time we reach this code is when we're > > exiting and the task_struct is about to be destroyed anyway. > > > > Cc: Dave Chinner > > Acked-by: Michal Hocko > > Reviewed-by: Darrick J. Wong > > Reviewed-by: Christoph Hellwig > > Signed-off-by: Matthew Wilcox (Oracle) > > Signed-off-by: Yafang Shao > > --- > > fs/xfs/libxfs/xfs_btree.c | 14 ++++++++------ > > include/linux/sched/mm.h | 23 +++++++++++++++++++++++ > > mm/vmscan.c | 16 +--------------- > > 3 files changed, 32 insertions(+), 21 deletions(-) > > > > diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c > > index 2d25bab..a04a442 100644 > > --- a/fs/xfs/libxfs/xfs_btree.c > > +++ b/fs/xfs/libxfs/xfs_btree.c > > @@ -2813,8 +2813,9 @@ struct xfs_btree_split_args { > > { > > struct xfs_btree_split_args *args = container_of(work, > > struct xfs_btree_split_args, work); > > + bool is_kswapd = args->kswapd; > > unsigned long pflags; > > - unsigned long new_pflags = PF_MEMALLOC_NOFS; > > + int memalloc_nofs; > > > > /* > > * we are in a transaction context here, but may also be doing work > > @@ -2822,16 +2823,17 @@ struct xfs_btree_split_args { > > * temporarily to ensure that we don't block waiting for memory reclaim > > * in any way. > > */ > > - if (args->kswapd) > > - new_pflags |= PF_MEMALLOC | PF_SWAPWRITE | PF_KSWAPD; > > - > > - current_set_flags_nested(&pflags, new_pflags); > > + if (is_kswapd) > > + pflags = become_kswapd(); > > + memalloc_nofs = memalloc_nofs_save(); > > > > args->result = __xfs_btree_split(args->cur, args->level, args->ptrp, > > args->key, args->curp, args->stat); > > complete(args->done); > > > > - current_restore_flags_nested(&pflags, new_pflags); > > + memalloc_nofs_restore(memalloc_nofs); > > + if (is_kswapd) > > + restore_kswapd(pflags); > > Note that there's a trivial merge conflict with the mrlock_t removal > series. I'll carry the fix in the tree, assuming that everything > passes. > This patchset is based on Andrew's tree currently. Seems I should rebase this patchset on your tree instead of Andrew's tree ? > --D > > > } > > > > /* > > diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h > > index d5ece7a..2faf03e 100644 > > --- a/include/linux/sched/mm.h > > +++ b/include/linux/sched/mm.h > > @@ -278,6 +278,29 @@ static inline void memalloc_nocma_restore(unsigned int flags) > > } > > #endif > > > > +/* > > + * Tell the memory management code that this thread is working on behalf > > + * of background memory reclaim (like kswapd). That means that it will > > + * get access to memory reserves should it need to allocate memory in > > + * order to make forward progress. With this great power comes great > > + * responsibility to not exhaust those reserves. > > + */ > > +#define KSWAPD_PF_FLAGS (PF_MEMALLOC | PF_SWAPWRITE | PF_KSWAPD) > > + > > +static inline unsigned long become_kswapd(void) > > +{ > > + unsigned long flags = current->flags & KSWAPD_PF_FLAGS; > > + > > + current->flags |= KSWAPD_PF_FLAGS; > > + > > + return flags; > > +} > > + > > +static inline void restore_kswapd(unsigned long flags) > > +{ > > + current->flags &= ~(flags ^ KSWAPD_PF_FLAGS); > > +} > > + > > #ifdef CONFIG_MEMCG > > DECLARE_PER_CPU(struct mem_cgroup *, int_active_memcg); > > /** > > diff --git a/mm/vmscan.c b/mm/vmscan.c > > index 1b8f0e0..77bc1dd 100644 > > --- a/mm/vmscan.c > > +++ b/mm/vmscan.c > > @@ -3869,19 +3869,7 @@ static int kswapd(void *p) > > if (!cpumask_empty(cpumask)) > > set_cpus_allowed_ptr(tsk, cpumask); > > > > - /* > > - * Tell the memory management that we're a "memory allocator", > > - * and that if we need more memory we should get access to it > > - * regardless (see "__alloc_pages()"). "kswapd" should > > - * never get caught in the normal page freeing logic. > > - * > > - * (Kswapd normally doesn't need memory anyway, but sometimes > > - * you need a small amount of memory in order to be able to > > - * page out something else, and this flag essentially protects > > - * us from recursively trying to free more memory as we're > > - * trying to free the first piece of memory in the first place). > > - */ > > - tsk->flags |= PF_MEMALLOC | PF_SWAPWRITE | PF_KSWAPD; > > + become_kswapd(); > > set_freezable(); > > > > WRITE_ONCE(pgdat->kswapd_order, 0); > > @@ -3931,8 +3919,6 @@ static int kswapd(void *p) > > goto kswapd_try_sleep; > > } > > > > - tsk->flags &= ~(PF_MEMALLOC | PF_SWAPWRITE | PF_KSWAPD); > > - > > return 0; > > } > > > > -- > > 1.8.3.1 > > -- Thanks Yafang