@@ -158,6 +158,8 @@ pub enum VcpuExit<'a> {
158
158
X86Rdmsr ( ReadMsrExit < ' a > ) ,
159
159
/// Corresponds to KVM_EXIT_X86_WRMSR.
160
160
X86Wrmsr ( WriteMsrExit < ' a > ) ,
161
+ /// Corresponds to KVM_EXIT_X86_BUS_LOCK.
162
+ X86BusLock ,
161
163
/// Corresponds to an exit reason that is unknown from the current version
162
164
/// of the kvm-ioctls crate. Let the consumer decide about what to do with
163
165
/// it.
@@ -1544,6 +1546,7 @@ impl VcpuFd {
1544
1546
Ok ( VcpuExit :: IoapicEoi ( eoi. vector ) )
1545
1547
}
1546
1548
KVM_EXIT_HYPERV => Ok ( VcpuExit :: Hyperv ) ,
1549
+ KVM_EXIT_X86_BUS_LOCK => Ok ( VcpuExit :: X86BusLock ) ,
1547
1550
r => Ok ( VcpuExit :: Unsupported ( r) ) ,
1548
1551
}
1549
1552
} else {
@@ -1823,6 +1826,19 @@ impl VcpuFd {
1823
1826
_ => Err ( errno:: Error :: last ( ) ) ,
1824
1827
}
1825
1828
}
1829
+
1830
+ /// If [`Cap::X86BusLockExit`](crate::Cap::X86BusLockExit) was enabled,
1831
+ /// checks whether a bus lock was detected on the last VM exit. This may
1832
+ /// return `true` even if the corresponding exit was not
1833
+ /// [`VcpuExit::X86BusLock`], as a different VM exit may have preempted
1834
+ /// it.
1835
+ ///
1836
+ /// See the API documentation for `KVM_CAP_X86_BUS_LOCK_EXIT`.
1837
+ #[ cfg( any( target_arch = "x86" , target_arch = "x86_64" ) ) ]
1838
+ pub fn bus_lock_detected ( & self ) -> bool {
1839
+ let kvm_run = self . kvm_run_ptr . as_ref ( ) ;
1840
+ kvm_run. flags as u32 & KVM_RUN_X86_BUS_LOCK != 0
1841
+ }
1826
1842
}
1827
1843
1828
1844
/// Helper function to create a new `VcpuFd`.
@@ -3049,4 +3065,39 @@ mod tests {
3049
3065
e => panic ! ( "Unexpected exit: {:?}" , e) ,
3050
3066
}
3051
3067
}
3068
+
3069
+ #[ cfg( any( target_arch = "x86" , target_arch = "x86_64" ) ) ]
3070
+ #[ test]
3071
+ fn test_enable_bus_lock_detection ( ) {
3072
+ let kvm = Kvm :: new ( ) . unwrap ( ) ;
3073
+ let vm = kvm. create_vm ( ) . unwrap ( ) ;
3074
+ if !vm. check_extension ( Cap :: X86BusLockExit ) {
3075
+ return ;
3076
+ }
3077
+ let args = KVM_BUS_LOCK_DETECTION_EXIT ;
3078
+ let cap = kvm_enable_cap {
3079
+ cap : Cap :: X86BusLockExit as u32 ,
3080
+ args : [ args as u64 , 0 , 0 , 0 ] ,
3081
+ ..Default :: default ( )
3082
+ } ;
3083
+ vm. enable_cap ( & cap) . unwrap ( ) ;
3084
+ }
3085
+
3086
+ #[ cfg( any( target_arch = "x86" , target_arch = "x86_64" ) ) ]
3087
+ #[ test]
3088
+ fn test_enable_bus_lock_detection_invalid ( ) {
3089
+ let kvm = Kvm :: new ( ) . unwrap ( ) ;
3090
+ let vm = kvm. create_vm ( ) . unwrap ( ) ;
3091
+ if !vm. check_extension ( Cap :: X86BusLockExit ) {
3092
+ return ;
3093
+ }
3094
+ // These flags should be mutually exclusive
3095
+ let args = KVM_BUS_LOCK_DETECTION_OFF | KVM_BUS_LOCK_DETECTION_EXIT ;
3096
+ let cap = kvm_enable_cap {
3097
+ cap : Cap :: X86BusLockExit as u32 ,
3098
+ args : [ args as u64 , 0 , 0 , 0 ] ,
3099
+ ..Default :: default ( )
3100
+ } ;
3101
+ vm. enable_cap ( & cap) . unwrap_err ( ) ;
3102
+ }
3052
3103
}
0 commit comments