Update to 6.4.3-1

4 files changed, 12 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f29e5c04a4ab..15f05bfca3c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-ck
-	pkgver = 6.4.2
+	pkgver = 6.4.3
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
@@ -15,24 +15,22 @@ pkgbase = linux-ck
 	makedepends = tar
 	makedepends = xz
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.2.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.2.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.3.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.3.tar.sign
 	source = config
 	source = more-uarches-20221217.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20221217.tar.gz
 	source = ck-hrtimer-2870d6ac146aa658af60bb18a9c7503efe5992d4.tar.gz::https://github.com/graysky2/linux-patches/archive/2870d6ac146aa658af60bb18a9c7503efe5992d4.tar.gz
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 	source = 0002-netfilter-nf_tables-unbind-non-anonymous-set-if-rule.patch
-	source = 0003-mm-disable-CONFIG_PER_VMA_LOCK-by-default-until-its-.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = a326ab224176c5b17c73c9ccad85f32e49b6e4e764861d57595727b7ef10062c
+	sha256sums = 7134ed29360df6f37a26410630283f0592c91a6d2178a9648226d30ddf8c88a1
 	sha256sums = SKIP
-	sha256sums = e8d4bbd63808eeec78680c7de4383333b76ab9d58214042bd4b01d784bbc8ec8
+	sha256sums = 392acc67300ea585c739e16a596d790daa2ee048f248832a400bc57dc226aa6d
 	sha256sums = f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0
 	sha256sums = ed0b8773d66079198edd1ecdbe0564d6ad33c641e82d85375e50a2d9e0275144
 	sha256sums = 4cb280177bbd41d26226417ad9e363708e12e7b8b1b4bbc45d1112bd63492b19
 	sha256sums = 6197fdd3e6d615f63bae43237c5c8292b8c52ac17d798061f7c3be2806cf0378
-	sha256sums = 36a7a3b002e25c7f01f1ca09c29e010e7ee78887c61354201d67c35345050873
 
 pkgname = linux-ck
 	pkgdesc = The Linux kernel and modules with ck's hrtimer patches
diff --git a/0003-mm-disable-CONFIG_PER_VMA_LOCK-by-default-until-its-.patch b/0003-mm-disable-CONFIG_PER_VMA_LOCK-by-default-until-its-.patch
deleted file mode 100644
index 994bf3c4267f..000000000000
--- a/0003-mm-disable-CONFIG_PER_VMA_LOCK-by-default-until-its-.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a6571d06002b30ca7f51af7681128179b122977c Mon Sep 17 00:00:00 2001
-From: Suren Baghdasaryan <surenb@google.com>
-Date: Mon, 3 Jul 2023 11:21:50 -0700
-Subject: [PATCH 3/4] mm: disable CONFIG_PER_VMA_LOCK by default until its
- fixed
-
-A memory corruption was reported in [1] with bisection pointing to the
-patch [2] enabling per-VMA locks for x86.
-Disable per-VMA locks config to prevent this issue while the problem is
-being investigated. This is expected to be a temporary measure.
-
-[1] https://bugzilla.kernel.org/show_bug.cgi?id=217624
-[2] https://lore.kernel.org/all/20230227173632.3292573-30-surenb@google.com
-
-Reported-by: Jiri Slaby <jirislaby@kernel.org>
-Reported-by: Jacob Young <jacobly.alt@gmail.com>
-Fixes: 0bff0aaea03e ("x86/mm: try VMA lock-based page fault handling first")
-Signed-off-by: Suren Baghdasaryan <surenb@google.com>
----
- mm/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mm/Kconfig b/mm/Kconfig
-index e3454087fd31..d91a544678ee 100644
---- a/mm/Kconfig
-+++ b/mm/Kconfig
-@@ -1198,7 +1198,7 @@ config ARCH_SUPPORTS_PER_VMA_LOCK
-        def_bool n
- 
- config PER_VMA_LOCK
--	def_bool y
-+	bool "Enable per-vma locking during page fault handling."
- 	depends on ARCH_SUPPORTS_PER_VMA_LOCK && MMU && SMP
- 	help
- 	  Allow per-vma locking during page fault handling.
--- 
-2.41.0
-
diff --git a/PKGBUILD b/PKGBUILD
index e76e65b90134..3c89439cecbb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -71,7 +71,7 @@ _subarch=
 
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 pkgbase=linux-ck
-pkgver=6.4.2
+pkgver=6.4.3
 pkgrel=1
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -104,20 +104,18 @@ source=(
   "ck-hrtimer-$_commit.tar.gz::https://github.com/graysky2/linux-patches/archive/$_commit.tar.gz"
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   0002-netfilter-nf_tables-unbind-non-anonymous-set-if-rule.patch
-  0003-mm-disable-CONFIG_PER_VMA_LOCK-by-default-until-its-.patch
 )
 validpgpkeys=(
   ABAF11C65A2970B130ABE3C479BE3E4300411886  # Linus Torvalds
   647F28654894E3BD457199BE38DBBDC86092693E  # Greg Kroah-Hartman
 )
-sha256sums=('a326ab224176c5b17c73c9ccad85f32e49b6e4e764861d57595727b7ef10062c'
+sha256sums=('7134ed29360df6f37a26410630283f0592c91a6d2178a9648226d30ddf8c88a1'
             'SKIP'
-            'e8d4bbd63808eeec78680c7de4383333b76ab9d58214042bd4b01d784bbc8ec8'
+            '392acc67300ea585c739e16a596d790daa2ee048f248832a400bc57dc226aa6d'
             'f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0'
             'ed0b8773d66079198edd1ecdbe0564d6ad33c641e82d85375e50a2d9e0275144'
             '4cb280177bbd41d26226417ad9e363708e12e7b8b1b4bbc45d1112bd63492b19'
-            '6197fdd3e6d615f63bae43237c5c8292b8c52ac17d798061f7c3be2806cf0378'
-            '36a7a3b002e25c7f01f1ca09c29e010e7ee78887c61354201d67c35345050873')
+            '6197fdd3e6d615f63bae43237c5c8292b8c52ac17d798061f7c3be2806cf0378')
 _make() {
   test -s version
   make KERNELRELEASE="$(<version)" "$@"
diff --git a/config b/config
index e9e2d4717ff1..a7652d9651ac 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.4.2-arch1 Kernel Configuration
+# Linux/x86 6.4.3-arch1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230429"
 CONFIG_CC_IS_GCC=y
@@ -1163,6 +1163,7 @@ CONFIG_LRU_GEN=y
 CONFIG_LRU_GEN_ENABLED=y
 # CONFIG_LRU_GEN_STATS is not set
 CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
+CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
 
 #
@@ -11164,6 +11165,7 @@ CONFIG_PTDUMP_CORE=y
 # CONFIG_PTDUMP_DEBUGFS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_PER_VMA_LOCK_STATS is not set
 # CONFIG_DEBUG_OBJECTS is not set
 CONFIG_SHRINKER_DEBUG=y
 # CONFIG_DEBUG_STACK_USAGE is not set