From: KY Srinivasan <kys@microsoft.com>
To: Long Li <longli@microsoft.com>, Haiyang Zhang <haiyangz@microsoft.com>,
        Bjorn Helgaas <bhelgaas@google.com>
CC: "devel@linuxdriverproject.org" <devel@linuxdriverproject.org>,
        "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH 1/2 v3] pci-hyperv: properly handle pci bus remove
Thread-Topic: [PATCH 1/2 v3] pci-hyperv: properly handle pci bus remove
Thread-Index: AQHSHfsEm6IioZB+AkCYLp3K+JyO56CYxS0g
Date: Tue, 4 Oct 2016 20:47:51 +0000
Message-ID: <DM5PR03MB2490F9784772A624BCB1E7ACA0C50@DM5PR03MB2490.namprd03.prod.outlook.com>
References: <1475563367-16511-1-git-send-email-longli@exchange.microsoft.com>
In-Reply-To: <1475563367-16511-1-git-send-email-longli@exchange.microsoft.com>
Accept-Language: en-US
Content-Language: en-US
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Oct 2016 20:47:51.4317
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB2226
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Transfer-Encoding: 8bit
X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id u94LL96Q009628
Content-Length: 3264
Lines: 93


> -----Original Message-----
> From: Long Li
> Sent: Monday, October 3, 2016 11:43 PM
> To: KY Srinivasan <kys@microsoft.com>; Haiyang Zhang
> <haiyangz@microsoft.com>; Bjorn Helgaas <bhelgaas@google.com>
> Cc: devel@linuxdriverproject.org; linux-pci@vger.kernel.org; linux-
> kernel@vger.kernel.org; Long Li <longli@microsoft.com>
> Subject: [PATCH 1/2 v3] pci-hyperv: properly handle pci bus remove
> 
> This sender failed our fraud detection checks and may not be who they
> appear to be. Learn about spoofing at http://aka.ms/LearnAboutSpoofing
> 
> From: Long Li <longli@microsoft.com>
> 
> hv_pci_devices_present is called in hv_pci_remove when we remove a PCI
> device from host (e.g. by disabling SRIOV 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 status hv_pcibus_removed, we can avoid this situation.
> 
> Signed-off-by: Long Li <longli@microsoft.com>
> Tested-by: Cathy Avery <cavery@redhat.com>
> Reported-by: Xiaofeng Wang <xiaofwan@redhat.com>

Acked-by: KY Srinivasan <kys@microsoft.com>


> ---
>  drivers/pci/host/pci-hyperv.c | 20 +++++++++++++++++---
>  1 file changed, 17 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c
> index a8deeca..4a37598 100644
> --- a/drivers/pci/host/pci-hyperv.c
> +++ b/drivers/pci/host/pci-hyperv.c
> @@ -348,6 +348,7 @@ enum hv_pcibus_state {
>         hv_pcibus_init = 0,
>         hv_pcibus_probed,
>         hv_pcibus_installed,
> +       hv_pcibus_removed,
>         hv_pcibus_maximum
>  };
> 
> @@ -1481,13 +1482,24 @@ static void pci_devices_present_work(struct
> work_struct *work)
>                 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);
> @@ -2163,6 +2175,7 @@ static int hv_pci_probe(struct hv_device *hdev,
>         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
> @@ -2305,6 +2318,7 @@ static int hv_pci_remove(struct hv_device *hdev)
>                 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);
> --
> 1.8.5.6