From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Adrian Suhov <v-adsuho@microsoft.com>,
Chris Valean <v-chvale@microsoft.com>,
Dexuan Cui <decui@microsoft.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Michael Kelley <mikelley@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Jack Morgenstein <jackm@mellanox.com>
Subject: [PATCH 4.14 11/52] PCI: hv: Fix 2 hang issues in hv_compose_msi_msg()
Date: Mon, 4 Jun 2018 08:58:06 +0200 [thread overview]
Message-ID: <20180604065606.984255770@linuxfoundation.org> (raw)
In-Reply-To: <20180604065606.532044490@linuxfoundation.org>
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dexuan Cui <decui@microsoft.com>
commit de0aa7b2f97d348ba7d1e17a00744c989baa0cb6 upstream.
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: 4900be83602b ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/pci/host/pci-hyperv.c | 58 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 57 insertions(+), 1 deletion(-)
--- a/drivers/pci/host/pci-hyperv.c
+++ b/drivers/pci/host/pci-hyperv.c
@@ -531,6 +531,8 @@ struct hv_pci_compl {
s32 completion_status;
};
+static void hv_pci_onchannelcallback(void *context);
+
/**
* hv_pci_generic_compl() - Invoked for a completion packet
* @context: Set up by the sender of the packet.
@@ -675,6 +677,31 @@ static void _hv_pcifront_read_config(str
}
}
+static u16 hv_pcifront_get_vendor_id(struct hv_pci_dev *hpdev)
+{
+ u16 ret;
+ unsigned long flags;
+ void __iomem *addr = hpdev->hbus->cfg_addr + CFG_PAGE_OFFSET +
+ PCI_VENDOR_ID;
+
+ spin_lock_irqsave(&hpdev->hbus->config_lock, flags);
+
+ /* Choose the function to be read. (See comment above) */
+ writel(hpdev->desc.win_slot.slot, hpdev->hbus->cfg_addr);
+ /* Make sure the function was chosen before we start reading. */
+ mb();
+ /* Read from that function's config space. */
+ ret = readw(addr);
+ /*
+ * mb() is not required here, because the spin_unlock_irqrestore()
+ * is a barrier.
+ */
+
+ spin_unlock_irqrestore(&hpdev->hbus->config_lock, flags);
+
+ return ret;
+}
+
/**
* _hv_pcifront_write_config() - Internal PCI config write
* @hpdev: The PCI driver's representation of the device
@@ -1121,8 +1148,37 @@ static void hv_compose_msi_msg(struct ir
* Since this function is called with IRQ locks held, can't
* do normal wait for completion; instead poll.
*/
- while (!try_wait_for_completion(&comp.comp_pkt.host_event))
+ while (!try_wait_for_completion(&comp.comp_pkt.host_event)) {
+ /* 0xFFFF means an invalid PCI VENDOR ID. */
+ if (hv_pcifront_get_vendor_id(hpdev) == 0xFFFF) {
+ dev_err_once(&hbus->hdev->device,
+ "the device has gone\n");
+ goto free_int_desc;
+ }
+
+ /*
+ * When the higher level interrupt code calls us with
+ * interrupt disabled, we must poll the channel by calling
+ * the channel callback directly when channel->target_cpu is
+ * the current CPU. When the higher level interrupt code
+ * calls us with interrupt enabled, let's add the
+ * local_bh_disable()/enable() to avoid race.
+ */
+ local_bh_disable();
+
+ if (hbus->hdev->channel->target_cpu == smp_processor_id())
+ hv_pci_onchannelcallback(hbus);
+
+ local_bh_enable();
+
+ if (hpdev->state == hv_pcichild_ejecting) {
+ dev_err_once(&hbus->hdev->device,
+ "the device is being ejected\n");
+ goto free_int_desc;
+ }
+
udelay(100);
+ }
if (comp.comp_pkt.completion_status < 0) {
dev_err(&hbus->hdev->device,
next prev parent reply other threads:[~2018-06-04 7:00 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-04 6:57 [PATCH 4.14 00/52] 4.14.48-stable review Greg Kroah-Hartman
2018-06-04 6:57 ` [PATCH 4.14 01/52] fix io_destroy()/aio_complete() race Greg Kroah-Hartman
2018-06-04 6:57 ` [PATCH 4.14 02/52] mm: fix the NULL mapping case in __isolate_lru_page() Greg Kroah-Hartman
2018-06-04 6:57 ` [PATCH 4.14 03/52] objtool: Support GCC 8s cold subfunctions Greg Kroah-Hartman
2018-06-04 6:57 ` [PATCH 4.14 04/52] objtool: Support GCC 8 switch tables Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 05/52] objtool: Detect RIP-relative switch table references Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 06/52] objtool: Detect RIP-relative switch table references, part 2 Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 07/52] objtool: Fix "noreturn" detection for recursive sibling calls Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 08/52] x86/mce/AMD: Carve out SMCA get_block_address() code Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 09/52] x86/MCE/AMD: Cache SMCA MISC block addresses Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 10/52] Revert "pinctrl: msm: Use dynamic GPIO numbering" Greg Kroah-Hartman
2018-06-04 6:58 ` Greg Kroah-Hartman [this message]
2018-06-04 6:58 ` [PATCH 4.14 12/52] xfs: convert XFS_AGFL_SIZE to a helper function Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 13/52] xfs: detect agfl count corruption and reset agfl Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 14/52] Input: synaptics - Lenovo Carbon X1 Gen5 (2017) devices should use RMI Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 15/52] Input: synaptics - Lenovo Thinkpad X1 Carbon G5 (2017) with Elantech trackpoints " Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 16/52] Input: synaptics - add Intertouch support on X1 Carbon 6th and X280 Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 17/52] Input: synaptics - add Lenovo 80 series ids to SMBus Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 18/52] Input: elan_i2c_smbus - fix corrupted stack Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 19/52] tracing: Fix crash when freeing instances with event triggers Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 20/52] tracing: Make the snapshot trigger work with instances Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 21/52] selinux: KASAN: slab-out-of-bounds in xattr_getsecurity Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 22/52] cfg80211: further limit wiphy names to 64 bytes Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 23/52] kbuild: clang: remove crufty HOSTCFLAGS Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 24/52] drm/i915: Always sanity check engine state upon idling Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 25/52] dma-buf: remove redundant initialization of sg_table Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 26/52] drm/amd/powerplay: Fix enum mismatch Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 27/52] rtlwifi: rtl8192cu: Remove variable self-assignment in rf.c Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 28/52] ASoC: Intel: sst: remove redundant variable dma_dev_name Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 29/52] platform/chrome: cros_ec_lpc: remove redundant pointer request Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 30/52] kbuild: clang: disable unused variable warnings only when constant Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 31/52] tcp: avoid integer overflows in tcp_rcv_space_adjust() Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 32/52] iio: ad7793: implement IIO_CHAN_INFO_SAMP_FREQ Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 33/52] iio:buffer: make length types match kfifo types Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 34/52] iio:kfifo_buf: check for uint overflow Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 35/52] iio: adc: select buffer for at91-sama5d2_adc Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 36/52] MIPS: lantiq: gphy: Drop reboot/remove reset asserts Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 37/52] MIPS: ptrace: Fix PTRACE_PEEKUSR requests for 64-bit FGRs Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 38/52] MIPS: prctl: Disallow FRE without FR with PR_SET_FP_MODE requests Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 39/52] scsi: scsi_transport_srp: Fix shost to rport translation Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 40/52] stm class: Use vmalloc for the master map Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 41/52] hwtracing: stm: fix build error on some arches Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 42/52] IB/core: Fix error code for invalid GID entry Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 43/52] mm/huge_memory.c: __split_huge_page() use atomic ClearPageDirty() Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 44/52] Revert "rt2800: use TXOP_BACKOFF for probe frames" Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 45/52] intel_th: Use correct device when freeing buffers Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 49/52] powerpc/mm/slice: Remove intermediate bitmap copy Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 50/52] powerpc/mm/slice: create header files dedicated to slices Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 51/52] powerpc/mm/slice: Enhance for supporting PPC32 Greg Kroah-Hartman
2018-06-04 6:58 ` [PATCH 4.14 52/52] powerpc/mm/slice: Fix hugepage allocation at hint address on 8xx Greg Kroah-Hartman
2018-06-04 13:19 ` [PATCH 4.14 00/52] 4.14.48-stable review Guenter Roeck
2018-06-04 19:45 ` Shuah Khan
2018-06-05 6:20 ` Naresh Kamboju
[not found] ` <5b15302c.1c69fb81.bb82c.0d31@mx.google.com>
[not found] ` <7h602ykv08.fsf@baylibre.com>
2018-06-05 8:27 ` Greg Kroah-Hartman
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=20180604065606.984255770@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=decui@microsoft.com \
--cc=haiyangz@microsoft.com \
--cc=jackm@mellanox.com \
--cc=kys@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mikelley@microsoft.com \
--cc=stable@vger.kernel.org \
--cc=sthemmin@microsoft.com \
--cc=v-adsuho@microsoft.com \
--cc=v-chvale@microsoft.com \
--cc=vkuznets@redhat.com \
/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;
as well as URLs for NNTP newsgroup(s).