From: Greg Kroah-Hartman Date: Tue, 14 Feb 2023 18:02:10 +0000 (+0100) Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... X-Git-Tag: v6.1.12~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ee60b7ae0e7c75cc6cd42d3bd16c4b5ea4f5b9e;p=thirdparty%2Fkernel%2Fstable-queue.git Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue --- 7ee60b7ae0e7c75cc6cd42d3bd16c4b5ea4f5b9e diff --cc queue-5.15/documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch index a1543b77947,637db39f320..d6938a4598e --- a/queue-5.15/documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch +++ b/queue-5.15/documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch @@@ -12,10 -13,10 +12,11 @@@ Add the admin guide for the Cross-Threa Signed-off-by: Tom Lendacky Message-Id: <60f9c0b4396956ce70499ae180cb548720b25c7e.1675956146.git.thomas.lendacky@amd.com> Signed-off-by: Paolo Bonzini + Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - .../admin-guide/hw-vuln/cross-thread-rsb.rst | 92 +++++++++++++++++++ - Documentation/admin-guide/hw-vuln/index.rst | 1 + + Documentation/admin-guide/hw-vuln/cross-thread-rsb.rst | 92 +++++++++++++++++ + Documentation/admin-guide/hw-vuln/index.rst | 1 2 files changed, 93 insertions(+) create mode 100644 Documentation/admin-guide/hw-vuln/cross-thread-rsb.rst diff --cc queue-5.15/kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch index b5ce60ddf11,8c7327a89e8..1f790158bda --- a/queue-5.15/kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch +++ b/queue-5.15/kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch @@@ -21,14 -21,16 +21,15 @@@ KVM will not allow the disabling of th Signed-off-by: Tom Lendacky Message-Id: <4019348b5e07148eb4d593380a5f6713b93c9a16.1675956146.git.thomas.lendacky@amd.com> Signed-off-by: Paolo Bonzini + Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - arch/x86/kvm/x86.c | 43 ++++++++++++++++++++++++++++++++----------- + arch/x86/kvm/x86.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) -diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index fcfa3fedf84f1..45a3d11bb70d9 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -184,6 +184,10 @@ module_param(force_emulation_prefix, bool, S_IRUGO); +@@ -184,6 +184,10 @@ module_param(force_emulation_prefix, boo int __read_mostly pi_inject_timer = -1; module_param(pi_inject_timer, bint, S_IRUGO | S_IWUSR); diff --cc queue-5.15/series index 01d55ecbb6f,dd9e664cdc2..a692b63a2ba --- a/queue-5.15/series +++ b/queue-5.15/series @@@ -61,7 -61,6 +61,6 @@@ fix-page-corruption-caused-by-racy-chec drm-amdgpu-fence-fix-oops-due-to-non-matching-drm_sched-init-fini.patch drm-i915-initialize-the-obj-flags-for-shmem-objects.patch drm-i915-fix-vbt-dsi-dvo-port-handling.patch - nvmem-core-fix-return-value.patch -x86-speculation-identify-processors-vulnerable-to-sm.patch -kvm-x86-mitigate-the-cross-thread-return-address-pre.patch -documentation-hw-vuln-add-documentation-for-cross-th.patch +x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch +kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch +documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch diff --cc queue-5.15/x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch index e2d32d65829,2ec96733250..d68f39824e3 --- a/queue-5.15/x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch +++ b/queue-5.15/x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch @@@ -22,12 -23,14 +22,13 @@@ Reviewed-by: Borislav Petkov (AMD) Message-Id: <91cec885656ca1fcd4f0185ce403a53dd9edecb7.1675956146.git.thomas.lendacky@amd.com> Signed-off-by: Paolo Bonzini + Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - arch/x86/include/asm/cpufeatures.h | 1 + - arch/x86/kernel/cpu/common.c | 9 +++++++-- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/kernel/cpu/common.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h -index f3cb8c8bf8d9c..e31c7e75d6b02 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -452,5 +452,6 @@ diff --cc queue-6.1/documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch index a1543b77947,e68bfc01a8c..d6938a4598e --- a/queue-6.1/documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch +++ b/queue-6.1/documentation-hw-vuln-add-documentation-for-cross-thread-return-predictions.patch @@@ -12,10 -13,10 +12,11 @@@ Add the admin guide for the Cross-Threa Signed-off-by: Tom Lendacky Message-Id: <60f9c0b4396956ce70499ae180cb548720b25c7e.1675956146.git.thomas.lendacky@amd.com> Signed-off-by: Paolo Bonzini + Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - .../admin-guide/hw-vuln/cross-thread-rsb.rst | 92 +++++++++++++++++++ - Documentation/admin-guide/hw-vuln/index.rst | 1 + + Documentation/admin-guide/hw-vuln/cross-thread-rsb.rst | 92 +++++++++++++++++ + Documentation/admin-guide/hw-vuln/index.rst | 1 2 files changed, 93 insertions(+) create mode 100644 Documentation/admin-guide/hw-vuln/cross-thread-rsb.rst diff --cc queue-6.1/kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch index d792758d272,f61a20ac3aa..5f232a46f78 --- a/queue-6.1/kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch +++ b/queue-6.1/kvm-x86-mitigate-the-cross-thread-return-address-predictions-bug.patch @@@ -21,11 -21,13 +21,12 @@@ KVM will not allow the disabling of th Signed-off-by: Tom Lendacky Message-Id: <4019348b5e07148eb4d593380a5f6713b93c9a16.1675956146.git.thomas.lendacky@amd.com> Signed-off-by: Paolo Bonzini + Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - arch/x86/kvm/x86.c | 43 ++++++++++++++++++++++++++++++++----------- + arch/x86/kvm/x86.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) -diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index 69227f77b201d..a0c35b948c30b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -192,6 +192,10 @@ module_param(enable_pmu, bool, 0444); diff --cc queue-6.1/x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch index 78f2acc02ec,6db9ce4f58b..c3716eb48a4 --- a/queue-6.1/x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch +++ b/queue-6.1/x86-speculation-identify-processors-vulnerable-to-smt-rsb-predictions.patch @@@ -22,12 -23,14 +22,13 @@@ Reviewed-by: Borislav Petkov (AMD) Message-Id: <91cec885656ca1fcd4f0185ce403a53dd9edecb7.1675956146.git.thomas.lendacky@amd.com> Signed-off-by: Paolo Bonzini + Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - arch/x86/include/asm/cpufeatures.h | 1 + - arch/x86/kernel/cpu/common.c | 9 +++++++-- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/kernel/cpu/common.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h -index b2da7cb64b317..92729c38853d1 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -463,5 +463,6 @@