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.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,USER_AGENT_GIT 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 F0683C433DF for ; Wed, 19 Aug 2020 02:25:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A510B205CB for ; Wed, 19 Aug 2020 02:25:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g6IVo8SN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A510B205CB 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 5167B8D0008; Tue, 18 Aug 2020 22:25:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4A0978D0007; Tue, 18 Aug 2020 22:25:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 341078D0008; Tue, 18 Aug 2020 22:25:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0238.hostedemail.com [216.40.44.238]) by kanga.kvack.org (Postfix) with ESMTP id 195778D0007 for ; Tue, 18 Aug 2020 22:25:17 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id CB638824805A for ; Wed, 19 Aug 2020 02:25:16 +0000 (UTC) X-FDA: 77165726232.13.lake78_340e3ac27024 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 9DDE518140B60 for ; Wed, 19 Aug 2020 02:25:16 +0000 (UTC) X-HE-Tag: lake78_340e3ac27024 X-Filterd-Recvd-Size: 7479 Received: from mail-qv1-f68.google.com (mail-qv1-f68.google.com [209.85.219.68]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Wed, 19 Aug 2020 02:25:16 +0000 (UTC) Received: by mail-qv1-f68.google.com with SMTP id o2so10584384qvk.6 for ; Tue, 18 Aug 2020 19:25:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NRcr1uR+jWrXWzQj4QCI0O5tOCY1uyw+iu2TAziMeTw=; b=g6IVo8SNkSoc13ObF7oUgd3Gzgh8q53F3K8BgSOlps6OhWtNQvqUcss/Mk7DyGZfEz HtWw2IuxUFN0sB1Rh3IkVT28nccCyK3Kgg1tdvz39hIf6SqKI2dVu5IY2nUZFDookii7 JfZ57jQZmunF9GVf9ezeTqLvNv8H6vxr/Z910Pidty32BYdKrhmXbxgkp1KfG+chdf/V 0r/jLVtedaMf86ZlvC+i2W+ctu0gOyOrTo999TaPg3tUmR6P1APbTKy4Dw9blV/kRWpZ ZPpUH8i2JCMN/rrs1PsDi1yypkfPESV5qMhOI6tqCTOX7MmTwlFDBfjlK1nAaKK8jAKK T1xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NRcr1uR+jWrXWzQj4QCI0O5tOCY1uyw+iu2TAziMeTw=; b=SFtIIsT/o3vqp9PjoG+AnSZV0QWc5wH0am2jL2dkv0N4bLnk82KE1nb9tHws7aexHg J9pCM4vjlPnLMNdDzFGUcWTxKvy+FjZWo7C8uBjAaCm3ntlgsorhRfPPd3MBo+0JxEFG J/yVeuz+apz4bsPKEvjprDfvrYVcAjLyyQQ5B6OqoF1t9q+SSvbWFYHIL+I0WQ8FpsYm jYJYJzR4kEUK/LotSSsndlGdmCTCf9PD13ybsnj0d9YvZv1AcjDZJU0Zo8W1dthzVWXL xOs9h01NL9a+sQKK+yD8ueNgJ1B8pTFJiC2w6DETXknIJwtBzCeFsK5lORmIbNuraJQW 9LZQ== X-Gm-Message-State: AOAM533kDQ+M956xaoykRQXr43Ee7vz47IMIhOWZmqKExMXooOMlCOtS 0Phfv/hCkO1XBaeBpm7PD8U= X-Google-Smtp-Source: ABdhPJx8Kw+IH+QeI3+5U/fnvkMljo7NN7EJojoUfStufzv8ixioHaLNelz+8ih/iIifgLjuJC7kbw== X-Received: by 2002:a0c:8b51:: with SMTP id d17mr22126354qvc.107.1597803915736; Tue, 18 Aug 2020 19:25:15 -0700 (PDT) Received: from localhost.localdomain ([50.236.19.102]) by smtp.gmail.com with ESMTPSA id t12sm21988275qkt.56.2020.08.18.19.25.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Aug 2020 19:25:15 -0700 (PDT) From: Yafang Shao To: david@fromorbit.com, hch@infradead.org, darrick.wong@oracle.com, willy@infradead.org, mhocko@kernel.org, akpm@linux-foundation.org Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Yafang Shao Subject: [PATCH v5 1/2] mm: Add become_kswapd and restore_kswapd Date: Wed, 19 Aug 2020 10:24:24 +0800 Message-Id: <20200819022425.25188-2-laoar.shao@gmail.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) In-Reply-To: <20200819022425.25188-1-laoar.shao@gmail.com> References: <20200819022425.25188-1-laoar.shao@gmail.com> X-Rspamd-Queue-Id: 9DDE518140B60 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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: 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 Cc: Christoph Hellwig Cc: Michal Hocko Cc: Darrick J. Wong Cc: Matthew Wilcox Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Yafang Shao --- fs/xfs/libxfs/xfs_btree.c | 14 ++++++++------ include/linux/sched/mm.h | 28 ++++++++++++++++++++++++++++ mm/vmscan.c | 16 +--------------- 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c index 2d25bab68764..a04a44238aab 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 f889e332912f..80cc132f13a1 100644 --- a/include/linux/sched/mm.h +++ b/include/linux/sched/mm.h @@ -303,6 +303,34 @@ static inline void memalloc_nocma_restore(unsigned int flags) } #endif +/* + * 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). + */ +#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 /** * memalloc_use_memcg - Starts the remote memcg charging scope. diff --git a/mm/vmscan.c b/mm/vmscan.c index 99e1796eb833..3a2615bfde35 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3859,19 +3859,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); @@ -3921,8 +3909,6 @@ static int kswapd(void *p) goto kswapd_try_sleep; } - tsk->flags &= ~(PF_MEMALLOC | PF_SWAPWRITE | PF_KSWAPD); - return 0; } -- 2.18.1