commit 0cbd7a33957e5863c91554f61f814297765849b8
author J-Alves <joao.alves@arm.com> Mon Feb 10 17:29:15 2025 +0000
committer Joao Alves <joao.alves@arm.com> Mon Mar 17 13:22:09 2025 +0100
tree 9ceb6226b00dd5570657124f396e6394a46fd7f8
parent ce42f7a064331afa0fb6e660dcee38d9d572c1b7

feat(interrupts): report CPU cycles to scheduler

Extend the FFA_NOTIFICATION_INFO_GET to include the
partition ID and vCPU IDs due to pending interrupt while
in the waiting state.

Drop the previous implementation of the same feature for
the IPI feature in Hafnium.
Partitions which need CPU due to IPI and interrupts due
to SRI policy configuration are reported in the same
function, and leveraging the same state structure,
to track whether the information has been retrieved via
FFA_NOTIFICATION_INFO_GET.

Change-Id: I39c1709dd7b63bf01c474cf4e7683f45e245908e
Signed-off-by: J-Alves <joao.alves@arm.com>

src/vm_test.cc

diff --git a/src/vm_test.cc b/src/vm_test.cc
index 97f5b74..0896da5 100644
--- a/src/vm_test.cc
+++ b/src/vm_test.cc
@@ -852,6 +852,7 @@
 
 	vcpu_locked = vcpu_lock(target_vcpu);
 	vcpu_virt_interrupt_inject(vcpu_locked, HF_IPI_INTID);
+	vcpu_virt_interrupt_enable(vcpu_locked, HF_IPI_INTID, true);
 	vcpu_unlock(&vcpu_locked);
 
 	vm_notifications_info_get_pending(current_vm_locked, is_from_vm, ids,
@@ -874,7 +875,7 @@
 	EXPECT_EQ(lists_sizes[0], 1);
 	EXPECT_EQ(ids[0], current_vm->id);
 	EXPECT_EQ(ids[1], 1);
-	EXPECT_EQ(target_vcpu->ipi_info_get_retrieved, true);
+	EXPECT_EQ(target_vcpu->interrupts_info_get_retrieved, true);
 
 	/* Check it is not retrieved multiple times. */
 	current_state = INIT;
@@ -892,6 +893,14 @@
 	EXPECT_EQ(lists_count, 0);
 	EXPECT_EQ(lists_sizes[0], 0);
 
+	vcpu_locked = vcpu_lock(target_vcpu);
+
+	EXPECT_EQ(vcpu_virt_interrupt_get_pending_and_enabled(vcpu_locked),
+		  HF_IPI_INTID);
+	EXPECT_FALSE(vcpu_locked.vcpu->interrupts_info_get_retrieved);
+
+	vcpu_unlock(&vcpu_locked);
+
 	vm_unlock(&current_vm_locked);
 }
 
@@ -920,6 +929,7 @@
 
 	vcpu_locked = vcpu_lock(target_vcpu);
 	vcpu_virt_interrupt_inject(vcpu_locked, HF_IPI_INTID);
+	vcpu_virt_interrupt_enable(vcpu_locked, HF_IPI_INTID, true);
 	vcpu_unlock(&vcpu_locked);
 
 	vm_notifications_partition_set_pending(current_vm_locked, is_from_vm,
@@ -934,7 +944,7 @@
 	EXPECT_EQ(lists_sizes[0], 1);
 	EXPECT_EQ(ids[0], current_vm->id);
 	EXPECT_EQ(ids[1], 1);
-	EXPECT_EQ(target_vcpu->ipi_info_get_retrieved, true);
+	EXPECT_EQ(target_vcpu->interrupts_info_get_retrieved, true);
 
 	/* Reset the state and values. */
 	current_state = INIT;
@@ -952,6 +962,11 @@
 	EXPECT_EQ(lists_count, 0);
 	EXPECT_EQ(lists_sizes[0], 0);
 
+	vcpu_locked = vcpu_lock(target_vcpu);
+	EXPECT_EQ(vcpu_virt_interrupt_get_pending_and_enabled(vcpu_locked),
+		  HF_IPI_INTID);
+	vcpu_unlock(&vcpu_locked);
+
 	vm_unlock(&current_vm_locked);
 }
 
@@ -984,6 +999,7 @@
 
 	vcpu_locked = vcpu_lock(target_vcpu);
 	vcpu_virt_interrupt_inject(vcpu_locked, HF_IPI_INTID);
+	vcpu_virt_interrupt_enable(vcpu_locked, HF_IPI_INTID, true);
 	vcpu_unlock(&vcpu_locked);
 
 	for (unsigned int i = 1; i < vcpu_count; i++) {
@@ -1014,6 +1030,80 @@
 	EXPECT_EQ(ids[4], current_vm->id);
 	EXPECT_EQ(ids[5], 3);
 
+	vcpu_locked = vcpu_lock(target_vcpu);
+	EXPECT_EQ(vcpu_virt_interrupt_get_pending_and_enabled(vcpu_locked),
+		  HF_IPI_INTID);
+	vcpu_unlock(&vcpu_locked);
+
 	vm_unlock(&current_vm_locked);
 }
+
+TEST_F(vm, pending_interrupts_info_retrieved)
+{
+	struct_vm *test_vm = vm_find_index(4);
+	struct_vcpu *vcpu = vm_get_vcpu(test_vm, 1);
+	const uint32_t intid = HF_NUM_INTIDS - 2;
+	struct vm_locked test_vm_locked;
+	struct vcpu_locked vcpu_locked;
+
+	/*
+	 *
+	 * Following set of variables that are also expected to be used when
+	 * handling ffa_notification_info_get.
+	 * For this 'ids_count' has been initialized such that it indicates
+	 * there is no space in the list for a per-vCPU notification (VM ID and
+	 * VCPU ID).
+	 */
+	uint16_t ids[FFA_NOTIFICATIONS_INFO_GET_MAX_IDS] = {0};
+	uint32_t ids_count = 0;
+	uint32_t lists_sizes[FFA_NOTIFICATIONS_INFO_GET_MAX_IDS] = {0};
+	uint32_t lists_count = 0;
+	enum notifications_info_get_state current_state = INIT;
+
+	/*
+	 * Make it such the FF-A and vCPU ID are included in the list,
+	 * when invoking notification info get.
+	 */
+	test_vm->sri_policy.intr_while_waiting = true;
+
+	vcpu_locked = vcpu_lock(vcpu);
+
+	/* Check this is starting from a clean state. */
+	EXPECT_EQ(vcpu_virt_interrupt_count_get(vcpu_locked), 0);
+	EXPECT_FALSE(vcpu->interrupts_info_get_retrieved);
+
+	/* Enable and get pending. */
+	vcpu_virt_interrupt_enable(vcpu_locked, intid, true);
+
+	vcpu_virt_interrupt_inject(vcpu_locked, intid);
+
+	vcpu->state = VCPU_STATE_WAITING;
+
+	EXPECT_EQ(vcpu_virt_interrupt_count_get(vcpu_locked), 1);
+
+	/* Free resource. */
+	vcpu_unlock(&vcpu_locked);
+
+	test_vm_locked = vm_lock(test_vm);
+
+	vm_notifications_info_get_pending(test_vm_locked, true, ids, &ids_count,
+					  lists_sizes, &lists_count,
+					  FFA_NOTIFICATIONS_INFO_GET_MAX_IDS,
+					  &current_state);
+
+	/* Assert the information flag as been retrieved. */
+	EXPECT_TRUE(vcpu->interrupts_info_get_retrieved);
+
+	vm_unlock(&test_vm_locked);
+
+	/*  Pop to clear test and attest intid is returned. */
+	vcpu_locked = vcpu_lock(vcpu);
+
+	EXPECT_EQ(vcpu_virt_interrupt_get_pending_and_enabled(vcpu_locked),
+		  intid);
+
+	EXPECT_FALSE(vcpu_locked.vcpu->interrupts_info_get_retrieved);
+
+	vcpu_unlock(&vcpu_locked);
+}
 } /* namespace */