hv: vlapic: wrap APICv accept interrupt API

The APICv ops is decided once the APICv feature on the physical platform is detected.
We will use apicv_advanced_ops if the physical platform support fully APICv feature;
otherwise, we will use apicv_basic_ops.
This patch only wrap the accept interrupt API for them.

Tracked-On: #1842
Signed-off-by: Li, Fei1 <fei1.li@intel.com>

hypervisor/arch/x86/cpu_caps.c

@@ -165,6 +165,8 @@ static void detect_apicv_cap(void)
 	}
 
 	cpu_caps.apicv_features = features;
+
+	vlapic_set_apicv_ops();
 }
 
 static void detect_vmx_mmu_cap(void)

hypervisor/arch/x86/guest/vlapic.c

@@ -87,6 +87,8 @@ static inline void vlapic_dump_irr(__unused const struct acrn_vlapic *vlapic, __
 static inline void vlapic_dump_isr(__unused const struct acrn_vlapic *vlapic, __unused const char *msg) {}
 #endif
 
+static const struct acrn_apicv_ops *apicv_ops;
+
 static int32_t
 apicv_set_intr_ready(struct acrn_vlapic *vlapic, uint32_t vector);
 
@@ -489,62 +491,63 @@ vlapic_reset_tmr(struct acrn_vlapic *vlapic)
 	vcpu_reset_eoi_exit_bitmaps(vlapic->vcpu);
 }
 
-/*
+static void apicv_basic_accept_intr(struct acrn_vlapic *vlapic, uint32_t vector, bool level)
- * Returns 1 if the vcpu needs to be notified of the interrupt and 0 otherwise.
- * @pre vector >= 16
- */
-static bool
-vlapic_accept_intr(struct acrn_vlapic *vlapic, uint32_t vector, bool level)
 {
 	struct lapic_regs *lapic;
 	struct lapic_reg *irrptr;
 	uint32_t idx;
-	int32_t pending_intr;
-	bool ret = true;
 
-	ASSERT(vector <= NR_MAX_VECTOR,
+	lapic = &(vlapic->apic_page);
-		"invalid vector %u", vector);
+	idx = vector >> 5U;
+	irrptr = &lapic->irr[0];
+
+	/* If the interrupt is set, don't try to do it again */
+	if (!bitmap32_test_and_set_lock((uint16_t)(vector & 0x1fU), &irrptr[idx].v)) {
+		/* set tmr if corresponding irr bit changes from 0 to 1 */
+		vlapic_set_tmr(vlapic, vector, level);
+		vcpu_make_request(vlapic->vcpu, ACRN_REQUEST_EVENT);
+	}
+}
+
+static void apicv_advanced_accept_intr(struct acrn_vlapic *vlapic, uint32_t vector, bool level)
+{
+	int32_t pending_intr = apicv_set_intr_ready(vlapic, vector);
+
+	vlapic_set_tmr(vlapic, vector, level);
+
+	if (pending_intr != 0) {
+		/*
+		 * Send interrupt to vCPU via posted interrupt way:
+		 * 1. If target vCPU is in root mode(isn't running),
+		 *    record this request as ACRN_REQUEST_EVENT,then
+		 *    will pick up the interrupt from PIR and inject
+		 *    it to vCPU in next vmentry.
+		 * 2. If target vCPU is in non-root mode(running),
+		 *    send PI notification to vCPU and hardware will
+		 *    sync PIR to vIRR automatically.
+		 */
+		bitmap_set_lock(ACRN_REQUEST_EVENT, &vlapic->vcpu->arch.pending_req);
+
+		if (get_cpu_id() != vlapic->vcpu->pcpu_id) {
+			apicv_post_intr(vlapic->vcpu->pcpu_id);
+		}
+	}
+}
+
+/*
+ * @pre vector >= 16
+ */
+static void vlapic_accept_intr(struct acrn_vlapic *vlapic, uint32_t vector, bool level)
+{
+	struct lapic_regs *lapic;
+	ASSERT(vector <= NR_MAX_VECTOR, "invalid vector %u", vector);
 
 	lapic = &(vlapic->apic_page);
 	if ((lapic->svr.v & APIC_SVR_ENABLE) == 0U) {
 		dev_dbg(ACRN_DBG_LAPIC, "vlapic is software disabled, ignoring interrupt %u", vector);
-		ret = false;
-	} else if (is_apicv_advanced_feature_supported()) {
-		pending_intr = apicv_set_intr_ready(vlapic, vector);
-
-		vlapic_set_tmr(vlapic, vector, level);
-
-		if ((pending_intr != 0) && (get_cpu_id() != vlapic->vcpu->pcpu_id)) {
-			/*
-			 * Send interrupt to vCPU via posted interrupt way:
-			 * 1. If target vCPU is in non-root mode(running),
-			 *    send PI notification to vCPU and hardware will
-			 *    sync PIR to vIRR automatically.
-			 * 2. If target vCPU is in root mode(isn't running),
-			 *    record this request as ACRN_REQUEST_EVENT,then
-			 *    will pick up the interrupt from PIR and inject
-			 *    it to vCPU in next vmentry.
-			 */
-			bitmap_set_lock(ACRN_REQUEST_EVENT, &vlapic->vcpu->arch.pending_req);
-			apicv_post_intr(vlapic->vcpu->pcpu_id);
-			ret = false;
-		} else {
-			ret = (pending_intr != 0);
-		}
 	} else {
-		idx = vector >> 5U;
+		apicv_ops->accept_intr(vlapic, vector, level);
-
-		irrptr = &lapic->irr[0];
-		/* If the interrupt is set, don't try to do it again */
-		if (bitmap32_test_and_set_lock((uint16_t)(vector & 0x1fU), &irrptr[idx].v)) {
-			ret = false;
-		} else {
-			/* set tmr if corresponding irr bit changes from 0 to 1 */
-			vlapic_set_tmr(vlapic, vector, level);
-		}
 	}
-
-	return ret;
 }
 
 /**
@@ -947,9 +950,7 @@ vlapic_set_error(struct acrn_vlapic *vlapic, uint32_t mask)
 		if ((lvt & APIC_LVT_M) == 0U) {
 			vec = lvt & APIC_LVT_VECTOR;
 			if (vec >= 16U) {
-				if (vlapic_accept_intr(vlapic, vec, LAPIC_TRIG_EDGE)) {
+				vlapic_accept_intr(vlapic, vec, LAPIC_TRIG_EDGE);
-					vcpu_make_request(vlapic->vcpu, ACRN_REQUEST_EVENT);
-				}
 			}
 		}
 		vlapic->esr_firing = 0;
@@ -1858,9 +1859,7 @@ vlapic_set_intr(struct acrn_vcpu *vcpu, uint32_t vector, bool level)
 		dev_dbg(ACRN_DBG_LAPIC,
 		    "vlapic ignoring interrupt to vector %u", vector);
 	} else {
-		if (vlapic_accept_intr(vlapic, vector, level)) {
+		vlapic_accept_intr(vlapic, vector, level);
-			vcpu_make_request(vcpu, ACRN_REQUEST_EVENT);
-		}
 	}
 }
 
@@ -2459,3 +2458,23 @@ int32_t tpr_below_threshold_vmexit_handler(struct acrn_vcpu *vcpu)
 
 	return 0;
 }
+
+static const struct acrn_apicv_ops apicv_basic_ops = {
+	.accept_intr = apicv_basic_accept_intr,
+};
+
+static const struct acrn_apicv_ops apicv_advanced_ops = {
+	.accept_intr = apicv_advanced_accept_intr,
+};
+
+/*
+ * set apicv ops for apicv basic mode or apicv advenced mode.
+ */
+void vlapic_set_apicv_ops(void)
+{
+	if (is_apicv_advanced_feature_supported()) {
+		apicv_ops = &apicv_advanced_ops;
+	} else {
+		apicv_ops = &apicv_basic_ops;
+	}
+}

hypervisor/arch/x86/guest/vlapic_priv.h

@@ -82,4 +82,8 @@
 #define APIC_OFFSET_TIMER_DCR	0x3E0U	/* Timer's Divide Configuration	*/
 #define APIC_OFFSET_SELF_IPI    0x3F0U  /* Self IPI Register */
 
+struct acrn_apicv_ops {
+	void (*accept_intr)(struct acrn_vlapic *vlapic, uint32_t vector, bool level);
+};
+
 #endif /* VLAPIC_PRIV_H */

hypervisor/include/arch/x86/guest/vlapic.h

@@ -110,6 +110,7 @@ struct acrn_vlapic {
 	uint32_t	lvt_last[VLAPIC_MAXLVT_INDEX + 1];
 } __aligned(PAGE_SIZE);
 
+void vlapic_set_apicv_ops(void);
 
 /**
  * @brief virtual LAPIC