From: Long Li <longli@microsoft.com>
To: "wei.liu@kernel.org" <wei.liu@kernel.org>,
Linux on Hyper-V List <linux-hyperv@vger.kernel.org>
Cc: "mukeshrathor@linux.microsoft.com"
<mukeshrathor@linux.microsoft.com>,
"anirudh@anirudhrb.com" <anirudh@anirudhrb.com>,
"schakrabarti@linux.microsoft.com"
<schakrabarti@linux.microsoft.com>,
"KY Srinivasan" <kys@microsoft.com>,
"Haiyang Zhang" <haiyangz@microsoft.com>,
"Dexuan Cui" <DECUI@microsoft.com>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kwilczynski@kernel.org>,
"Manivannan Sadhasivam" <mani@kernel.org>,
"Rob Herring" <robh@kernel.org>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"open list:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS"
<linux-pci@vger.kernel.org>,
"open list" <linux-kernel@vger.kernel.org>
Subject: RE: [EXTERNAL] [PATCH 2/3] PCI: hv: unmap MSI interrupt on the nested root partition teardown path
Date: Tue, 25 Aug 2026 20:12:33 +0000 [thread overview]
Message-ID: <SA1PR21MB6683F98FD2FF83D39F93B473CEAF2@SA1PR21MB6683.namprd21.prod.outlook.com> (raw)
In-Reply-To: <20260822003623.2925128-3-wei.liu@kernel.org>
>
> From: Wei Liu <wei.liu@kernel.org>
>
> On a nested root partition the vPCI MSI/MSI-X interrupts of vmbus devices
> (e.g. the MANA NIC) are mapped in the hypervisor with a
> MAP_DEVICE_INTERRUPT hypercall. This is done from hv_arch_irq_unmask()
> -> hv_map_msi_interrupt() because the nested hypervisor performs the
> interrupt remapping and a RETARGET_INTERRUPT is not usable there.
>
> The mapping was never removed: hv_arch_irq_unmask() called
> hv_map_msi_interrupt(data, NULL), so the returned hv_interrupt_entry was
> discarded, and hv_msi_free() tears the interrupt down with a vmbus
> PCI_DELETE_INTERRUPT message (hv_int_desc_free()) without issuing
> UNMAP_DEVICE_INTERRUPT.
>
> This has led to MSHV rejecting already-mapped (vp, vector) pair from being
> used. When this happens during early boot, the system hangs.
>
> Keep the hypervisor mapping in sync with the kernel's interrupt lifecycle.
>
> The mapping is only created on x86 (hv_arch_irq_unmask() is a stub on
> arm64), so the unmap hypercall is guarded accordingly.
>
> Signed-off-by: Wei Liu <wei.liu@kernel.org>
> ---
> drivers/pci/controller/pci-hyperv.c | 85 ++++++++++++++++++++++++++---
> 1 file changed, 78 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-
> hyperv.c
> index cfc8fa403dad..5a36382742bf 100644
> --- a/drivers/pci/controller/pci-hyperv.c
> +++ b/drivers/pci/controller/pci-hyperv.c
> @@ -283,6 +283,35 @@ struct tran_int_desc {
> u64 address;
> } __packed;
>
> +/*
> + * On a nested root partition a vPCI MSI is mapped in the hypervisor
> +with a
> + * MAP_DEVICE_INTERRUPT hypercall in hv_arch_irq_unmask(). Keep the
> +entry the
> + * hypervisor returns next to the per-interrupt transaction descriptor
> +so the
> + * mapping can be removed again with UNMAP_DEVICE_INTERRUPT when
> the
> +interrupt
> + * is torn down. tran_int_desc stays first: chip_data is used as a
> +struct
> + * tran_int_desc throughout this driver.
> + */
> +struct hv_msi_int_entry {
> + struct tran_int_desc int_desc;
> + struct hv_interrupt_entry hv_entry;
> +};
> +
> +/* chip_data is passed around as a struct tran_int_desc *, so it must
> +be first. */ static_assert(offsetof(struct hv_msi_int_entry, int_desc)
> +== 0);
> +
> +static void hv_vmbus_unmap_msi_interrupt(struct pci_dev *pdev
> __maybe_unused,
> + void *chip_data)
> +{
> + struct hv_msi_int_entry *ie = chip_data;
> +
> + if (!ie || !ie->hv_entry.source)
> + return;
> +#ifdef CONFIG_X86
> + hv_unmap_msi_interrupt(pdev, &ie->hv_entry); #endif
Since you don't want to check the return value from hv_unmap_msi_interrupt(), add a (void) to the front to prevent some tools from giving warnings.
next prev parent reply other threads:[~2026-08-25 20:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-22 0:36 [PATCH 0/3] Fix pci-hyperv interrupt code on a nested root partition wei.liu
2026-08-22 0:36 ` [PATCH 1/3] x86/hyperv: export hv_unmap_msi_interrupt() wei.liu
2026-08-25 17:25 ` [EXTERNAL] " Long Li
2026-08-22 0:36 ` [PATCH 2/3] PCI: hv: unmap MSI interrupt on the nested root partition teardown path wei.liu
2026-08-22 0:45 ` sashiko-bot
2026-08-25 20:12 ` Long Li [this message]
2026-08-26 21:31 ` [EXTERNAL] " Wei Liu
2026-08-27 4:28 ` Michael Kelley
2026-08-22 0:36 ` [PATCH 3/3] PCI: hv: fix interrupt affinity change on the nested root partition wei.liu
2026-08-22 0:52 ` sashiko-bot
2026-08-25 20:33 ` [EXTERNAL] " Long Li
2026-08-27 4:28 ` Michael Kelley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=SA1PR21MB6683F98FD2FF83D39F93B473CEAF2@SA1PR21MB6683.namprd21.prod.outlook.com \
--to=longli@microsoft.com \
--cc=DECUI@microsoft.com \
--cc=anirudh@anirudhrb.com \
--cc=bhelgaas@google.com \
--cc=haiyangz@microsoft.com \
--cc=kwilczynski@kernel.org \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=mukeshrathor@linux.microsoft.com \
--cc=robh@kernel.org \
--cc=schakrabarti@linux.microsoft.com \
--cc=wei.liu@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox