Merge branch 'main' into fix-vmclock-sigsegv

Author: Manciukic

resources/guest_configs/debug.config

@@ -3,3 +3,4 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_KGDB_SERIAL_CONSOLE=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_DWARF4=y
+CONFIG_DEBUG_INFO_BTF=y

src/clippy-tracing/src/main.rs

@@ -128,7 +128,8 @@ macro_rules! create_check_visitor_function {
     ($func_name:ident, $item:ident) => {
         fn $func_name(&mut self, i: &syn::$item) {
             let attr = check_attributes(&i.attrs);
-            if !attr.instrumented && !attr.test && i.sig.constness.is_none() {
+            if !attr.instrumented && !attr.test && i.sig.constness.is_none() && i.sig.abi.is_none()
+            {
                 self.0 = Some(i.span());
             } else {
                 self.visit_block(&i.block);
@@ -162,7 +163,8 @@ macro_rules! create_fix_visitor_function {
         fn $func_name(&mut self, i: &syn::$item) {
             let attr = check_attributes(&i.attrs);
 
-            if !attr.instrumented && !attr.test && i.sig.constness.is_none() {
+            if !attr.instrumented && !attr.test && i.sig.constness.is_none() && i.sig.abi.is_none()
+            {
                 let line = i.span().start().line;
 
                 let attr_string = instrument(&i.sig, self.suffix, self.cfg_attr);

src/clippy-tracing/tests/integration_tests.rs

@@ -407,6 +407,36 @@ mod tests {
     check_file(GIVEN, &path);
 }
 
+#[test]
+fn fix_skips_extern_c_fn() {
+    const GIVEN: &str = "extern \"C\" fn handle_signal() {}\nfn normal() {}";
+    const EXPECTED: &str =
+        "extern \"C\" fn handle_signal() {}\n#[log_instrument::instrument]\nfn normal() {}";
+    fix(GIVEN, EXPECTED, None);
+}
+
+#[test]
+fn check_skips_extern_c_fn() {
+    const GIVEN: &str = "extern \"C\" fn handle_signal() {}";
+    let path = setup(GIVEN);
+    let output = Command::new(BINARY)
+        .args(["--action", "check", "--path", &path])
+        .output()
+        .unwrap();
+    assert_eq!(output.status.code(), Some(0));
+    assert_eq!(output.stdout, []);
+    assert_eq!(output.stderr, []);
+    remove_file(path).unwrap();
+}
+
+#[test]
+fn fix_skips_extern_c_fn_in_impl() {
+    const GIVEN: &str =
+        "struct S;\nimpl S {\n    extern \"C\" fn callback() {}\n    fn normal() {}\n}";
+    const EXPECTED: &str = "struct S;\nimpl S {\n    extern \"C\" fn callback() {}\n    #[log_instrument::instrument]\n    fn normal() {}\n}";
+    fix(GIVEN, EXPECTED, None);
+}
+
 #[test]
 fn readme_custom_suffix() {
     const GIVEN: &str = r#"fn main() {

src/vmm/src/acpi/mod.rs

@@ -247,9 +247,9 @@ mod tests {
         // A mocke Vmm object with 128MBs of memory
         let vmm = default_vmm();
         let mut writer = AcpiTableWriter {
-            mem: vmm.vm.guest_memory(),
+            mem: vmm.vm.as_kvm().unwrap().guest_memory(),
         };
-        let mut resource_allocator = vmm.vm.resource_allocator();
+        let mut resource_allocator = vmm.vm.as_kvm().unwrap().resource_allocator();
 
         // This should succeed
         let mut sdt = MockSdt(vec![0; 4096]);
@@ -309,7 +309,7 @@ mod tests {
     // change in the future.
     #[test]
     fn test_write_acpi_table_small_memory() {
-        let (_, vm) = setup_vm_with_memory(u64_to_usize(SYSTEM_MEM_START + SYSTEM_MEM_SIZE - 4096));
+        let vm = setup_vm_with_memory(u64_to_usize(SYSTEM_MEM_START + SYSTEM_MEM_SIZE - 4096));
         let mut writer = AcpiTableWriter {
             mem: vm.guest_memory(),
         };

src/vmm/src/arch/aarch64/fdt.rs

@@ -564,7 +564,8 @@ mod tests {
     use crate::device_manager::tests::default_device_manager;
     use crate::test_utils::arch_mem;
     use crate::vstate::memory::GuestAddress;
-    use crate::{EventManager, Kvm, Vm};
+    use crate::vstate::vm::KvmVm;
+    use crate::{EventManager, Kvm};
 
     // The `load` function from the `device_tree` will mistakenly check the actual size
     // of the buffer with the allocated size. This works around that.
@@ -581,7 +582,7 @@ mod tests {
         let mut event_manager = EventManager::new().unwrap();
         let mut device_manager = default_device_manager();
         let kvm = Kvm::new(vec![]).unwrap();
-        let vm = Vm::new(&kvm).unwrap();
+        let vm = KvmVm::new(kvm).unwrap();
         let gic = create_gic(vm.fd(), 1, None).unwrap();
         let mut cmdline = kernel_cmdline::Cmdline::new(4096).unwrap();
         cmdline.insert("console", "/dev/tty0").unwrap();
@@ -618,7 +619,7 @@ mod tests {
         let mem = arch_mem(layout::FDT_MAX_SIZE + 0x1000);
         let device_manager = default_device_manager();
         let kvm = Kvm::new(vec![]).unwrap();
-        let vm = Vm::new(&kvm).unwrap();
+        let vm = KvmVm::new(kvm).unwrap();
         let gic = create_gic(vm.fd(), 1, None).unwrap();
 
         let saved_dtb_bytes = match gic.fdt_compatibility() {
@@ -675,7 +676,7 @@ mod tests {
         let mem = arch_mem(layout::FDT_MAX_SIZE + 0x1000);
         let device_manager = default_device_manager();
         let kvm = Kvm::new(vec![]).unwrap();
-        let vm = Vm::new(&kvm).unwrap();
+        let vm = KvmVm::new(kvm).unwrap();
         let gic = create_gic(vm.fd(), 1, None).unwrap();
 
         let saved_dtb_bytes = match gic.fdt_compatibility() {

src/vmm/src/arch/aarch64/mod.rs

@@ -37,7 +37,8 @@ use crate::vstate::memory::{
     Address, Bytes, GuestAddress, GuestMemory, GuestMemoryMmap, GuestRegionType,
 };
 use crate::vstate::vcpu::KvmVcpuError;
-use crate::{DeviceManager, Kvm, Vcpu, VcpuConfig, Vm, logger};
+use crate::vstate::vm::KvmVm;
+use crate::{DeviceManager, Kvm, Vcpu, VcpuConfig, logger};
 
 /// Errors thrown while configuring aarch64 system.
 #[derive(Debug, thiserror::Error, displaydoc::Display)]
@@ -92,7 +93,7 @@ pub fn arch_memory_regions(size: usize) -> Vec<(GuestAddress, usize)> {
 #[allow(clippy::too_many_arguments)]
 pub fn configure_system_for_boot(
     kvm: &Kvm,
-    vm: &Vm,
+    vm: &KvmVm,
     device_manager: &mut DeviceManager,
     vcpus: &mut [Vcpu],
     machine_config: &MachineConfig,

src/vmm/src/arch/aarch64/vcpu.rs

@@ -26,7 +26,7 @@ use crate::vcpu::{VcpuConfig, VcpuError};
 use crate::vstate::bus::Bus;
 use crate::vstate::memory::{Address, GuestMemoryMmap};
 use crate::vstate::vcpu::VcpuEmulation;
-use crate::vstate::vm::Vm;
+use crate::vstate::vm::KvmVm;
 
 /// Errors thrown while setting aarch64 registers.
 #[derive(Debug, PartialEq, Eq, thiserror::Error, displaydoc::Display)]
@@ -133,7 +133,7 @@ impl KvmVcpu {
     ///
     /// * `index` - Represents the 0-based CPU index between [0, max vcpus).
     /// * `vm` - The vm to which this vcpu will get attached.
-    pub fn new(index: u8, vm: &Vm) -> Result<Self, KvmVcpuError> {
+    pub fn new(index: u8, vm: &KvmVm) -> Result<Self, KvmVcpuError> {
         let kvm_vcpu = vm
             .fd()
             .create_vcpu(index.into())
@@ -561,27 +561,25 @@ mod tests {
     use crate::cpu_config::templates::RegisterValueFilter;
     use crate::test_utils::arch_mem;
     use crate::vcpu::VcpuConfig;
-    use crate::vstate::kvm::Kvm;
-    use crate::vstate::vm::Vm;
     use crate::vstate::vm::tests::setup_vm_with_memory;
 
-    fn setup_vcpu(mem_size: usize) -> (Kvm, Vm, KvmVcpu) {
-        let (kvm, mut vm, mut vcpu) = setup_vcpu_no_init(mem_size);
+    fn setup_vcpu(mem_size: usize) -> (KvmVm, KvmVcpu) {
+        let (mut vm, mut vcpu) = setup_vcpu_no_init(mem_size);
         vcpu.init(&[]).unwrap();
         vm.setup_irqchip(1).unwrap();
-        (kvm, vm, vcpu)
+        (vm, vcpu)
     }
 
-    fn setup_vcpu_no_init(mem_size: usize) -> (Kvm, Vm, KvmVcpu) {
-        let (kvm, vm) = setup_vm_with_memory(mem_size);
+    fn setup_vcpu_no_init(mem_size: usize) -> (KvmVm, KvmVcpu) {
+        let vm = setup_vm_with_memory(mem_size);
         let vcpu = KvmVcpu::new(0, &vm).unwrap();
 
-        (kvm, vm, vcpu)
+        (vm, vcpu)
     }
 
     #[test]
     fn test_create_vcpu() {
-        let (_, vm) = setup_vm_with_memory(0x1000);
+        let vm = setup_vm_with_memory(0x1000);
 
         unsafe { libc::close(vm.fd().as_raw_fd()) };
 
@@ -600,8 +598,8 @@ mod tests {
 
     #[test]
     fn test_configure_vcpu() {
-        let (kvm, vm, mut vcpu) = setup_vcpu(0x10000);
-        let optional_capabilities = kvm.optional_capabilities();
+        let (vm, mut vcpu) = setup_vcpu(0x10000);
+        let optional_capabilities = vm.kvm().optional_capabilities();
 
         let vcpu_config = VcpuConfig {
             vcpu_count: 1,
@@ -649,7 +647,7 @@ mod tests {
 
     #[test]
     fn test_init_vcpu() {
-        let (_, mut vm) = setup_vm_with_memory(0x1000);
+        let mut vm = setup_vm_with_memory(0x1000);
         let mut vcpu = KvmVcpu::new(0, &vm).unwrap();
         vm.setup_irqchip(1).unwrap();
 
@@ -668,7 +666,7 @@ mod tests {
 
     #[test]
     fn test_pmu_v3_feature_invalid() {
-        let (_, mut vm) = setup_vm_with_memory(0x1000);
+        let mut vm = setup_vm_with_memory(0x1000);
         let mut vcpu = KvmVcpu::new(0, &vm).unwrap();
         vm.setup_irqchip(1).unwrap();
 
@@ -688,7 +686,7 @@ mod tests {
 
     #[test]
     fn test_vcpu_save_restore_state() {
-        let (_, mut vm) = setup_vm_with_memory(0x1000);
+        let mut vm = setup_vm_with_memory(0x1000);
         let mut vcpu = KvmVcpu::new(0, &vm).unwrap();
         vm.setup_irqchip(1).unwrap();
 
@@ -732,7 +730,7 @@ mod tests {
         //
         // This should fail with ENOEXEC.
         // https://elixir.bootlin.com/linux/v5.10.176/source/arch/arm64/kvm/arm.c#L1165
-        let (_, mut vm) = setup_vm_with_memory(0x1000);
+        let mut vm = setup_vm_with_memory(0x1000);
         let vcpu = KvmVcpu::new(0, &vm).unwrap();
         vm.setup_irqchip(1).unwrap();
 
@@ -742,7 +740,7 @@ mod tests {
     #[test]
     fn test_dump_cpu_config_after_init() {
         // Test `dump_cpu_config()` after `KVM_VCPU_INIT`.
-        let (_, mut vm) = setup_vm_with_memory(0x1000);
+        let mut vm = setup_vm_with_memory(0x1000);
         let mut vcpu = KvmVcpu::new(0, &vm).unwrap();
         vm.setup_irqchip(1).unwrap();
         vcpu.init(&[]).unwrap();
@@ -752,7 +750,7 @@ mod tests {
 
     #[test]
     fn test_setup_non_boot_vcpu() {
-        let (_, vm) = setup_vm_with_memory(0x1000);
+        let vm = setup_vm_with_memory(0x1000);
         let mut vcpu1 = KvmVcpu::new(0, &vm).unwrap();
         vcpu1.init(&[]).unwrap();
         let mut vcpu2 = KvmVcpu::new(1, &vm).unwrap();
@@ -764,24 +762,24 @@ mod tests {
         // Test `get_regs()` with valid register IDs.
         // - X0: 0x6030 0000 0010 0000
         // - X1: 0x6030 0000 0010 0002
-        let (_, _, vcpu) = setup_vcpu(0x10000);
+        let (_, vcpu) = setup_vcpu(0x10000);
         let reg_list = Vec::<u64>::from([0x6030000000100000, 0x6030000000100002]);
         get_registers(&vcpu.fd, &reg_list, &mut Aarch64RegisterVec::default()).unwrap();
     }
 
     #[test]
     fn test_get_invalid_regs() {
         // Test `get_regs()` with invalid register IDs.
-        let (_, _, vcpu) = setup_vcpu(0x10000);
+        let (_, vcpu) = setup_vcpu(0x10000);
         let reg_list = Vec::<u64>::from([0x6030000000100001, 0x6030000000100003]);
         get_registers(&vcpu.fd, &reg_list, &mut Aarch64RegisterVec::default()).unwrap_err();
     }
 
     #[test]
     fn test_setup_regs() {
-        let (kvm, _, vcpu) = setup_vcpu_no_init(0x10000);
+        let (vm, vcpu) = setup_vcpu_no_init(0x10000);
         let mem = arch_mem(layout::FDT_MAX_SIZE + 0x1000);
-        let optional_capabilities = kvm.optional_capabilities();
+        let optional_capabilities = vm.kvm().optional_capabilities();
 
         let res = vcpu.setup_boot_regs(0x0, &mem, &optional_capabilities);
         assert!(matches!(
@@ -816,7 +814,7 @@ mod tests {
 
     #[test]
     fn test_read_mpidr() {
-        let (_, _, vcpu) = setup_vcpu_no_init(0x10000);
+        let (_, vcpu) = setup_vcpu_no_init(0x10000);
 
         // Must fail when vcpu is not initialized yet.
         let res = vcpu.get_mpidr();
@@ -831,7 +829,7 @@ mod tests {
 
     #[test]
     fn test_get_set_regs() {
-        let (_, _, vcpu) = setup_vcpu_no_init(0x10000);
+        let (_, vcpu) = setup_vcpu_no_init(0x10000);
 
         // Must fail when vcpu is not initialized yet.
         let mut regs = Aarch64RegisterVec::default();
@@ -849,7 +847,7 @@ mod tests {
     fn test_mpstate() {
         use std::os::unix::io::AsRawFd;
 
-        let (_, _, vcpu) = setup_vcpu(0x10000);
+        let (_, vcpu) = setup_vcpu(0x10000);
 
         let res = vcpu.get_mpstate();
         vcpu.set_mpstate(res.unwrap()).unwrap();