Received: by 10.213.65.68 with SMTP id h4csp38731imn; Mon, 19 Mar 2018 18:48:42 -0700 (PDT) X-Google-Smtp-Source: AG47ELto4YVDEcmOxedea9F6oQBBmMdgf0FNWhEMUNY1CKmj6CRSYnMALxDKBIGVhw5nWCALEvMy X-Received: by 10.99.119.79 with SMTP id s76mr10391160pgc.291.1521510522614; Mon, 19 Mar 2018 18:48:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521510522; cv=none; d=google.com; s=arc-20160816; b=ObQBq8DJf2EpBG3/s/4doRUypf918YSsvnIl+fMDmTrlRXmZAxnvXZW9prADRpVaIm igKq+0+LZSoqgrJOKpImlSxfvoRSCC99Bm5BNhFjiXYWVMNRL3PXcFyacM1ZYShQypoA g8qlWQ5kHQLl5BZqVqQxFZw+LjzAaCM2Cg4t3EV/EwvVzqqqNTteLWWSjOEZLaQE0kO/ Du6L1ZIdHGnk7NhzDqVHeyBDjp2PMkVeoGTN3lGTQRkBUECgOuk2FWEsPF4lWL6Ylr4z WVA58HZXIoaGNle1ZtlS2Fbg3fReGqTVL1yfcNKOxfjK3cGTxeMAQEv1vSP5s08d4WQM VW1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Y+ujeQhtXQY+gGH0MSa3ySzmD6kIRusTrKQKv/UUIRI=; b=Fbt12OfVyJr3ER15BOCcOtBo1e0EDeU4xqc9IQssoYBnfIKxVpNHur6/OBi3w8b08u ga2Yw5k/JpQei0bHTwWeYCRWRq2IeaCB4Q6gIVW8dpNs06CUVSaSH9HDXP+Y7/pWq65g ZfpoXUREXXKSxlcLoZLJLV0o1HgLjyZyEJ4EJTr0JAx8VQa3XkVeSw7RW/gPPL6Osy7/ 0XRRJZ33ntvZXcc8mMNntk4pkdusX7A19zKtHfdC0QtX4hQ6si3WfaDfZas3dbHov0go iB9Z/A6zD8pT2aXu+lyDSJw26gD2XvmhdF8vxrilHuUrRA+1MtzEdOkGR3trk0AdRsNy 3tVw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v27si426853pfa.387.2018.03.19.18.48.28; Mon, 19 Mar 2018 18:48:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S969812AbeCSTqV (ORCPT + 99 others); Mon, 19 Mar 2018 15:46:21 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:47750 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966304AbeCSSUh (ORCPT ); Mon, 19 Mar 2018 14:20:37 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 9487311CE; Mon, 19 Mar 2018 18:20:36 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiaofeng Wang , Long Li , Bjorn Helgaas , "K. Y. Srinivasan" , Sasha Levin Subject: [PATCH 4.9 060/241] PCI: hv: Properly handle PCI bus remove Date: Mon, 19 Mar 2018 19:05:25 +0100 Message-Id: <20180319180753.687625995@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Long Li [ Upstream commit d3a78d8bf759d8848339dcc367c4c1678b57a08b ] hv_pci_devices_present() is called in hv_pci_remove() when we remove a PCI device from the host, e.g., by disabling SR-IOV on a device. In hv_pci_remove(), the bus is already removed before the call, so we don't need to rescan the bus in the workqueue scheduled from hv_pci_devices_present(). By introducing bus state hv_pcibus_removed, we can avoid this situation. Reported-by: Xiaofeng Wang Signed-off-by: Long Li Signed-off-by: Bjorn Helgaas Acked-by: K. Y. Srinivasan Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/pci/host/pci-hyperv.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) --- a/drivers/pci/host/pci-hyperv.c +++ b/drivers/pci/host/pci-hyperv.c @@ -351,6 +351,7 @@ enum hv_pcibus_state { hv_pcibus_init = 0, hv_pcibus_probed, hv_pcibus_installed, + hv_pcibus_removed, hv_pcibus_maximum }; @@ -1489,13 +1490,24 @@ static void pci_devices_present_work(str put_pcichild(hpdev, hv_pcidev_ref_initial); } - /* Tell the core to rescan bus because there may have been changes. */ - if (hbus->state == hv_pcibus_installed) { + switch(hbus->state) { + case hv_pcibus_installed: + /* + * Tell the core to rescan bus + * because there may have been changes. + */ pci_lock_rescan_remove(); pci_scan_child_bus(hbus->pci_bus); pci_unlock_rescan_remove(); - } else { + break; + + case hv_pcibus_init: + case hv_pcibus_probed: survey_child_resources(hbus); + break; + + default: + break; } up(&hbus->enum_sem); @@ -2170,6 +2182,7 @@ static int hv_pci_probe(struct hv_device hbus = kzalloc(sizeof(*hbus), GFP_KERNEL); if (!hbus) return -ENOMEM; + hbus->state = hv_pcibus_init; /* * The PCI bus "domain" is what is called "segment" in ACPI and @@ -2312,6 +2325,7 @@ static int hv_pci_remove(struct hv_devic pci_stop_root_bus(hbus->pci_bus); pci_remove_root_bus(hbus->pci_bus); pci_unlock_rescan_remove(); + hbus->state = hv_pcibus_removed; } ret = hv_send_resources_released(hdev);