From: Greg Kroah-Hartman Date: Thu, 5 Mar 2020 14:56:43 +0000 (+0100) Subject: drop arm-ftrace-fix-be-text-poking.patch from everywhere. X-Git-Tag: v4.19.108~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3dc926759eb2bc6aa69dfb72503ab79b259b4964;p=thirdparty%2Fkernel%2Fstable-queue.git drop arm-ftrace-fix-be-text-poking.patch from everywhere. --- diff --git a/queue-4.14/arm-ftrace-fix-be-text-poking.patch b/queue-4.14/arm-ftrace-fix-be-text-poking.patch deleted file mode 100644 index b8a93b1d841..00000000000 --- a/queue-4.14/arm-ftrace-fix-be-text-poking.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5c01d47e9e5bde52f25b9da7015f906662b7f6a5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 7 Feb 2020 12:57:36 +0100 -Subject: arm/ftrace: Fix BE text poking - -From: Peter Zijlstra - -[ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ] - -The __patch_text() function already applies __opcode_to_mem_*(), so -when __opcode_to_mem_*() is not the identity (BE*), it is applied -twice, wrecking the instruction. - -Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()") -Reported-by: Dmitry Osipenko -Signed-off-by: Peter Zijlstra (Intel) -Signed-off-by: Ingo Molnar -Tested-by: Dmitry Osipenko -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/ftrace.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c -index 5617932a83dfa..26b7321bb2152 100644 ---- a/arch/arm/kernel/ftrace.c -+++ b/arch/arm/kernel/ftrace.c -@@ -106,13 +106,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old, - { - unsigned long replaced; - -- if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) { -+ if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) - old = __opcode_to_mem_thumb32(old); -- new = __opcode_to_mem_thumb32(new); -- } else { -+ else - old = __opcode_to_mem_arm(old); -- new = __opcode_to_mem_arm(new); -- } - - if (validate) { - if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE)) --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 8d876c60727..21c8b1f23e0 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -10,7 +10,6 @@ mac80211-consider-more-elements-in-parsing-crc.patch cfg80211-check-wiphy-driver-existence-for-drvinfo-re.patch qmi_wwan-re-add-dw5821e-pre-production-variant.patch qmi_wwan-unconditionally-reject-2-ep-interfaces.patch -arm-ftrace-fix-be-text-poking.patch net-ena-fix-potential-crash-when-rxfh-key-is-null.patch net-ena-fix-uses-of-round_jiffies.patch net-ena-add-missing-ethtool-tx-timestamping-indicati.patch diff --git a/queue-4.19/arm-ftrace-fix-be-text-poking.patch b/queue-4.19/arm-ftrace-fix-be-text-poking.patch deleted file mode 100644 index 98db8f4db27..00000000000 --- a/queue-4.19/arm-ftrace-fix-be-text-poking.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 12be401a2eb29c1dfa5a24dadaf598c9d605936e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 7 Feb 2020 12:57:36 +0100 -Subject: arm/ftrace: Fix BE text poking - -From: Peter Zijlstra - -[ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ] - -The __patch_text() function already applies __opcode_to_mem_*(), so -when __opcode_to_mem_*() is not the identity (BE*), it is applied -twice, wrecking the instruction. - -Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()") -Reported-by: Dmitry Osipenko -Signed-off-by: Peter Zijlstra (Intel) -Signed-off-by: Ingo Molnar -Tested-by: Dmitry Osipenko -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/ftrace.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c -index ee673c09aa6c0..dd0215fb6fe23 100644 ---- a/arch/arm/kernel/ftrace.c -+++ b/arch/arm/kernel/ftrace.c -@@ -106,13 +106,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old, - { - unsigned long replaced; - -- if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) { -+ if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) - old = __opcode_to_mem_thumb32(old); -- new = __opcode_to_mem_thumb32(new); -- } else { -+ else - old = __opcode_to_mem_arm(old); -- new = __opcode_to_mem_arm(new); -- } - - if (validate) { - if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE)) --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index e8162639a41..b3933f964a4 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -8,7 +8,6 @@ cfg80211-check-wiphy-driver-existence-for-drvinfo-re.patch s390-zcrypt-fix-card-and-queue-total-counter-wrap.patch qmi_wwan-re-add-dw5821e-pre-production-variant.patch qmi_wwan-unconditionally-reject-2-ep-interfaces.patch -arm-ftrace-fix-be-text-poking.patch arm-dts-sti-fixup-sound-frame-inversion-for-stihxxx-.patch soc-tegra-fuse-fix-build-with-tegra194-configuration.patch net-ena-fix-potential-crash-when-rxfh-key-is-null.patch diff --git a/queue-4.4/arm-ftrace-fix-be-text-poking.patch b/queue-4.4/arm-ftrace-fix-be-text-poking.patch deleted file mode 100644 index c99aa1417be..00000000000 --- a/queue-4.4/arm-ftrace-fix-be-text-poking.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8c9c4da2c156ee1fed4e685d42609b510019e269 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 7 Feb 2020 12:57:36 +0100 -Subject: arm/ftrace: Fix BE text poking - -From: Peter Zijlstra - -[ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ] - -The __patch_text() function already applies __opcode_to_mem_*(), so -when __opcode_to_mem_*() is not the identity (BE*), it is applied -twice, wrecking the instruction. - -Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()") -Reported-by: Dmitry Osipenko -Signed-off-by: Peter Zijlstra (Intel) -Signed-off-by: Ingo Molnar -Tested-by: Dmitry Osipenko -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/ftrace.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c -index faa9a905826ee..7982409e5c27f 100644 ---- a/arch/arm/kernel/ftrace.c -+++ b/arch/arm/kernel/ftrace.c -@@ -105,13 +105,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old, - { - unsigned long replaced; - -- if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) { -+ if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) - old = __opcode_to_mem_thumb32(old); -- new = __opcode_to_mem_thumb32(new); -- } else { -+ else - old = __opcode_to_mem_arm(old); -- new = __opcode_to_mem_arm(new); -- } - - if (validate) { - if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE)) --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index b99975e8aa5..a92d443e59f 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -5,7 +5,6 @@ ext4-fix-potential-race-between-s_group_info-online-.patch ipmi-ssif-handle-a-possible-null-pointer-reference.patch mac80211-consider-more-elements-in-parsing-crc.patch cfg80211-check-wiphy-driver-existence-for-drvinfo-re.patch -arm-ftrace-fix-be-text-poking.patch cifs-fix-mode-output-in-debugging-statements.patch cfg80211-add-missing-policy-for-nl80211_attr_status_.patch sysrq-restore-original-console_loglevel-when-sysrq-disabled.patch diff --git a/queue-4.9/arm-ftrace-fix-be-text-poking.patch b/queue-4.9/arm-ftrace-fix-be-text-poking.patch deleted file mode 100644 index 5edf4261df4..00000000000 --- a/queue-4.9/arm-ftrace-fix-be-text-poking.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 66890fa0013d7b4fa4ea585b1916e91ceebf7bb3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 7 Feb 2020 12:57:36 +0100 -Subject: arm/ftrace: Fix BE text poking - -From: Peter Zijlstra - -[ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ] - -The __patch_text() function already applies __opcode_to_mem_*(), so -when __opcode_to_mem_*() is not the identity (BE*), it is applied -twice, wrecking the instruction. - -Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()") -Reported-by: Dmitry Osipenko -Signed-off-by: Peter Zijlstra (Intel) -Signed-off-by: Ingo Molnar -Tested-by: Dmitry Osipenko -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/ftrace.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c -index 414e60ed02573..58a01083b0415 100644 ---- a/arch/arm/kernel/ftrace.c -+++ b/arch/arm/kernel/ftrace.c -@@ -105,13 +105,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old, - { - unsigned long replaced; - -- if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) { -+ if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) - old = __opcode_to_mem_thumb32(old); -- new = __opcode_to_mem_thumb32(new); -- } else { -+ else - old = __opcode_to_mem_arm(old); -- new = __opcode_to_mem_arm(new); -- } - - if (validate) { - if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE)) --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 79403e20b10..135292d2def 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -7,7 +7,6 @@ drm-msm-set-dma-maximum-segment-size-for-mdss.patch mac80211-consider-more-elements-in-parsing-crc.patch cfg80211-check-wiphy-driver-existence-for-drvinfo-re.patch qmi_wwan-re-add-dw5821e-pre-production-variant.patch -arm-ftrace-fix-be-text-poking.patch net-ena-fix-potential-crash-when-rxfh-key-is-null.patch net-ena-add-missing-ethtool-tx-timestamping-indicati.patch net-ena-fix-incorrect-default-rss-key.patch diff --git a/queue-5.4/arm-ftrace-fix-be-text-poking.patch b/queue-5.4/arm-ftrace-fix-be-text-poking.patch deleted file mode 100644 index 1d4335460ee..00000000000 --- a/queue-5.4/arm-ftrace-fix-be-text-poking.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e4a84378c32f4e6ea1d64315410c82f144fb89a2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 7 Feb 2020 12:57:36 +0100 -Subject: arm/ftrace: Fix BE text poking - -From: Peter Zijlstra - -[ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ] - -The __patch_text() function already applies __opcode_to_mem_*(), so -when __opcode_to_mem_*() is not the identity (BE*), it is applied -twice, wrecking the instruction. - -Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()") -Reported-by: Dmitry Osipenko -Signed-off-by: Peter Zijlstra (Intel) -Signed-off-by: Ingo Molnar -Tested-by: Dmitry Osipenko -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/ftrace.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c -index bda949fd84e8b..93caf757f1d5d 100644 ---- a/arch/arm/kernel/ftrace.c -+++ b/arch/arm/kernel/ftrace.c -@@ -81,13 +81,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old, - { - unsigned long replaced; - -- if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) { -+ if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) - old = __opcode_to_mem_thumb32(old); -- new = __opcode_to_mem_thumb32(new); -- } else { -+ else - old = __opcode_to_mem_arm(old); -- new = __opcode_to_mem_arm(new); -- } - - if (validate) { - if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE)) --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 565c272397f..1c69f8af45d 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -32,7 +32,6 @@ qmi_wwan-re-add-dw5821e-pre-production-variant.patch qmi_wwan-unconditionally-reject-2-ep-interfaces.patch nfsv4-fix-races-between-open-and-dentry-revalidation.patch perf-smmuv3-use-platform_get_irq_optional-for-wired-.patch -arm-ftrace-fix-be-text-poking.patch perf-x86-intel-add-elkhart-lake-support.patch perf-x86-cstate-add-tremont-support.patch perf-x86-msr-add-tremont-support.patch diff --git a/queue-5.5/arm-ftrace-fix-be-text-poking.patch b/queue-5.5/arm-ftrace-fix-be-text-poking.patch deleted file mode 100644 index 7598d9d25a1..00000000000 --- a/queue-5.5/arm-ftrace-fix-be-text-poking.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 912cb6f91c90045342a0972d31f1eb8fb72858ef Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 7 Feb 2020 12:57:36 +0100 -Subject: arm/ftrace: Fix BE text poking - -From: Peter Zijlstra - -[ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ] - -The __patch_text() function already applies __opcode_to_mem_*(), so -when __opcode_to_mem_*() is not the identity (BE*), it is applied -twice, wrecking the instruction. - -Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()") -Reported-by: Dmitry Osipenko -Signed-off-by: Peter Zijlstra (Intel) -Signed-off-by: Ingo Molnar -Tested-by: Dmitry Osipenko -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/ftrace.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c -index bda949fd84e8b..93caf757f1d5d 100644 ---- a/arch/arm/kernel/ftrace.c -+++ b/arch/arm/kernel/ftrace.c -@@ -81,13 +81,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old, - { - unsigned long replaced; - -- if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) { -+ if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) - old = __opcode_to_mem_thumb32(old); -- new = __opcode_to_mem_thumb32(new); -- } else { -+ else - old = __opcode_to_mem_arm(old); -- new = __opcode_to_mem_arm(new); -- } - - if (validate) { - if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE)) --- -2.20.1 - diff --git a/queue-5.5/series b/queue-5.5/series index a2db600fc9b..fd938eb49ef 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -36,7 +36,6 @@ qmi_wwan-re-add-dw5821e-pre-production-variant.patch qmi_wwan-unconditionally-reject-2-ep-interfaces.patch nfsv4-fix-races-between-open-and-dentry-revalidation.patch perf-smmuv3-use-platform_get_irq_optional-for-wired-.patch -arm-ftrace-fix-be-text-poking.patch perf-x86-intel-add-elkhart-lake-support.patch perf-x86-cstate-add-tremont-support.patch perf-x86-msr-add-tremont-support.patch