summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rw-r--r--config.x86_643
-rw-r--r--disable-CONFIG_PER_VMA_LOCK.patch26
4 files changed, 37 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 429c86753d0d..2e7dc372fb1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-amd
pkgver = 6.4.v.2
- pkgrel = 2
+ pkgrel = 3
url = https://www.kernel.org/
arch = x86_64
license = GPL2
@@ -19,11 +19,13 @@ pkgbase = linux-amd
source = linux-amd.preset
source = linux.install
source = https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/20230105/more-uarches-for-kernel-5.17+.patch
+ source = disable-CONFIG_PER_VMA_LOCK.patch
sha256sums = SKIP
- sha256sums = e82e3760d1af47f9bd5cbb72173fe0de378272ea21a85b4dd40a8ca0b10b3b67
+ sha256sums = 0b96aeb601093ec93fd2699e26fb77deefa08926b392afd34473d2891da34aab
sha256sums = 60c6ba602443e94a9eba3aeee9d194027d69bffaa428c6d055348ebf03681b5c
sha256sums = d590e751ab4cf424b78fd0d57e53d187f07401a68c8b468d17a5f39a337dacf0
sha256sums = 81ad663925a0aa5b5332a69bae7227393664bb81ee2e57a283e7f16e9ff75efe
+ sha256sums = c0faece79d42dc4453141333c3cd70094fa9f9c5a403aa275458426ecd3af342
pkgname = linux-amd
pkgdesc = Linux kernel aimed at the ZNVER4/MZEN4 AMD Ryzen CPU based hardware
diff --git a/PKGBUILD b/PKGBUILD
index ff9de7cbd119..ae528e26a7c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ gitver=v6.4.2
patchver=20230105
patchname=more-uarches-for-kernel-5.17+.patch
pkgver=6.4.v.2
-pkgrel=2
+pkgrel=3
arch=('x86_64')
url="https://www.kernel.org/"
license=('GPL2')
@@ -22,16 +22,20 @@ source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#ta
'linux.install'
# patch from our graysky archlinux colleague
"https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/$patchver/$patchname"
+ # disable CONFIG_PER_VMA_LOCK patch
+ 'disable-CONFIG_PER_VMA_LOCK.patch'
)
sha256sums=('SKIP'
#config.x86_64
- 'e82e3760d1af47f9bd5cbb72173fe0de378272ea21a85b4dd40a8ca0b10b3b67'
+ '0b96aeb601093ec93fd2699e26fb77deefa08926b392afd34473d2891da34aab'
#.preset file
'60c6ba602443e94a9eba3aeee9d194027d69bffaa428c6d055348ebf03681b5c'
#linux install file
'd590e751ab4cf424b78fd0d57e53d187f07401a68c8b468d17a5f39a337dacf0'
#grayskypatch
'81ad663925a0aa5b5332a69bae7227393664bb81ee2e57a283e7f16e9ff75efe'
+ #CONFIG_PER_VMA_LOCK.patch
+ 'c0faece79d42dc4453141333c3cd70094fa9f9c5a403aa275458426ecd3af342'
)
_kernelname=${pkgbase#linux}
diff --git a/config.x86_64 b/config.x86_64
index 7137d38255bc..a91c09d0fa73 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1151,7 +1151,7 @@ CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_LRU_GEN is not set
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
-CONFIG_PER_VMA_LOCK=y
+# CONFIG_PER_VMA_LOCK is not set
CONFIG_LOCK_MM_AND_FIND_VMA=y
#
@@ -9853,7 +9853,6 @@ CONFIG_GENERIC_PTDUMP=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 is not set
# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/disable-CONFIG_PER_VMA_LOCK.patch b/disable-CONFIG_PER_VMA_LOCK.patch
new file mode 100644
index 000000000000..340aecb2d444
--- /dev/null
+++ b/disable-CONFIG_PER_VMA_LOCK.patch
@@ -0,0 +1,26 @@
+From d1ede67eef06f1f064cf61e519881528359e37c7 Mon Sep 17 00:00:00 2001
+From: egnappahz <egnappah@gmail.com>
+Date: Fri, 7 Jul 2023 15:52:26 +0200
+Subject: [PATCH] disable CONFIG_PER_VMA_LOCK by default until its fixed
+
+Signed-off-by: egnappahz <egnappah@gmail.com>
+---
+ mm/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mm/Kconfig b/mm/Kconfig
+index e3454087fd31..3507251a5528 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
+