From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 839B138B7D8 for ; Wed, 15 Jul 2026 02:32:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784082767; cv=none; b=ZbxWYicGTqk8D3RYcLIBmjOY/dYdsa/tIWJ6fb69hAUfNIhVzpg6ljm3dG64ejPz9J4GOcjeMCNM0ewGEEPY6Wh7yWqCm1YiMJS3Tp8gvnPXpwXZClxspO6TVUuCfIgvAiHL15CJzlDy16odL/7yjR5CeKJ3jSf9vaZPTMMn1F0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784082767; c=relaxed/simple; bh=e4GRpthrj2AAky5aXcfBm0TNTOlfS67hoIBySELqqVc=; h=Date:To:From:Subject:Message-Id; b=tXCD01wnhtAQJdN38EkbENWkWwwgBovwGzZvU8ceftH1CwjYrkBfUMrIdb2XmmjkYLe4owkpWX5BWDNL5EFpAxvo5ioJ3+x1F3M9yU90c1ajdjBFPnrpdOSYLs9ogkAirt5zUJOdqzViSDoecIX1fRW71Jt+L5g8BOwO17EySZM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=f2+PUZrZ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="f2+PUZrZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E90711F00A3A; Wed, 15 Jul 2026 02:32:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1784082766; bh=x2ZbEo63BrU2m6raUqICjld44vmeONlXCt6FcRmPPGQ=; h=Date:To:From:Subject; b=f2+PUZrZZxCnFIjEYm3HdO4FAh1k+Fxhu0xuVaAwA5/XiC4ld+KDikeujtSPfZFH8 EdqkOcVFXK4YsFpnWkFKm331B0PmMc4txos1R2nOpjVcNLsto54Eu4mUzy5V2lvsrm tOeawqPmznmTqfvNbBP58menMVnby6SihzibUXtk= Date: Tue, 14 Jul 2026 19:32:45 -0700 To: mm-commits@vger.kernel.org,shikemeng@huaweicloud.com,shakeel.butt@linux.dev,roman.gushchin@linux.dev,nphamcs@gmail.com,muchun.song@linux.dev,mhocko@kernel.org,kasong@tencent.com,hannes@cmpxchg.org,chrisl@kernel.org,baoquan.he@linux.dev,baohua@kernel.org,chenridong@xiaomi.com,akpm@linux-foundation.org From: Andrew Morton Subject: [to-be-updated] memcg-move-mem_cgroup_swappiness-to-memcontrolh.patch removed from -mm tree Message-Id: <20260715023245.E90711F00A3A@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: memcg: move mem_cgroup_swappiness to memcontrol.h has been removed from the -mm tree. Its filename was memcg-move-mem_cgroup_swappiness-to-memcontrolh.patch This patch was dropped because an updated version will be issued ------------------------------------------------------ From: Ridong Chen Subject: memcg: move mem_cgroup_swappiness to memcontrol.h Date: Fri, 10 Jul 2026 19:12:24 +0800 The per-memcg swappiness knob is v1-only; v2 always uses global vm_swappiness and ignores the per-cgroup field. Guard memcg->swappiness with CONFIG_MEMCG_V1, and move the helper to memcontrol.h where it belongs. No functional change for v1; v2-only kernels drop the unused field. Link: https://lore.kernel.org/20260710111224.2355668-1-ridong.chen@linux.dev Signed-off-by: Ridong Chen Acked-by: Johannes Weiner Cc: Baoquan He Cc: Barry Song Cc: Chris Li Cc: Kairui Song Cc: Kemeng Shi Cc: Michal Hocko Cc: Muchun Song Cc: Nhat Pham Cc: Roman Gushchin Cc: Shakeel Butt Signed-off-by: Andrew Morton --- include/linux/memcontrol.h | 25 +++++++++++++++++++++++-- include/linux/swap.h | 19 ------------------- mm/memcontrol.c | 3 +-- 3 files changed, 24 insertions(+), 23 deletions(-) --- a/include/linux/memcontrol.h~memcg-move-mem_cgroup_swappiness-to-memcontrolh +++ a/include/linux/memcontrol.h @@ -239,8 +239,6 @@ struct mem_cgroup { */ bool oom_group; - int swappiness; - /* memory.events and memory.events.local */ struct cgroup_file events_file; struct cgroup_file events_local_file; @@ -318,6 +316,9 @@ struct mem_cgroup { /* List of events which userspace want to receive */ struct list_head event_list; spinlock_t event_list_lock; + + int swappiness; + #endif /* CONFIG_MEMCG_V1 */ struct mem_cgroup_per_node *nodeinfo[]; @@ -365,6 +366,9 @@ enum objext_flags { #define OBJEXTS_FLAGS_MASK (__NR_OBJEXTS_FLAGS - 1) +/* Defined in mm/vmscan.c; used by mem_cgroup_swappiness(). */ +extern int vm_swappiness; + #ifdef CONFIG_MEMCG /* * After the initialization objcg->memcg is always pointing at @@ -1440,6 +1444,23 @@ static inline void mem_cgroup_flush_work static inline int mem_cgroup_init(void) { return 0; } #endif /* CONFIG_MEMCG */ +static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg) +{ +#ifdef CONFIG_MEMCG_V1 + /* Cgroup2 doesn't have per-cgroup swappiness */ + if (cgroup_subsys_on_dfl(memory_cgrp_subsys)) + return READ_ONCE(vm_swappiness); + + /* root ? */ + if (mem_cgroup_disabled() || mem_cgroup_is_root(memcg)) + return READ_ONCE(vm_swappiness); + + return READ_ONCE(memcg->swappiness); +#else + return READ_ONCE(vm_swappiness); +#endif +} + /* * Extended information for slab objects stored as an array in page->memcg_data * if MEMCG_DATA_OBJEXTS is set. --- a/include/linux/swap.h~memcg-move-mem_cgroup_swappiness-to-memcontrolh +++ a/include/linux/swap.h @@ -309,7 +309,6 @@ static inline bool lru_cache_disabled(vo } extern unsigned long shrink_all_memory(unsigned long nr_pages); -extern int vm_swappiness; long remove_mapping(struct address_space *mapping, struct folio *folio); #if defined(CONFIG_SYSFS) && defined(CONFIG_NUMA) @@ -468,25 +467,7 @@ static inline int add_swap_extent(struct } #endif /* CONFIG_SWAP */ #ifdef CONFIG_MEMCG -static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg) -{ - /* Cgroup2 doesn't have per-cgroup swappiness */ - if (cgroup_subsys_on_dfl(memory_cgrp_subsys)) - return READ_ONCE(vm_swappiness); - - /* root ? */ - if (mem_cgroup_disabled() || mem_cgroup_is_root(memcg)) - return READ_ONCE(vm_swappiness); - - return READ_ONCE(memcg->swappiness); -} - void lru_reparent_memcg(struct mem_cgroup *memcg, struct mem_cgroup *parent, int nid); -#else -static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg) -{ - return READ_ONCE(vm_swappiness); -} #endif #if defined(CONFIG_SWAP) && defined(CONFIG_MEMCG) && defined(CONFIG_BLK_CGROUP) --- a/mm/memcontrol.c~memcg-move-mem_cgroup_swappiness-to-memcontrolh +++ a/mm/memcontrol.c @@ -4174,11 +4174,10 @@ mem_cgroup_css_alloc(struct cgroup_subsy #endif page_counter_set_high(&memcg->swap, PAGE_COUNTER_MAX); if (parent) { - WRITE_ONCE(memcg->swappiness, mem_cgroup_swappiness(parent)); - page_counter_init(&memcg->memory, &parent->memory, memcg_on_dfl); page_counter_init(&memcg->swap, &parent->swap, false); #ifdef CONFIG_MEMCG_V1 + WRITE_ONCE(memcg->swappiness, mem_cgroup_swappiness(parent)); memcg->memory.track_failcnt = !memcg_on_dfl; WRITE_ONCE(memcg->oom_kill_disable, READ_ONCE(parent->oom_kill_disable)); page_counter_init(&memcg->kmem, &parent->kmem, false); _ Patches currently in -mm which might be from chenridong@xiaomi.com are