x86: Remove guest registers and cpu_data parameters from apic_mmio_access

The function only works on the current CPU, thus should avoid to take
misleading parameters. The necessary references can be obtained inline.

With the parameters no longer needed, the callers
svm/vmx_handle_apic_access can drop some of them as well.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/hypervisor/arch/x86/apic.c b/hypervisor/arch/x86/apic.c
index 393ec9cfc2a248003432a847207381c768bbdfab..f514943c5f338e78b56d039d94dea63ac6dca040 100644 (file)
--- a/hypervisor/arch/x86/apic.c
+++ b/hypervisor/arch/x86/apic.c
@@ -468,8 +468,7 @@ static bool apic_invalid_lvt_delivery_mode(unsigned int reg, u32 val)
        return true;
 }
 
-unsigned int apic_mmio_access(union registers *guest_regs,
-                             struct per_cpu *cpu_data, unsigned long rip,
+unsigned int apic_mmio_access(unsigned long rip,
                              const struct guest_paging_structures *pg_structs,
                              unsigned int reg, bool is_write)
 {
@@ -485,7 +484,7 @@ unsigned int apic_mmio_access(union registers *guest_regs,
                return 0;
        }
        if (is_write) {
-               val = guest_regs->by_index[inst.reg_num];
+               val = this_cpu_data()->guest_regs.by_index[inst.reg_num];
                if (apic_accessing_reserved_bits(reg, val))
                        return 0;
 
@@ -494,7 +493,7 @@ unsigned int apic_mmio_access(union registers *guest_regs,
                                        apic_ops.read(APIC_REG_ICR_HI)))
                                return 0;
                } else if (reg == APIC_REG_LDR &&
-                        val != 1UL << (cpu_data->cpu_id + XAPIC_DEST_SHIFT)) {
+                        val != 1UL << (this_cpu_id() + XAPIC_DEST_SHIFT)) {
                        panic_printk("FATAL: Unsupported change to LDR: %x\n",
                                     val);
                        return 0;
@@ -512,7 +511,7 @@ unsigned int apic_mmio_access(union registers *guest_regs,
                        apic_ops.write(reg, val);
        } else {
                val = apic_ops.read(reg);
-               guest_regs->by_index[inst.reg_num] = val;
+               this_cpu_data()->guest_regs.by_index[inst.reg_num] = val;
        }
        return inst.inst_len;
 }

diff --git a/hypervisor/arch/x86/include/asm/apic.h b/hypervisor/arch/x86/include/asm/apic.h
index 20a4d9c007dcf1205e9abdb83e32ceba9302676e..9c7ca12b6cde896163b58b552b361a875d823abc 100644 (file)
--- a/hypervisor/arch/x86/include/asm/apic.h
+++ b/hypervisor/arch/x86/include/asm/apic.h
@@ -161,8 +161,7 @@ void apic_send_irq(struct apic_irq_message irq_msg);
 
 void apic_irq_handler(void);
 
-unsigned int apic_mmio_access(union registers *guest_regs,
-                             struct per_cpu *cpu_data, unsigned long rip,
+unsigned int apic_mmio_access(unsigned long rip,
                              const struct guest_paging_structures *pg_structs,
                              unsigned int reg, bool is_write);
 

diff --git a/hypervisor/arch/x86/svm.c b/hypervisor/arch/x86/svm.c
index 098be1e2adcf34e822b8d6bf3fff588d15a4eda3..87db3b351a6449c09d9388c5fe5b0a0d8084db7a 100644 (file)
--- a/hypervisor/arch/x86/svm.c
+++ b/hypervisor/arch/x86/svm.c
@@ -845,8 +845,7 @@ static bool svm_handle_msr_write(union registers *guest_regs,
  * TODO: This handles unaccelerated (non-AVIC) access. AVIC should
  * be treated separately in svm_handle_avic_access().
  */
-static bool svm_handle_apic_access(union registers *guest_regs,
-                                  struct per_cpu *cpu_data)
+static bool svm_handle_apic_access(struct per_cpu *cpu_data)
 {
        struct vmcb *vmcb = &cpu_data->vmcb;
        struct guest_paging_structures pg_structs;
@@ -863,8 +862,8 @@ static bool svm_handle_apic_access(union registers *guest_regs,
        if (!vcpu_get_guest_paging_structs(&pg_structs))
                goto out_err;
 
-       inst_len = apic_mmio_access(guest_regs, cpu_data, vmcb->rip,
-                                   &pg_structs, offset >> 4, is_write);
+       inst_len = apic_mmio_access(vmcb->rip, &pg_structs, offset >> 4,
+                                   is_write);
        if (!inst_len)
                goto out_err;
 
@@ -975,7 +974,7 @@ void vcpu_handle_exit(struct per_cpu *cpu_data)
                     vmcb->exitinfo2 < XAPIC_BASE + PAGE_SIZE) {
                        /* APIC access in non-AVIC mode */
                        cpu_data->stats[JAILHOUSE_CPU_STAT_VMEXITS_XAPIC]++;
-                       if (svm_handle_apic_access(guest_regs, cpu_data))
+                       if (svm_handle_apic_access(cpu_data))
                                return;
                } else {
                        /* General MMIO (IOAPIC, PCI etc) */

diff --git a/hypervisor/arch/x86/vmx.c b/hypervisor/arch/x86/vmx.c
index 0eb58da0a020ff475d82fe1db109da4601edb1fa..b3aa2ca5672cb305046270e3d5408d5eed78768f 100644 (file)
--- a/hypervisor/arch/x86/vmx.c
+++ b/hypervisor/arch/x86/vmx.c
@@ -948,8 +948,7 @@ void vcpu_vendor_set_guest_pat(unsigned long val)
        vmcs_write64(GUEST_IA32_PAT, val);
 }
 
-static bool vmx_handle_apic_access(union registers *guest_regs,
-                                  struct per_cpu *cpu_data)
+static bool vmx_handle_apic_access(void)
 {
        struct guest_paging_structures pg_structs;
        unsigned int inst_len, offset;
@@ -969,8 +968,7 @@ static bool vmx_handle_apic_access(union registers *guest_regs,
                if (!vcpu_get_guest_paging_structs(&pg_structs))
                        break;
 
-               inst_len = apic_mmio_access(guest_regs, cpu_data,
-                                           vmcs_read64(GUEST_RIP),
+               inst_len = apic_mmio_access(vmcs_read64(GUEST_RIP),
                                            &pg_structs, offset >> 4,
                                            is_write);
                if (!inst_len)
@@ -1094,7 +1092,7 @@ void vcpu_handle_exit(struct per_cpu *cpu_data)
                break;
        case EXIT_REASON_APIC_ACCESS:
                cpu_data->stats[JAILHOUSE_CPU_STAT_VMEXITS_XAPIC]++;
-               if (vmx_handle_apic_access(guest_regs, cpu_data))
+               if (vmx_handle_apic_access())
                        return;
                break;
        case EXIT_REASON_XSETBV: