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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 849ACC19F28 for ; Wed, 3 Aug 2022 11:29:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BDD686B0071; Wed, 3 Aug 2022 07:29:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B8E048E0001; Wed, 3 Aug 2022 07:29:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A54896B0073; Wed, 3 Aug 2022 07:29:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 941366B0071 for ; Wed, 3 Aug 2022 07:29:03 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 613131C6539 for ; Wed, 3 Aug 2022 11:29:03 +0000 (UTC) X-FDA: 79758059766.15.0832CCA Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf08.hostedemail.com (Postfix) with ESMTP id D6A66160009 for ; Wed, 3 Aug 2022 11:29:01 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 5FDC533FC5; Wed, 3 Aug 2022 11:29:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1659526140; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8dYSp9FkxWYhq7shbNgnFFdDe+YIHT7/x9Ijr1mix0I=; b=fcYHHTuqTlfgxJZcvyxGKgTu1VnPjFXTOUt52Ni4Bw7g85QoBmSi4vKwbJPKPNXDrCdZra cplMKPt/0pFTe9HQlH6cvsO98tf3NZ6XHPh9IufME2nCHwRwCP1bfXB1qDcSNfbpwLG+fx xnnm2nF/mGmZl3fwq5oA261sUfGmXRU= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 3CA2913A94; Wed, 3 Aug 2022 11:29:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id RYNeDPxb6mIyQgAAMHmgww (envelope-from ); Wed, 03 Aug 2022 11:29:00 +0000 Date: Wed, 3 Aug 2022 13:28:59 +0200 From: Michal Hocko To: Feng Tang Cc: Muchun Song , "akpm@linux-foundation.org" , "bwidawsk@kernel.org" , "dave.hansen@linux.intel.com" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Mike Kravetz Subject: Re: [PATCH] mm: mempolicy: fix policy_nodemask() for MPOL_PREFERRED_MANY case Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659526142; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8dYSp9FkxWYhq7shbNgnFFdDe+YIHT7/x9Ijr1mix0I=; b=hHUyng8JHWGNXiCORfk94780MGCGI/YAnvGurpg9okvquKQ1CQ8FX8JiQlCIHhnoODj0DD +q1J5NhaUhWOhcWohqS4pNskug/xHfJgZUQmeqkZV2VPkk1OFKczNXLx4PQrKvzEvjyVs6 Yw01R0arnYQIueD8yu0iONK7T5O8W5o= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=fcYHHTuq; spf=pass (imf08.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659526142; a=rsa-sha256; cv=none; b=VPZBLE2Wp9yQxkvJKH0E2pWk4wt9yq9yYcvUfnJrpBzYrFg0tcO5vgUq6IbnZzWrjLOg+p ssfSP+VK9R3ZrDwvC8wTAnc9DbHO+7sAw0N2N4cvs8xe9hFAq8lM3P3tQBqqmY9gh3zM7p bn3Let4uyZeAMErjZVyFWbWdxo1mj44= X-Rspam-User: X-Stat-Signature: rtjiob4317eo5k9mcxs6dzka1h8xkudr X-Rspamd-Queue-Id: D6A66160009 Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=fcYHHTuq; spf=pass (imf08.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com X-Rspamd-Server: rspam08 X-HE-Tag: 1659526141-352821 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 04-08-22 01:14:32, Feng Tang wrote: [...] > Ok, I change it as below: Wouldn't it be better to make this allowed_mems_nr specific to be explicit about the intention? Not that I feel strongly about that. > --- > mm/hugetlb.c | 28 +++++++++++++++++++++++----- > 1 file changed, 23 insertions(+), 5 deletions(-) Not even compile tested include/linux/mempolicy.h | 12 ------------ mm/hugetlb.c | 24 ++++++++++++++++++++---- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h index 668389b4b53d..e38b0ef20b8b 100644 --- a/include/linux/mempolicy.h +++ b/include/linux/mempolicy.h @@ -151,13 +151,6 @@ extern bool mempolicy_in_oom_domain(struct task_struct *tsk, const nodemask_t *mask); extern nodemask_t *policy_nodemask(gfp_t gfp, struct mempolicy *policy); -static inline nodemask_t *policy_nodemask_current(gfp_t gfp) -{ - struct mempolicy *mpol = get_task_policy(current); - - return policy_nodemask(gfp, mpol); -} - extern unsigned int mempolicy_slab_node(void); extern enum zone_type policy_zone; @@ -294,11 +287,6 @@ static inline void mpol_put_task_policy(struct task_struct *task) { } -static inline nodemask_t *policy_nodemask_current(gfp_t gfp) -{ - return NULL; -} - static inline bool mpol_is_preferred_many(struct mempolicy *pol) { return false; diff --git a/mm/hugetlb.c b/mm/hugetlb.c index a18c071c294e..6cacbc9b15a1 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4330,18 +4330,34 @@ static int __init default_hugepagesz_setup(char *s) } __setup("default_hugepagesz=", default_hugepagesz_setup); +struct mempolicy *policy_mbind_nodemask(gfp_t gfp) +{ +#ifdef CONFIG_MEMPOLICY + struct mempolicy *mpol = get_task_policy(current); + + /* + * only enforce MBIND which overlaps with cpuset policy (from policy_nodemask) + * specifically for hugetlb case + */ + if (mpol->mode == MPOL_BIND && + (apply_policy_zone(mpol, gfp_zone(gfp)) && + cpuset_nodemask_valid_mems_allowed(&policy->nodes)) + return &mpol->nodes; +#endif + return NULL; +} + static unsigned int allowed_mems_nr(struct hstate *h) { int node; unsigned int nr = 0; - nodemask_t *mpol_allowed; + nodemask_t *mbind_nodemask; unsigned int *array = h->free_huge_pages_node; gfp_t gfp_mask = htlb_alloc_mask(h); - mpol_allowed = policy_nodemask_current(gfp_mask); - + mbind_nodemask = policy_mbind_nodemask(gfp_mask); for_each_node_mask(node, cpuset_current_mems_allowed) { - if (!mpol_allowed || node_isset(node, *mpol_allowed)) + if (!mbind_nodemask || node_isset(node, *mbind_nodemask)) nr += array[node]; } -- Michal Hocko SUSE Labs