From: Greg Kroah-Hartman Date: Wed, 4 Nov 2020 14:37:17 +0000 (+0100) Subject: drop some 4.4 patches that broke the build X-Git-Tag: v4.14.204~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3a8537170e4fa0f7e4bfc02aa667243dfac1d4d;p=thirdparty%2Fkernel%2Fstable-queue.git drop some 4.4 patches that broke the build --- diff --git a/queue-4.4/acpi-add-out-of-bounds-and-numa_off-protections-to-p.patch b/queue-4.4/acpi-add-out-of-bounds-and-numa_off-protections-to-p.patch deleted file mode 100644 index 3144ef48196..00000000000 --- a/queue-4.4/acpi-add-out-of-bounds-and-numa_off-protections-to-p.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8603591e9f729fc0ec7a91664ee068931c6fb01a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 18 Aug 2020 22:24:25 +0800 -Subject: ACPI: Add out of bounds and numa_off protections to pxm_to_node() - -From: Jonathan Cameron - -[ Upstream commit 8a3decac087aa897df5af04358c2089e52e70ac4 ] - -The function should check the validity of the pxm value before using -it to index the pxm_to_node_map[] array. - -Whilst hardening this code may be good in general, the main intent -here is to enable following patches that use this function to replace -acpi_map_pxm_to_node() for non SRAT usecases which should return -NO_NUMA_NODE for PXM entries not matching with those in SRAT. - -Signed-off-by: Jonathan Cameron -Reviewed-by: Barry Song -Reviewed-by: Hanjun Guo -Signed-off-by: Rafael J. Wysocki -Signed-off-by: Sasha Levin ---- - drivers/acpi/numa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c -index 2946e2846573b..15a506c2d20a0 100644 ---- a/drivers/acpi/numa.c -+++ b/drivers/acpi/numa.c -@@ -46,7 +46,7 @@ unsigned char acpi_srat_revision __initdata; - - int pxm_to_node(int pxm) - { -- if (pxm < 0) -+ if (pxm < 0 || pxm >= MAX_PXM_DOMAINS || numa_off) - return NUMA_NO_NODE; - return pxm_to_node_map[pxm]; - } --- -2.27.0 - diff --git a/queue-4.4/kvm-ppc-book3s-hv-do-not-allocate-hpt-for-a-nested-g.patch b/queue-4.4/kvm-ppc-book3s-hv-do-not-allocate-hpt-for-a-nested-g.patch deleted file mode 100644 index f7876a30889..00000000000 --- a/queue-4.4/kvm-ppc-book3s-hv-do-not-allocate-hpt-for-a-nested-g.patch +++ /dev/null @@ -1,101 +0,0 @@ -From e9e8cae2958340193606eae6b7841d39e25e51da Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 11 Sep 2020 01:16:07 -0300 -Subject: KVM: PPC: Book3S HV: Do not allocate HPT for a nested guest - -From: Fabiano Rosas - -[ Upstream commit 05e6295dc7de859c9d56334805485c4d20bebf25 ] - -The current nested KVM code does not support HPT guests. This is -informed/enforced in some ways: - -- Hosts < P9 will not be able to enable the nested HV feature; - -- The nested hypervisor MMU capabilities will not contain - KVM_CAP_PPC_MMU_HASH_V3; - -- QEMU reflects the MMU capabilities in the - 'ibm,arch-vec-5-platform-support' device-tree property; - -- The nested guest, at 'prom_parse_mmu_model' ignores the - 'disable_radix' kernel command line option if HPT is not supported; - -- The KVM_PPC_CONFIGURE_V3_MMU ioctl will fail if trying to use HPT. - -There is, however, still a way to start a HPT guest by using -max-compat-cpu=power8 at the QEMU machine options. This leads to the -guest being set to use hash after QEMU calls the KVM_PPC_ALLOCATE_HTAB -ioctl. - -With the guest set to hash, the nested hypervisor goes through the -entry path that has no knowledge of nesting (kvmppc_run_vcpu) and -crashes when it tries to execute an hypervisor-privileged (mtspr -HDEC) instruction at __kvmppc_vcore_entry: - -root@L1:~ $ qemu-system-ppc64 -machine pseries,max-cpu-compat=power8 ... - - -[ 538.543303] CPU: 83 PID: 25185 Comm: CPU 0/KVM Not tainted 5.9.0-rc4 #1 -[ 538.543355] NIP: c00800000753f388 LR: c00800000753f368 CTR: c0000000001e5ec0 -[ 538.543417] REGS: c0000013e91e33b0 TRAP: 0700 Not tainted (5.9.0-rc4) -[ 538.543470] MSR: 8000000002843033 CR: 22422882 XER: 20040000 -[ 538.543546] CFAR: c00800000753f4b0 IRQMASK: 3 - GPR00: c0080000075397a0 c0000013e91e3640 c00800000755e600 0000000080000000 - GPR04: 0000000000000000 c0000013eab19800 c000001394de0000 00000043a054db72 - GPR08: 00000000003b1652 0000000000000000 0000000000000000 c0080000075502e0 - GPR12: c0000000001e5ec0 c0000007ffa74200 c0000013eab19800 0000000000000008 - GPR16: 0000000000000000 c00000139676c6c0 c000000001d23948 c0000013e91e38b8 - GPR20: 0000000000000053 0000000000000000 0000000000000001 0000000000000000 - GPR24: 0000000000000001 0000000000000001 0000000000000000 0000000000000001 - GPR28: 0000000000000001 0000000000000053 c0000013eab19800 0000000000000001 -[ 538.544067] NIP [c00800000753f388] __kvmppc_vcore_entry+0x90/0x104 [kvm_hv] -[ 538.544121] LR [c00800000753f368] __kvmppc_vcore_entry+0x70/0x104 [kvm_hv] -[ 538.544173] Call Trace: -[ 538.544196] [c0000013e91e3640] [c0000013e91e3680] 0xc0000013e91e3680 (unreliable) -[ 538.544260] [c0000013e91e3820] [c0080000075397a0] kvmppc_run_core+0xbc8/0x19d0 [kvm_hv] -[ 538.544325] [c0000013e91e39e0] [c00800000753d99c] kvmppc_vcpu_run_hv+0x404/0xc00 [kvm_hv] -[ 538.544394] [c0000013e91e3ad0] [c0080000072da4fc] kvmppc_vcpu_run+0x34/0x48 [kvm] -[ 538.544472] [c0000013e91e3af0] [c0080000072d61b8] kvm_arch_vcpu_ioctl_run+0x310/0x420 [kvm] -[ 538.544539] [c0000013e91e3b80] [c0080000072c7450] kvm_vcpu_ioctl+0x298/0x778 [kvm] -[ 538.544605] [c0000013e91e3ce0] [c0000000004b8c2c] sys_ioctl+0x1dc/0xc90 -[ 538.544662] [c0000013e91e3dc0] [c00000000002f9a4] system_call_exception+0xe4/0x1c0 -[ 538.544726] [c0000013e91e3e20] [c00000000000d140] system_call_common+0xf0/0x27c -[ 538.544787] Instruction dump: -[ 538.544821] f86d1098 60000000 60000000 48000099 e8ad0fe8 e8c500a0 e9264140 75290002 -[ 538.544886] 7d1602a6 7cec42a6 40820008 7d0807b4 <7d164ba6> 7d083a14 f90d10a0 480104fd -[ 538.544953] ---[ end trace 74423e2b948c2e0c ]--- - -This patch makes the KVM_PPC_ALLOCATE_HTAB ioctl fail when running in -the nested hypervisor, causing QEMU to abort. - -Reported-by: Satheesh Rajendran -Signed-off-by: Fabiano Rosas -Reviewed-by: Greg Kurz -Reviewed-by: David Gibson -Signed-off-by: Paul Mackerras -Signed-off-by: Sasha Levin ---- - arch/powerpc/kvm/book3s_hv.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c -index 54c6ba87a25ad..b005ce9dc8f04 100644 ---- a/arch/powerpc/kvm/book3s_hv.c -+++ b/arch/powerpc/kvm/book3s_hv.c -@@ -3157,6 +3157,12 @@ static long kvm_arch_vm_ioctl_hv(struct file *filp, - case KVM_PPC_ALLOCATE_HTAB: { - u32 htab_order; - -+ /* If we're a nested hypervisor, we currently only support radix */ -+ if (kvmhv_on_pseries()) { -+ r = -EOPNOTSUPP; -+ break; -+ } -+ - r = -EFAULT; - if (get_user(htab_order, (u32 __user *)argp)) - break; --- -2.27.0 - diff --git a/queue-4.4/series b/queue-4.4/series index d4a2e692a67..83fa4e33f4c 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -19,7 +19,6 @@ mmc-via-sdmmc-fix-data-race-bug.patch printk-reduce-log_buf_shift-range-for-h8300.patch kgdb-make-kgdbcon-work-properly-with-kgdb_earlycon.patch usb-adutux-fix-debugging.patch -acpi-add-out-of-bounds-and-numa_off-protections-to-p.patch drivers-net-wan-hdlc_fr-correctly-handle-special-skb.patch power-supply-test_power-add-missing-newlines-when-pr.patch md-bitmap-md_bitmap_get_counter-returns-wrong-blocks.patch @@ -27,7 +26,6 @@ clk-ti-clockdomain-fix-static-checker-warning.patch net-9p-initialize-sun_server.sun_path-to-have-addr-s.patch drivers-watchdog-rdc321x_wdt-fix-race-condition-bugs.patch ext4-detect-already-used-quota-file-early.patch -kvm-ppc-book3s-hv-do-not-allocate-hpt-for-a-nested-g.patch gfs2-add-validation-checks-for-size-of-superblock.patch memory-emif-remove-bogus-debugfs-error-handling.patch arm-dts-s5pv210-move-pmu-node-out-of-clock-controlle.patch