Skip to content

Commit 9239f89

Browse files
jepiogregkh
authored andcommitted
crypto: ccp - Clear PSP interrupt status register before calling handler
[ Upstream commit 45121ad ] The PSP IRQ is edge-triggered (MSI or MSI-X) in all cases supported by the psp module so clear the interrupt status register early in the handler to prevent missed interrupts. sev_irq_handler() calls wake_up() on a wait queue, which can result in a new command being submitted from a different CPU. This then races with the clearing of isr and can result in missed interrupts. A missed interrupt results in a command waiting until it times out, which results in the psp being declared dead. This is unlikely on bare metal, but has been observed when running virtualized. In the cases where this is observed, sev->cmdresp_reg has PSP_CMDRESP_RESP set which indicates that the command was processed correctly but no interrupt was asserted. The full sequence of events looks like this: CPU 1: submits SEV cmd #1 CPU 1: calls wait_event_timeout() CPU 0: enters psp_irq_handler() CPU 0: calls sev_handler()->wake_up() CPU 1: wakes up; finishes processing cmd #1 CPU 1: submits SEV cmd #2 CPU 1: calls wait_event_timeout() PSP: finishes processing cmd #2; interrupt status is still set; no interrupt CPU 0: clears intsts CPU 0: exits psp_irq_handler() CPU 1: wait_event_timeout() times out; psp_dead=true Fixes: 200664d ("crypto: ccp: Add Secure Encrypted Virtualization (SEV) command support") Cc: stable@vger.kernel.org Signed-off-by: Jeremi Piotrowski <jpiotrowski@linux.microsoft.com> Acked-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent add6627 commit 9239f89

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/crypto/ccp/psp-dev.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ static irqreturn_t psp_irq_handler(int irq, void *data)
4242
/* Read the interrupt status: */
4343
status = ioread32(psp->io_regs + psp->vdata->intsts_reg);
4444

45+
/* Clear the interrupt status by writing the same value we read. */
46+
iowrite32(status, psp->io_regs + psp->vdata->intsts_reg);
47+
4548
/* invoke subdevice interrupt handlers */
4649
if (status) {
4750
if (psp->sev_irq_handler)
@@ -51,9 +54,6 @@ static irqreturn_t psp_irq_handler(int irq, void *data)
5154
psp->tee_irq_handler(irq, psp->tee_irq_data, status);
5255
}
5356

54-
/* Clear the interrupt status by writing the same value we read. */
55-
iowrite32(status, psp->io_regs + psp->vdata->intsts_reg);
56-
5757
return IRQ_HANDLED;
5858
}
5959

0 commit comments

Comments
 (0)