Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <22f86189-76fa-61ab-4e80-9c2740ec8e8a@intel.com>
Date:   Wed, 26 Oct 2022 16:26:28 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Firefox/102.0 Thunderbird/102.4.0
Subject: Re: [PATCH] mm/vmscan: respect cpuset policy during page demotion
Content-Language: en-US
To:     Feng Tang <feng.tang@intel.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Johannes Weiner <hannes@cmpxchg.org>,
        "Michal Hocko" <mhocko@suse.com>, Tejun Heo <tj@kernel.org>,
        Zefan Li <lizefan.x@bytedance.com>,
        Waiman Long <longman@redhat.com>, <ying.huang@intel.com>,
        <aneesh.kumar@linux.ibm.com>, <linux-mm@kvack.org>,
        <cgroups@vger.kernel.org>
CC:     <linux-kernel@vger.kernel.org>, <dave.hansen@intel.com>,
        <tim.c.chen@intel.com>
References: <20221026074343.6517-1-feng.tang@intel.com>
From:   "Yin, Fengwei" <fengwei.yin@intel.com>
In-Reply-To: <20221026074343.6517-1-feng.tang@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SjFNK3NUZWJyYVpsNEFMOUpWdFFjVTV5QTlUMjlEc2l5STk1NklOaWxDNk01?=
 =?utf-8?B?c0owNmpPU0VqdndNdHJSNG01eThUeGFEbU0vZnlIdVMwSGxHNVF5R3IwRklu?=
 =?utf-8?B?UlpzNXhPSU1jSlR6U0hKZnJOMkcra2l4a1FYdWJGTXhCcVkvSUtCQkgxenE5?=
 =?utf-8?B?S2kxV1N2NzZlejdTSkZpT0JpcUpmQjB1QS9KRml6T0k0SjlSdHVNOUxaSkVG?=
 =?utf-8?B?cDZ0czRobS82bGsvbnpBekM3cHNWaGZnNUVvanFLY2xkUjI0QjBEK3BKTXN3?=
 =?utf-8?B?ek9wOE9ZVExVWktBNi80aTVOSXU5YnZIVGlxZDI3d01SZ01DdlZpdCtDSWRR?=
 =?utf-8?B?cFFVT3pLbVFmZDlrSFN3QndqYUJGZ3ljNkVTbG5XcFVuVHdNU1ltQU1jUnpF?=
 =?utf-8?B?WU5BbnVhR2VNWkl6dmRYRjNmVDk3V1ZWZVYyOXU2dmxnc1N5aklsMW90WXRr?=
 =?utf-8?B?NUNBb0g1VTdsVXhZaXRBRFRVUXVPanBqSVdHaWpCWXJSTjlFaXJGdWtEa1dV?=
 =?utf-8?B?YmN0SHdNK1JaY2U2T3gvREFVL2ZCZWJQcjNxcmNiNHJqcnJXQ2NtSlkrcm1s?=
 =?utf-8?B?Tmk1dlk2OXhMZU0vblA2aGZyQnFrek0rNXlCaUc5T1BjZWpPMVBVcmt6dmtp?=
 =?utf-8?B?Q3NCQldNZWNzeUEyNi9zanJtMU91ckh4U2JkbjVhUnBCWDNvODFxRzVvMHV1?=
 =?utf-8?B?Mk96UDc2MUcrSm02S1BiWmkyVCtGejFjcFhwbi9VRjhGK3ZaQXIvcHNyenFt?=
 =?utf-8?B?Z2puc1U4bzMvZTE3TlM2aXhrS1lZeUVIcTV5Sno1bXpyRk1LYTlUTkMvcEtv?=
 =?utf-8?B?aUIybGt3RUlRYmxzcHJ6UHpkZ0ZoWHF3NEJIaE1vWlQ3UCtrTXdBSWgycDBr?=
 =?utf-8?B?U0FqMjBYTVova21aekZieTdPRUFHWDY4b1l4R2x0MGV0WGxEZDM4dU45WENB?=
 =?utf-8?B?cWhubFY3YjEvWm5scm1LUXV1cEZRS21WRDdIMndKeDQzTVlySy9sM3B5cjRB?=
 =?utf-8?B?Mm5aaFIwVEpuTXJIdmZLOFBYN084YTdZc1ZYRmF5eEtLZjZaNC9mWjVCRTZx?=
 =?utf-8?B?aHJlRWErRXlMeFBaUmJzMGRZMUxwblB5eXdpQW1hL0N0eGFHam1rZEQ5UHYv?=
 =?utf-8?B?VjIzN3RRSlY4aHR0bVV2Y3dEWVdaVTk2aHBEMVhUUC9Id242M3hqN2R5SkdE?=
 =?utf-8?B?Q0l5UWx2ZCtuS1lSREQ5WWJ5aVhiaitWZXAwalc5Q2RqWXU1MGR5MWVULy90?=
 =?utf-8?B?YnMrQXBEdnY2U2dRaHJ2bnZzeS9qZnVDZlp4T1lRZWo3T1hOTU9BYnh4WnpW?=
 =?utf-8?B?WEZiZDZtcHdKUjJ4ZWF2YWFVUGVWc1c1b212UmZEK3RWZ2F3bUwxZjZzOXFV?=
 =?utf-8?B?Tm9YbEdGN01TQW5GZmZNaFdRWGdwL3ZrRm5xNmRTbm1lQ1ZFbmhtcVJVTk5s?=
 =?utf-8?B?RUJWdm12TzNpdmMyaUl3UHZUR3N5Y0grODBLVC9IdEIrbkZ6SFNrclBuZWhx?=
 =?utf-8?B?MEVVenVlb1BLVVVjc0htRzRVNlFzZitMZmlnSHQvWkVuQ2ZxbDVrOFFyOUZP?=
 =?utf-8?B?ZmhEZFpDZk8veVk4cFhnTE8xN1VSOHY5azlHM1I1Q1NndmNNNFdxSHg0Tk9U?=
 =?utf-8?B?K0loWGJ4SmRFSnFQODVVSWRMTVlJczlBUXZ6L0ZTajNwUkI1akJGNUY2UXlF?=
 =?utf-8?B?djd5bjl3cHBOWXd4Y1hXdU9DOUxKRStmUXlpcFpXeWY3TXBPQ05oOUpRVHFQ?=
 =?utf-8?B?eHpibGVHYzVnVDFoSzQ4Q0cvZlJ1UXVyMWQwZnpjY1Q5UkYza2RhbHFqZjln?=
 =?utf-8?B?NDg1dnJSMEd5Ti9iSTgrSUFYUUJtbFgyK0QyUzlMOXNETmFSU29PU01IR0RN?=
 =?utf-8?B?VHBsSDlwQ1puR3FWOE94MS9DeVJ6VndMUEthdmhVK2piSGRoK0tMdm9ZV0p4?=
 =?utf-8?B?MFhHWkNDRGgvQkxCTk43Mld1eWs2czhVSDAzNEI1TEtRcTJBMHBZdUJxSWQr?=
 =?utf-8?B?N0I3aUZYNzFvVlhxNDJHUzVCNmVOYVZRbEJZMnNzUWdpd2hwOTNVNUE5K05N?=
 =?utf-8?B?UVhGbDUzUWlsalFnajUrRHVVN1R6akNwREwrSjZRSDN0aFZkek42UTBOcFFm?=
 =?utf-8?Q?oxTZMw/AySPm6gGNa3iv67tAc?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 0e0822c7-3e4c-4b3d-fe92-08dab72bcd27
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4820.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2022 08:26:38.1035
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: hiGk3YeMcxKD/kjsaNUiCLzl0uXVoJxa1NmRZFINlebJ2nrWimI2rwnUZsXJ//oEp/IuqQZJrZhI0ObgT1AbyA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB7408
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Feng,

On 10/26/2022 3:43 PM, Feng Tang wrote:
> In page reclaim path, memory could be demoted from faster memory tier
> to slower memory tier. Currently, there is no check about cpuset's
> memory policy, that even if the target demotion node is not allowd
> by cpuset, the demotion will still happen, which breaks the cpuset
> semantics.
> 
> So add cpuset policy check in the demotion path and skip demotion
> if the demotion targets are not allowed by cpuset.
> 
> Signed-off-by: Feng Tang <feng.tang@intel.com>
> ---
> Hi reviewers,
> 
> For easy bisectable, I combined the cpuset change and mm change
> in one patch, if you prefer to separate them, I can turn it into
> 2 patches.
> 
> Thanks,
> Feng
> 
>  include/linux/cpuset.h |  6 ++++++
>  kernel/cgroup/cpuset.c | 29 +++++++++++++++++++++++++++++
>  mm/vmscan.c            | 35 ++++++++++++++++++++++++++++++++---
>  3 files changed, 67 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
> index d58e0476ee8e..6fcce2bd2631 100644
> --- a/include/linux/cpuset.h
> +++ b/include/linux/cpuset.h
> @@ -178,6 +178,8 @@ static inline void set_mems_allowed(nodemask_t nodemask)
>  	task_unlock(current);
>  }
>  
> +extern void cpuset_get_allowed_mem_nodes(struct cgroup *cgroup,
> +						nodemask_t *nmask);
>  #else /* !CONFIG_CPUSETS */
>  
>  static inline bool cpusets_enabled(void) { return false; }
> @@ -299,6 +301,10 @@ static inline bool read_mems_allowed_retry(unsigned int seq)
>  	return false;
>  }
>  
> +static inline void cpuset_get_allowed_mem_nodes(struct cgroup *cgroup,
> +						nodemask_t *nmask)
> +{
> +}
>  #endif /* !CONFIG_CPUSETS */
>  
>  #endif /* _LINUX_CPUSET_H */
> diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
> index 3ea2e836e93e..cbb118c0502f 100644
> --- a/kernel/cgroup/cpuset.c
> +++ b/kernel/cgroup/cpuset.c
> @@ -3750,6 +3750,35 @@ nodemask_t cpuset_mems_allowed(struct task_struct *tsk)
>  	return mask;
>  }
>  
> +/*
> + * Retrieve the allowed memory nodemask for a cgroup.
> + *
> + * Set *nmask to cpuset's effective allowed nodemask for cgroup v2,
> + * and NODE_MASK_ALL (means no constraint) for cgroup v1 where there
> + * is no guaranteed association from a cgroup to a cpuset.
> + */
> +void cpuset_get_allowed_mem_nodes(struct cgroup *cgroup, nodemask_t *nmask)
> +{
> +	struct cgroup_subsys_state *css;
> +	struct cpuset *cs;
> +
> +	if (!is_in_v2_mode()) {
> +		*nmask = NODE_MASK_ALL;
> +		return;
> +	}
> +
> +	rcu_read_lock();
> +	css = cgroup_e_css(cgroup, &cpuset_cgrp_subsys);
> +	if (css) {
> +		css_get(css);
> +		cs = css_cs(css);
> +		*nmask = cs->effective_mems;
> +		css_put(css);
> +	}
> +
> +	rcu_read_unlock();
> +}
> +
>  /**
>   * cpuset_nodemask_valid_mems_allowed - check nodemask vs. current mems_allowed
>   * @nodemask: the nodemask to be checked
> diff --git a/mm/vmscan.c b/mm/vmscan.c
> index 18f6497994ec..c205d98283bc 100644
> --- a/mm/vmscan.c
> +++ b/mm/vmscan.c
> @@ -1537,9 +1537,21 @@ static struct page *alloc_demote_page(struct page *page, unsigned long private)
>  {
>  	struct page *target_page;
>  	nodemask_t *allowed_mask;
> -	struct migration_target_control *mtc;
> +	struct migration_target_control *mtc = (void *)private;
>  
> -	mtc = (struct migration_target_control *)private;
> +#if IS_ENABLED(CONFIG_MEMCG) && IS_ENABLED(CONFIG_CPUSETS)
> +	struct mem_cgroup *memcg;
> +	nodemask_t cpuset_nmask;
> +
> +	memcg = page_memcg(page);
> +	cpuset_get_allowed_mem_nodes(memcg->css.cgroup, &cpuset_nmask);
> +
> +	if (!node_isset(mtc->nid, cpuset_nmask)) {
> +		if (mtc->nmask)
> +			nodes_and(*mtc->nmask, *mtc->nmask, cpuset_nmask);
> +		return alloc_migration_target(page, (unsigned long)mtc);
> +	}
> +#endif
>  
>  	allowed_mask = mtc->nmask;
>  	/*
> @@ -1649,6 +1661,7 @@ static unsigned int shrink_folio_list(struct list_head *folio_list,
>  		enum folio_references references = FOLIOREF_RECLAIM;
>  		bool dirty, writeback;
>  		unsigned int nr_pages;
> +		bool skip_this_demotion = false;
>  
>  		cond_resched();
>  
> @@ -1658,6 +1671,22 @@ static unsigned int shrink_folio_list(struct list_head *folio_list,
>  		if (!folio_trylock(folio))
>  			goto keep;
>  
> +#if IS_ENABLED(CONFIG_MEMCG) && IS_ENABLED(CONFIG_CPUSETS)
> +		if (do_demote_pass) {
> +			struct mem_cgroup *memcg;
> +			nodemask_t nmask, nmask1;
> +
> +			node_get_allowed_targets(pgdat, &nmask);
> +			memcg = folio_memcg(folio);
> +			if (memcg)
Doesn't check memcg in the change to alloc_demote_page(). What's the difference here?

> +				cpuset_get_allowed_mem_nodes(memcg->css.cgroup,
> +								&nmask1);
> +
> +			if (!nodes_intersects(nmask, nmask1))
If memcg is NULL, nmask1 will have an uninitialized value. Thanks.

Regards
Yin, Fengwei

> +				skip_this_demotion = true;
> +		}
> +#endif
> +
>  		VM_BUG_ON_FOLIO(folio_test_active(folio), folio);
>  
>  		nr_pages = folio_nr_pages(folio);
> @@ -1799,7 +1828,7 @@ static unsigned int shrink_folio_list(struct list_head *folio_list,
>  		 * Before reclaiming the folio, try to relocate
>  		 * its contents to another node.
>  		 */
> -		if (do_demote_pass &&
> +		if (do_demote_pass && !skip_this_demotion &&
>  		    (thp_migration_supported() || !folio_test_large(folio))) {
>  			list_add(&folio->lru, &demote_folios);
>  			folio_unlock(folio);