diff --git a/config/i386/pae b/config/i386/pae index 3827a6c..8467a94 100644 --- a/config/i386/pae +++ b/config/i386/pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.3.0-rc2 Kernel Configuration +# Linux/i386 6.3.0-rc3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -981,7 +981,6 @@ CONFIG_SYSV68_PARTITION=y # CONFIG_CMDLINE_PARTITION is not set # end of Partition Types -# CONFIG_BLOCK_COMPAT is not set CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_MQ_RDMA=y diff --git a/config/ppc64/default b/config/ppc64/default index b169033..7e76899 100644 --- a/config/ppc64/default +++ b/config/ppc64/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 6.3.0-rc2 Kernel Configuration +# Linux/powerpc 6.3.0-rc3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -804,7 +804,6 @@ CONFIG_SYSV68_PARTITION=y # CONFIG_CMDLINE_PARTITION is not set # end of Partition Types -CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_MQ_RDMA=y @@ -4075,7 +4074,6 @@ CONFIG_SERIAL_XILINX_PS_UART=m CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m -CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_SERIAL_FSL_LINFLEXUART=m # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set CONFIG_SERIAL_SPRD=m diff --git a/config/ppc64le/default b/config/ppc64le/default index a9e8900..19c34e3 100644 --- a/config/ppc64le/default +++ b/config/ppc64le/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 6.3.0-rc2 Kernel Configuration +# Linux/powerpc 6.3.0-rc3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -768,7 +768,6 @@ CONFIG_SYSV68_PARTITION=y # CONFIG_CMDLINE_PARTITION is not set # end of Partition Types -CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_MQ_RDMA=y @@ -3972,7 +3971,6 @@ CONFIG_SERIAL_XILINX_PS_UART=m CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m -CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_SERIAL_FSL_LINFLEXUART=m # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set CONFIG_SERIAL_SPRD=m diff --git a/config/riscv64/default b/config/riscv64/default index fd383e6..fdf54c5 100644 --- a/config/riscv64/default +++ b/config/riscv64/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.3.0-rc2 Kernel Configuration +# Linux/riscv 6.3.0-rc3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -637,7 +637,6 @@ CONFIG_SYSV68_PARTITION=y # CONFIG_CMDLINE_PARTITION is not set # end of Partition Types -CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_MQ_RDMA=y @@ -4159,7 +4158,6 @@ CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m -CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_SERIAL_FSL_LINFLEXUART=m # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set CONFIG_SERIAL_SPRD=m diff --git a/config/s390x/default b/config/s390x/default index d61c448..72bfb76 100644 --- a/config/s390x/default +++ b/config/s390x/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 6.3.0-rc2 Kernel Configuration +# Linux/s390 6.3.0-rc3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -610,7 +610,6 @@ CONFIG_SYSV68_PARTITION=y # CONFIG_CMDLINE_PARTITION is not set # end of Partition Types -CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_MQ_RDMA=y diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump index 99b99d8..f659230 100644 --- a/config/s390x/zfcpdump +++ b/config/s390x/zfcpdump @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 6.3.0-rc2 Kernel Configuration +# Linux/s390 6.3.0-rc3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -485,7 +485,6 @@ CONFIG_MSDOS_PARTITION=y CONFIG_EFI_PARTITION=y # end of Partition Types -CONFIG_BLOCK_COMPAT=y # CONFIG_BLK_MQ_PCI is not set CONFIG_BLK_MQ_VIRTIO=y # CONFIG_BLK_PM is not set diff --git a/config/x86_64/default b/config/x86_64/default index 3868056..89c50c9 100644 --- a/config/x86_64/default +++ b/config/x86_64/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.3.0-rc2 Kernel Configuration +# Linux/x86_64 6.3.0-rc3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -1013,7 +1013,6 @@ CONFIG_SYSV68_PARTITION=y # CONFIG_CMDLINE_PARTITION is not set # end of Partition Types -CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_MQ_RDMA=y @@ -4569,7 +4568,6 @@ CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m -CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_SERIAL_FSL_LINFLEXUART=m CONFIG_SERIAL_SPRD=m # end of Serial drivers diff --git a/patches.suse/powerpc-mm-Fix-false-detection-of-read-faults.patch b/patches.suse/powerpc-mm-Fix-false-detection-of-read-faults.patch deleted file mode 100644 index b1a0578..0000000 --- a/patches.suse/powerpc-mm-Fix-false-detection-of-read-faults.patch +++ /dev/null @@ -1,61 +0,0 @@ -From cbe94edc1c062ba2f31e9d2432a374d17f25a002 Mon Sep 17 00:00:00 2001 -From: Russell Currey -Date: Fri, 10 Mar 2023 16:08:34 +1100 -Subject: [PATCH] powerpc/mm: Fix false detection of read faults -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Patch-mainline: submitted http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20230310050834.63105-1-ruscur@russell.cc/ -References: bsc#1208864 - -To support detection of read faults with Radix execute-only memory, the -vma_is_accessible() check in access_error() (which checks for PROT_NONE) -was replaced with a check to see if VM_READ was missing, and if so, -returns true to assert the fault was caused by a bad read. - -This is incorrect, as it ignores that both VM_WRITE and VM_EXEC imply -read on powerpc, as defined in protection_map[]. This causes mappings -containing VM_WRITE or VM_EXEC without VM_READ to misreport the cause of -page faults, since the MMU is still allowing reads. - -Correct this by restoring the original vma_is_accessible() check for -PROT_NONE mappings, and adding a separate check for Radix PROT_EXEC-only -mappings. - -Fixes: 395cac7752b9 ("powerpc/mm: Support execute-only memory on the Radix MMU") -Reported-by: Michal Suchánek -Tested-by: Benjamin Gray -Signed-off-by: Russell Currey -Acked-by: Michal Suchanek ---- - arch/powerpc/mm/fault.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c -index 2bef19cc1b98..af46aa88422b 100644 ---- a/arch/powerpc/mm/fault.c -+++ b/arch/powerpc/mm/fault.c -@@ -271,11 +271,16 @@ static bool access_error(bool is_write, bool is_exec, struct vm_area_struct *vma - } - - /* -- * Check for a read fault. This could be caused by a read on an -- * inaccessible page (i.e. PROT_NONE), or a Radix MMU execute-only page. -+ * VM_READ, VM_WRITE and VM_EXEC all imply read permissions, as -+ * defined in protection_map[]. Read faults can only be caused by -+ * a PROT_NONE mapping, or with a PROT_EXEC-only mapping on Radix. - */ -- if (unlikely(!(vma->vm_flags & VM_READ))) -+ if (unlikely(!vma_is_accessible(vma))) - return true; -+ -+ if (unlikely(radix_enabled() && ((vma->vm_flags & VM_ACCESS_FLAGS) == VM_EXEC))) -+ return true; -+ - /* - * We should ideally do the vma pkey access check here. But in the - * fault path, handle_mm_fault() also does the same check. To avoid --- -2.39.2 - diff --git a/rpm/config.sh b/rpm/config.sh index a7f51d7..17a93ef 100644 --- a/rpm/config.sh +++ b/rpm/config.sh @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=6.3-rc2 +SRCVERSION=6.3-rc3 # variant of the kernel-source package, either empty or "-rt" VARIANT= # enable kernel module compression diff --git a/series.conf b/series.conf index 64d2371..f1069d2 100644 --- a/series.conf +++ b/series.conf @@ -72,7 +72,6 @@ # to area specific sections below. ######################################################## patches.suse/arm64-efi-Use-SMBIOS-processor-ID-to-key-off-Altra-q.patch - patches.suse/powerpc-mm-Fix-false-detection-of-read-faults.patch ######################################################## # kbuild/module infrastructure fixes