From patchwork Wed Oct 7 21:16:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kelsey Skunberg X-Patchwork-Id: 1378287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C66bb3w9dz9sTf; Thu, 8 Oct 2020 08:16:59 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kQGnu-0000jV-SO; Wed, 07 Oct 2020 21:16:54 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kQGnr-0000iO-La for kernel-team@lists.ubuntu.com; Wed, 07 Oct 2020 21:16:51 +0000 Received: from mail-oo1-f70.google.com ([209.85.161.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kQGnr-00017J-BJ for kernel-team@lists.ubuntu.com; Wed, 07 Oct 2020 21:16:51 +0000 Received: by mail-oo1-f70.google.com with SMTP id q189so1595124ooa.18 for ; Wed, 07 Oct 2020 14:16:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RCXB+dehqnxdw9jj0dDnPMN0vmfbok9gaAS6pne3QCg=; b=GXoX7lJ149aL8ZFz1RTn27hoILpe039rK0ARKpQUatziGj893quWhReoW66voiWpFg ThbSkAx+fBuSXy6OM9pz190ckPTaHKLgEtmvn2L2J2uqwe5nq3iDBezhztDFS+6e5tyF Yl2jaILRjTymMGmrBP74c5XKtrahb5l/J4CMaKxhF6wv6pSQ32zDCYBMiNhhGTvdPib5 7tAvMmejCbNKTkfg1wUSn/oZiB+tBFSAvAcqKMqSHn5aeC/sTI2mbAajtyXisBYCy04k BU3r6JHMtLdZTk+eG+myWhOgv9M8hcJs6pJpxTvaCKI40ORX8s6cd4Qf4O9+TxH2IUPX 3SyA== X-Gm-Message-State: AOAM532VpWqaUsbhK/qSm8CjxPNwp8sIfaTRV5fnCwl2vOBGx9WCSoX2 z8+aKAjG0iRNiEBKqkRsnQu6ayWHxjvPylcq5dpOsfeH+t7CzoEHFbqWOQN7pQHZ3O8V+gTgSTC 3qTXsXAn7k5TSVWekJkvEXctHDHKhWTlMdH9ZJcPPYw== X-Received: by 2002:aca:ac8e:: with SMTP id v136mr3106954oie.113.1602105409866; Wed, 07 Oct 2020 14:16:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtyNY+Fl+3cad1Sy0QJKmRxCvB48YrEtr4xeyZp5BU+DXyssvmw9ZHrZAAT6oSBv7LkHTUZQ== X-Received: by 2002:aca:ac8e:: with SMTP id v136mr3106942oie.113.1602105409491; Wed, 07 Oct 2020 14:16:49 -0700 (PDT) Received: from localhost.localdomain ([38.80.149.171]) by smtp.gmail.com with ESMTPSA id v17sm2891236oic.4.2020.10.07.14.16.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 14:16:48 -0700 (PDT) From: Kelsey Skunberg To: kernel-team@lists.ubuntu.com Subject: [focal/linux-azure][PATCH 2/2] PCI: hv: Retry PCI bus D0 entry on invalid device state Date: Wed, 7 Oct 2020 15:16:40 -0600 Message-Id: <20201007211640.60573-6-kelsey.skunberg@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201007211640.60573-1-kelsey.skunberg@canonical.com> References: <20201007211640.60573-1-kelsey.skunberg@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Wei Hu BugLink: https://bugs.launchpad.net/bugs/1883261 When kdump is triggered, some PCI devices may have not been shut down cleanly before the kdump kernel starts. This causes the initial attempt to enter D0 state in the kdump kernel to fail with invalid device state returned from Hyper-V host. When this happens, explicitly call hv_pci_bus_exit() and retry to enter the D0 state. Link: https://lore.kernel.org/r/20200507050300.10974-1-weh@microsoft.com Signed-off-by: Wei Hu [lorenzo.pieralisi@arm.com: commit log] Signed-off-by: Lorenzo Pieralisi Reviewed-by: Michael Kelley (cherry picked from commit c81992e7f4aa19a055dbff5bd6c6d5ff9408f2fb) Signed-off-by: Kelsey Skunberg --- drivers/pci/controller/pci-hyperv.c | 40 +++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index 27e65f0f3250..2c92d020729f 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -2791,6 +2791,8 @@ static void hv_free_config_window(struct hv_pcibus_device *hbus) vmbus_free_mmio(hbus->mem_config->start, PCI_CONFIG_MMIO_LENGTH); } +static int hv_pci_bus_exit(struct hv_device *hdev, bool keep_devs); + /** * hv_pci_enter_d0() - Bring the "bus" into the D0 power state * @hdev: VMBus's tracking struct for this root PCI bus @@ -2803,8 +2805,10 @@ static int hv_pci_enter_d0(struct hv_device *hdev) struct pci_bus_d0_entry *d0_entry; struct hv_pci_compl comp_pkt; struct pci_packet *pkt; + bool retry = true; int ret; +enter_d0_retry: /* * Tell the host that the bus is ready to use, and moved into the * powered-on state. This includes telling the host which region @@ -2831,6 +2835,38 @@ static int hv_pci_enter_d0(struct hv_device *hdev) if (ret) goto exit; + /* + * In certain case (Kdump) the pci device of interest was + * not cleanly shut down and resource is still held on host + * side, the host could return invalid device status. + * We need to explicitly request host to release the resource + * and try to enter D0 again. + */ + if (comp_pkt.completion_status < 0 && retry) { + retry = false; + + dev_err(&hdev->device, "Retrying D0 Entry\n"); + + /* + * Hv_pci_bus_exit() calls hv_send_resource_released() + * to free up resources of its child devices. + * In the kdump kernel we need to set the + * wslot_res_allocated to 255 so it scans all child + * devices to release resources allocated in the + * normal kernel before panic happened. + */ + hbus->wslot_res_allocated = 255; + + ret = hv_pci_bus_exit(hdev, true); + + if (ret == 0) { + kfree(pkt); + goto enter_d0_retry; + } + dev_err(&hdev->device, + "Retrying D0 failed with ret %d\n", ret); + } + if (comp_pkt.completion_status < 0) { dev_err(&hdev->device, "PCI Pass-through VSP failed D0 Entry with status %x\n", @@ -3219,7 +3255,7 @@ static int hv_pci_probe(struct hv_device *hdev, return ret; } -static int hv_pci_bus_exit(struct hv_device *hdev, bool hibernating) +static int hv_pci_bus_exit(struct hv_device *hdev, bool keep_devs) { struct hv_pcibus_device *hbus = hv_get_drvdata(hdev); struct { @@ -3237,7 +3273,7 @@ static int hv_pci_bus_exit(struct hv_device *hdev, bool hibernating) if (hdev->channel->rescind) return 0; - if (!hibernating) { + if (!keep_devs) { /* Delete any children which might still exist. */ dr = kzalloc(sizeof(*dr), GFP_KERNEL); if (dr && hv_pci_start_relations_work(hbus, dr))