commit a101911c9280a0a349006a74b25d28d6b32c2cb8
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> Tue Jun 21 18:57:44 2022 -0500
committer Madhukar Pappireddy <madhukar.pappireddy@arm.com> Mon Oct 03 08:48:07 2022 -0500
tree 5e379909a0c3c3867c22e0a9e33164a258122511
parent 469fa71d9cabc6434c52331e4b8d9f58c403a2c8

feat(interrupt): clear pending managed exit state

A SP may be signaled a managed exit but actually not trap
the virtual interrupt, probably because it has virtual
interrupts masked, and emit direct resp. In this case the
managed exit operation is considered completed and it would
also need to clear the pending managed exit flag for the SP
vCPU.

Change-Id: I5d6568a295a39bf51e87f20b10e08bd878d35eeb
Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>

src/api.c

diff --git a/src/api.c b/src/api.c
index d78f6ee..568d371 100644
--- a/src/api.c
+++ b/src/api.c
@@ -2178,6 +2178,14 @@
 	return 0;
 }
 
+static void api_interrupt_clear_decrement(struct vcpu_locked locked_vcpu,
+					  struct interrupts *interrupts,
+					  uint32_t intid)
+{
+	vcpu_virt_interrupt_clear_pending(interrupts, intid);
+	vcpu_interrupt_count_decrement(locked_vcpu, interrupts, intid);
+}
+
 /**
  * Returns the ID of the next pending interrupt for the calling vCPU, and
  * acknowledges it (i.e. marks it as no longer pending). Returns
@@ -2209,10 +2217,7 @@
 			/*
 			 * Mark it as no longer pending and decrement the count.
 			 */
-			vcpu_virt_interrupt_clear_pending(interrupts,
-							  first_interrupt);
-
-			vcpu_interrupt_count_decrement(
+			api_interrupt_clear_decrement(
 				current_locked, interrupts, first_interrupt);
 			break;
 		}
@@ -2689,7 +2694,23 @@
 		CHECK(!current->processing_secure_interrupt);
 
 		plat_interrupts_set_priority_mask(current->priority_mask);
+		/*
+		 * A SP may be signaled a managed exit but actually not trap
+		 * the virtual interrupt, probably because it has virtual
+		 * interrupts masked, and emit direct resp. In this case the
+		 * managed exit operation is considered completed and it would
+		 * also need to clear the pending managed exit flag for the SP
+		 * vCPU.
+		 */
 		current->processing_managed_exit = false;
+		struct interrupts *interrupts = &current->interrupts;
+
+		if (vcpu_is_virt_interrupt_pending(interrupts,
+						   HF_MANAGED_EXIT_INTID)) {
+			api_interrupt_clear_decrement(current_locked,
+						      interrupts,
+						      HF_MANAGED_EXIT_INTID);
+		}
 	}
 
 	/* Clear direct request origin for the caller. */