Add check for hv_is_hyperv_initialized() at the top of init_hv_pci_drv(),
so if the pci-hyperv driver is force-loaded on non Hyper-V platforms, the
init_hv_pci_drv() will exit immediately, without any side effects, like
assignments to hvpci_block_ops, etc.
Signed-off-by: Haiyang Zhang <[email protected]>
Reported-and-tested-by: Mohammad Alqayeem <[email protected]>
---
drivers/pci/controller/pci-hyperv.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
index 6511648271b2..bebe3eeebc4e 100644
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@ -3476,6 +3476,9 @@ static void __exit exit_hv_pci_drv(void)
static int __init init_hv_pci_drv(void)
{
+ if (!hv_is_hyperv_initialized())
+ return -ENODEV;
+
/* Set the invalid domain number's bit, so it will not be used */
set_bit(HVPCI_DOM_INVALID, hvpci_dom_map);
--
2.25.1
On Tue, May 25, 2021 at 04:17:33PM -0700, Haiyang Zhang wrote:
> Add check for hv_is_hyperv_initialized() at the top of init_hv_pci_drv(),
> so if the pci-hyperv driver is force-loaded on non Hyper-V platforms, the
> init_hv_pci_drv() will exit immediately, without any side effects, like
> assignments to hvpci_block_ops, etc.
>
> Signed-off-by: Haiyang Zhang <[email protected]>
> Reported-and-tested-by: Mohammad Alqayeem <[email protected]>
Reviewed-by: Wei Liu <[email protected]>
> ---
> drivers/pci/controller/pci-hyperv.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
> index 6511648271b2..bebe3eeebc4e 100644
> --- a/drivers/pci/controller/pci-hyperv.c
> +++ b/drivers/pci/controller/pci-hyperv.c
> @@ -3476,6 +3476,9 @@ static void __exit exit_hv_pci_drv(void)
>
> static int __init init_hv_pci_drv(void)
> {
> + if (!hv_is_hyperv_initialized())
> + return -ENODEV;
> +
> /* Set the invalid domain number's bit, so it will not be used */
> set_bit(HVPCI_DOM_INVALID, hvpci_dom_map);
>
> --
> 2.25.1
>
On Tue, May 25, 2021 at 04:17:33PM -0700, Haiyang Zhang wrote:
> Add check for hv_is_hyperv_initialized() at the top of init_hv_pci_drv(),
> so if the pci-hyperv driver is force-loaded on non Hyper-V platforms, the
> init_hv_pci_drv() will exit immediately, without any side effects, like
> assignments to hvpci_block_ops, etc.
>
> Signed-off-by: Haiyang Zhang <[email protected]>
> Reported-and-tested-by: Mohammad Alqayeem <[email protected]>
Hello PCI subsystem maintainers, are you going to take this patch or
shall I?
Wei.
> ---
> drivers/pci/controller/pci-hyperv.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
> index 6511648271b2..bebe3eeebc4e 100644
> --- a/drivers/pci/controller/pci-hyperv.c
> +++ b/drivers/pci/controller/pci-hyperv.c
> @@ -3476,6 +3476,9 @@ static void __exit exit_hv_pci_drv(void)
>
> static int __init init_hv_pci_drv(void)
> {
> + if (!hv_is_hyperv_initialized())
> + return -ENODEV;
> +
> /* Set the invalid domain number's bit, so it will not be used */
> set_bit(HVPCI_DOM_INVALID, hvpci_dom_map);
>
> --
> 2.25.1
>
On Wed, Jun 02, 2021 at 10:32:06AM +0000, Wei Liu wrote:
> On Tue, May 25, 2021 at 04:17:33PM -0700, Haiyang Zhang wrote:
> > Add check for hv_is_hyperv_initialized() at the top of init_hv_pci_drv(),
> > so if the pci-hyperv driver is force-loaded on non Hyper-V platforms, the
> > init_hv_pci_drv() will exit immediately, without any side effects, like
> > assignments to hvpci_block_ops, etc.
> >
> > Signed-off-by: Haiyang Zhang <[email protected]>
> > Reported-and-tested-by: Mohammad Alqayeem <[email protected]>
>
> Hello PCI subsystem maintainers, are you going to take this patch or
> shall I?
This was mistakenly assigned to me, so I reassigned it back to
Lorenzo.
If you *do* take this, please at least update it to follow the PCI
commit log conventions, e.g.,
PCI: hv: Add check ...
and wrap the text so it fits in 75 columns.
> > ---
> > drivers/pci/controller/pci-hyperv.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
> > index 6511648271b2..bebe3eeebc4e 100644
> > --- a/drivers/pci/controller/pci-hyperv.c
> > +++ b/drivers/pci/controller/pci-hyperv.c
> > @@ -3476,6 +3476,9 @@ static void __exit exit_hv_pci_drv(void)
> >
> > static int __init init_hv_pci_drv(void)
> > {
> > + if (!hv_is_hyperv_initialized())
> > + return -ENODEV;
> > +
> > /* Set the invalid domain number's bit, so it will not be used */
> > set_bit(HVPCI_DOM_INVALID, hvpci_dom_map);
> >
> > --
> > 2.25.1
> >
On Fri, Jun 04, 2021 at 04:26:22PM -0500, Bjorn Helgaas wrote:
> On Wed, Jun 02, 2021 at 10:32:06AM +0000, Wei Liu wrote:
> > On Tue, May 25, 2021 at 04:17:33PM -0700, Haiyang Zhang wrote:
> > > Add check for hv_is_hyperv_initialized() at the top of init_hv_pci_drv(),
> > > so if the pci-hyperv driver is force-loaded on non Hyper-V platforms, the
> > > init_hv_pci_drv() will exit immediately, without any side effects, like
> > > assignments to hvpci_block_ops, etc.
> > >
> > > Signed-off-by: Haiyang Zhang <[email protected]>
> > > Reported-and-tested-by: Mohammad Alqayeem <[email protected]>
> >
> > Hello PCI subsystem maintainers, are you going to take this patch or
> > shall I?
>
> This was mistakenly assigned to me, so I reassigned it back to
> Lorenzo.
>
> If you *do* take this, please at least update it to follow the PCI
> commit log conventions, e.g.,
>
> PCI: hv: Add check ...
>
> and wrap the text so it fits in 75 columns.
Lorenzo already picked up two Hyper-V PCI patches from Long Li. I think
leaving this to him is better.
Wei.
On Sat, Jun 05, 2021 at 10:40:21AM +0000, Wei Liu wrote:
> On Fri, Jun 04, 2021 at 04:26:22PM -0500, Bjorn Helgaas wrote:
> > On Wed, Jun 02, 2021 at 10:32:06AM +0000, Wei Liu wrote:
> > > On Tue, May 25, 2021 at 04:17:33PM -0700, Haiyang Zhang wrote:
> > > > Add check for hv_is_hyperv_initialized() at the top of init_hv_pci_drv(),
> > > > so if the pci-hyperv driver is force-loaded on non Hyper-V platforms, the
> > > > init_hv_pci_drv() will exit immediately, without any side effects, like
> > > > assignments to hvpci_block_ops, etc.
> > > >
> > > > Signed-off-by: Haiyang Zhang <[email protected]>
> > > > Reported-and-tested-by: Mohammad Alqayeem <[email protected]>
> > >
> > > Hello PCI subsystem maintainers, are you going to take this patch or
> > > shall I?
> >
> > This was mistakenly assigned to me, so I reassigned it back to
> > Lorenzo.
> >
> > If you *do* take this, please at least update it to follow the PCI
> > commit log conventions, e.g.,
> >
> > PCI: hv: Add check ...
> >
> > and wrap the text so it fits in 75 columns.
>
> Lorenzo already picked up two Hyper-V PCI patches from Long Li. I think
> leaving this to him is better.
>
This patch is still missing from pci/hv, so I've picked it up via
hyperv-next (with the adjustments required by Bjorn).
Wei.
> -----Original Message-----
> From: Wei Liu <[email protected]>
> Sent: Friday, June 18, 2021 9:23 AM
> To: Bjorn Helgaas <[email protected]>
> Cc: Wei Liu <[email protected]>; Haiyang Zhang <[email protected]>;
> [email protected]; [email protected]; linux-
> [email protected]; [email protected]; KY Srinivasan
> <[email protected]>; [email protected]; vkuznets <[email protected]>;
> [email protected]
> Subject: Re: [PATCH] pci-hyperv: Add check for hyperv_initialized in
> init_hv_pci_drv()
>
> On Sat, Jun 05, 2021 at 10:40:21AM +0000, Wei Liu wrote:
> > On Fri, Jun 04, 2021 at 04:26:22PM -0500, Bjorn Helgaas wrote:
> > > On Wed, Jun 02, 2021 at 10:32:06AM +0000, Wei Liu wrote:
> > > > On Tue, May 25, 2021 at 04:17:33PM -0700, Haiyang Zhang wrote:
> > > > > Add check for hv_is_hyperv_initialized() at the top of
> > > > > init_hv_pci_drv(), so if the pci-hyperv driver is force-loaded
> > > > > on non Hyper-V platforms, the
> > > > > init_hv_pci_drv() will exit immediately, without any side
> > > > > effects, like assignments to hvpci_block_ops, etc.
> > > > >
> > > > > Signed-off-by: Haiyang Zhang <[email protected]>
> > > > > Reported-and-tested-by: Mohammad Alqayeem
> > > > > <[email protected]>
> > > >
> > > > Hello PCI subsystem maintainers, are you going to take this patch
> > > > or shall I?
> > >
> > > This was mistakenly assigned to me, so I reassigned it back to
> > > Lorenzo.
> > >
> > > If you *do* take this, please at least update it to follow the PCI
> > > commit log conventions, e.g.,
> > >
> > > PCI: hv: Add check ...
> > >
> > > and wrap the text so it fits in 75 columns.
> >
> > Lorenzo already picked up two Hyper-V PCI patches from Long Li. I
> > think leaving this to him is better.
> >
>
> This patch is still missing from pci/hv, so I've picked it up via hyperv-next
> (with the adjustments required by Bjorn).
Thank you!
- Haiyang