From 6e0191b2917259c8fafd48a8f236d940f8c73ca4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 Jul 2020 20:39:57 +0200 Subject: [PATCH] drop arm64 patch --- ...affected-by-arm64_workaround_1418040.patch | 44 ------------------- queue-4.14/series | 1 - ...affected-by-arm64_workaround_1418040.patch | 44 ------------------- queue-4.19/series | 1 - ...affected-by-arm64_workaround_1418040.patch | 44 ------------------- queue-5.4/series | 1 - 6 files changed, 135 deletions(-) delete mode 100644 queue-4.14/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch delete mode 100644 queue-4.19/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch delete mode 100644 queue-5.4/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch diff --git a/queue-4.14/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch b/queue-4.14/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch deleted file mode 100644 index b1c476c2c6b..00000000000 --- a/queue-4.14/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4b661d6133c5d3a7c9aca0b4ee5a78c7766eff3f Mon Sep 17 00:00:00 2001 -From: Marc Zyngier -Date: Mon, 6 Jul 2020 17:38:01 +0100 -Subject: arm64: arch_timer: Disable the compat vdso for cores affected by ARM64_WORKAROUND_1418040 - -From: Marc Zyngier - -commit 4b661d6133c5d3a7c9aca0b4ee5a78c7766eff3f upstream. - -ARM64_WORKAROUND_1418040 requires that AArch32 EL0 accesses to -the virtual counter register are trapped and emulated by the kernel. -This makes the vdso pretty pointless, and in some cases livelock -prone. - -Provide a workaround entry that limits the vdso to 64bit tasks. - -Signed-off-by: Marc Zyngier -Acked-by: Mark Rutland -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/20200706163802.1836732-4-maz@kernel.org -Signed-off-by: Will Deacon -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/clocksource/arm_arch_timer.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/drivers/clocksource/arm_arch_timer.c -+++ b/drivers/clocksource/arm_arch_timer.c -@@ -381,6 +381,14 @@ static const struct arch_timer_erratum_w - .read_cntvct_el0 = arm64_858921_read_cntvct_el0, - }, - #endif -+#ifdef CONFIG_ARM64_ERRATUM_1418040 -+ { -+ .match_type = ate_match_local_cap_id, -+ .id = (void *)ARM64_WORKAROUND_1418040, -+ .desc = "ARM erratum 1418040", -+ .disable_compat_vdso = true, -+ }, -+#endif - }; - - typedef bool (*ate_match_fn_t)(const struct arch_timer_erratum_workaround *, diff --git a/queue-4.14/series b/queue-4.14/series index b866df33f28..cf69bb32a9d 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -38,4 +38,3 @@ dm-use-noio-when-sending-kobject-event.patch arc-entry-fix-potential-efa-clobber-when-tif_syscall_trace.patch arc-elf-use-right-elf_arch.patch s390-mm-fix-huge-pte-soft-dirty-copying.patch -arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch diff --git a/queue-4.19/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch b/queue-4.19/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch deleted file mode 100644 index 2291f185fc4..00000000000 --- a/queue-4.19/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4b661d6133c5d3a7c9aca0b4ee5a78c7766eff3f Mon Sep 17 00:00:00 2001 -From: Marc Zyngier -Date: Mon, 6 Jul 2020 17:38:01 +0100 -Subject: arm64: arch_timer: Disable the compat vdso for cores affected by ARM64_WORKAROUND_1418040 - -From: Marc Zyngier - -commit 4b661d6133c5d3a7c9aca0b4ee5a78c7766eff3f upstream. - -ARM64_WORKAROUND_1418040 requires that AArch32 EL0 accesses to -the virtual counter register are trapped and emulated by the kernel. -This makes the vdso pretty pointless, and in some cases livelock -prone. - -Provide a workaround entry that limits the vdso to 64bit tasks. - -Signed-off-by: Marc Zyngier -Acked-by: Mark Rutland -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/20200706163802.1836732-4-maz@kernel.org -Signed-off-by: Will Deacon -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/clocksource/arm_arch_timer.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/drivers/clocksource/arm_arch_timer.c -+++ b/drivers/clocksource/arm_arch_timer.c -@@ -463,6 +463,14 @@ static const struct arch_timer_erratum_w - .set_next_event_virt = erratum_set_next_event_tval_virt, - }, - #endif -+#ifdef CONFIG_ARM64_ERRATUM_1418040 -+ { -+ .match_type = ate_match_local_cap_id, -+ .id = (void *)ARM64_WORKAROUND_1418040, -+ .desc = "ARM erratum 1418040", -+ .disable_compat_vdso = true, -+ }, -+#endif - }; - - typedef bool (*ate_match_fn_t)(const struct arch_timer_erratum_workaround *, diff --git a/queue-4.19/series b/queue-4.19/series index fc32ec320bd..1011d027980 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -56,4 +56,3 @@ dm-use-noio-when-sending-kobject-event.patch arc-entry-fix-potential-efa-clobber-when-tif_syscall_trace.patch arc-elf-use-right-elf_arch.patch s390-mm-fix-huge-pte-soft-dirty-copying.patch -arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch diff --git a/queue-5.4/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch b/queue-5.4/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch deleted file mode 100644 index 718e006822e..00000000000 --- a/queue-5.4/arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4b661d6133c5d3a7c9aca0b4ee5a78c7766eff3f Mon Sep 17 00:00:00 2001 -From: Marc Zyngier -Date: Mon, 6 Jul 2020 17:38:01 +0100 -Subject: arm64: arch_timer: Disable the compat vdso for cores affected by ARM64_WORKAROUND_1418040 - -From: Marc Zyngier - -commit 4b661d6133c5d3a7c9aca0b4ee5a78c7766eff3f upstream. - -ARM64_WORKAROUND_1418040 requires that AArch32 EL0 accesses to -the virtual counter register are trapped and emulated by the kernel. -This makes the vdso pretty pointless, and in some cases livelock -prone. - -Provide a workaround entry that limits the vdso to 64bit tasks. - -Signed-off-by: Marc Zyngier -Acked-by: Mark Rutland -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/20200706163802.1836732-4-maz@kernel.org -Signed-off-by: Will Deacon -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/clocksource/arm_arch_timer.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/drivers/clocksource/arm_arch_timer.c -+++ b/drivers/clocksource/arm_arch_timer.c -@@ -476,6 +476,14 @@ static const struct arch_timer_erratum_w - .set_next_event_virt = erratum_set_next_event_tval_virt, - }, - #endif -+#ifdef CONFIG_ARM64_ERRATUM_1418040 -+ { -+ .match_type = ate_match_local_cap_id, -+ .id = (void *)ARM64_WORKAROUND_1418040, -+ .desc = "ARM erratum 1418040", -+ .disable_compat_vdso = true, -+ }, -+#endif - }; - - typedef bool (*ate_match_fn_t)(const struct arch_timer_erratum_workaround *, diff --git a/queue-5.4/series b/queue-5.4/series index 8da3ca7620a..eaec7c692ed 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -100,7 +100,6 @@ arc-entry-fix-potential-efa-clobber-when-tif_syscall_trace.patch arc-elf-use-right-elf_arch.patch s390-setup-init-jump-labels-before-command-line-parsing.patch s390-mm-fix-huge-pte-soft-dirty-copying.patch -arm64-arch_timer-disable-the-compat-vdso-for-cores-affected-by-arm64_workaround_1418040.patch blk-mq-consider-non-idle-request-as-inflight-in-blk_mq_rq_inflight.patch dm-writecache-reject-asynchronous-pmem-devices.patch perf-scripts-python-export-to-postgresql.py-fix-struct.pack-int-argument.patch -- 2.47.3