From nobody Wed Apr 8 01:18:31 2026 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 2B9A8145A1F for ; Wed, 11 Mar 2026 03:02:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773198169; cv=none; b=ZBBzgkMScpNTtfXA+g4KxhVH6UDMxhwR/+KPQMdMglwmSnLoy1G/8yhtkyAEga8/PDwLtNNn8761KH5gwccFri6FiHhLc/O7a0hOhMBf1wMtm1Y5a1Xpvj3W6vqImfuUlibj5IRvz5rgdXgkS8zEp4ENCYh8qWDXIG5c32bZ7fs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773198169; c=relaxed/simple; bh=dCwfTCGHxiZaqLLfQElMjU/EtsHoLiAIFvxC9jCEBtw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QbQNnsDzUfPu9gUuEYnzSr6wv2V4ZpQEdTv8N08xagiDSU2qbosaO7zqryFUdSEm01Ynh3rhBRtRDsRQZTjv9e3oW55ZeNFGRKWPAHLZBfcW1e74JXWVLrfwfn2SYEahNUdUZpJvHf207CY9gNBEa0z3icDonNQVGpmOnqXjV/M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com; spf=pass smtp.mailfrom=shopee.com; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b=U/aFX30p; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=shopee.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b="U/aFX30p" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2a8fba3f769so59775905ad.2 for ; Tue, 10 Mar 2026 20:02:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1773198167; x=1773802967; 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=IJuSJm3X4xhlOG3+qvokrBOrPsbIME05pWUjl43X0aE=; b=U/aFX30psc1cKZdBipA0r4QF9smSc5CXShRRa/57NyqsJ9RNg2wpbHfT9fEXqU6QKT 5rYmJQKztDj9e+XR/hOnJUofFCyeHAClkbyG8aD4fi9xD4vnl/NIU6tOFTFwftweBBe7 2muoBnmKwzOzYRgLvVIaUsLVbcupnZLg6wj6uOyRWLVvkhxJex/veMSj4B0qDjRcL/Qr NT+jHaK+v79vQFoafVaadkFxoZzz4k6QStRnYGTAu/o4xEssNZBEuKV2qmbYvyDwcy+T 0u9vRcdOD5HeMjMsxVQKUpmk08BDHRbHoW3UmkC9vFb9rFpNFnsxQd3iNCOS/SOANo1S sr/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773198167; x=1773802967; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=IJuSJm3X4xhlOG3+qvokrBOrPsbIME05pWUjl43X0aE=; b=dt2AYegXTiFUR5zCWdveHoPLd/2O9BsWMf7hlregCcL//0Bh91XwLbbEFrbHWkFGc4 H7ctOp6vz0hHRWFVZD9DreZfekrhrA6u5fGG3UHbXyR2K2OLGzGgtLCO3Qn3AeHgRpa9 GqDWyWkgqvV0xap4aq+FFsbUy9N3HHhUztnN0QZnRHTG+rQnQYwlJ1tQ1dC+UO2fOZo1 teYWfuk9oD2ZpWRqqYnhnnGuUKCHwl4MAIC8jZZyOa3FlI47RLLL75qhgjVp13yWjZ81 UvTB7NXwJ675JqEAa5Cpg4prr1/X+FafqWk5xHNolRPfnuEZZSdmmjZPXclH3ZF1fBDr nEnQ== X-Forwarded-Encrypted: i=1; AJvYcCVV7LHflFxYNXEG56ES0Eu17yPuLvAGpqc5GNQykkfBJy8bZxYpPlcssbrix94moYbfsoQw//bBYSkC5mc=@vger.kernel.org X-Gm-Message-State: AOJu0Yy0G9WoF6TUUVwiC5DL4xooLz/bEV71dYntTwBOvUI61XuvjxHG cWIssEyosXpGc/y4lJjERlOoo6bC3BfXQDkYjW4vKoVg5UH98Yn1UPu5zzqCYviP1LU= X-Gm-Gg: ATEYQzz+aUW771AxU6pFNgqkYj0A2kcDtsBM+a9FQlkX39Fft+2IB+x6cUdWPJy+N0S GToFX7TLbSaTLUNHVtM7ZlFLquUrAvyZ0LJR8OULuOQPvpLEeTtrh8a9StteRmbZU/FXAKpXc0i sZSD46H/CqLz+p0QMFXj6z5MxfzHOBoDMzkWjI22vQcowCoL2C+anT6WAf9i0Uo5nqsARvNXr3a eOrJDVkrWAKVZpjNkVgMYuzwkiOXbuScVvo/IwKAqcdJMkfYA6HSPpVoMdJE0v7KiVqj3SW/SUQ 78iAxbacpeYwm29vhuqie2ubQHZUGXy12JZfL+L5A1+4qxEkawDtXXkx5OYQX51H/nDIB0AFc1s XXD8kKssVjtMbanxxJlk2C/K+9tk23wVp4eFj5Pd8m0e2fSF4Q2WdwRxlJGEQ7nKg8CTtAtcNIe +sVy+NDsVkU4snTuVHgWsrhtVOJ4UxRlEDnEODlQ== X-Received: by 2002:a17:903:41c4:b0:2ae:4f81:2f14 with SMTP id d9443c01a7336-2aeae81642fmr10076395ad.24.1773198167284; Tue, 10 Mar 2026 20:02:47 -0700 (PDT) Received: from localhost.localdomain ([147.136.157.1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aeae378974sm6251555ad.82.2026.03.10.20.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:02:46 -0700 (PDT) From: Haifeng Xu To: akpm@linux-foundation.org, david@fromorbit.com, roman.gushchin@linux.dev, hannes@cmpxchg.org, mhocko@kernel.org, shakeel.butt@linux.dev Cc: zhengqi.arch@bytedance.com, muchun.song@linux.dev, usama.arif@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH V3 1/4] mm: shrinker: add one more parameter in shrinker_id() Date: Wed, 11 Mar 2026 11:02:32 +0800 Message-ID: <20260311030235.240953-2-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260311030235.240953-1-haifeng.xu@shopee.com> References: <20260311030235.240953-1-haifeng.xu@shopee.com> 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" Add a parameter points to target memory cgroup in shrinker_id(). The following patch will use it to decide the id of shrinker. No functional change here. Signed-off-by: Haifeng Xu --- include/linux/memcontrol.h | 4 ++-- mm/huge_memory.c | 4 ++-- mm/shrinker.c | 12 ++++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 70b685a85bf4..a583dbc0adcc 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1634,7 +1634,7 @@ void free_shrinker_info(struct mem_cgroup *memcg); void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id); void reparent_shrinker_deferred(struct mem_cgroup *memcg); =20 -static inline int shrinker_id(struct shrinker *shrinker) +static inline int shrinker_id(struct mem_cgroup *memcg, struct shrinker *s= hrinker) { return shrinker->id; } @@ -1670,7 +1670,7 @@ static inline void set_shrinker_bit(struct mem_cgroup= *memcg, { } =20 -static inline int shrinker_id(struct shrinker *shrinker) +static inline int shrinker_id(struct mem_cgroup *memcg, struct shrinker *s= hrinker) { return -1; } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8e2746ea74ad..6050f8d71587 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -4353,7 +4353,7 @@ void deferred_split_folio(struct folio *folio, bool p= artially_mapped) ds_queue->split_queue_len++; if (memcg) set_shrinker_bit(memcg, folio_nid(folio), - shrinker_id(deferred_split_shrinker)); + shrinker_id(memcg, deferred_split_shrinker)); } split_queue_unlock_irqrestore(ds_queue, flags); } @@ -4509,7 +4509,7 @@ void reparent_deferred_split_queue(struct mem_cgroup = *memcg) ds_queue->split_queue_len =3D 0; =20 for_each_node(nid) - set_shrinker_bit(parent, nid, shrinker_id(deferred_split_shrinker)); + set_shrinker_bit(parent, nid, shrinker_id(parent, deferred_split_shrinke= r)); =20 unlock: spin_unlock(&parent_ds_queue->split_queue_lock); diff --git a/mm/shrinker.c b/mm/shrinker.c index 7b61fc0ee78f..61dbb6afae52 100644 --- a/mm/shrinker.c +++ b/mm/shrinker.c @@ -255,11 +255,13 @@ static long xchg_nr_deferred_memcg(int nid, struct sh= rinker *shrinker, struct shrinker_info *info; struct shrinker_info_unit *unit; long nr_deferred; + int id; =20 rcu_read_lock(); + id =3D shrinker_id(memcg, shrinker); info =3D rcu_dereference(memcg->nodeinfo[nid]->shrinker_info); - unit =3D info->unit[shrinker_id_to_index(shrinker->id)]; - nr_deferred =3D atomic_long_xchg(&unit->nr_deferred[shrinker_id_to_offset= (shrinker->id)], 0); + unit =3D info->unit[shrinker_id_to_index(id)]; + nr_deferred =3D atomic_long_xchg(&unit->nr_deferred[shrinker_id_to_offset= (id)], 0); rcu_read_unlock(); =20 return nr_deferred; @@ -271,12 +273,14 @@ static long add_nr_deferred_memcg(long nr, int nid, s= truct shrinker *shrinker, struct shrinker_info *info; struct shrinker_info_unit *unit; long nr_deferred; + int id; =20 rcu_read_lock(); + id =3D shrinker_id(memcg, shrinker); info =3D rcu_dereference(memcg->nodeinfo[nid]->shrinker_info); - unit =3D info->unit[shrinker_id_to_index(shrinker->id)]; + unit =3D info->unit[shrinker_id_to_index(id)]; nr_deferred =3D - atomic_long_add_return(nr, &unit->nr_deferred[shrinker_id_to_offset(shri= nker->id)]); + atomic_long_add_return(nr, &unit->nr_deferred[shrinker_id_to_offset(id)]= ); rcu_read_unlock(); =20 return nr_deferred; --=20 2.43.0 From nobody Wed Apr 8 01:18:31 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 82537145A1F for ; Wed, 11 Mar 2026 03:02:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773198173; cv=none; b=MtCdajATjvF+1xFcikaQxXkZK83vsGlJ4C9aT5dbT1YP0ugjws/y+Zld8DjhHyxvTyalqZtoME66rcAKbOtvWzB+frm/hv2TqCDAr3fR0Jl4zmf9b0uOd5J943mzmdkKLI7uRmvoo7mpL2KSb4fC/2Kmp+7fD1wsPwbqWYv4md8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773198173; c=relaxed/simple; bh=eP4rRkrdvvo7zSt7SRouGHMKrIys1GBHBWGYBH5RubI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NygQpCwnmKeG8uP0qY9tKulWDHb4YRnT1+q1YnKAL5sFef78BO06GYTILBPVOTG3N7Di0pWq/H1zjcird0IUiIoRGBEi8Ii5Hbp3ZTff60dphDOsyKhqWdx/MarjqOJlMM3h+RFRFuwHpIGxUnGbm0XVi6gsTrgxx0OUjAnDw7k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com; spf=pass smtp.mailfrom=shopee.com; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b=dmxS34vS; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=shopee.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b="dmxS34vS" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2ad9f316d68so60902495ad.2 for ; Tue, 10 Mar 2026 20:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1773198172; x=1773802972; 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=+OzUwreO0Fx04kzL8hUKy9/smwpH8GzkcqgpiyONa3A=; b=dmxS34vSsMH8AlKv6aYNHNs0qnXO3Lb5sLAB3kzzxa5HVqou/CbB+gPHggzLpFMSub fwLJUt5E62t+A4dCT9EvkAjXvR7J0z0GC8XJGWm2RJ+x/iaut3PBHo0xQGncupvdroWX HBMS3zzW1JYQr5ziphzOhxyTktmE5nHLBwj95rfs32vGRyEQih7rmTVp2ItV09H7CUgv oFsCoX5CMoL1spYs1nqpwcqZzdPFlcQ8tz25eYWqMXYyZFo4GdMxzB59taelY7UoCrNn +CHQJBibjPyCBMzo6PaB9RtTvjm6ORXyv9qF8l0qiDnfjxytB6bk9jJxYizvoUPLuhqd T6nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773198172; x=1773802972; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+OzUwreO0Fx04kzL8hUKy9/smwpH8GzkcqgpiyONa3A=; b=vIDzNgmK8kmk8cY9WaCkxSXiN8Z4Dlb2U/BJfnCA/QBOnq2SsZ4R2I+2ezCYgK6bB4 23V1yNkSb84qtR3PuboOykAim1opPyCVyNs+UcFEkDi+v89Aiv1Q3k4wGHhS2jHyF20b sZdpA3W/Dt2f7Zi5aracWU5acR41UkPeadNKFaZYxVRtigW2ddZj4J4xt/rd81QwpxFz vOa+/AS9r0s5TbIZ5xNkjOBOKDEz4HaqC3l0WPr+CHLnHnZZ3SZMJKFyJDwUlg+FPFok PieUYMdfao5TigQWUfUvZ0BLecPYjOhkbrXW9bW53UUJRwsUBnrdhd8RRBWNz8nIsz4i 6uxA== X-Forwarded-Encrypted: i=1; AJvYcCXSe/Fc73d0iMwkRESNjsXaMs74e02QFcn9Jn60JxDETWliPdPM+BnW/aYVMWrH/S13p/iwfgUj+DHa0Zc=@vger.kernel.org X-Gm-Message-State: AOJu0Yxv71I7KJzSUeTNTT9Xcx0wYz2L/1xIl/bOGzAD+jHr+hJA6Wmb u4TqJrk6ulwUhcVZcnSesmie1tQnUStgu46RWK/qjm3IUdPewFL2FlDMbd1zu+i1aFs= X-Gm-Gg: ATEYQzyP061GJNhEiB8X1BX40VOFrJOXdchdF3W+TuJ7vMyrS/5+rrQSHdZKnVxtmUo kR4REKbA4CuHPKAF06T9hSmQ4mUarcjD+zXses9tiPrz6PLNCS6KeojuMBuTRCeDC5M2Y+c7meC jFQI5KepnBtC4rNJfuwNk7+u5TSMAYQrLQCHfdqViP5FuU7UW6JrUiEp/h4k31cYaCHnzjTZM1H hBEdjuKzkV/nY/fvfK26gH2uK2tieGSEgGnqcpgoq8JdXqVEORrHcHQwocNl8fVi15iscA806Om B+yH/XxPPlbgl5gH2iQfri6NMcoMQAaAgd3nZGDq42Oq3GrfbDoMIvq2nHtZAeuiGi0Q1W5j1AK yvvQ6QcHiPAjZ6iUXtsijOzReimh4S9RkE+NMOh/4lAVrMa7lnxyFRtCN5QmHi45k9KD+iHUNvO Cm+kuWJX/qyKngW+tULI6K/eBkunUuojQQdGEFcw== X-Received: by 2002:a17:903:3c2d:b0:2ae:46b9:c653 with SMTP id d9443c01a7336-2aeae8945b1mr11721805ad.33.1773198171778; Tue, 10 Mar 2026 20:02:51 -0700 (PDT) Received: from localhost.localdomain ([147.136.157.1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aeae378974sm6251555ad.82.2026.03.10.20.02.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:02:51 -0700 (PDT) From: Haifeng Xu To: akpm@linux-foundation.org, david@fromorbit.com, roman.gushchin@linux.dev, hannes@cmpxchg.org, mhocko@kernel.org, shakeel.butt@linux.dev Cc: zhengqi.arch@bytedance.com, muchun.song@linux.dev, usama.arif@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH V3 2/4] mm: shrinker: move shrinker_id() code block below memcg_kmem_online() Date: Wed, 11 Mar 2026 11:02:33 +0800 Message-ID: <20260311030235.240953-3-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260311030235.240953-1-haifeng.xu@shopee.com> References: <20260311030235.240953-1-haifeng.xu@shopee.com> 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" The following patch will use memcg_kmem_online() to decide the id of shrinker, so move the code block down to reduce the diff noise in the following patch. No functional change here. Signed-off-by: Haifeng Xu --- include/linux/memcontrol.h | 188 ++++++++++++++++++------------------- 1 file changed, 94 insertions(+), 94 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index a583dbc0adcc..ce7b5101bc02 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1582,100 +1582,6 @@ static inline void mem_cgroup_flush_foreign(struct = bdi_writeback *wb) =20 #endif /* CONFIG_CGROUP_WRITEBACK */ =20 -struct sock; -#ifdef CONFIG_MEMCG -extern struct static_key_false memcg_sockets_enabled_key; -#define mem_cgroup_sockets_enabled static_branch_unlikely(&memcg_sockets_e= nabled_key) - -void mem_cgroup_sk_alloc(struct sock *sk); -void mem_cgroup_sk_free(struct sock *sk); -void mem_cgroup_sk_inherit(const struct sock *sk, struct sock *newsk); -bool mem_cgroup_sk_charge(const struct sock *sk, unsigned int nr_pages, - gfp_t gfp_mask); -void mem_cgroup_sk_uncharge(const struct sock *sk, unsigned int nr_pages); - -#if BITS_PER_LONG < 64 -static inline void mem_cgroup_set_socket_pressure(struct mem_cgroup *memcg) -{ - u64 val =3D get_jiffies_64() + HZ; - unsigned long flags; - - write_seqlock_irqsave(&memcg->socket_pressure_seqlock, flags); - memcg->socket_pressure =3D val; - write_sequnlock_irqrestore(&memcg->socket_pressure_seqlock, flags); -} - -static inline u64 mem_cgroup_get_socket_pressure(struct mem_cgroup *memcg) -{ - unsigned int seq; - u64 val; - - do { - seq =3D read_seqbegin(&memcg->socket_pressure_seqlock); - val =3D memcg->socket_pressure; - } while (read_seqretry(&memcg->socket_pressure_seqlock, seq)); - - return val; -} -#else -static inline void mem_cgroup_set_socket_pressure(struct mem_cgroup *memcg) -{ - WRITE_ONCE(memcg->socket_pressure, jiffies + HZ); -} - -static inline u64 mem_cgroup_get_socket_pressure(struct mem_cgroup *memcg) -{ - return READ_ONCE(memcg->socket_pressure); -} -#endif - -int alloc_shrinker_info(struct mem_cgroup *memcg); -void free_shrinker_info(struct mem_cgroup *memcg); -void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id); -void reparent_shrinker_deferred(struct mem_cgroup *memcg); - -static inline int shrinker_id(struct mem_cgroup *memcg, struct shrinker *s= hrinker) -{ - return shrinker->id; -} -#else -#define mem_cgroup_sockets_enabled 0 - -static inline void mem_cgroup_sk_alloc(struct sock *sk) -{ -} - -static inline void mem_cgroup_sk_free(struct sock *sk) -{ -} - -static inline void mem_cgroup_sk_inherit(const struct sock *sk, struct soc= k *newsk) -{ -} - -static inline bool mem_cgroup_sk_charge(const struct sock *sk, - unsigned int nr_pages, - gfp_t gfp_mask) -{ - return false; -} - -static inline void mem_cgroup_sk_uncharge(const struct sock *sk, - unsigned int nr_pages) -{ -} - -static inline void set_shrinker_bit(struct mem_cgroup *memcg, - int nid, int shrinker_id) -{ -} - -static inline int shrinker_id(struct mem_cgroup *memcg, struct shrinker *s= hrinker) -{ - return -1; -} -#endif - #ifdef CONFIG_MEMCG bool mem_cgroup_kmem_disabled(void); int __memcg_kmem_charge_page(struct page *page, gfp_t gfp, int order); @@ -1844,6 +1750,100 @@ static inline bool memcg_is_dying(struct mem_cgroup= *memcg) } #endif /* CONFIG_MEMCG */ =20 +struct sock; +#ifdef CONFIG_MEMCG +extern struct static_key_false memcg_sockets_enabled_key; +#define mem_cgroup_sockets_enabled static_branch_unlikely(&memcg_sockets_e= nabled_key) + +void mem_cgroup_sk_alloc(struct sock *sk); +void mem_cgroup_sk_free(struct sock *sk); +void mem_cgroup_sk_inherit(const struct sock *sk, struct sock *newsk); +bool mem_cgroup_sk_charge(const struct sock *sk, unsigned int nr_pages, + gfp_t gfp_mask); +void mem_cgroup_sk_uncharge(const struct sock *sk, unsigned int nr_pages); + +#if BITS_PER_LONG < 64 +static inline void mem_cgroup_set_socket_pressure(struct mem_cgroup *memcg) +{ + u64 val =3D get_jiffies_64() + HZ; + unsigned long flags; + + write_seqlock_irqsave(&memcg->socket_pressure_seqlock, flags); + memcg->socket_pressure =3D val; + write_sequnlock_irqrestore(&memcg->socket_pressure_seqlock, flags); +} + +static inline u64 mem_cgroup_get_socket_pressure(struct mem_cgroup *memcg) +{ + unsigned int seq; + u64 val; + + do { + seq =3D read_seqbegin(&memcg->socket_pressure_seqlock); + val =3D memcg->socket_pressure; + } while (read_seqretry(&memcg->socket_pressure_seqlock, seq)); + + return val; +} +#else +static inline void mem_cgroup_set_socket_pressure(struct mem_cgroup *memcg) +{ + WRITE_ONCE(memcg->socket_pressure, jiffies + HZ); +} + +static inline u64 mem_cgroup_get_socket_pressure(struct mem_cgroup *memcg) +{ + return READ_ONCE(memcg->socket_pressure); +} +#endif + +int alloc_shrinker_info(struct mem_cgroup *memcg); +void free_shrinker_info(struct mem_cgroup *memcg); +void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id); +void reparent_shrinker_deferred(struct mem_cgroup *memcg); + +static inline int shrinker_id(struct mem_cgroup *memcg, struct shrinker *s= hrinker) +{ + return shrinker->id; +} +#else +#define mem_cgroup_sockets_enabled 0 + +static inline void mem_cgroup_sk_alloc(struct sock *sk) +{ +} + +static inline void mem_cgroup_sk_free(struct sock *sk) +{ +} + +static inline void mem_cgroup_sk_inherit(const struct sock *sk, struct soc= k *newsk) +{ +} + +static inline bool mem_cgroup_sk_charge(const struct sock *sk, + unsigned int nr_pages, + gfp_t gfp_mask) +{ + return false; +} + +static inline void mem_cgroup_sk_uncharge(const struct sock *sk, + unsigned int nr_pages) +{ +} + +static inline void set_shrinker_bit(struct mem_cgroup *memcg, + int nid, int shrinker_id) +{ +} + +static inline int shrinker_id(struct mem_cgroup *memcg, struct shrinker *s= hrinker) +{ + return -1; +} +#endif + #if defined(CONFIG_MEMCG) && defined(CONFIG_ZSWAP) bool obj_cgroup_may_zswap(struct obj_cgroup *objcg); void obj_cgroup_charge_zswap(struct obj_cgroup *objcg, size_t size); --=20 2.43.0 From nobody Wed Apr 8 01:18:31 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 026FB3630B0 for ; Wed, 11 Mar 2026 03:02:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773198178; cv=none; b=i1JmhecW8Sqsca9CSNzwE0y5C/I2yiBhQxclo5n5Sgt/M01eidBddG0Py1ACegiwC3mk461Nd+w7hDjRZaEfNGyflae1rh2qnWaV1J6vu+wrmJLDRWo+buQ+jDVAdsxebmnF6RKl7W6UZFTUDOyIJtHoZZbLY+ClQUegsH/yBOM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773198178; c=relaxed/simple; bh=42Us+IqcaMdNlezkQsLqEZY9sOJKTa/yaa10PAZo22M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hY2LTSW0NQUcjt3nCpXm87cXRcVwYKfF/7SZc7y2eH547dexBk3pXSnPxWDeuuOyi3UyKbcwOtfFT3WVpdVQMBgNqzv7etkEOiMaZd3RHIVAGRo0PmA6cDg5o9GXuWC/0r5X98ABd9v32Ew1jJ7+omIxiizRKSEkjsrLb3sqh3w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com; spf=pass smtp.mailfrom=shopee.com; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b=VkLU3d62; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=shopee.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b="VkLU3d62" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2a871daa98fso101099715ad.1 for ; Tue, 10 Mar 2026 20:02:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1773198176; x=1773802976; 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=llSFVwpJUq7vN+RyIjB37GeQ61RCDZGes5EfnEaTg+0=; b=VkLU3d62KCsgLPKogNpxNAWu8PpOhcIW+EksCUtCaVlbljfBmZyBFig07bo4wq8Ysu 0zz4OTkZTYbr1O/LJ4GGzF3WC9Obbzuy8mJEf1i6qpBugCFd82VSKdPNfxSDByhQpMDf 9OKVo6689GVEILIirGDUDUNqfMss/2fXnmdFcsrk0k53IdzCBVH3A6TfHoubsqhqCWHw YWNydmioDQCXftCpTeZ9OqIfbUlFPMyXIXnxHpgbTmm5+GDqVjYK+zvlPeAM3mBMjkqt YOcIUCwdH180pM6GW83P3bJb/E7BXJNP/3n1ixwSaVs8E5o6Mg/LerpvmUyJsCmUE8An qYJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773198176; x=1773802976; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=llSFVwpJUq7vN+RyIjB37GeQ61RCDZGes5EfnEaTg+0=; b=rJ8uG20DyPJmR1xYvKuHbMYMaAVjDN3YAECq87pGfBT1I4dkDKGXQoNeWHI0Pu2yy/ JFnKKqBrK5JNHOV6mBBU3eWrUbRwwEHrFANMbduhypyEiIt5KWaTZe5Xosic3XSQ0jwP B3R7nYzjC6fyuh3j66zsxr4OKNtK0CU2tHFVGHIqO7q9rIOX6dtBSHIEGzfIJkkMwT/z 8hPlD8DjyAC/AJeTxQ2kjXKzC21Onvprx/8cj+qa9zhfxpQTmRolTdtPFecQkPRc7Ror zrrFfTH5lN/aqagFElJz+iXGyR7Oyq9SaUCiDtsQBnG0h/iayxlxnC7IWq6wDndD0KXT aTdQ== X-Forwarded-Encrypted: i=1; AJvYcCVQP70uhFULfMTerXu/oKS0ReAYmEjQFRWM/zd1eOhHK5OJmQABMJ1w/tgopuYJX8jnCdGDSmhyFCE8kf0=@vger.kernel.org X-Gm-Message-State: AOJu0Ywtd697u6zOBB8eRjgeyQEFGablrBB4jLX2C6EUIS4lHd5JaJGS zNbye4QMa5YCZB+ZhJV92xFKZe+lFyuQlHjZNr2QMlIPxDi4cgFXj4t4Kd0QAx2xHc0= X-Gm-Gg: ATEYQzzobpoYBtYiOUqQfeQH+efY9zHZKV/Mmm8x+2+hqhtTpSArn0IDi0xEEljPwgs BNKAumlEMX3tFcKe+9V6guEVsUYuVSm9phx2a52ahDktqe6DelwKE/lyGLKwnFtLb17x0iojDPZ R9RnbzrExqaDkz3MGk0Ot7lFlnPSAHHKDCn+0ZPg8HnnHknjjWuMu4VEKWr/dcmkv1kIxbJxrED uHU3jPnSUutlICzTJurfk88zu8aSVZvBNDZ6KXhglwtcJb9O5AbSMcxqfFuGKaBy6BbQo2ut44e pUV3aOR4NJYs63UI0fzrUEhG3hfDVumiIOI1rzcPgjayN4PWtp7gaQpmd3JCEAEc3XrmJ2IiyZT DwqfagKUZMw3EmI3yZzclAUHDYmSZNSf3DZMOcNJ+HCTGwYBO9qwKkZmxvaIYW7b3Um86VHbsPH al9Fl2aFpi0P7FB5PHvnbFf2hu2Gj8v8T3836zUw== X-Received: by 2002:a17:903:18d:b0:2ae:3dd5:c69c with SMTP id d9443c01a7336-2aeae858e3fmr11351905ad.33.1773198176279; Tue, 10 Mar 2026 20:02:56 -0700 (PDT) Received: from localhost.localdomain ([147.136.157.1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aeae378974sm6251555ad.82.2026.03.10.20.02.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:02:55 -0700 (PDT) From: Haifeng Xu To: akpm@linux-foundation.org, david@fromorbit.com, roman.gushchin@linux.dev, hannes@cmpxchg.org, mhocko@kernel.org, shakeel.butt@linux.dev Cc: zhengqi.arch@bytedance.com, muchun.song@linux.dev, usama.arif@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH V3 3/4] mm: shrinker: optimize the allocation of shrinker_info when setting cgroup_memory_nokmem Date: Wed, 11 Mar 2026 11:02:34 +0800 Message-ID: <20260311030235.240953-4-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260311030235.240953-1-haifeng.xu@shopee.com> References: <20260311030235.240953-1-haifeng.xu@shopee.com> 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" When kmem is disabled, memcg slab shrink only call non-slab shrinkers, so just allocates shrinker info for non-slab shrinkers to non-root memcgs. Therefore, if memcg_kmem_online is true, all things keep same as before. Otherwise, root memcg allocates id from shrinker_idr to identify each shrinker and non-root memcgs use nonslab_id to identify non-slab shrinkers. The size of shrinkers_info in non-root memcgs can be very low because the number of shrinkers marked as SHRINKER_NONSLAB | SHRINKER_MEMCG_AWARE is few. Also, the time spending in expand_shrinker_info() can reduce a lot. When setting shrinker bit or updating nr_deferred, use nonslab_id for non-root memcgs if the shrinker is marked as SHRINKER_NONSLAB. Signed-off-by: Haifeng Xu --- include/linux/memcontrol.h | 8 ++- include/linux/shrinker.h | 3 + mm/shrinker.c | 117 +++++++++++++++++++++++++++++++++---- 3 files changed, 115 insertions(+), 13 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index ce7b5101bc02..3edd6211aed2 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1804,7 +1804,13 @@ void reparent_shrinker_deferred(struct mem_cgroup *m= emcg); =20 static inline int shrinker_id(struct mem_cgroup *memcg, struct shrinker *s= hrinker) { - return shrinker->id; + int id =3D shrinker->id; + + if (!memcg_kmem_online() && (shrinker->flags & SHRINKER_NONSLAB) && + memcg !=3D root_mem_cgroup) + id =3D shrinker->nonslab_id; + + return id; } #else #define mem_cgroup_sockets_enabled 0 diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h index 1a00be90d93a..df53008ed8b5 100644 --- a/include/linux/shrinker.h +++ b/include/linux/shrinker.h @@ -107,6 +107,9 @@ struct shrinker { #ifdef CONFIG_MEMCG /* ID in shrinker_idr */ int id; + + /* ID in shrinker_nonslab_idr */ + int nonslab_id; #endif #ifdef CONFIG_SHRINKER_DEBUG int debugfs_id; diff --git a/mm/shrinker.c b/mm/shrinker.c index 61dbb6afae52..3137518bc746 100644 --- a/mm/shrinker.c +++ b/mm/shrinker.c @@ -12,6 +12,7 @@ DEFINE_MUTEX(shrinker_mutex); =20 #ifdef CONFIG_MEMCG static int shrinker_nr_max; +static int shrinker_nonslab_nr_max; =20 static inline int shrinker_unit_size(int nr_items) { @@ -78,15 +79,26 @@ int alloc_shrinker_info(struct mem_cgroup *memcg) { int nid, ret =3D 0; int array_size =3D 0; + int alloc_nr_max; =20 mutex_lock(&shrinker_mutex); - array_size =3D shrinker_unit_size(shrinker_nr_max); + + if (memcg_kmem_online()) { + alloc_nr_max =3D shrinker_nr_max; + } else { + if (memcg =3D=3D root_mem_cgroup) + alloc_nr_max =3D shrinker_nr_max; + else + alloc_nr_max =3D shrinker_nonslab_nr_max; + } + + array_size =3D shrinker_unit_size(alloc_nr_max); for_each_node(nid) { struct shrinker_info *info =3D kvzalloc_node(sizeof(*info) + array_size, GFP_KERNEL, nid); if (!info) goto err; - info->map_nr_max =3D shrinker_nr_max; + info->map_nr_max =3D alloc_nr_max; if (shrinker_unit_alloc(info, NULL, nid)) { kvfree(info); goto err; @@ -147,33 +159,47 @@ static int expand_one_shrinker_info(struct mem_cgroup= *memcg, int new_size, return 0; } =20 -static int expand_shrinker_info(int new_id) +static int expand_shrinker_info(int new_id, bool full, bool root) { int ret =3D 0; int new_nr_max =3D round_up(new_id + 1, SHRINKER_UNIT_BITS); int new_size, old_size =3D 0; struct mem_cgroup *memcg; + struct mem_cgroup *start =3D NULL; + int old_nr_max =3D shrinker_nr_max; =20 if (!root_mem_cgroup) goto out; =20 lockdep_assert_held(&shrinker_mutex); =20 + if (!full && !root) { + start =3D root_mem_cgroup; + old_nr_max =3D shrinker_nonslab_nr_max; + } + new_size =3D shrinker_unit_size(new_nr_max); - old_size =3D shrinker_unit_size(shrinker_nr_max); + old_size =3D shrinker_unit_size(old_nr_max); + + memcg =3D mem_cgroup_iter(NULL, start, NULL); + if (!memcg) + goto out; =20 - memcg =3D mem_cgroup_iter(NULL, NULL, NULL); do { ret =3D expand_one_shrinker_info(memcg, new_size, old_size, new_nr_max); - if (ret) { + if (ret || (root && memcg =3D=3D root_mem_cgroup)) { mem_cgroup_iter_break(NULL, memcg); goto out; } } while ((memcg =3D mem_cgroup_iter(NULL, memcg, NULL)) !=3D NULL); out: - if (!ret) - shrinker_nr_max =3D new_nr_max; + if (!ret) { + if (!full && !root) + shrinker_nonslab_nr_max =3D new_nr_max; + else + shrinker_nr_max =3D new_nr_max; + } =20 return ret; } @@ -212,25 +238,58 @@ void set_shrinker_bit(struct mem_cgroup *memcg, int n= id, int shrinker_id) } =20 static DEFINE_IDR(shrinker_idr); +static DEFINE_IDR(shrinker_nonslab_idr); =20 static int shrinker_memcg_alloc(struct shrinker *shrinker) { int id, ret =3D -ENOMEM; + bool kmem_online; =20 if (mem_cgroup_disabled()) return -ENOSYS; =20 + kmem_online =3D memcg_kmem_online(); mutex_lock(&shrinker_mutex); id =3D idr_alloc(&shrinker_idr, shrinker, 0, 0, GFP_KERNEL); if (id < 0) goto unlock; =20 if (id >=3D shrinker_nr_max) { - if (expand_shrinker_info(id)) { + /* If memcg_kmem_online() returns true, expand shrinker + * info for all memcgs, otherwise, expand shrinker info + * for root memcg only + */ + if (expand_shrinker_info(id, kmem_online, !kmem_online)) { idr_remove(&shrinker_idr, id); goto unlock; } } + + shrinker->nonslab_id =3D -1; + /* + * If cgroup_memory_nokmem is set, record shrinkers with SHRINKER_NONSLAB + * because memcg slab shrink only call non-slab shrinkers. + */ + if (!kmem_online && shrinker->flags & SHRINKER_NONSLAB) { + int nonslab_id; + + nonslab_id =3D idr_alloc(&shrinker_nonslab_idr, shrinker, 0, 0, GFP_KERN= EL); + if (nonslab_id < 0) { + idr_remove(&shrinker_idr, id); + goto unlock; + } + + if (nonslab_id >=3D shrinker_nonslab_nr_max) { + /* expand shrinker info for non-root memcgs */ + if (expand_shrinker_info(nonslab_id, false, false)) { + idr_remove(&shrinker_idr, id); + idr_remove(&shrinker_nonslab_idr, nonslab_id); + goto unlock; + } + } + shrinker->nonslab_id =3D nonslab_id; + } + shrinker->id =3D id; ret =3D 0; unlock: @@ -247,6 +306,12 @@ static void shrinker_memcg_remove(struct shrinker *shr= inker) lockdep_assert_held(&shrinker_mutex); =20 idr_remove(&shrinker_idr, id); + + if (shrinker->flags & SHRINKER_NONSLAB) { + id =3D shrinker->nonslab_id; + if (id >=3D 0) + idr_remove(&shrinker_nonslab_idr, id); + } } =20 static long xchg_nr_deferred_memcg(int nid, struct shrinker *shrinker, @@ -305,10 +370,33 @@ void reparent_shrinker_deferred(struct mem_cgroup *me= mcg) parent_info =3D shrinker_info_protected(parent, nid); for (index =3D 0; index < shrinker_id_to_index(child_info->map_nr_max); = index++) { child_unit =3D child_info->unit[index]; - parent_unit =3D parent_info->unit[index]; for (offset =3D 0; offset < SHRINKER_UNIT_BITS; offset++) { nr =3D atomic_long_read(&child_unit->nr_deferred[offset]); - atomic_long_add(nr, &parent_unit->nr_deferred[offset]); + + /* + * If memcg_kmem_online() is false, the non-root memcgs use + * nonslab_id but root memory cgroup use id. When reparenting + * shrinker info to it, must convert the nonslab_id to id. + */ + if (!memcg_kmem_online() && parent =3D=3D root_mem_cgroup) { + int id, p_index, p_off; + struct shrinker *shrinker; + + id =3D calc_shrinker_id(index, offset); + shrinker =3D idr_find(&shrinker_nonslab_idr, id); + if (shrinker) { + id =3D shrinker->id; + p_index =3D shrinker_id_to_index(id); + p_off =3D shrinker_id_to_offset(id); + + parent_unit =3D parent_info->unit[p_index]; + atomic_long_add(nr, + &parent_unit->nr_deferred[p_off]); + } + } else { + parent_unit =3D parent_info->unit[index]; + atomic_long_add(nr, &parent_unit->nr_deferred[offset]); + } } } } @@ -538,7 +626,12 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask,= int nid, int shrinker_id =3D calc_shrinker_id(index, offset); =20 rcu_read_lock(); - shrinker =3D idr_find(&shrinker_idr, shrinker_id); + + if (memcg_kmem_online()) + shrinker =3D idr_find(&shrinker_idr, shrinker_id); + else + shrinker =3D idr_find(&shrinker_nonslab_idr, shrinker_id); + if (unlikely(!shrinker || !shrinker_try_get(shrinker))) { clear_bit(offset, unit->map); rcu_read_unlock(); --=20 2.43.0 From nobody Wed Apr 8 01:18:31 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 5C2E134D390 for ; Wed, 11 Mar 2026 03:03:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773198182; cv=none; b=j1jFsE70jCHdlNl+1XWuL/3/auM98Yx1SU0spDBN4mW3k3AGgUkvJDVGvJ/ltZz+sRBOS1V0cejobGbPZfWb/DnCes5Fh3/Q/2ADDzQ0ArGcnPzj92Lo93QsxEJfQdb1Sdn+FbBeT6lz8K941nPCs8Hmn1xxUXK0icS7akFsNes= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773198182; c=relaxed/simple; bh=bCr3faLzA5fDRoom0L80CxJO5ve40rsLpjNa5vvSbCc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cXJKibj3dzNMgBtXgaukovKNVPggX1+L6QPWEL+ffudFBjmuVbvrB7+lBF3/+BcgLiqwJs48thWXr3VxFZH6smCwp2Co0biw9JYCsqRKltNuf78hBC+vOi3iBQZ+BOYxKug+Eehr4x3ctFh3QFvwZk+aeiC4RkPXBsstHOrIBgs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com; spf=pass smtp.mailfrom=shopee.com; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b=EItdXMFr; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=shopee.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b="EItdXMFr" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2aea68839a5so3918065ad.1 for ; Tue, 10 Mar 2026 20:03:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1773198181; x=1773802981; 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=Ly1IRsMskN9R+65s2IxLzpzlj0ryymd9c9VwDaOci84=; b=EItdXMFrUuwYvrvppxEZDj0kPZnLfMEXmTvkPScaKTvCjmooW8WzYHHWEb671y0k8O APwhCf8aXw/IjDlBzm9bDMhwM3DG3MSKfHlgnnqoU3Un1bznjyDkRpheaRgqz+qSWjYx IOxyjBquL+SC3eyXm5B+42in7xHgsGBwixfkLo3l+8KQcuV2+NW0SsBOjiVIOC6U8Ie5 MIJ/FIasG+FFX0XaYB/B04fBBnf4pbjfrtNm/iozO0f8E0C2gw5KXkxB2x0H8+yHFnjD jRecv8dXQLf1GkpARC8E2N1lZ+G1QN4AolidJpkudTqhcSZ+L9VeL2ur+sEdD5R8WGzR QTyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773198181; x=1773802981; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Ly1IRsMskN9R+65s2IxLzpzlj0ryymd9c9VwDaOci84=; b=a7er3Pv+ZwfxgUQFMNtgF7H1fbegh4HIlBAxH+IdIq7+8p+nEQUustnliF3WVE9X1U trmmdH09FW2BeTCrZP5fJkxhm3xbNIMheB24oGKRX19OWo6E0DQOEvV3qsfSBjTzqKWj TSl1CDASS9AX6+BObCZzk9vfRp/y2vXvaDXC8/R0MihJYvumm+Q9obhfzKEzdJe3wXvk 3Wil4Iru61aAr7qhySxvHEYf6LIidFVSNzWUcgKdG1N5YIFEbxXdMHs/9a8aR7ddYFZq zGyZY2D9Ui6Lf0+7GkTmgQVTIOn4zYOWEIdRKGw5cq4k6AZXhkOXmPaiR9TVZGxFH/rb vspQ== X-Forwarded-Encrypted: i=1; AJvYcCWHQknZCTBAWzhVHDAPt8nVY7fAMhaGwbpYSQr2u1cS8Mn/zDNEpBtv9Ems+jP3raAS5uQVBTJxVFvZhfg=@vger.kernel.org X-Gm-Message-State: AOJu0YydjhgQd37DboP+hVH7IWpcmxqKPlPFnUmZtXre6UCtfkgeQKCO mepKrcD94qW+SlbmWzvDBs8Jk0/JDBWgGf+z4qEX+rjRgM5Z4XzrX5OV7NEkAijedbE= X-Gm-Gg: ATEYQzwQ8mqWx+aueFUESdD4Uk6dBbHRHFsdi48ZUab8yWMkQMfrfCGwgURy0V5cFs0 OT7rtNMTJj/yMpWGryRuDV/5zRiT3pYICVWQYud/BSThQA738I8pmrlhFE/xDdMgurhRKZV2sfM ph6L0DLRz8389VsfxzHQ21thYt0P6CkmBBPo69ADeKy+rLnldhSt64X9Ocnafzgjyrk7+pyqwGw 8FuoJBORXQ1+Ux7nNg2dWepc67R6Fk4Xafj+br2xHt++jvI2nRzWfT9emb+kP8KZBdEIKSF50gA WvhlyuLFio1VTLxN5pXS6tkI564RNoB5xK91rFcmi3exVkPfuowCbajVXBMX6bgtOA58TvbQQo0 ahMxAk0BuE8jMF4UPPHxbbkL7dhbroYvou1hM3HVTZf7b4n8u/qsBSnocwzkGnxdkNFVwCbGXWR WtucmVJzYbcA++i9uEeZeZzHg67XGaQfpVIRxkbA== X-Received: by 2002:a17:903:41cb:b0:2aa:dad4:dfa2 with SMTP id d9443c01a7336-2aea1de84ccmr61348405ad.18.1773198180714; Tue, 10 Mar 2026 20:03:00 -0700 (PDT) Received: from localhost.localdomain ([147.136.157.1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aeae378974sm6251555ad.82.2026.03.10.20.02.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:03:00 -0700 (PDT) From: Haifeng Xu To: akpm@linux-foundation.org, david@fromorbit.com, roman.gushchin@linux.dev, hannes@cmpxchg.org, mhocko@kernel.org, shakeel.butt@linux.dev Cc: zhengqi.arch@bytedance.com, muchun.song@linux.dev, usama.arif@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH V3 4/4] mm: shrinker: remove unnecessary check in shrink_slab_memcg() Date: Wed, 11 Mar 2026 11:02:35 +0800 Message-ID: <20260311030235.240953-5-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260311030235.240953-1-haifeng.xu@shopee.com> References: <20260311030235.240953-1-haifeng.xu@shopee.com> 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" If memcg_kmem_online() is false, only non-slab shrinkers are recorded in the map, so remove the check. Signed-off-by: Haifeng Xu --- mm/shrinker.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mm/shrinker.c b/mm/shrinker.c index 3137518bc746..98307a9bd00e 100644 --- a/mm/shrinker.c +++ b/mm/shrinker.c @@ -639,11 +639,6 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask,= int nid, } rcu_read_unlock(); =20 - /* Call non-slab shrinkers even though kmem is disabled */ - if (!memcg_kmem_online() && - !(shrinker->flags & SHRINKER_NONSLAB)) - continue; - ret =3D do_shrink_slab(&sc, shrinker, priority); if (ret =3D=3D SHRINK_EMPTY) { clear_bit(offset, unit->map); --=20 2.43.0