reknel release 6.0.11

4 files changed, 10 insertions, 147 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fcd602f137f9..2f4ab2c39c3e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-jcore
 	pkgdesc = Kernel for Manjaro/Arch (ACS override patch include)
-	pkgver = 6.0.10
+	pkgver = 6.0.11
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -20,10 +20,9 @@ pkgbase = linux-jcore
 	replaces = linux-acs-manjaro
 	replaces = linux-acs-manjaro-headers
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.10.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.11.tar.xz
 	source = config
 	source = 0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch
-	source = 0102-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch
 	source = 0103-soundwire_intel_Initialize_clock_stop_timeout.patch
 	source = 0104-drm_sched_add_DRM_SCHED_FENCE_DONT_PIPELINE_flag.patch
 	source = 0105-drm_amdgpu_use_DRM_SCHED_FENCE_DONT_PIPELINE_for_VM_updates.patch
@@ -44,10 +43,9 @@ pkgbase = linux-jcore
 	source = 0412-bootsplash.patch
 	source = 0413-bootsplash.gitpatch
 	source = 0999-acs.gitpatch
-	sha256sums = 39e57fcd84cd70bfa3e1a4185d3aa0ed7f1432f24c6548d16326b0c3c9541dd0
-	sha256sums = 9cba609ac53b1f042a6e5b33cb3fd12e88e6f671ea683376ae48a80aae8af7c9
+	sha256sums = 2bae6131e64971e1e34ff395fa542971134c857bdb0b29069ab847c7c9a9c762
+	sha256sums = 0927a403aaee7c444defdf49876e6f81d0debb3668427108050608de5190fe12
 	sha256sums = 05f04019d4a2ee072238c32860fa80d673687d84d78ef436ae9332b6fb788467
-	sha256sums = a75d2a2322c8cd99a6dc9945424fd9006e7a8f9d2793c0ae97ef931f2d54b9a5
 	sha256sums = 5a72a4163937bc588d6a8ed6320e610f6512376b7aa20c4ada5c0ae09cdcd525
 	sha256sums = 8ecbe2fdd40c1accc4e7ccd687c319938c18f5adf056ff314c7702775347adf9
 	sha256sums = 11b7c141c218d6c026a29aed5ba3c3322343ae677155a6dccf622c151eb1b1aa
diff --git a/0102-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch b/0102-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch
deleted file mode 100644
index 7a771a2a0fc2..000000000000
--- a/0102-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 2535fbde890f14c78b750139fcf87d1143850626 Mon Sep 17 00:00:00 2001
-From: Johannes Weiner <hannes@cmpxchg.org>
-Date: Tue, 2 Aug 2022 12:28:11 -0400
-Subject: [PATCH] mm: vmscan: fix extreme overreclaim and swap floods
-
-During proactive reclaim, we sometimes observe severe overreclaim, with
-several thousand times more pages reclaimed than requested.
-
-This trace was obtained from shrink_lruvec() during such an instance:
-
-    prio:0 anon_cost:1141521 file_cost:7767
-    nr_reclaimed:4387406 nr_to_reclaim:1047 (or_factor:4190)
-    nr=[7161123 345 578 1111]
-
-While he reclaimer requested 4M, vmscan reclaimed close to 16G, most of it
-by swapping.  These requests take over a minute, during which the write()
-to memory.reclaim is unkillably stuck inside the kernel.
-
-Digging into the source, this is caused by the proportional reclaim
-bailout logic.  This code tries to resolve a fundamental conflict: to
-reclaim roughly what was requested, while also aging all LRUs fairly and
-in accordance to their size, swappiness, refault rates etc.  The way it
-attempts fairness is that once the reclaim goal has been reached, it stops
-scanning the LRUs with the smaller remaining scan targets, and adjusts the
-remainder of the bigger LRUs according to how much of the smaller LRUs was
-scanned.  It then finishes scanning that remainder regardless of the
-reclaim goal.
-
-This works fine if priority levels are low and the LRU lists are
-comparable in size.  However, in this instance, the cgroup that is
-targeted by proactive reclaim has almost no files left - they've already
-been squeezed out by proactive reclaim earlier - and the remaining anon
-pages are hot.  Anon rotations cause the priority level to drop to 0,
-which results in reclaim targeting all of anon (a lot) and all of file
-(almost nothing).  By the time reclaim decides to bail, it has scanned
-most or all of the file target, and therefor must also scan most or all of
-the enormous anon target.  This target is thousands of times larger than
-the reclaim goal, thus causing the overreclaim.
-
-The bailout code hasn't changed in years, why is this failing now?  The
-most likely explanations are two other recent changes in anon reclaim:
-
-1. Before the series starting with commit 5df741963d52 ("mm: fix LRU
-   balancing effect of new transparent huge pages"), the VM was
-   overall relatively reluctant to swap at all, even if swap was
-   configured. This means the LRU balancing code didn't come into play
-   as often as it does now, and mostly in high pressure situations
-   where pronounced swap activity wouldn't be as surprising.
-
-2. For historic reasons, shrink_lruvec() loops on the scan targets of
-   all LRU lists except the active anon one, meaning it would bail if
-   the only remaining pages to scan were active anon - even if there
-   were a lot of them.
-
-   Before the series starting with commit ccc5dc67340c ("mm/vmscan:
-   make active/inactive ratio as 1:1 for anon lru"), most anon pages
-   would live on the active LRU; the inactive one would contain only a
-   handful of preselected reclaim candidates. After the series, anon
-   gets aged similarly to file, and the inactive list is the default
-   for new anon pages as well, making it often the much bigger list.
-
-   As a result, the VM is now more likely to actually finish large
-   anon targets than before.
-
-Change the code such that only one SWAP_CLUSTER_MAX-sized nudge toward the
-larger LRU lists is made before bailing out on a met reclaim goal.
-
-This fixes the extreme overreclaim problem.
-
-Fairness is more subtle and harder to evaluate.  No obvious misbehavior
-was observed on the test workload, in any case.  Conceptually, fairness
-should primarily be a cumulative effect from regular, lower priority
-scans.  Once the VM is in trouble and needs to escalate scan targets to
-make forward progress, fairness needs to take a backseat.  This is also
-acknowledged by the myriad exceptions in get_scan_count().  This patch
-makes fairness decrease gradually, as it keeps fairness work static over
-increasing priority levels with growing scan targets.  This should make
-more sense - although we may have to re-visit the exact values.
-
-Link: https://lkml.kernel.org/r/20220802162811.39216-1-hannes@cmpxchg.org
-Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
-Reviewed-by: Rik van Riel <riel@surriel.com>
-Acked-by: Mel Gorman <mgorman@techsingularity.net>
-Cc: Hugh Dickins <hughd@google.com>
-Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
----
- mm/vmscan.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/mm/vmscan.c b/mm/vmscan.c
-index 382dbe97329f33..266eb8cfe93a67 100644
---- a/mm/vmscan.c
-+++ b/mm/vmscan.c
-@@ -2955,8 +2955,8 @@ static void shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc)
- 	enum lru_list lru;
- 	unsigned long nr_reclaimed = 0;
- 	unsigned long nr_to_reclaim = sc->nr_to_reclaim;
-+	bool proportional_reclaim;
- 	struct blk_plug plug;
--	bool scan_adjusted;
-
- 	get_scan_count(lruvec, sc, nr);
-
-@@ -2974,8 +2974,8 @@ static void shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc)
- 	 * abort proportional reclaim if either the file or anon lru has already
- 	 * dropped to zero at the first pass.
- 	 */
--	scan_adjusted = (!cgroup_reclaim(sc) && !current_is_kswapd() &&
--			 sc->priority == DEF_PRIORITY);
-+	proportional_reclaim = (!cgroup_reclaim(sc) && !current_is_kswapd() &&
-+				sc->priority == DEF_PRIORITY);
-
- 	blk_start_plug(&plug);
- 	while (nr[LRU_INACTIVE_ANON] || nr[LRU_ACTIVE_FILE] ||
-@@ -2995,7 +2995,7 @@ static void shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc)
-
- 		cond_resched();
-
--		if (nr_reclaimed < nr_to_reclaim || scan_adjusted)
-+		if (nr_reclaimed < nr_to_reclaim || proportional_reclaim)
- 			continue;
-
- 		/*
-@@ -3046,8 +3046,6 @@ static void shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc)
- 		nr_scanned = targets[lru] - nr[lru];
- 		nr[lru] = targets[lru] * (100 - percentage) / 100;
- 		nr[lru] -= min(nr[lru], nr_scanned);
--
--		scan_adjusted = true;
- 	}
- 	blk_finish_plug(&plug);
- 	sc->nr_reclaimed += nr_reclaimed;
diff --git a/PKGBUILD b/PKGBUILD
index ae5e2b7438de..04feb4e90782 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgbase=linux-jcore
 pkgname=('linux-jcore' 'linux-jcore-headers')
 _kernelname=-jcore
 _hostname=jcore
-pkgver=6.0.10
+pkgver=6.0.11
 pkgrel=1
 pkgdesc="Kernel for Manjaro/Arch (ACS override patch include)"
 arch=('x86_64')
@@ -26,7 +26,6 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$pkgver.tar.xz"
         'config'
         # ARCH Patches
         '0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch'
-        '0102-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch'
         '0103-soundwire_intel_Initialize_clock_stop_timeout.patch'
         '0104-drm_sched_add_DRM_SCHED_FENCE_DONT_PIPELINE_flag.patch'
         '0105-drm_amdgpu_use_DRM_SCHED_FENCE_DONT_PIPELINE_for_VM_updates.patch'
@@ -51,10 +50,9 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$pkgver.tar.xz"
         '0413-bootsplash.gitpatch'
         # ACS override patch
         '0999-acs.gitpatch')
-sha256sums=('39e57fcd84cd70bfa3e1a4185d3aa0ed7f1432f24c6548d16326b0c3c9541dd0'
-            '9cba609ac53b1f042a6e5b33cb3fd12e88e6f671ea683376ae48a80aae8af7c9'
+sha256sums=('2bae6131e64971e1e34ff395fa542971134c857bdb0b29069ab847c7c9a9c762'
+            '0927a403aaee7c444defdf49876e6f81d0debb3668427108050608de5190fe12'
             '05f04019d4a2ee072238c32860fa80d673687d84d78ef436ae9332b6fb788467'
-            'a75d2a2322c8cd99a6dc9945424fd9006e7a8f9d2793c0ae97ef931f2d54b9a5'
             '5a72a4163937bc588d6a8ed6320e610f6512376b7aa20c4ada5c0ae09cdcd525'
             '8ecbe2fdd40c1accc4e7ccd687c319938c18f5adf056ff314c7702775347adf9'
             '11b7c141c218d6c026a29aed5ba3c3322343ae677155a6dccf622c151eb1b1aa'
diff --git a/config b/config
index eb0bcb622615..538ab2eb2417 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.0.10-1 Kernel Configuration
+# Linux/x86 6.0.11-1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
@@ -659,7 +659,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 #
 CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_AMD_PSTATE=m
+CONFIG_X86_AMD_PSTATE=y
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ_CPB=y
 CONFIG_X86_POWERNOW_K8=m
@@ -1207,6 +1207,7 @@ CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TABLE_PERTURB_ORDER=16
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m