drop memcg patch from 6.1 and 6.6

diff --git a/queue-6.1/memcg-drain-obj-stock-on-cpu-hotplug-teardown.patch b/queue-6.1/memcg-drain-obj-stock-on-cpu-hotplug-teardown.patch
deleted file mode 100644 (file)
index de98fd8..0000000
--- a/queue-6.1/memcg-drain-obj-stock-on-cpu-hotplug-teardown.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From stable+bounces-177965-greg=kroah.com@vger.kernel.org Sat Sep  6 16:13:42 2025
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat,  6 Sep 2025 10:13:21 -0400
-Subject: memcg: drain obj stock on cpu hotplug teardown
-To: stable@vger.kernel.org
-Cc: Shakeel Butt <shakeel.butt@linux.dev>, Roman Gushchin <roman.gushchin@linux.dev>, Johannes Weiner <hannes@cmpxchg.org>, Michal Hocko <mhocko@kernel.org>, Muchun Song <muchun.song@linux.dev>, Andrew Morton <akpm@linux-foundation.org>, Sasha Levin <sashal@kernel.org>
-Message-ID: <20250906141321.25877-1-sashal@kernel.org>
-
-From: Shakeel Butt <shakeel.butt@linux.dev>
-
-[ Upstream commit 9f01b4954490d4ccdbcc2b9be34a9921ceee9cbb ]
-
-Currently on cpu hotplug teardown, only memcg stock is drained but we
-need to drain the obj stock as well otherwise we will miss the stats
-accumulated on the target cpu as well as the nr_bytes cached. The stats
-include MEMCG_KMEM, NR_SLAB_RECLAIMABLE_B & NR_SLAB_UNRECLAIMABLE_B. In
-addition we are leaking reference to struct obj_cgroup object.
-
-Link: https://lkml.kernel.org/r/20250310230934.2913113-1-shakeel.butt@linux.dev
-Fixes: bf4f059954dc ("mm: memcg/slab: obj_cgroup API")
-Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>
-Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev>
-Acked-by: Johannes Weiner <hannes@cmpxchg.org>
-Cc: Michal Hocko <mhocko@kernel.org>
-Cc: Muchun Song <muchun.song@linux.dev>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- mm/memcontrol.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/mm/memcontrol.c
-+++ b/mm/memcontrol.c
-@@ -2366,9 +2366,18 @@ static void drain_all_stock(struct mem_c
- static int memcg_hotplug_cpu_dead(unsigned int cpu)
- {
-       struct memcg_stock_pcp *stock;
-+      struct obj_cgroup *old;
-+      unsigned long flags;
- 
-       stock = &per_cpu(memcg_stock, cpu);
-+
-+      /* drain_obj_stock requires stock_lock */
-+      local_lock_irqsave(&memcg_stock.stock_lock, flags);
-+      old = drain_obj_stock(stock);
-+      local_unlock_irqrestore(&memcg_stock.stock_lock, flags);
-+
-       drain_stock(stock);
-+      obj_cgroup_put(old);
- 
-       return 0;
- }

diff --git a/queue-6.1/series b/queue-6.1/series
index 91a310433b223b56a8f517362acda7e90166f70a..c066293749906bc2e60a4d74b8925aaaaf6b2251 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -54,7 +54,6 @@ net-pcs-rzn1-miic-correct-modctrl-register-offset.patch
 mm-slub-avoid-accessing-metadata-when-pointer-is-invalid-in-object_err.patch
 pci-msi-add-an-option-to-write-msix-entry_data-before-any-reads.patch
 cpufreq-sched-explicitly-synchronize-limits_changed-flag-handling.patch
-memcg-drain-obj-stock-on-cpu-hotplug-teardown.patch
 btrfs-adjust-subpage-bit-start-based-on-sectorsize.patch
 iio-chemical-pms7003-use-aligned_s64-for-timestamp.patch
 iio-light-opt3001-fix-deadlock-due-to-concurrent-flag-access.patch

diff --git a/queue-6.6/memcg-drain-obj-stock-on-cpu-hotplug-teardown.patch b/queue-6.6/memcg-drain-obj-stock-on-cpu-hotplug-teardown.patch
deleted file mode 100644 (file)
index 82a5535..0000000
--- a/queue-6.6/memcg-drain-obj-stock-on-cpu-hotplug-teardown.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From stable+bounces-177962-greg=kroah.com@vger.kernel.org Sat Sep  6 15:48:56 2025
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat,  6 Sep 2025 09:48:45 -0400
-Subject: memcg: drain obj stock on cpu hotplug teardown
-To: stable@vger.kernel.org
-Cc: Shakeel Butt <shakeel.butt@linux.dev>, Roman Gushchin <roman.gushchin@linux.dev>, Johannes Weiner <hannes@cmpxchg.org>, Michal Hocko <mhocko@kernel.org>, Muchun Song <muchun.song@linux.dev>, Andrew Morton <akpm@linux-foundation.org>, Sasha Levin <sashal@kernel.org>
-Message-ID: <20250906134845.8414-1-sashal@kernel.org>
-
-From: Shakeel Butt <shakeel.butt@linux.dev>
-
-[ Upstream commit 9f01b4954490d4ccdbcc2b9be34a9921ceee9cbb ]
-
-Currently on cpu hotplug teardown, only memcg stock is drained but we
-need to drain the obj stock as well otherwise we will miss the stats
-accumulated on the target cpu as well as the nr_bytes cached. The stats
-include MEMCG_KMEM, NR_SLAB_RECLAIMABLE_B & NR_SLAB_UNRECLAIMABLE_B. In
-addition we are leaking reference to struct obj_cgroup object.
-
-Link: https://lkml.kernel.org/r/20250310230934.2913113-1-shakeel.butt@linux.dev
-Fixes: bf4f059954dc ("mm: memcg/slab: obj_cgroup API")
-Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>
-Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev>
-Acked-by: Johannes Weiner <hannes@cmpxchg.org>
-Cc: Michal Hocko <mhocko@kernel.org>
-Cc: Muchun Song <muchun.song@linux.dev>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- mm/memcontrol.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/mm/memcontrol.c
-+++ b/mm/memcontrol.c
-@@ -2376,9 +2376,18 @@ static void drain_all_stock(struct mem_c
- static int memcg_hotplug_cpu_dead(unsigned int cpu)
- {
-       struct memcg_stock_pcp *stock;
-+      struct obj_cgroup *old;
-+      unsigned long flags;
- 
-       stock = &per_cpu(memcg_stock, cpu);
-+
-+      /* drain_obj_stock requires stock_lock */
-+      local_lock_irqsave(&memcg_stock.stock_lock, flags);
-+      old = drain_obj_stock(stock);
-+      local_unlock_irqrestore(&memcg_stock.stock_lock, flags);
-+
-       drain_stock(stock);
-+      obj_cgroup_put(old);
- 
-       return 0;
- }

diff --git a/queue-6.6/series b/queue-6.6/series
index 13c9ecbbb29f3b93471ec4ab5721fc0d5ef07ab4..69456316da07cee12f7ce0c876373b7449615fad 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -78,7 +78,6 @@ mm-slub-avoid-accessing-metadata-when-pointer-is-invalid-in-object_err.patch
 spi-fsl-qspi-use-devm-function-instead-of-driver-remove.patch
 thermal-drivers-mediatek-lvts-disable-low-offset-irq-for-minimum-threshold.patch
 pci-msi-add-an-option-to-write-msix-entry_data-before-any-reads.patch
-memcg-drain-obj-stock-on-cpu-hotplug-teardown.patch
 btrfs-adjust-subpage-bit-start-based-on-sectorsize.patch
 iio-imu-inv_mpu6050-align-buffer-for-timestamp.patch
 iio-chemical-pms7003-use-aligned_s64-for-timestamp.patch