Page MenuHomeFreeBSD

D61641.1794944002.diff
No OneTemporary

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D61641.1794944002.diff

diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
--- a/share/man/man7/security.7
+++ b/share/man/man7/security.7
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd June 22, 2026
+.Dd November 11, 2026
.Dt SECURITY 7
.Os
.Sh NAME
@@ -1024,6 +1024,9 @@
amd64 and i386.
Controls Indirect Branch Restricted Speculation hardware information leak
mitigation.
+On AMD processors that support Automatic IBRS, enabling it sets
+.Dv EFER.AIBRSE
+instead of toggling IBRS on every kernel entry and exit.
.It Va machdep.syscall_ret_flush_l1d
amd64.
Controls force-flush of L1D cache on return from syscalls which report
diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c
--- a/sys/x86/x86/cpu_machdep.c
+++ b/sys/x86/x86/cpu_machdep.c
@@ -1210,6 +1210,13 @@
IA32_SPEC_CTRL_IBRS, NULL);
hw_ibrs_active = hw_ibrs_disable == 0;
hw_ibrs_ibpb_active = 0;
+ } else if ((amd_extended_feature2 & AMDFE2_AUTOIBRS) != 0) {
+ x86_msr_op(MSR_EFER, (for_all_cpus ?
+ MSR_OP_RENDEZVOUS_ALL : MSR_OP_LOCAL) |
+ (hw_ibrs_disable != 0 ? MSR_OP_ANDNOT : MSR_OP_OR),
+ EFER_AIBRSE, NULL);
+ hw_ibrs_active = hw_ibrs_disable == 0;
+ hw_ibrs_ibpb_active = 0;
} else {
hw_ibrs_active = hw_ibrs_ibpb_active = hw_ibrs_entry_ok() &&
!hw_ibrs_disable;

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 17, 7:33 PM (22 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41806045
Default Alt Text
D61641.1794944002.diff (1 KB)

Event Timeline