@@ -377,6 +377,42 @@ static int savic_probe(void)
return 1;
}
+static inline bool is_vector_level_trig(unsigned int cpu, unsigned int vector)
+{
+ unsigned long *reg = get_reg_bitmap(cpu, APIC_TMR);
+ unsigned int bit = get_vec_bit(vector);
+
+ return test_bit(bit, reg);
+}
+
+static void savic_eoi(void)
+{
+ unsigned int cpu;
+ int vec;
+
+ cpu = raw_smp_processor_id();
+ vec = apic_find_highest_vector(get_reg_bitmap(cpu, APIC_ISR));
+ if (WARN_ONCE(vec == -1, "EOI write while no active interrupt in APIC_ISR"))
+ return;
+
+ if (is_vector_level_trig(cpu, vec)) {
+ update_vector(cpu, APIC_ISR, vec, false);
+ /*
+ * Propagate the EOI write to hv for level-triggered interrupts.
+ * Return to guest from GHCB protocol event takes care of
+ * re-evaluating interrupt state.
+ */
+ savic_ghcb_msr_write(APIC_EOI, 0);
+ } else {
+ /*
+ * Hardware clears APIC_ISR and re-evaluates the interrupt state
+ * to determine if there is any pending interrupt which can be
+ * delivered to CPU.
+ */
+ native_apic_msr_eoi();
+ }
+}
+
static struct apic apic_x2apic_savic __ro_after_init = {
.name = "secure avic x2apic",
@@ -407,7 +443,7 @@ static struct apic apic_x2apic_savic __ro_after_init = {
.read = savic_read,
.write = savic_write,
- .eoi = native_apic_msr_eoi,
+ .eoi = savic_eoi,
.icr_read = native_x2apic_icr_read,
.icr_write = savic_icr_write,
Secure AVIC accelerates guest's EOI msr writes for edge-triggered interrupts. For level-triggered interrupts, EOI msr writes trigger VC exception with SVM_EXIT_AVIC_UNACCELERATED_ACCESS error code. The VC handler would need to trigger a GHCB protocol MSR write event to notify the Hypervisor about completion of the level-triggered interrupt. This is required for cases like emulated IOAPIC. VC exception handling adds extra performance overhead for APIC register write. In addition, some unaccelerated APIC register msr writes are trapped, whereas others are faulted. This results in additional complexity in VC exception handling for unacclerated accesses. So, directly do a GHCB protocol based EOI write from apic->eoi() callback for level-triggered interrupts. Use wrmsr for edge-triggered interrupts, so that hardware re-evaluates any pending interrupt which can be delivered to guest vCPU. For level- triggered interrupts, re-evaluation happens on return from VMGEXIT corresponding to the GHCB event for EOI msr write. Signed-off-by: Neeraj Upadhyay <Neeraj.Upadhyay@amd.com> --- Changes since v3: - Removed KVM updates and moved to separate patch. - Rename callback to savic_eoi(). - Changed test_vector() to is_vector_level_trig(), as there is a single user of that. arch/x86/kernel/apic/x2apic_savic.c | 38 ++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-)