* RE: [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus remove
[not found] <1485236721-27620-1-git-send-email-longli@exchange.microsoft.com>
@ 2017-01-27 18:42 ` KY Srinivasan
2017-02-11 1:18 ` Long Li
0 siblings, 1 reply; 8+ messages in thread
From: KY Srinivasan @ 2017-01-27 18:42 UTC (permalink / raw)
To: Long Li, Haiyang Zhang, Bjorn Helgaas
Cc: devel, linux-pci, linux-kernel, Long Li
> -----Original Message-----
> From: Long Li [mailto:longli@exchange.microsoft.com]
> Sent: Monday, January 23, 2017 9:45 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: [Resend 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>
> Reported-by: Xiaofeng Wang <xiaofwan@redhat.com>
Acked-by: K. Y. 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus remove
2017-01-27 18:42 ` [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus remove KY Srinivasan
@ 2017-02-11 1:18 ` Long Li
0 siblings, 0 replies; 8+ messages in thread
From: Long Li @ 2017-02-11 1:18 UTC (permalink / raw)
To: KY Srinivasan, Haiyang Zhang, Bjorn Helgaas
Cc: devel, linux-pci, linux-kernel
Hi Bjorn,
This patch and the other one in the series ([Resend PATCH 2/2 v3] pci-hyperv: lock pci bus on device eject) have been Acked.
Is there anything else should be done before it can be merged? Please let me know.
Thanks
Long
> -----Original Message-----
> From: KY Srinivasan
> Sent: Friday, January 27, 2017 10:42 AM
> To: Long Li <longli@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: RE: [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus
> remove
>
>
>
> > -----Original Message-----
> > From: Long Li [mailto:longli@exchange.microsoft.com]
> > Sent: Monday, January 23, 2017 9:45 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: [Resend 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>
> > Reported-by: Xiaofeng Wang <xiaofwan@redhat.com>
> Acked-by: K. Y. 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus remove
@ 2017-02-11 1:18 ` Long Li
0 siblings, 0 replies; 8+ messages in thread
From: Long Li @ 2017-02-11 1:18 UTC (permalink / raw)
To: KY Srinivasan, Haiyang Zhang, Bjorn Helgaas
Cc: devel, linux-pci, linux-kernel
Hi Bjorn,
This patch and the other one in the series ([Resend PATCH 2/2 v3] pci-hyper=
v: lock pci bus on device eject) have been Acked.
Is there anything else should be done before it can be merged? Please let m=
e know.
Thanks
Long
> -----Original Message-----
> From: KY Srinivasan
> Sent: Friday, January 27, 2017 10:42 AM
> To: Long Li <longli@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: RE: [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus
> remove
>=20
>=20
>=20
> > -----Original Message-----
> > From: Long Li [mailto:longli@exchange.microsoft.com]
> > Sent: Monday, January 23, 2017 9:45 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: [Resend 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>
> > Reported-by: Xiaofeng Wang <xiaofwan@redhat.com>
> Acked-by: K. Y. 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 =3D 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 chan=
ges.
> */
> > - if (hbus->state =3D=3D 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 =3D kzalloc(sizeof(*hbus), GFP_KERNEL);
> > if (!hbus)
> > return -ENOMEM;
> > + hbus->state =3D 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 =3D hv_pcibus_removed;
> > }
> >
> > ret =3D hv_send_resources_released(hdev);
> > --
> > 1.8.5.6
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus remove
2017-02-11 1:18 ` Long Li
(?)
@ 2017-02-11 17:35 ` Bjorn Helgaas
2017-02-13 19:02 ` Long Li
-1 siblings, 1 reply; 8+ messages in thread
From: Bjorn Helgaas @ 2017-02-11 17:35 UTC (permalink / raw)
To: Long Li; +Cc: KY Srinivasan, Haiyang Zhang, devel, linux-pci, linux-kernel
On Fri, Feb 10, 2017 at 7:18 PM, Long Li <longli@microsoft.com> wrote:
> Hi Bjorn,
>
> This patch and the other one in the series ([Resend PATCH 2/2 v3] pci-hyperv: lock pci bus on device eject) have been Acked.
>
> Is there anything else should be done before it can be merged? Please let me know.
Sorry, I don't know what happened here. I see your Jan 23 posting in
my work email (bhelgaas@google.com), but I don't see it on the
linux-pci or linux-kernel lists, and patchwork [1] doesn't have a copy
either. I suspect there was something about your email that made
vger drop it (maybe an HTML or other "fancy" stuff per
http://vger.kernel.org/majordomo-info.html).
Patchwork works by subscribing to linux-pci and collecting things that
look like patches. Then I work from patchwork as a to-do list.
That's a convenient way to ensure that patches appear on the mailing
list before I apply them. It also means that if a patch doesn't
appear on linux-pci and subsequently in patchwork, I don't know about
it.
Patchwork does have copies of previous versions, but I marked them
"changes requested". When I do that, the patch drops off the to-do
list because I'm expecting a new version, which *will* appear on the
list. I don't mark things "changes requested" if I'm only waiting for
an ack, so it looks like the only change I was looking for was a
changelog revision. Normally I just tweak changelogs myself, so I
apologize for not doing that in this case.
Anyway, can you just post the current version, including the acks, and
make sure it shows up on the mailing list?
I'm sorry this has languished so long. Thanks for reminding me about
it so we can sort this out.
[1] https://patchwork.ozlabs.org/project/linux-pci/list/?submitter=69886&state=*&q=&archive=both&delegate=
>> -----Original Message-----
>> From: KY Srinivasan
>> Sent: Friday, January 27, 2017 10:42 AM
>> To: Long Li <longli@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: RE: [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus
>> remove
>>
>>
>>
>> > -----Original Message-----
>> > From: Long Li [mailto:longli@exchange.microsoft.com]
>> > Sent: Monday, January 23, 2017 9:45 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: [Resend 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>
>> > Reported-by: Xiaofeng Wang <xiaofwan@redhat.com>
>> Acked-by: K. Y. 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
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus remove
2017-02-11 17:35 ` Bjorn Helgaas
@ 2017-02-13 19:02 ` Long Li
0 siblings, 0 replies; 8+ messages in thread
From: Long Li @ 2017-02-13 19:02 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: KY Srinivasan, Haiyang Zhang, devel, linux-pci, linux-kernel
> -----Original Message-----
> From: Bjorn Helgaas [mailto:bhelgaas@google.com]
> Sent: Saturday, February 11, 2017 9:35 AM
> To: Long Li <longli@microsoft.com>
> Cc: KY Srinivasan <kys@microsoft.com>; Haiyang Zhang
> <haiyangz@microsoft.com>; devel@linuxdriverproject.org; linux-
> pci@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: Re: [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus
> remove
>
> On Fri, Feb 10, 2017 at 7:18 PM, Long Li <longli@microsoft.com> wrote:
> > Hi Bjorn,
> >
> > This patch and the other one in the series ([Resend PATCH 2/2 v3] pci-
> hyperv: lock pci bus on device eject) have been Acked.
> >
> > Is there anything else should be done before it can be merged? Please let
> me know.
>
> Sorry, I don't know what happened here. I see your Jan 23 posting in my
> work email (bhelgaas@google.com), but I don't see it on the linux-pci or
> linux-kernel lists, and patchwork [1] doesn't have a copy
> either. I suspect there was something about your email that made
> vger drop it (maybe an HTML or other "fancy" stuff per
> https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fvger.ke
> rnel.org%2Fmajordomo-
> info.html&data=02%7C01%7Clongli%40microsoft.com%7Cd3d9fb666bdd4244
> 901b08d452a4692b%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C63
> 6224313474452403&sdata=UcQu75mTXO3xh5ot%2FZTRDgL5GXayaXjs%2Fugt
> wWe91Ko%3D&reserved=0).
>
> Patchwork works by subscribing to linux-pci and collecting things that look
> like patches. Then I work from patchwork as a to-do list.
> That's a convenient way to ensure that patches appear on the mailing list
> before I apply them. It also means that if a patch doesn't appear on linux-pci
> and subsequently in patchwork, I don't know about it.
>
> Patchwork does have copies of previous versions, but I marked them
> "changes requested". When I do that, the patch drops off the to-do list
> because I'm expecting a new version, which *will* appear on the list. I don't
> mark things "changes requested" if I'm only waiting for an ack, so it looks like
> the only change I was looking for was a changelog revision. Normally I just
> tweak changelogs myself, so I apologize for not doing that in this case.
>
> Anyway, can you just post the current version, including the acks, and make
> sure it shows up on the mailing list?
>
> I'm sorry this has languished so long. Thanks for reminding me about it so we
> can sort this out.
Thank you. I will fix the email and resend the patch.
>
> [1]
> https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatch
> work.ozlabs.org%2Fproject%2Flinux-
> pci%2Flist%2F%3Fsubmitter%3D69886%26state%3D*%26q%3D%26archive%3
> Dboth%26delegate&data=02%7C01%7Clongli%40microsoft.com%7Cd3d9fb66
> 6bdd4244901b08d452a4692b%7C72f988bf86f141af91ab2d7cd011db47%7C1%
> 7C0%7C636224313474452403&sdata=ELx04yDnSbe1fxXLy7z2iFoKwazKEMlDLrl
> p4CWhXbk%3D&reserved=0=
>
> >> -----Original Message-----
> >> From: KY Srinivasan
> >> Sent: Friday, January 27, 2017 10:42 AM
> >> To: Long Li <longli@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: RE: [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci
> >> bus remove
> >>
> >>
> >>
> >> > -----Original Message-----
> >> > From: Long Li [mailto:longli@exchange.microsoft.com]
> >> > Sent: Monday, January 23, 2017 9:45 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: [Resend 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
> >> >
> https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Faka
> >> >
> .ms%2FLearnAboutSpoofing&data=02%7C01%7Clongli%40microsoft.com%7C
> d3
> >> >
> d9fb666bdd4244901b08d452a4692b%7C72f988bf86f141af91ab2d7cd011db47
> %7
> >> >
> C1%7C0%7C636224313474452403&sdata=jlfhIYsJJT4HbcPGSPTk43AApcip%2F
> 9m
> >> > w7snnFn%2FvI74%3D&reserved=0]
> >> >
> >> > 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>
> >> > Reported-by: Xiaofeng Wang <xiaofwan@redhat.com>
> >> Acked-by: K. Y. 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
> >
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus remove
@ 2017-02-13 19:02 ` Long Li
0 siblings, 0 replies; 8+ messages in thread
From: Long Li @ 2017-02-13 19:02 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: KY Srinivasan, Haiyang Zhang, devel, linux-pci, linux-kernel
PiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBCam9ybiBIZWxnYWFzIFttYWls
dG86YmhlbGdhYXNAZ29vZ2xlLmNvbV0NCj4gU2VudDogU2F0dXJkYXksIEZlYnJ1YXJ5IDExLCAy
MDE3IDk6MzUgQU0NCj4gVG86IExvbmcgTGkgPGxvbmdsaUBtaWNyb3NvZnQuY29tPg0KPiBDYzog
S1kgU3Jpbml2YXNhbiA8a3lzQG1pY3Jvc29mdC5jb20+OyBIYWl5YW5nIFpoYW5nDQo+IDxoYWl5
YW5nekBtaWNyb3NvZnQuY29tPjsgZGV2ZWxAbGludXhkcml2ZXJwcm9qZWN0Lm9yZzsgbGludXgt
DQo+IHBjaUB2Z2VyLmtlcm5lbC5vcmc7IGxpbnV4LWtlcm5lbEB2Z2VyLmtlcm5lbC5vcmcNCj4g
U3ViamVjdDogUmU6IFtSZXNlbmQgUEFUQ0ggMS8yIHYzXSBwY2ktaHlwZXJ2OiBwcm9wZXJseSBo
YW5kbGUgcGNpIGJ1cw0KPiByZW1vdmUNCj4gDQo+IE9uIEZyaSwgRmViIDEwLCAyMDE3IGF0IDc6
MTggUE0sIExvbmcgTGkgPGxvbmdsaUBtaWNyb3NvZnQuY29tPiB3cm90ZToNCj4gPiBIaSBCam9y
biwNCj4gPg0KPiA+IFRoaXMgcGF0Y2ggYW5kIHRoZSBvdGhlciBvbmUgaW4gdGhlIHNlcmllcyAo
W1Jlc2VuZCBQQVRDSCAyLzIgdjNdIHBjaS0NCj4gaHlwZXJ2OiBsb2NrIHBjaSBidXMgb24gZGV2
aWNlIGVqZWN0KSBoYXZlIGJlZW4gQWNrZWQuDQo+ID4NCj4gPiBJcyB0aGVyZSBhbnl0aGluZyBl
bHNlIHNob3VsZCBiZSBkb25lIGJlZm9yZSBpdCBjYW4gYmUgbWVyZ2VkPyBQbGVhc2UgbGV0DQo+
IG1lIGtub3cuDQo+IA0KPiBTb3JyeSwgSSBkb24ndCBrbm93IHdoYXQgaGFwcGVuZWQgaGVyZS4g
IEkgc2VlIHlvdXIgSmFuIDIzIHBvc3RpbmcgaW4gbXkNCj4gd29yayBlbWFpbCAoYmhlbGdhYXNA
Z29vZ2xlLmNvbSksIGJ1dCBJIGRvbid0IHNlZSBpdCBvbiB0aGUgbGludXgtcGNpIG9yDQo+IGxp
bnV4LWtlcm5lbCBsaXN0cywgYW5kIHBhdGNod29yayBbMV0gZG9lc24ndCBoYXZlIGEgY29weQ0K
PiBlaXRoZXIuICAgSSBzdXNwZWN0IHRoZXJlIHdhcyBzb21ldGhpbmcgYWJvdXQgeW91ciBlbWFp
bCB0aGF0IG1hZGUNCj4gdmdlciBkcm9wIGl0IChtYXliZSBhbiBIVE1MIG9yIG90aGVyICJmYW5j
eSIgc3R1ZmYgcGVyDQo+IGh0dHBzOi8vbmEwMS5zYWZlbGlua3MucHJvdGVjdGlvbi5vdXRsb29r
LmNvbS8/dXJsPWh0dHAlM0ElMkYlMkZ2Z2VyLmtlDQo+IHJuZWwub3JnJTJGbWFqb3Jkb21vLQ0K
PiBpbmZvLmh0bWwmZGF0YT0wMiU3QzAxJTdDbG9uZ2xpJTQwbWljcm9zb2Z0LmNvbSU3Q2QzZDlm
YjY2NmJkZDQyNDQNCj4gOTAxYjA4ZDQ1MmE0NjkyYiU3QzcyZjk4OGJmODZmMTQxYWY5MWFiMmQ3
Y2QwMTFkYjQ3JTdDMSU3QzAlN0M2Mw0KPiA2MjI0MzEzNDc0NDUyNDAzJnNkYXRhPVVjUXU3NW1U
WE8zeGg1b3QlMkZaVFJEZ0w1R1hheWFYanMlMkZ1Z3QNCj4gd1dlOTFLbyUzRCZyZXNlcnZlZD0w
KS4NCj4gDQo+IFBhdGNod29yayB3b3JrcyBieSBzdWJzY3JpYmluZyB0byBsaW51eC1wY2kgYW5k
IGNvbGxlY3RpbmcgdGhpbmdzIHRoYXQgbG9vaw0KPiBsaWtlIHBhdGNoZXMuICBUaGVuIEkgd29y
ayBmcm9tIHBhdGNod29yayBhcyBhIHRvLWRvIGxpc3QuDQo+IFRoYXQncyBhIGNvbnZlbmllbnQg
d2F5IHRvIGVuc3VyZSB0aGF0IHBhdGNoZXMgYXBwZWFyIG9uIHRoZSBtYWlsaW5nIGxpc3QNCj4g
YmVmb3JlIEkgYXBwbHkgdGhlbS4gIEl0IGFsc28gbWVhbnMgdGhhdCBpZiBhIHBhdGNoIGRvZXNu
J3QgYXBwZWFyIG9uIGxpbnV4LXBjaQ0KPiBhbmQgc3Vic2VxdWVudGx5IGluIHBhdGNod29yaywg
SSBkb24ndCBrbm93IGFib3V0IGl0Lg0KPiANCj4gUGF0Y2h3b3JrIGRvZXMgaGF2ZSBjb3BpZXMg
b2YgcHJldmlvdXMgdmVyc2lvbnMsIGJ1dCBJIG1hcmtlZCB0aGVtDQo+ICJjaGFuZ2VzIHJlcXVl
c3RlZCIuICBXaGVuIEkgZG8gdGhhdCwgdGhlIHBhdGNoIGRyb3BzIG9mZiB0aGUgdG8tZG8gbGlz
dA0KPiBiZWNhdXNlIEknbSBleHBlY3RpbmcgYSBuZXcgdmVyc2lvbiwgd2hpY2ggKndpbGwqIGFw
cGVhciBvbiB0aGUgbGlzdC4gIEkgZG9uJ3QNCj4gbWFyayB0aGluZ3MgImNoYW5nZXMgcmVxdWVz
dGVkIiBpZiBJJ20gb25seSB3YWl0aW5nIGZvciBhbiBhY2ssIHNvIGl0IGxvb2tzIGxpa2UNCj4g
dGhlIG9ubHkgY2hhbmdlIEkgd2FzIGxvb2tpbmcgZm9yIHdhcyBhIGNoYW5nZWxvZyByZXZpc2lv
bi4gIE5vcm1hbGx5IEkganVzdA0KPiB0d2VhayBjaGFuZ2Vsb2dzIG15c2VsZiwgc28gSSBhcG9s
b2dpemUgZm9yIG5vdCBkb2luZyB0aGF0IGluIHRoaXMgY2FzZS4NCj4gDQo+IEFueXdheSwgY2Fu
IHlvdSBqdXN0IHBvc3QgdGhlIGN1cnJlbnQgdmVyc2lvbiwgaW5jbHVkaW5nIHRoZSBhY2tzLCBh
bmQgbWFrZQ0KPiBzdXJlIGl0IHNob3dzIHVwIG9uIHRoZSBtYWlsaW5nIGxpc3Q/DQo+IA0KPiBJ
J20gc29ycnkgdGhpcyBoYXMgbGFuZ3Vpc2hlZCBzbyBsb25nLiAgVGhhbmtzIGZvciByZW1pbmRp
bmcgbWUgYWJvdXQgaXQgc28gd2UNCj4gY2FuIHNvcnQgdGhpcyBvdXQuDQoNClRoYW5rIHlvdS4g
SSB3aWxsIGZpeCB0aGUgZW1haWwgYW5kIHJlc2VuZCB0aGUgcGF0Y2guDQoNCj4gDQo+IFsxXQ0K
PiBodHRwczovL25hMDEuc2FmZWxpbmtzLnByb3RlY3Rpb24ub3V0bG9vay5jb20vP3VybD1odHRw
cyUzQSUyRiUyRnBhdGNoDQo+IHdvcmsub3psYWJzLm9yZyUyRnByb2plY3QlMkZsaW51eC0NCj4g
cGNpJTJGbGlzdCUyRiUzRnN1Ym1pdHRlciUzRDY5ODg2JTI2c3RhdGUlM0QqJTI2cSUzRCUyNmFy
Y2hpdmUlMw0KPiBEYm90aCUyNmRlbGVnYXRlJmRhdGE9MDIlN0MwMSU3Q2xvbmdsaSU0MG1pY3Jv
c29mdC5jb20lN0NkM2Q5ZmI2Ng0KPiA2YmRkNDI0NDkwMWIwOGQ0NTJhNDY5MmIlN0M3MmY5ODhi
Zjg2ZjE0MWFmOTFhYjJkN2NkMDExZGI0NyU3QzElDQo+IDdDMCU3QzYzNjIyNDMxMzQ3NDQ1MjQw
MyZzZGF0YT1FTHgwNHlEblNiZTFmeFhMeTd6MmlGb0t3YXpLRU1sRExybA0KPiBwNENXaFhiayUz
RCZyZXNlcnZlZD0wPQ0KPiANCj4gPj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gPj4g
RnJvbTogS1kgU3Jpbml2YXNhbg0KPiA+PiBTZW50OiBGcmlkYXksIEphbnVhcnkgMjcsIDIwMTcg
MTA6NDIgQU0NCj4gPj4gVG86IExvbmcgTGkgPGxvbmdsaUBtaWNyb3NvZnQuY29tPjsgSGFpeWFu
ZyBaaGFuZw0KPiA+PiA8aGFpeWFuZ3pAbWljcm9zb2Z0LmNvbT47IEJqb3JuIEhlbGdhYXMgPGJo
ZWxnYWFzQGdvb2dsZS5jb20+DQo+ID4+IENjOiBkZXZlbEBsaW51eGRyaXZlcnByb2plY3Qub3Jn
OyBsaW51eC1wY2lAdmdlci5rZXJuZWwub3JnOyBsaW51eC0NCj4gPj4ga2VybmVsQHZnZXIua2Vy
bmVsLm9yZzsgTG9uZyBMaSA8bG9uZ2xpQG1pY3Jvc29mdC5jb20+DQo+ID4+IFN1YmplY3Q6IFJF
OiBbUmVzZW5kIFBBVENIIDEvMiB2M10gcGNpLWh5cGVydjogcHJvcGVybHkgaGFuZGxlIHBjaQ0K
PiA+PiBidXMgcmVtb3ZlDQo+ID4+DQo+ID4+DQo+ID4+DQo+ID4+ID4gLS0tLS1PcmlnaW5hbCBN
ZXNzYWdlLS0tLS0NCj4gPj4gPiBGcm9tOiBMb25nIExpIFttYWlsdG86bG9uZ2xpQGV4Y2hhbmdl
Lm1pY3Jvc29mdC5jb21dDQo+ID4+ID4gU2VudDogTW9uZGF5LCBKYW51YXJ5IDIzLCAyMDE3IDk6
NDUgUE0NCj4gPj4gPiBUbzogS1kgU3Jpbml2YXNhbiA8a3lzQG1pY3Jvc29mdC5jb20+OyBIYWl5
YW5nIFpoYW5nDQo+ID4+ID4gPGhhaXlhbmd6QG1pY3Jvc29mdC5jb20+OyBCam9ybiBIZWxnYWFz
IDxiaGVsZ2Fhc0Bnb29nbGUuY29tPg0KPiA+PiA+IENjOiBkZXZlbEBsaW51eGRyaXZlcnByb2pl
Y3Qub3JnOyBsaW51eC1wY2lAdmdlci5rZXJuZWwub3JnOyBsaW51eC0NCj4gPj4gPiBrZXJuZWxA
dmdlci5rZXJuZWwub3JnOyBMb25nIExpIDxsb25nbGlAbWljcm9zb2Z0LmNvbT4NCj4gPj4gPiBT
dWJqZWN0OiBbUmVzZW5kIFBBVENIIDEvMiB2M10gcGNpLWh5cGVydjogcHJvcGVybHkgaGFuZGxl
IHBjaSBidXMNCj4gPj4gPiByZW1vdmUNCj4gPj4gPg0KPiA+PiA+IFtUaGlzIHNlbmRlciBmYWls
ZWQgb3VyIGZyYXVkIGRldGVjdGlvbiBjaGVja3MgYW5kIG1heSBub3QgYmUgd2hvDQo+ID4+ID4g
dGhleSBhcHBlYXIgdG8gYmUuIExlYXJuIGFib3V0IHNwb29maW5nIGF0DQo+ID4+ID4NCj4gaHR0
cHM6Ly9uYTAxLnNhZmVsaW5rcy5wcm90ZWN0aW9uLm91dGxvb2suY29tLz91cmw9aHR0cCUzQSUy
RiUyRmFrYQ0KPiA+PiA+DQo+IC5tcyUyRkxlYXJuQWJvdXRTcG9vZmluZyZkYXRhPTAyJTdDMDEl
N0Nsb25nbGklNDBtaWNyb3NvZnQuY29tJTdDDQo+IGQzDQo+ID4+ID4NCj4gZDlmYjY2NmJkZDQy
NDQ5MDFiMDhkNDUyYTQ2OTJiJTdDNzJmOTg4YmY4NmYxNDFhZjkxYWIyZDdjZDAxMWRiNDcNCj4g
JTcNCj4gPj4gPg0KPiBDMSU3QzAlN0M2MzYyMjQzMTM0NzQ0NTI0MDMmc2RhdGE9amxmaElZc0pK
VDRIYmNQR1NQVGs0M0FBcGNpcCUyRg0KPiA5bQ0KPiA+PiA+IHc3c25uRm4lMkZ2STc0JTNEJnJl
c2VydmVkPTBdDQo+ID4+ID4NCj4gPj4gPiBGcm9tOiBMb25nIExpIDxsb25nbGlAbWljcm9zb2Z0
LmNvbT4NCj4gPj4gPg0KPiA+PiA+IGh2X3BjaV9kZXZpY2VzX3ByZXNlbnQgaXMgY2FsbGVkIGlu
IGh2X3BjaV9yZW1vdmUgd2hlbiB3ZSByZW1vdmUgYQ0KPiA+PiA+IFBDSSBkZXZpY2UgZnJvbSBo
b3N0IChlLmcuIGJ5IGRpc2FibGluZyBTUklPViBvbiBhIGRldmljZSkuIEluDQo+ID4+ID4gaHZf
cGNpX3JlbW92ZSwgdGhlIGJ1cyBpcyBhbHJlYWR5IHJlbW92ZWQgYmVmb3JlIHRoZSBjYWxsLCBz
byB3ZQ0KPiA+PiA+IGRvbid0IG5lZWQgdG8gcmVzY2FuIHRoZSBidXMgaW4gdGhlIHdvcmtxdWV1
ZSBzY2hlZHVsZWQgZnJvbQ0KPiA+PiA+IGh2X3BjaV9kZXZpY2VzX3ByZXNlbnQuIEJ5IGludHJv
ZHVjaW5nIHN0YXR1cyBodl9wY2lidXNfcmVtb3ZlZCwgd2UNCj4gPj4gY2FuIGF2b2lkIHRoaXMg
c2l0dWF0aW9uLg0KPiA+PiA+DQo+ID4+ID4gU2lnbmVkLW9mZi1ieTogTG9uZyBMaSA8bG9uZ2xp
QG1pY3Jvc29mdC5jb20+DQo+ID4+ID4gUmVwb3J0ZWQtYnk6IFhpYW9mZW5nIFdhbmcgPHhpYW9m
d2FuQHJlZGhhdC5jb20+DQo+ID4+IEFja2VkLWJ5OiBLLiBZLiBTcmluaXZhc2FuIDxreXNAbWlj
cm9zb2Z0LmNvbT4NCj4gPj4gPiAtLS0NCj4gPj4gPiAgZHJpdmVycy9wY2kvaG9zdC9wY2ktaHlw
ZXJ2LmMgfCAyMCArKysrKysrKysrKysrKysrKy0tLQ0KPiA+PiA+ICAxIGZpbGUgY2hhbmdlZCwg
MTcgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkNCj4gPj4gPg0KPiA+PiA+IGRpZmYgLS1n
aXQgYS9kcml2ZXJzL3BjaS9ob3N0L3BjaS1oeXBlcnYuYw0KPiA+PiA+IGIvZHJpdmVycy9wY2kv
aG9zdC9wY2ktaHlwZXJ2LmMgaW5kZXggYThkZWVjYS4uNGEzNzU5OCAxMDA2NDQNCj4gPj4gPiAt
LS0gYS9kcml2ZXJzL3BjaS9ob3N0L3BjaS1oeXBlcnYuYw0KPiA+PiA+ICsrKyBiL2RyaXZlcnMv
cGNpL2hvc3QvcGNpLWh5cGVydi5jDQo+ID4+ID4gQEAgLTM0OCw2ICszNDgsNyBAQCBlbnVtIGh2
X3BjaWJ1c19zdGF0ZSB7DQo+ID4+ID4gICAgICAgICBodl9wY2lidXNfaW5pdCA9IDAsDQo+ID4+
ID4gICAgICAgICBodl9wY2lidXNfcHJvYmVkLA0KPiA+PiA+ICAgICAgICAgaHZfcGNpYnVzX2lu
c3RhbGxlZCwNCj4gPj4gPiArICAgICAgIGh2X3BjaWJ1c19yZW1vdmVkLA0KPiA+PiA+ICAgICAg
ICAgaHZfcGNpYnVzX21heGltdW0NCj4gPj4gPiAgfTsNCj4gPj4gPg0KPiA+PiA+IEBAIC0xNDgx
LDEzICsxNDgyLDI0IEBAIHN0YXRpYyB2b2lkIHBjaV9kZXZpY2VzX3ByZXNlbnRfd29yayhzdHJ1
Y3QNCj4gPj4gPiB3b3JrX3N0cnVjdCAqd29yaykNCj4gPj4gPiAgICAgICAgICAgICAgICAgcHV0
X3BjaWNoaWxkKGhwZGV2LCBodl9wY2lkZXZfcmVmX2luaXRpYWwpOw0KPiA+PiA+ICAgICAgICAg
fQ0KPiA+PiA+DQo+ID4+ID4gLSAgICAgICAvKiBUZWxsIHRoZSBjb3JlIHRvIHJlc2NhbiBidXMg
YmVjYXVzZSB0aGVyZSBtYXkgaGF2ZSBiZWVuDQo+IGNoYW5nZXMuDQo+ID4+ICovDQo+ID4+ID4g
LSAgICAgICBpZiAoaGJ1cy0+c3RhdGUgPT0gaHZfcGNpYnVzX2luc3RhbGxlZCkgew0KPiA+PiA+
ICsgICAgICAgc3dpdGNoIChoYnVzLT5zdGF0ZSkgew0KPiA+PiA+ICsgICAgICAgY2FzZSBodl9w
Y2lidXNfaW5zdGFsbGVkOg0KPiA+PiA+ICsgICAgICAgICAgICAgICAvKg0KPiA+PiA+ICsgICAg
ICAgICAgICAgICAgKiBUZWxsIHRoZSBjb3JlIHRvIHJlc2NhbiBidXMNCj4gPj4gPiArICAgICAg
ICAgICAgICAgICogYmVjYXVzZSB0aGVyZSBtYXkgaGF2ZSBiZWVuIGNoYW5nZXMuDQo+ID4+ID4g
KyAgICAgICAgICAgICAgICAqLw0KPiA+PiA+ICAgICAgICAgICAgICAgICBwY2lfbG9ja19yZXNj
YW5fcmVtb3ZlKCk7DQo+ID4+ID4gICAgICAgICAgICAgICAgIHBjaV9zY2FuX2NoaWxkX2J1cyho
YnVzLT5wY2lfYnVzKTsNCj4gPj4gPiAgICAgICAgICAgICAgICAgcGNpX3VubG9ja19yZXNjYW5f
cmVtb3ZlKCk7DQo+ID4+ID4gLSAgICAgICB9IGVsc2Ugew0KPiA+PiA+ICsgICAgICAgICAgICAg
ICBicmVhazsNCj4gPj4gPiArDQo+ID4+ID4gKyAgICAgICBjYXNlIGh2X3BjaWJ1c19pbml0Og0K
PiA+PiA+ICsgICAgICAgY2FzZSBodl9wY2lidXNfcHJvYmVkOg0KPiA+PiA+ICAgICAgICAgICAg
ICAgICBzdXJ2ZXlfY2hpbGRfcmVzb3VyY2VzKGhidXMpOw0KPiA+PiA+ICsgICAgICAgICAgICAg
ICBicmVhazsNCj4gPj4gPiArDQo+ID4+ID4gKyAgICAgICBkZWZhdWx0Og0KPiA+PiA+ICsgICAg
ICAgICAgICAgICBicmVhazsNCj4gPj4gPiAgICAgICAgIH0NCj4gPj4gPg0KPiA+PiA+ICAgICAg
ICAgdXAoJmhidXMtPmVudW1fc2VtKTsNCj4gPj4gPiBAQCAtMjE2Myw2ICsyMTc1LDcgQEAgc3Rh
dGljIGludCBodl9wY2lfcHJvYmUoc3RydWN0IGh2X2RldmljZQ0KPiAqaGRldiwNCj4gPj4gPiAg
ICAgICAgIGhidXMgPSBremFsbG9jKHNpemVvZigqaGJ1cyksIEdGUF9LRVJORUwpOw0KPiA+PiA+
ICAgICAgICAgaWYgKCFoYnVzKQ0KPiA+PiA+ICAgICAgICAgICAgICAgICByZXR1cm4gLUVOT01F
TTsNCj4gPj4gPiArICAgICAgIGhidXMtPnN0YXRlID0gaHZfcGNpYnVzX2luaXQ7DQo+ID4+ID4N
Cj4gPj4gPiAgICAgICAgIC8qDQo+ID4+ID4gICAgICAgICAgKiBUaGUgUENJIGJ1cyAiZG9tYWlu
IiBpcyB3aGF0IGlzIGNhbGxlZCAic2VnbWVudCIgaW4gQUNQSQ0KPiA+PiA+IGFuZCBAQCAtMjMw
NSw2ICsyMzE4LDcgQEAgc3RhdGljIGludCBodl9wY2lfcmVtb3ZlKHN0cnVjdCBodl9kZXZpY2UN
Cj4gPj4gKmhkZXYpDQo+ID4+ID4gICAgICAgICAgICAgICAgIHBjaV9zdG9wX3Jvb3RfYnVzKGhi
dXMtPnBjaV9idXMpOw0KPiA+PiA+ICAgICAgICAgICAgICAgICBwY2lfcmVtb3ZlX3Jvb3RfYnVz
KGhidXMtPnBjaV9idXMpOw0KPiA+PiA+ICAgICAgICAgICAgICAgICBwY2lfdW5sb2NrX3Jlc2Nh
bl9yZW1vdmUoKTsNCj4gPj4gPiArICAgICAgICAgICAgICAgaGJ1cy0+c3RhdGUgPSBodl9wY2li
dXNfcmVtb3ZlZDsNCj4gPj4gPiAgICAgICAgIH0NCj4gPj4gPg0KPiA+PiA+ICAgICAgICAgcmV0
ID0gaHZfc2VuZF9yZXNvdXJjZXNfcmVsZWFzZWQoaGRldik7DQo+ID4+ID4gLS0NCj4gPj4gPiAx
LjguNS42DQo+ID4NCg==
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus remove
@ 2017-02-24 21:41 ` Long Li
0 siblings, 0 replies; 8+ messages in thread
From: Long Li @ 2017-02-24 21:41 UTC (permalink / raw)
To: KY Srinivasan, Haiyang Zhang, Bjorn Helgaas
Cc: devel, linux-pci, linux-kernel
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>
Reported-by: Xiaofeng Wang <xiaofwan@redhat.com>
Acked-by: K. Y. 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus remove
@ 2017-02-24 21:41 ` Long Li
0 siblings, 0 replies; 8+ messages in thread
From: Long Li @ 2017-02-24 21:41 UTC (permalink / raw)
To: KY Srinivasan, Haiyang Zhang, Bjorn Helgaas
Cc: devel, linux-pci, linux-kernel
hv_pci_devices_present is called in hv_pci_remove when we remove a PCI devi=
ce from host (e.g. by disabling SRIOV on a device). In hv_pci_remove, the b=
us is already removed before the call, so we don't need to rescan the bus i=
n the workqueue scheduled from hv_pci_devices_present. By introducing statu=
s hv_pcibus_removed, we can avoid this situation.
Signed-off-by: Long Li <longli@microsoft.com>
Reported-by: Xiaofeng Wang <xiaofwan@redhat.com>
Acked-by: K. Y. 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 =3D 0,
hv_pcibus_probed,
hv_pcibus_installed,
+ hv_pcibus_removed,
hv_pcibus_maximum
};
=20
@@ -1481,13 +1482,24 @@ static void pci_devices_present_work(struct work_st=
ruct *work)
put_pcichild(hpdev, hv_pcidev_ref_initial);
}
=20
- /* Tell the core to rescan bus because there may have been changes. */
- if (hbus->state =3D=3D 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;
}
=20
up(&hbus->enum_sem);
@@ -2163,6 +2175,7 @@ static int hv_pci_probe(struct hv_device *hdev,
hbus =3D kzalloc(sizeof(*hbus), GFP_KERNEL);
if (!hbus)
return -ENOMEM;
+ hbus->state =3D hv_pcibus_init;
=20
/*
* 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 =3D hv_pcibus_removed;
}
=20
ret =3D hv_send_resources_released(hdev);
--=20
1.8.5.6
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-02-24 21:42 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1485236721-27620-1-git-send-email-longli@exchange.microsoft.com>
2017-01-27 18:42 ` [Resend PATCH 1/2 v3] pci-hyperv: properly handle pci bus remove KY Srinivasan
2017-02-11 1:18 ` Long Li
2017-02-11 1:18 ` Long Li
2017-02-11 17:35 ` Bjorn Helgaas
2017-02-13 19:02 ` Long Li
2017-02-13 19:02 ` Long Li
2017-02-24 21:41 Long Li
2017-02-24 21:41 ` Long Li
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.