Skip to content

Commit de0aa7b

Browse files
dcuiLorenzo Pieralisi
authored andcommitted
PCI: hv: Fix 2 hang issues in hv_compose_msi_msg()
1. With the patch "x86/vector/msi: Switch to global reservation mode", the recent v4.15 and newer kernels always hang for 1-vCPU Hyper-V VM with SR-IOV. This is because when we reach hv_compose_msi_msg() by request_irq() -> request_threaded_irq() ->__setup_irq()->irq_startup() -> __irq_startup() -> irq_domain_activate_irq() -> ... -> msi_domain_activate() -> ... -> hv_compose_msi_msg(), local irq is disabled in __setup_irq(). Note: when we reach hv_compose_msi_msg() by another code path: pci_enable_msix_range() -> ... -> irq_domain_activate_irq() -> ... -> hv_compose_msi_msg(), local irq is not disabled. hv_compose_msi_msg() depends on an interrupt from the host. With interrupts disabled, a UP VM always hangs in the busy loop in the function, because the interrupt callback hv_pci_onchannelcallback() can not be called. We can do nothing but work it around by polling the channel. This is ugly, but we don't have any other choice. 2. If the host is ejecting the VF device before we reach hv_compose_msi_msg(), in a UP VM, we can hang in hv_compose_msi_msg() forever, because at this time the host doesn't respond to the CREATE_INTERRUPT request. This issue exists the first day the pci-hyperv driver appears in the kernel. Luckily, this can also by worked around by polling the channel for the PCI_EJECT message and hpdev->state, and by checking the PCI vendor ID. Note: actually the above 2 issues also happen to a SMP VM, if "hbus->hdev->channel->target_cpu == smp_processor_id()" is true. Fixes: 4900be8 ("x86/vector/msi: Switch to global reservation mode") Tested-by: Adrian Suhov <v-adsuho@microsoft.com> Tested-by: Chris Valean <v-chvale@microsoft.com> Signed-off-by: Dexuan Cui <decui@microsoft.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Michael Kelley <mikelley@microsoft.com> Acked-by: Haiyang Zhang <haiyangz@microsoft.com> Cc: <stable@vger.kernel.org> Cc: Stephen Hemminger <sthemmin@microsoft.com> Cc: K. Y. Srinivasan <kys@microsoft.com> Cc: Vitaly Kuznetsov <vkuznets@redhat.com> Cc: Jack Morgenstein <jackm@mellanox.com>
1 parent 021ad27 commit de0aa7b

File tree

1 file changed

+57
-1
lines changed

1 file changed

+57
-1
lines changed

drivers/pci/host/pci-hyperv.c

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,8 @@ struct hv_pci_compl {
521521
s32 completion_status;
522522
};
523523

524+
static void hv_pci_onchannelcallback(void *context);
525+
524526
/**
525527
* hv_pci_generic_compl() - Invoked for a completion packet
526528
* @context: Set up by the sender of the packet.
@@ -665,6 +667,31 @@ static void _hv_pcifront_read_config(struct hv_pci_dev *hpdev, int where,
665667
}
666668
}
667669

670+
static u16 hv_pcifront_get_vendor_id(struct hv_pci_dev *hpdev)
671+
{
672+
u16 ret;
673+
unsigned long flags;
674+
void __iomem *addr = hpdev->hbus->cfg_addr + CFG_PAGE_OFFSET +
675+
PCI_VENDOR_ID;
676+
677+
spin_lock_irqsave(&hpdev->hbus->config_lock, flags);
678+
679+
/* Choose the function to be read. (See comment above) */
680+
writel(hpdev->desc.win_slot.slot, hpdev->hbus->cfg_addr);
681+
/* Make sure the function was chosen before we start reading. */
682+
mb();
683+
/* Read from that function's config space. */
684+
ret = readw(addr);
685+
/*
686+
* mb() is not required here, because the spin_unlock_irqrestore()
687+
* is a barrier.
688+
*/
689+
690+
spin_unlock_irqrestore(&hpdev->hbus->config_lock, flags);
691+
692+
return ret;
693+
}
694+
668695
/**
669696
* _hv_pcifront_write_config() - Internal PCI config write
670697
* @hpdev: The PCI driver's representation of the device
@@ -1107,8 +1134,37 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
11071134
* Since this function is called with IRQ locks held, can't
11081135
* do normal wait for completion; instead poll.
11091136
*/
1110-
while (!try_wait_for_completion(&comp.comp_pkt.host_event))
1137+
while (!try_wait_for_completion(&comp.comp_pkt.host_event)) {
1138+
/* 0xFFFF means an invalid PCI VENDOR ID. */
1139+
if (hv_pcifront_get_vendor_id(hpdev) == 0xFFFF) {
1140+
dev_err_once(&hbus->hdev->device,
1141+
"the device has gone\n");
1142+
goto free_int_desc;
1143+
}
1144+
1145+
/*
1146+
* When the higher level interrupt code calls us with
1147+
* interrupt disabled, we must poll the channel by calling
1148+
* the channel callback directly when channel->target_cpu is
1149+
* the current CPU. When the higher level interrupt code
1150+
* calls us with interrupt enabled, let's add the
1151+
* local_bh_disable()/enable() to avoid race.
1152+
*/
1153+
local_bh_disable();
1154+
1155+
if (hbus->hdev->channel->target_cpu == smp_processor_id())
1156+
hv_pci_onchannelcallback(hbus);
1157+
1158+
local_bh_enable();
1159+
1160+
if (hpdev->state == hv_pcichild_ejecting) {
1161+
dev_err_once(&hbus->hdev->device,
1162+
"the device is being ejected\n");
1163+
goto free_int_desc;
1164+
}
1165+
11111166
udelay(100);
1167+
}
11121168

11131169
if (comp.comp_pkt.completion_status < 0) {
11141170
dev_err(&hbus->hdev->device,

0 commit comments

Comments
 (0)