6.1-stable patches

added patches:
	revert-memcg-drop-kmem.limit_in_bytes.patch

diff --git a/queue-6.1/revert-memcg-drop-kmem.limit_in_bytes.patch b/queue-6.1/revert-memcg-drop-kmem.limit_in_bytes.patch
new file mode 100644 (file)
index 0000000..80062f6
--- /dev/null
+++ b/queue-6.1/revert-memcg-drop-kmem.limit_in_bytes.patch
@@ -0,0 +1,65 @@
+From 19cf24ef28d43eb50b0f1f79eb644938f5ec59e5 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Wed, 20 Sep 2023 12:57:00 +0200
+Subject: Revert "memcg: drop kmem.limit_in_bytes"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 21ef9e11205fca43785eecf7d4a99528d4de5701 which is
+commit 86327e8eb94c52eca4f93cfece2e29d1bf52acbf upstream.
+
+It breaks existing runc systems, as the tool always thinks the file
+should be present.
+
+Reported-by: Jeremi Piotrowski <jpiotrowski@linux.microsoft.com>
+Link: https://lore.kernel.org/r/20230920081101.GA12096@linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net
+Cc: Michal Hocko <mhocko@suse.com>
+Cc: Shakeel Butt <shakeelb@google.com>
+Cc: Johannes Weiner <hannes@cmpxchg.org>
+Cc: Roman Gushchin <roman.gushchin@linux.dev>
+Cc: Muchun Song <muchun.song@linux.dev>
+Cc: Tejun Heo <tj@kernel.org>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/admin-guide/cgroup-v1/memory.rst |    2 ++
+ mm/memcontrol.c                                |   10 ++++++++++
+ 2 files changed, 12 insertions(+)
+
+--- a/Documentation/admin-guide/cgroup-v1/memory.rst
++++ b/Documentation/admin-guide/cgroup-v1/memory.rst
+@@ -91,6 +91,8 @@ Brief summary of control files.
+  memory.oom_control                set/show oom controls.
+  memory.numa_stat                  show the number of memory usage per numa
+                                    node
++ memory.kmem.limit_in_bytes          This knob is deprecated and writing to
++                                     it will return -ENOTSUPP.
+  memory.kmem.usage_in_bytes          show current kernel memory allocation
+  memory.kmem.failcnt                 show the number of kernel memory usage
+                                    hits limits
+--- a/mm/memcontrol.c
++++ b/mm/memcontrol.c
+@@ -3841,6 +3841,10 @@ static ssize_t mem_cgroup_write(struct k
+               case _MEMSWAP:
+                       ret = mem_cgroup_resize_max(memcg, nr_pages, true);
+                       break;
++              case _KMEM:
++                      /* kmem.limit_in_bytes is deprecated. */
++                      ret = -EOPNOTSUPP;
++                      break;
+               case _TCP:
+                       ret = memcg_update_tcp_max(memcg, nr_pages);
+                       break;
+@@ -5052,6 +5056,12 @@ static struct cftype mem_cgroup_legacy_f
+       },
+ #endif
+       {
++              .name = "kmem.limit_in_bytes",
++              .private = MEMFILE_PRIVATE(_KMEM, RES_LIMIT),
++              .write = mem_cgroup_write,
++              .read_u64 = mem_cgroup_read_u64,
++      },
++      {
+               .name = "kmem.usage_in_bytes",
+               .private = MEMFILE_PRIVATE(_KMEM, RES_USAGE),
+               .read_u64 = mem_cgroup_read_u64,

diff --git a/queue-6.1/series b/queue-6.1/series
index e7a5f5eb6301e07c4ab7ee5aa8cb284f775c91d7..1bdfdcb0f8399811e12a618a0af91ec1977a5cdd 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -134,3 +134,4 @@ scsi-megaraid_sas-fix-deadlock-on-firmware-crashdump.patch
 scsi-pm8001-setup-irqs-on-resume.patch
 ext4-fix-rec_len-verify-error.patch
 drm-amd-display-fix-the-white-screen-issue-when-64gb-dram.patch
+revert-memcg-drop-kmem.limit_in_bytes.patch