From patchwork Tue Nov 3 13:17:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 11877459 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F18C86A2 for ; Tue, 3 Nov 2020 13:18:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9E57C216C4 for ; Tue, 3 Nov 2020 13:18:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U4Sq0WIh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E57C216C4 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 9E95A6B0070; Tue, 3 Nov 2020 08:18:28 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9985E6B0071; Tue, 3 Nov 2020 08:18:28 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 837396B0072; Tue, 3 Nov 2020 08:18:28 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0092.hostedemail.com [216.40.44.92]) by kanga.kvack.org (Postfix) with ESMTP id 4402E6B0070 for ; Tue, 3 Nov 2020 08:18:28 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id E51F58249980 for ; Tue, 3 Nov 2020 13:18:27 +0000 (UTC) X-FDA: 77443161054.22.crib34_3c16017272b8 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin22.hostedemail.com (Postfix) with ESMTP id 5460D18038E6F for ; Tue, 3 Nov 2020 13:18:27 +0000 (UTC) X-Spam-Summary: 1,0,0,a7029096f376e5eb,d41d8cd98f00b204,laoar.shao@gmail.com,,RULES_HIT:41:69:355:379:541:800:960:966:973:981:988:989:1260:1345:1359:1437:1535:1544:1605:1711:1730:1747:1777:1792:2196:2198:2199:2200:2393:2553:2559:2562:2693:2731:2901:2903:3138:3139:3140:3141:3142:3165:3865:3866:3867:3868:3870:3871:3872:3873:3874:4118:4250:4321:4385:4605:5007:6119:6261:6653:7514:7576:9413:9592:10004:11026:11473:11658:11914:12043:12291:12296:12297:12438:12517:12519:12555:12895:12986:13869:14130:14181:14394:14687:14721:21080:21324:21433:21444:21451:21627:21666:21740:21990,0,RBL:209.85.167.194:@gmail.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04ygdqmks6yjagtp8bfwshoub3amfocwbat9ppnn36bn8kbww1yqxgz1be9potj.4ecx9coi6ixkgup89ya9b3f7t69yxdmgqyrkgi63dnq9yroqjpy1qs31kqgimyt.o-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:70,LUA_SUMMARY:none X-HE-Tag: crib34_3c16017272b8 X-Filterd-Recvd-Size: 7208 Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Tue, 3 Nov 2020 13:18:26 +0000 (UTC) Received: by mail-oi1-f194.google.com with SMTP id c80so6808500oib.2 for ; Tue, 03 Nov 2020 05:18:26 -0800 (PST) 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=wcewLsncu9ZYLAdf8Dj+b3i3xIrhlEzCNXPbs1EqjSc=; b=U4Sq0WIhR9xhMN9zPWhvg/zls9REX7I5XS/eUk2Dmrg1PTGMlH1hqkaQhkJsZW4aFs HrzLLXJxQx4kGNkUK94cTwvSumfEUW+OSbdZYyoZx3Qqee+1b7NjQowPXNXKtQlMcqqs iIwgdq+MNQBS+u0Kn4Wn/U+aAR5ZdkGh1ICGYhD3fNGn8gb9XE2GKYGBV8WcpbRtaw/c htJYPkbAEBUYmJK0SGX2FdKMPK33YSZtRS1HdZ836qNuvDSdrIw2S1FOvdcd053EIuuK 6A+2buP86nqP0qO5t2ucS15ZhxZM9yku26PMyApS3/c48JLNnV9oo4FYG8a1AhbrcZwm UGtA== 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=wcewLsncu9ZYLAdf8Dj+b3i3xIrhlEzCNXPbs1EqjSc=; b=DQtcxVBrVaKR1WP7ofGRgyBtL61i269kVWpsgk4vPZ5VoKFbKOvDgE1jcMFl915geW uVHoSgBEetUeZ3xKPc1VfjoREHqpecOkFt9diJbuIIVzO3uqva5v3TSSmtCnPMEs1E+q PAOrBMeIaD9E0cdopHsLjCMga7rSvKsjUyG5A2f/MGFs9LYjDSVNPd5tVaxnMgMI5/az ovGywwja0DptmkSin952atNJV2ALh4S/yS8zXs6FfwZwC2nrk7PKo12YafTNK/dK9x9Q FcCKffmqKYZzFZ30QkianvWsFXDUYagwpUcsApZ2xQIU8ygAlkldGQaGwNcbQn8ITBfe EanQ== X-Gm-Message-State: AOAM530lrcFulHzR6TlNGdHqU17gfU4dqWsVb60dTKe2CvNRT6z72LAh HOTs1RdFnPKylmYcXd7ra9w= X-Google-Smtp-Source: ABdhPJxxY1oARG/kzprtfN6LQpvSv/dkZkBdU/f6ENapc5lPESBoit+o9PJKuZzR/35lv0PKgZQ8Aw== X-Received: by 2002:aca:1e08:: with SMTP id m8mr1763659oic.168.1604409506161; Tue, 03 Nov 2020 05:18:26 -0800 (PST) Received: from localhost.localdomain ([50.236.19.102]) by smtp.gmail.com with ESMTPSA id f18sm4396138otf.55.2020.11.03.05.18.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Nov 2020 05:18:25 -0800 (PST) From: Yafang Shao To: akpm@linux-foundation.org Cc: david@fromorbit.com, hch@infradead.org, darrick.wong@oracle.com, willy@infradead.org, mhocko@kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, Yafang Shao Subject: [PATCH v8 resend 1/2] mm: Add become_kswapd and restore_kswapd Date: Tue, 3 Nov 2020 21:17:53 +0800 Message-Id: <20201103131754.94949-2-laoar.shao@gmail.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) In-Reply-To: <20201103131754.94949-1-laoar.shao@gmail.com> References: <20201103131754.94949-1-laoar.shao@gmail.com> 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 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); } /* 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; }