From nobody Sun Apr 26 09:36:49 2026 Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5714A1FECBD for ; Thu, 24 Apr 2025 20:22:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745526135; cv=none; b=Vz3wf1ERzzE39dC9ddyRNHlUbJ9zce4f9Pq5CN6SaLLqj78PsPsU2jsu5UIG866K67Ab3trP78QBfUDu+wwESdLZcwgyBZX4ikKorruijHum5g0fUU6pplGy3oQlXwo14ur0EqiON7oS0GQu/gpn7jnkt/2gFPKbD2t3ULbXILA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745526135; c=relaxed/simple; bh=QemlZRsMnReDRXGr7XlMMBNDMS1lFareGFcDixhJSmM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E6//WbAeZurytpEqCBLpH4Fd24hOo7KpQPNEqmV8KhaS7Offc9sBSb+8Xa3nn+3/pxPFfmHWbu9A7SJWuc+5DpoPGVCnHmuOgk5UaYQUvJAUfN0GxWPPgzMoslvZ5wyG7nsWG4uEDjZ2868+pu+79nOGAJ35jtyUcxxsYRms9g0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=Jg1BE/WG; arc=none smtp.client-ip=209.85.219.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="Jg1BE/WG" Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-6e8f05acc13so19698776d6.2 for ; Thu, 24 Apr 2025 13:22:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1745526133; x=1746130933; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=djWz5UXPAr8AyfZCTcoqGVabcC1mywuVV3L68VCKfXA=; b=Jg1BE/WGha1Ba8gtn9LKM27JKHUyeY26IA2dyHy0iXFM4ETPY3/w/Auiux3LO7Lnf2 xML5mmPecSaB4jlZzvdhgEtfhyg5DCY+IdrEbg62tUnEgc+3MM3J189JRlJ3hyNrH1V/ WVG2kfXZ/SfN6euQoeyY8xMZS7kAgGN+yQG5gHCXPhIqg8OFuArPmGXuYvKtDYE5CJpa OM5rCIXVGSapgJneJrYoZqD2trAMGq4vHEguXqbZrTUUojK6Xf2+YaYAJIlC+9f7hKPl hnfdHlWLcy5p/tN5ydG8N7eEWeV6DyWPhWqCFOuIY3ZgHmKt+fTuM11MqvxGlMLSYxlL P8Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526133; x=1746130933; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=djWz5UXPAr8AyfZCTcoqGVabcC1mywuVV3L68VCKfXA=; b=QT4eYXNrsYu1SAx1YCdfUJ6IBbkFIXmpGZ8GG3LSLXSOyRksjU+0rNgtw8PqhclT/5 3iozfaUaOyhU4lWSKDpI0mcLctse5t7brBbxDbJRqL+P+K26Zql4IWLCjGpjEMn8vjsd OuNynySatG09dQhXwyiTqj1IgDsAkjj7bNkI4k64XMr+yLFlQQdkvYGS/Lyxa51EC8kb J2N6LK+4MA7IqVU3qytw6LWyFEUQoMRV6Z2J50sIsj0mF3EFYuBWweoy+35ZacKzoDSG XZOdnaPU4LQDjgINsKN8RnBtI7GfMimmeMyCjSTI9myp4xJ7XPQ3OvkM4YY9+Fg7hzHM nQfQ== X-Forwarded-Encrypted: i=1; AJvYcCVGSKgeQVWLNwwwIXg/ANpDQ18FGAeWBruG8ITRF/zjmGEJ3vuCg22gymS1KwFRekDs5DDeGwsuG9V4nXc=@vger.kernel.org X-Gm-Message-State: AOJu0Yzu7Jm/imXosdxasx7dCEeiP5ZmmT7CMjtEcZWrhgKpwO9TxHmm 0SWNFCGaY8VVnuusFsmbv7yiz6/mfLGnY6oORvGUfPQrFabBjjbwiobqmFymdpQ= X-Gm-Gg: ASbGnct+7ZGBV8CSODHkbHasPAt6Pc294mWm381AOLyGK15gNe21JiebV1Oqc0Lu706 zRjszFKf6UFMb/opKSdTy64rVLloAqvbRygQERzcCqXRsYJ1BR7LVKeylE+4jykyhOO9Tkj0zh3 kZ0LK30MsZrLwt14O0tni3qSangT/YZ6zP4dSKmgBFDc8D8GxqyFJuwP4S6LGCJ0mJD2oCKO6B8 ZfmTbqmxD9L1QU4qlaNnHg3nvuFrkPfXtRXGxP1WEjHOHyIGdOMYVPB2R5T4hKi8mThDOpda2xb zOW5EzhPOgL3odAHHdgaZnc0ZfR4pC/FZBAts/7Vz723mAxWEqKAi5S/FM8qYUOkHlh1kXg38QA dDPQrBigyZGcbNJsCzBax4Ha2MRTI X-Google-Smtp-Source: AGHT+IGTR16pKWoAXu/Nzo3/8RRbXp5lOY1wD4Nku79p9Oo5rq2IkT3OM+hRvSu40zPacObUxtfaQQ== X-Received: by 2002:a05:6214:1d05:b0:6e8:99bb:f061 with SMTP id 6a1803df08f44-6f4c9508186mr19863646d6.18.1745526133011; Thu, 24 Apr 2025 13:22:13 -0700 (PDT) Received: from gourry-fedora-PF4VCD3F.lan (pool-173-79-56-208.washdc.fios.verizon.net. [173.79.56.208]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c958cbfb1bsm129618385a.44.2025.04.24.13.22.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 13:22:12 -0700 (PDT) From: Gregory Price To: linux-mm@kvack.org Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, longman@redhat.com, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, tj@kernel.org, mkoutny@suse.com, akpm@linux-foundation.org Subject: [PATCH v5 1/2] cpuset: rename cpuset_node_allowed to cpuset_current_node_allowed Date: Thu, 24 Apr 2025 16:22:06 -0400 Message-ID: <20250424202207.50028-2-gourry@gourry.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250424202207.50028-1-gourry@gourry.net> References: <20250422012616.1883287-3-gourry@gourry.net> <20250424202207.50028-1-gourry@gourry.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename cpuset_node_allowed to reflect that the function checks the current task's cpuset.mems. This allows us to make a new cpuset_node_allowed function that checks a target cgroup's cpuset.mems. Acked-by: Waiman Long Acked-by: Tejun Heo Acked-by: Johannes Weiner Reviewed-by: Shakeel Butt Signed-off-by: Gregory Price --- include/linux/cpuset.h | 4 ++-- kernel/cgroup/cpuset.c | 4 ++-- mm/page_alloc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h index 835e7b793f6a..893a4c340d48 100644 --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h @@ -82,11 +82,11 @@ extern nodemask_t cpuset_mems_allowed(struct task_struc= t *p); void cpuset_init_current_mems_allowed(void); int cpuset_nodemask_valid_mems_allowed(nodemask_t *nodemask); =20 -extern bool cpuset_node_allowed(int node, gfp_t gfp_mask); +extern bool cpuset_current_node_allowed(int node, gfp_t gfp_mask); =20 static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask) { - return cpuset_node_allowed(zone_to_nid(z), gfp_mask); + return cpuset_current_node_allowed(zone_to_nid(z), gfp_mask); } =20 static inline bool cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 0f910c828973..f8e6a9b642cb 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -4090,7 +4090,7 @@ static struct cpuset *nearest_hardwall_ancestor(struc= t cpuset *cs) } =20 /* - * cpuset_node_allowed - Can we allocate on a memory node? + * cpuset_current_node_allowed - Can current task allocate on a memory nod= e? * @node: is this an allowed node? * @gfp_mask: memory allocation flags * @@ -4129,7 +4129,7 @@ static struct cpuset *nearest_hardwall_ancestor(struc= t cpuset *cs) * GFP_KERNEL - any node in enclosing hardwalled cpuset ok * GFP_USER - only nodes in current tasks mems allowed ok. */ -bool cpuset_node_allowed(int node, gfp_t gfp_mask) +bool cpuset_current_node_allowed(int node, gfp_t gfp_mask) { struct cpuset *cs; /* current cpuset ancestors */ bool allowed; /* is allocation in zone z allowed? */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 5079b1b04d49..233ce25f8f3d 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3461,7 +3461,7 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int o= rder, int alloc_flags, retry: /* * Scan zonelist, looking for a zone with enough free. - * See also cpuset_node_allowed() comment in kernel/cgroup/cpuset.c. + * See also cpuset_current_node_allowed() comment in kernel/cgroup/cpuset= .c. */ no_fallback =3D alloc_flags & ALLOC_NOFRAGMENT; z =3D ac->preferred_zoneref; @@ -4148,7 +4148,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask, unsigned int order) /* * Ignore cpuset mems for non-blocking __GFP_HIGH (probably * GFP_ATOMIC) rather than fail, see the comment for - * cpuset_node_allowed(). + * cpuset_current_node_allowed(). */ if (alloc_flags & ALLOC_MIN_RESERVE) alloc_flags &=3D ~ALLOC_CPUSET; --=20 2.49.0 From nobody Sun Apr 26 09:36:49 2026 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 065F121D3D4 for ; Thu, 24 Apr 2025 20:22:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745526138; cv=none; b=XVEeXxWgm7Vi+N1S77d2DmH7CrwdSYuhabdV3K09zQhFXvluU3M48B0vvVpoTKRf3ne4+OmljO6x/LvKwfAJjJGzF92D5o/pMPvpSPNVJRVlHQn/z3+X3LX+3eGecDX+7hJWF2JpzjM+ntIDwzXIIMzOatbWUHpgtEOsKSCnM/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745526138; c=relaxed/simple; bh=zfoCZAi+qgWXFIaHeDNfmek6cFG6y/TXE1VwWMa2yYs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mzk89tl/QHiWKxyGT/AN7yz9RH/rDf2UZZMK/XwW+9hWkoYFPHIau1GcP82okYpORpBlrKu79/MdFYOtRz8RYWEoUuG8WpxlCQuU5HTiZunUfuv1iWWcNwgUmn/RB2TjCSxaI7DcJmioKrs4u/wdyoPkBpiGU46TsOmLFeHvUso= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=DWvDJHOk; arc=none smtp.client-ip=209.85.222.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="DWvDJHOk" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-7c5e39d1db2so87847785a.3 for ; Thu, 24 Apr 2025 13:22:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1745526135; x=1746130935; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CxWEnn5MTFE6+1tVKFs4oJ/SdesKMia6cc2bPiHfnm4=; b=DWvDJHOkAbht3mtqtvZAchxA19WDDmvitYiCjMROC//5LcgnRvWiYHkhclT6xiFjgG hbN0i/O9JIMni+J1cGVlM7S9om3DFK8vBDVegxhN+opkje6AuyWH8s3hYTT+MErtPYma raNtk2RSgr63HJxP3FpIubdB6DHwlHTBfxr0Wqlj7L/NFKIzw8H3QtAeLc69FCH421BT JRn9Os31cwTmmqJ5ccFGrXgvD8o+n+Q/lzHZ6glw76F+MPR7/wkBB95I9aOLi7NjtuYy Z5IwClT3ZamUSXVghglIVTKBV7Oueq16dEq69CiTq6UcAJdSTi5sra8mN7qIb/sMGW6g VCfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526135; x=1746130935; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CxWEnn5MTFE6+1tVKFs4oJ/SdesKMia6cc2bPiHfnm4=; b=WiGLarDWz5zPB9rYTujNGiJNQkJOq+8QFkpiKjvl8aOKBROnSPaFFaUML+3yxVAFBK 0rmPJRG5z4mIrdJfdO+Pdcm1RwzN9NKR48s61Ya+DxaTI5cNhyALXfkEZDh2aSx0CCWh aYi9lds2GSFj2aPfRuJjMzw6Cz/R6wusM3KoUlqHdyK1Ti8BfRd+j0wdADhfEqtaN7RY cp7CBtxBXf47uPR0yZEb6c4BVcBZOJ2m/T4pU/bUmwoD24F+gvOrP6ngrQLQq6Ne1yaJ oetAFHSnIFg5PacY8plhVE0bqmYwkiTsnuhKXGe5NDklRHxHs1K/jfv+FvCfDoLyDQUG QthQ== X-Forwarded-Encrypted: i=1; AJvYcCWq/QJWfV52pFmVyVm6uWPucmOMIYri3QsIJM8s0+zzyQeP6gNo3d8dohIkFhaPwy/IYdMPFVgo3JH3Vw8=@vger.kernel.org X-Gm-Message-State: AOJu0YyC3+qQDE5/v2GarppugkyIVhGsMkYhEbhLJB7T5Wofd0Fkve6H SsE6aHtBdty/FxSVQU5SuD6SsGyO7IBDr6tVUmqWj1boy2HRxEG9Z6lAeffszJk= X-Gm-Gg: ASbGnctJpzOCMUhoLaOR7w4YfOFlnPB0faUJGJDNSYF4CKwRy4HSyvR0Wkh6tYaPEPD iwBoE6sQ+AtlANf1YVR2W2/iUTGsZk8rUKHsIIxlz+DpkaKhf7dUaZGypOjYOHoHtUq74W4Jd+r Fw6tsFt0yBsHvyNw/kEiY7/qaN3L/GcM0hrdAHi5N95puDR2xE31En8nO2S4vYxCaT039osmj1q yfh6FngZ442Z5y37enM4oEBjHIdt/3Knz1BhhaPnuA2GjT7b/oKkMjFh+QEdH2iu6kGJp2Lxotl fV+8rPYslakTtdIXfErsr7aanPR3aPQiBpS1OhJBsJniNt1HBjtpx3MItRe6j6yxcC1tGHtw+Wo IZIWmDiaLVKZFfIbjYdKDoUbXLKei X-Google-Smtp-Source: AGHT+IFyN8wb//0ERja9QfMESqcq2paUli+6NaJiW4JLzbqSHvuuo3oBkSX4VWrim2OosaiAh03+XQ== X-Received: by 2002:a05:620a:2404:b0:7c5:e2a0:4e64 with SMTP id af79cd13be357-7c95ef89880mr122896385a.51.1745526134699; Thu, 24 Apr 2025 13:22:14 -0700 (PDT) Received: from gourry-fedora-PF4VCD3F.lan (pool-173-79-56-208.washdc.fios.verizon.net. [173.79.56.208]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c958cbfb1bsm129618385a.44.2025.04.24.13.22.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 13:22:14 -0700 (PDT) From: Gregory Price To: linux-mm@kvack.org Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, longman@redhat.com, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, tj@kernel.org, mkoutny@suse.com, akpm@linux-foundation.org Subject: [PATCH v5 2/2] vmscan,cgroup: apply mems_effective to reclaim Date: Thu, 24 Apr 2025 16:22:07 -0400 Message-ID: <20250424202207.50028-3-gourry@gourry.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250424202207.50028-1-gourry@gourry.net> References: <20250422012616.1883287-3-gourry@gourry.net> <20250424202207.50028-1-gourry@gourry.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It is possible for a reclaimer to cause demotions of an lruvec belonging to a cgroup with cpuset.mems set to exclude some nodes. Attempt to apply this limitation based on the lruvec's memcg and prevent demotion. Notably, this may still allow demotion of shared libraries or any memory first instantiated in another cgroup. This means cpusets still cannot cannot guarantee complete isolation when demotion is enabled, and the docs have been updated to reflect this. This is useful for isolating workloads on a multi-tenant system from certain classes of memory more consistently - with the noted exceptions. Note on locking: The cgroup_get_e_css reference protects the css->effective_mems, and calls of this interface would be subject to the same race conditions associated with a non-atomic access to cs->effective_mems. So while this interface cannot make strong guarantees of correctness, it can therefore avoid taking a global or rcu_read_lock for performance. Suggested-by: Shakeel Butt Suggested-by: Waiman Long Acked-by: Tejun Heo Acked-by: Johannes Weiner Reviewed-by: Shakeel Butt Reviewed-by: Waiman Long Signed-off-by: Gregory Price --- .../ABI/testing/sysfs-kernel-mm-numa | 16 +++++--- include/linux/cpuset.h | 5 +++ include/linux/memcontrol.h | 6 +++ kernel/cgroup/cpuset.c | 36 ++++++++++++++++ mm/memcontrol.c | 6 +++ mm/vmscan.c | 41 +++++++++++-------- 6 files changed, 88 insertions(+), 22 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-kernel-mm-numa b/Documentation= /ABI/testing/sysfs-kernel-mm-numa index 77e559d4ed80..90e375ff54cb 100644 --- a/Documentation/ABI/testing/sysfs-kernel-mm-numa +++ b/Documentation/ABI/testing/sysfs-kernel-mm-numa @@ -16,9 +16,13 @@ Description: Enable/disable demoting pages during reclaim Allowing page migration during reclaim enables these systems to migrate pages from fast tiers to slow tiers when the fast tier is under pressure. This migration - is performed before swap. It may move data to a NUMA - node that does not fall into the cpuset of the - allocating process which might be construed to violate - the guarantees of cpusets. This should not be enabled - on systems which need strict cpuset location - guarantees. + is performed before swap if an eligible numa node is + present in cpuset.mems for the cgroup (or if cpuset v1 + is being used). If cpusets.mems changes at runtime, it + may move data to a NUMA node that does not fall into the + cpuset of the new cpusets.mems, which might be construed + to violate the guarantees of cpusets. Shared memory, + such as libraries, owned by another cgroup may still be + demoted and result in memory use on a node not present + in cpusets.mem. This should not be enabled on systems + which need strict cpuset location guarantees. diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h index 893a4c340d48..5255e3fdbf62 100644 --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h @@ -171,6 +171,7 @@ static inline void set_mems_allowed(nodemask_t nodemask) task_unlock(current); } =20 +extern bool cpuset_node_allowed(struct cgroup *cgroup, int nid); #else /* !CONFIG_CPUSETS */ =20 static inline bool cpusets_enabled(void) { return false; } @@ -282,6 +283,10 @@ static inline bool read_mems_allowed_retry(unsigned in= t seq) return false; } =20 +static inline bool cpuset_node_allowed(struct cgroup *cgroup, int nid) +{ + return true; +} #endif /* !CONFIG_CPUSETS */ =20 #endif /* _LINUX_CPUSET_H */ diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 53364526d877..a6c4e3faf721 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1736,6 +1736,8 @@ static inline void count_objcg_events(struct obj_cgro= up *objcg, rcu_read_unlock(); } =20 +bool mem_cgroup_node_allowed(struct mem_cgroup *memcg, int nid); + #else static inline bool mem_cgroup_kmem_disabled(void) { @@ -1793,6 +1795,10 @@ static inline void count_objcg_events(struct obj_cgr= oup *objcg, { } =20 +static inline bool mem_cgroup_node_allowed(struct mem_cgroup *memcg, int n= id) +{ + return true; +} #endif /* CONFIG_MEMCG */ =20 #if defined(CONFIG_MEMCG) && defined(CONFIG_ZSWAP) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index f8e6a9b642cb..7eb71d411dc7 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -4163,6 +4163,42 @@ bool cpuset_current_node_allowed(int node, gfp_t gfp= _mask) return allowed; } =20 +bool cpuset_node_allowed(struct cgroup *cgroup, int nid) +{ + struct cgroup_subsys_state *css; + struct cpuset *cs; + bool allowed; + + /* + * In v1, mem_cgroup and cpuset are unlikely in the same hierarchy + * and mems_allowed is likely to be empty even if we could get to it, + * so return true to avoid taking a global lock on the empty check. + */ + if (!cpuset_v2()) + return true; + + css =3D cgroup_get_e_css(cgroup, &cpuset_cgrp_subsys); + if (!css) + return true; + + /* + * Normally, accessing effective_mems would require the cpuset_mutex + * or callback_lock - but node_isset is atomic and the reference + * taken via cgroup_get_e_css is sufficient to protect css. + * + * Since this interface is intended for use by migration paths, we + * relax locking here to avoid taking global locks - while accepting + * there may be rare scenarios where the result may be innaccurate. + * + * Reclaim and migration are subject to these same race conditions, and + * cannot make strong isolation guarantees, so this is acceptable. + */ + cs =3D container_of(css, struct cpuset, css); + allowed =3D node_isset(nid, cs->effective_mems); + css_put(css); + return allowed; +} + /** * cpuset_spread_node() - On which node to begin search for a page * @rotor: round robin rotor diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 40c07b8699ae..2f61d0060fd1 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -5437,3 +5438,8 @@ static int __init mem_cgroup_swap_init(void) subsys_initcall(mem_cgroup_swap_init); =20 #endif /* CONFIG_SWAP */ + +bool mem_cgroup_node_allowed(struct mem_cgroup *memcg, int nid) +{ + return memcg ? cpuset_node_allowed(memcg->css.cgroup, nid) : true; +} diff --git a/mm/vmscan.c b/mm/vmscan.c index 2b2ab386cab5..32a7ce421e42 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -342,16 +342,22 @@ static void flush_reclaim_state(struct scan_control *= sc) } } =20 -static bool can_demote(int nid, struct scan_control *sc) +static bool can_demote(int nid, struct scan_control *sc, + struct mem_cgroup *memcg) { + int demotion_nid; + if (!numa_demotion_enabled) return false; if (sc && sc->no_demotion) return false; - if (next_demotion_node(nid) =3D=3D NUMA_NO_NODE) + + demotion_nid =3D next_demotion_node(nid); + if (demotion_nid =3D=3D NUMA_NO_NODE) return false; =20 - return true; + /* If demotion node isn't in the cgroup's mems_allowed, fall back */ + return mem_cgroup_node_allowed(memcg, demotion_nid); } =20 static inline bool can_reclaim_anon_pages(struct mem_cgroup *memcg, @@ -376,7 +382,7 @@ static inline bool can_reclaim_anon_pages(struct mem_cg= roup *memcg, * * Can it be reclaimed from this node via demotion? */ - return can_demote(nid, sc); + return can_demote(nid, sc, memcg); } =20 /* @@ -1096,7 +1102,8 @@ static bool may_enter_fs(struct folio *folio, gfp_t g= fp_mask) */ static unsigned int shrink_folio_list(struct list_head *folio_list, struct pglist_data *pgdat, struct scan_control *sc, - struct reclaim_stat *stat, bool ignore_references) + struct reclaim_stat *stat, bool ignore_references, + struct mem_cgroup *memcg) { struct folio_batch free_folios; LIST_HEAD(ret_folios); @@ -1109,7 +1116,7 @@ static unsigned int shrink_folio_list(struct list_hea= d *folio_list, folio_batch_init(&free_folios); memset(stat, 0, sizeof(*stat)); cond_resched(); - do_demote_pass =3D can_demote(pgdat->node_id, sc); + do_demote_pass =3D can_demote(pgdat->node_id, sc, memcg); =20 retry: while (!list_empty(folio_list)) { @@ -1658,7 +1665,7 @@ unsigned int reclaim_clean_pages_from_list(struct zon= e *zone, */ noreclaim_flag =3D memalloc_noreclaim_save(); nr_reclaimed =3D shrink_folio_list(&clean_folios, zone->zone_pgdat, &sc, - &stat, true); + &stat, true, NULL); memalloc_noreclaim_restore(noreclaim_flag); =20 list_splice(&clean_folios, folio_list); @@ -2031,7 +2038,8 @@ static unsigned long shrink_inactive_list(unsigned lo= ng nr_to_scan, if (nr_taken =3D=3D 0) return 0; =20 - nr_reclaimed =3D shrink_folio_list(&folio_list, pgdat, sc, &stat, false); + nr_reclaimed =3D shrink_folio_list(&folio_list, pgdat, sc, &stat, false, + lruvec_memcg(lruvec)); =20 spin_lock_irq(&lruvec->lru_lock); move_folios_to_lru(lruvec, &folio_list); @@ -2214,7 +2222,7 @@ static unsigned int reclaim_folio_list(struct list_he= ad *folio_list, .no_demotion =3D 1, }; =20 - nr_reclaimed =3D shrink_folio_list(folio_list, pgdat, &sc, &stat, true); + nr_reclaimed =3D shrink_folio_list(folio_list, pgdat, &sc, &stat, true, N= ULL); while (!list_empty(folio_list)) { folio =3D lru_to_folio(folio_list); list_del(&folio->lru); @@ -2646,7 +2654,7 @@ static void get_scan_count(struct lruvec *lruvec, str= uct scan_control *sc, * Anonymous LRU management is a waste if there is * ultimately no way to reclaim the memory. */ -static bool can_age_anon_pages(struct pglist_data *pgdat, +static bool can_age_anon_pages(struct lruvec *lruvec, struct scan_control *sc) { /* Aging the anon LRU is valuable if swap is present: */ @@ -2654,7 +2662,8 @@ static bool can_age_anon_pages(struct pglist_data *pg= dat, return true; =20 /* Also valuable if anon pages can be demoted: */ - return can_demote(pgdat->node_id, sc); + return can_demote(lruvec_pgdat(lruvec)->node_id, sc, + lruvec_memcg(lruvec)); } =20 #ifdef CONFIG_LRU_GEN @@ -2732,7 +2741,7 @@ static int get_swappiness(struct lruvec *lruvec, stru= ct scan_control *sc) if (!sc->may_swap) return 0; =20 - if (!can_demote(pgdat->node_id, sc) && + if (!can_demote(pgdat->node_id, sc, memcg) && mem_cgroup_get_nr_swap_pages(memcg) < MIN_LRU_BATCH) return 0; =20 @@ -4695,7 +4704,7 @@ static int evict_folios(struct lruvec *lruvec, struct= scan_control *sc, int swap if (list_empty(&list)) return scanned; retry: - reclaimed =3D shrink_folio_list(&list, pgdat, sc, &stat, false); + reclaimed =3D shrink_folio_list(&list, pgdat, sc, &stat, false, memcg); sc->nr.unqueued_dirty +=3D stat.nr_unqueued_dirty; sc->nr_reclaimed +=3D reclaimed; trace_mm_vmscan_lru_shrink_inactive(pgdat->node_id, @@ -5850,7 +5859,7 @@ static void shrink_lruvec(struct lruvec *lruvec, stru= ct scan_control *sc) * Even if we did not try to evict anon pages at all, we want to * rebalance the anon lru active/inactive ratio. */ - if (can_age_anon_pages(lruvec_pgdat(lruvec), sc) && + if (can_age_anon_pages(lruvec, sc) && inactive_is_low(lruvec, LRU_INACTIVE_ANON)) shrink_active_list(SWAP_CLUSTER_MAX, lruvec, sc, LRU_ACTIVE_ANON); @@ -6681,10 +6690,10 @@ static void kswapd_age_node(struct pglist_data *pgd= at, struct scan_control *sc) return; } =20 - if (!can_age_anon_pages(pgdat, sc)) + lruvec =3D mem_cgroup_lruvec(NULL, pgdat); + if (!can_age_anon_pages(lruvec, sc)) return; =20 - lruvec =3D mem_cgroup_lruvec(NULL, pgdat); if (!inactive_is_low(lruvec, LRU_INACTIVE_ANON)) return; =20 --=20 2.49.0