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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 9E299C4361B for ; Thu, 17 Dec 2020 04:47:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 211EA23731 for ; Thu, 17 Dec 2020 04:47:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 211EA23731 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 499A96B006E; Wed, 16 Dec 2020 23:47:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 44B106B0070; Wed, 16 Dec 2020 23:47:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 362496B0071; Wed, 16 Dec 2020 23:47:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0037.hostedemail.com [216.40.44.37]) by kanga.kvack.org (Postfix) with ESMTP id 1FBC76B006E for ; Wed, 16 Dec 2020 23:47:25 -0500 (EST) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id CCF461E0B for ; Thu, 17 Dec 2020 04:47:24 +0000 (UTC) X-FDA: 77601540408.14.board64_1a0c4f727432 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id B08A818229818 for ; Thu, 17 Dec 2020 04:47:24 +0000 (UTC) X-HE-Tag: board64_1a0c4f727432 X-Filterd-Recvd-Size: 8848 Received: from mail-io1-f43.google.com (mail-io1-f43.google.com [209.85.166.43]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Thu, 17 Dec 2020 04:47:24 +0000 (UTC) Received: by mail-io1-f43.google.com with SMTP id w18so12410135iot.0 for ; Wed, 16 Dec 2020 20:47:24 -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=PRUMLTk7szvcs7E9rP3JJrNFOeJ7mkueV5pL+SzEkSM=; b=QRlJcth1nNqZpZH57ZV7mSS0URPgxM4TleMaXtrVW/Wg6sSJuMdzAQ2MVJbIfHK9QL TOjdktPjwgqXEoHWHBuG0Kpl5+maKdYmNU23/jI1DNrB7ADfnRzpSVzf5oooxKCXqVWq LJp3q2T9S3J8Fi9w+CzM9u8yRXMkm79eE0iOva5jDp3J6nJS24PCJ1Hh6p+wh7NyRmIR uBJxBaLZ2Q7CnqnG56ombBFJ5qYfZsS8mYqJ4D3qCOlBEOM8qGFfxhi9WaUKcr3kl9Y8 7WcXPNc0OTcuLR0XZm0DqojDVwC9wEupU2c+tXHL3XNjFgEMwxClj5IeqMz46oiH8mpr d27g== 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=PRUMLTk7szvcs7E9rP3JJrNFOeJ7mkueV5pL+SzEkSM=; b=ejg9nngLpFky5F7pvA3j1mK2rsuvGsCj65Ux9BPkgDUWZKwe0y3Tcgn5C/UFgJ80g0 MQgDGvW5JwEzCt0Xd4cSWBYkmY6EveImJC7jSpmabeCiXNOYvmXSzm3ykLjHUAqKQ1p9 kiUBxxT4HezLz8B1iP2vEIiBurKvtH2geXQjZvO46OrxbKF2e2bGKU9u9KQlVmGO3ofI 0htw1h3w8ucIS3AMD/NbQoO/WwrLqhPePugKk6hoNYDFM382EXHFEe+YiFMpOep+2QK/ waFO/gnu+vXJzyL3ZI/JgrCyk9xaY4/ZGgBjKP9OgLOgvg/Dqt0LYPc9E7QILKzf9GEV E05A== X-Gm-Message-State: AOAM532cx8BJo4jKnn5ruhyHkj/G6iJG528BSKOFFde4/uoEtaa11kOx IBO5ujLJgAhx+CbZOz818QOG69wCO02FN4vBeEo= X-Google-Smtp-Source: ABdhPJxBoUYfBARhqKQXlH0TMk7AC8ra43Si0SEHE3kCbFav1S1El7VPg2rN//ZysJPcc8ybj8p4DXerd58/pSgl2f0= X-Received: by 2002:a05:6602:2157:: with SMTP id y23mr45264126ioy.202.1608180443614; Wed, 16 Dec 2020 20:47:23 -0800 (PST) MIME-Version: 1.0 References: <20201217011157.92549-1-laoar.shao@gmail.com> <20201217011157.92549-2-laoar.shao@gmail.com> <20201217030609.GP632069@dread.disaster.area> In-Reply-To: <20201217030609.GP632069@dread.disaster.area> From: Yafang Shao Date: Thu, 17 Dec 2020 12:46:47 +0800 Message-ID: Subject: Re: [PATCH v13 1/4] mm: Add become_kswapd and restore_kswapd To: Dave Chinner Cc: "Darrick J. Wong" , Matthew Wilcox , Christoph Hellwig , Michal Hocko , Andrew Morton , David Howells , jlayton@redhat.com, linux-fsdevel@vger.kernel.org, linux-cachefs@redhat.com, linux-xfs@vger.kernel.org, Linux MM , Michal Hocko , Christoph Hellwig 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 Thu, Dec 17, 2020 at 11:06 AM Dave Chinner wrote: > > On Thu, Dec 17, 2020 at 09:11:54AM +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 51dbff9b0908..0f35b7a38e76 100644 > > --- a/fs/xfs/libxfs/xfs_btree.c > > +++ b/fs/xfs/libxfs/xfs_btree.c > > @@ -2813,8 +2813,9 @@ xfs_btree_split_worker( > > { > > 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 @@ xfs_btree_split_worker( > > * 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); > > } > > > > /* > > diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h > > index d5ece7a9a403..2faf03e79a1e 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; > > +} > > You can get rid of the empty lines out of this function. > > > +static inline void restore_kswapd(unsigned long flags) > > +{ > > + current->flags &= ~(flags ^ KSWAPD_PF_FLAGS); > > +} > > Urk, that requires thinking about to determine whether it is > correct. And it is 3 runtime logic operations (^, ~ and &) too. The > way all the memalloc_*_restore() functions restore the previous > flags is obviously correct and only requires 2 runtime logic > operations because the compiler calculates the ~ operation on the > constant. So why do it differently here? i.e.: > > current->flags = (current->flags & ~KSWAPD_PF_FLAGS) | flags; > I will change it as you suggested if Matthew doesn't have a different opinion, Matthew ? > > --- a/mm/vmscan.c > > +++ b/mm/vmscan.c > > @@ -3870,19 +3870,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); > > @@ -3932,8 +3920,6 @@ static int kswapd(void *p) > > goto kswapd_try_sleep; > > } > > > > - tsk->flags &= ~(PF_MEMALLOC | PF_SWAPWRITE | PF_KSWAPD); > > - > > Missing a restore_kswapd()? > > Cheers, > > Dave. > -- > Dave Chinner > david@fromorbit.com -- Thanks Yafang