Skip to content

Commit 4232da2

Browse files
committed
Merge tag 'loongarch-kvm-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson into HEAD
LoongArch KVM changes for v6.10 1. Add ParaVirt IPI support. 2. Add software breakpoint support. 3. Add mmio trace events support.
2 parents bbe10a5 + 7b7e584 commit 4232da2

File tree

1,174 files changed

+16282
-7647
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,174 files changed

+16282
-7647
lines changed

.mailmap

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ Alexei Starovoitov <[email protected]> <[email protected]>
3838
Alexei Starovoitov <[email protected]> <[email protected]>
3939
Alexei Starovoitov <[email protected]> <[email protected]>
4040
41+
Alex Elder <[email protected]>
42+
43+
44+
45+
46+
47+
48+
49+
50+
4151
4252
4353
@@ -98,6 +108,8 @@ Ben Widawsky <[email protected]> <[email protected]>
98108
99109
100110
111+
Benjamin Tissoires <[email protected]> <[email protected]>
112+
Benjamin Tissoires <[email protected]> <[email protected]>
101113
102114
103115
@@ -446,7 +458,8 @@ Mythri P K <[email protected]>
446458
447459
448460
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
449-
461+
462+
450463
451464
452465
@@ -499,6 +512,7 @@ Praveen BP <[email protected]>
499512
Pradeep Kumar Chitrapu <[email protected]> <[email protected]>
500513
501514
515+
502516
503517
504518
@@ -524,6 +538,7 @@ Rémi Denis-Courmont <[email protected]>
524538
525539
Ricardo Ribalda <[email protected]> Ricardo Ribalda Delgado <[email protected]>
526540
541+
527542
528543
529544

CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3146,6 +3146,10 @@ S: Triftstra=DFe 55
31463146
S: 13353 Berlin
31473147
S: Germany
31483148

3149+
N: Gustavo Pimental
3150+
3151+
D: PCI driver for Synopsys DesignWare
3152+
31493153
N: Emanuel Pirker
31503154
31513155
D: AIC5800 IEEE 1394, RAW I/O on 1394

Documentation/admin-guide/hw-vuln/spectre.rst

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,10 @@ associated with the source address of the indirect branch. Specifically,
138138
the BHB might be shared across privilege levels even in the presence of
139139
Enhanced IBRS.
140140

141-
Currently the only known real-world BHB attack vector is via
142-
unprivileged eBPF. Therefore, it's highly recommended to not enable
143-
unprivileged eBPF, especially when eIBRS is used (without retpolines).
144-
For a full mitigation against BHB attacks, it's recommended to use
145-
retpolines (or eIBRS combined with retpolines).
141+
Previously the only known real-world BHB attack vector was via unprivileged
142+
eBPF. Further research has found attacks that don't require unprivileged eBPF.
143+
For a full mitigation against BHB attacks it is recommended to set BHI_DIS_S or
144+
use the BHB clearing sequence.
146145

147146
Attack scenarios
148147
----------------
@@ -430,6 +429,23 @@ The possible values in this file are:
430429
'PBRSB-eIBRS: Not affected' CPU is not affected by PBRSB
431430
=========================== =======================================================
432431

432+
- Branch History Injection (BHI) protection status:
433+
434+
.. list-table::
435+
436+
* - BHI: Not affected
437+
- System is not affected
438+
* - BHI: Retpoline
439+
- System is protected by retpoline
440+
* - BHI: BHI_DIS_S
441+
- System is protected by BHI_DIS_S
442+
* - BHI: SW loop, KVM SW loop
443+
- System is protected by software clearing sequence
444+
* - BHI: Vulnerable
445+
- System is vulnerable to BHI
446+
* - BHI: Vulnerable, KVM: SW loop
447+
- System is vulnerable; KVM is protected by software clearing sequence
448+
433449
Full mitigation might require a microcode update from the CPU
434450
vendor. When the necessary microcode is not available, the kernel will
435451
report vulnerability.
@@ -484,7 +500,11 @@ Spectre variant 2
484500

485501
Systems which support enhanced IBRS (eIBRS) enable IBRS protection once at
486502
boot, by setting the IBRS bit, and they're automatically protected against
487-
Spectre v2 variant attacks.
503+
some Spectre v2 variant attacks. The BHB can still influence the choice of
504+
indirect branch predictor entry, and although branch predictor entries are
505+
isolated between modes when eIBRS is enabled, the BHB itself is not isolated
506+
between modes. Systems which support BHI_DIS_S will set it to protect against
507+
BHI attacks.
488508

489509
On Intel's enhanced IBRS systems, this includes cross-thread branch target
490510
injections on SMT systems (STIBP). In other words, Intel eIBRS enables
@@ -638,6 +658,18 @@ kernel command line.
638658
spectre_v2=off. Spectre variant 1 mitigations
639659
cannot be disabled.
640660

661+
spectre_bhi=
662+
663+
[X86] Control mitigation of Branch History Injection
664+
(BHI) vulnerability. This setting affects the deployment
665+
of the HW BHI control and the SW BHB clearing sequence.
666+
667+
on
668+
(default) Enable the HW or SW mitigation as
669+
needed.
670+
off
671+
Disable the mitigation.
672+
641673
For spectre_v2_user see Documentation/admin-guide/kernel-parameters.txt
642674

643675
Mitigation selection guide

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3423,6 +3423,9 @@
34233423
arch-independent options, each of which is an
34243424
aggregation of existing arch-specific options.
34253425

3426+
Note, "mitigations" is supported if and only if the
3427+
kernel was built with CPU_MITIGATIONS=y.
3428+
34263429
off
34273430
Disable all optional CPU mitigations. This
34283431
improves system performance, but it may also
@@ -3444,6 +3447,7 @@
34443447
retbleed=off [X86]
34453448
spec_rstack_overflow=off [X86]
34463449
spec_store_bypass_disable=off [X86,PPC]
3450+
spectre_bhi=off [X86]
34473451
spectre_v2_user=off [X86]
34483452
srbds=off [X86,INTEL]
34493453
ssbd=force-off [ARM64]
@@ -6063,6 +6067,15 @@
60636067
sonypi.*= [HW] Sony Programmable I/O Control Device driver
60646068
See Documentation/admin-guide/laptops/sonypi.rst
60656069

6070+
spectre_bhi= [X86] Control mitigation of Branch History Injection
6071+
(BHI) vulnerability. This setting affects the
6072+
deployment of the HW BHI control and the SW BHB
6073+
clearing sequence.
6074+
6075+
on - (default) Enable the HW or SW mitigation
6076+
as needed.
6077+
off - Disable the mitigation.
6078+
60666079
spectre_v2= [X86,EARLY] Control mitigation of Spectre variant 2
60676080
(indirect branch speculation) vulnerability.
60686081
The default operation protects the kernel from

0 commit comments

Comments
 (0)