| Message ID | 20170718172220.9954-1-mopsfelder@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/18/2017 02:22 PM, Murilo Opsfelder Araujo wrote: > When CONFIG_EEH=y and CONFIG_VFIO_SPAPR_EEH=n, build fails with the > following: > > drivers/vfio/pci/vfio_pci.o: In function `.vfio_pci_release': > vfio_pci.c:(.text+0xa98): undefined reference to `.vfio_spapr_pci_eeh_release' > drivers/vfio/pci/vfio_pci.o: In function `.vfio_pci_open': > vfio_pci.c:(.text+0x1420): undefined reference to `.vfio_spapr_pci_eeh_open' > > In this case, vfio_pci.c should use the empty definitions of > vfio_spapr_pci_eeh_open and vfio_spapr_pci_eeh_release functions. > > This patch fixes it by guarding these function definitions with > CONFIG_VFIO_SPAPR_EEH, the symbol that controls whether vfio_spapr_eeh.c is > built, which is where the non-empty versions of these functions are. We need to > make use of IS_ENABLED() macro because CONFIG_VFIO_SPAPR_EEH is a tristate > option. > > This issue was found during a randconfig build. Logs are here: > > http://kisskb.ellerman.id.au/kisskb/buildresult/12982362/ > > Signed-off-by: Murilo Opsfelder Araujo <mopsfelder@gmail.com> > --- > > Changes from v1: > - Rebased on top of next-20170718. Hi, Alex. Are you applying this? Thanks!
[cc +Alexey, David] Any comments from the usual suspects for vfio/spapr? Thanks, Alex On Tue, 25 Jul 2017 10:56:38 -0300 Murilo Opsfelder Araújo <mopsfelder@gmail.com> wrote: > On 07/18/2017 02:22 PM, Murilo Opsfelder Araujo wrote: > > When CONFIG_EEH=y and CONFIG_VFIO_SPAPR_EEH=n, build fails with the > > following: > > > > drivers/vfio/pci/vfio_pci.o: In function `.vfio_pci_release': > > vfio_pci.c:(.text+0xa98): undefined reference to `.vfio_spapr_pci_eeh_release' > > drivers/vfio/pci/vfio_pci.o: In function `.vfio_pci_open': > > vfio_pci.c:(.text+0x1420): undefined reference to `.vfio_spapr_pci_eeh_open' > > > > In this case, vfio_pci.c should use the empty definitions of > > vfio_spapr_pci_eeh_open and vfio_spapr_pci_eeh_release functions. > > > > This patch fixes it by guarding these function definitions with > > CONFIG_VFIO_SPAPR_EEH, the symbol that controls whether vfio_spapr_eeh.c is > > built, which is where the non-empty versions of these functions are. We need to > > make use of IS_ENABLED() macro because CONFIG_VFIO_SPAPR_EEH is a tristate > > option. > > > > This issue was found during a randconfig build. Logs are here: > > > > http://kisskb.ellerman.id.au/kisskb/buildresult/12982362/ > > > > Signed-off-by: Murilo Opsfelder Araujo <mopsfelder@gmail.com> > > --- > > > > Changes from v1: > > - Rebased on top of next-20170718. > > Hi, Alex. > > Are you applying this? > > Thanks! >
On 26/07/17 01:44, Alex Williamson wrote: > [cc +Alexey, David] > > Any comments from the usual suspects for vfio/spapr? Thanks, [trying once again as mailists rejected the previous response due to broken outgoing mail encoding config in my thunderbird] Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru> Having EEH + VFIO_PCI and not having VFIO_SPAPR_EEH does not make practical sense and won't be seen in the wild so EEH + VFIO should enforce VFIO_SPAPR_EEH but this is for another patch. > > Alex > > On Tue, 25 Jul 2017 10:56:38 -0300 > Murilo Opsfelder Araújo <mopsfelder@gmail.com> wrote: > >> On 07/18/2017 02:22 PM, Murilo Opsfelder Araujo wrote: >>> When CONFIG_EEH=y and CONFIG_VFIO_SPAPR_EEH=n, build fails with the >>> following: >>> >>> drivers/vfio/pci/vfio_pci.o: In function `.vfio_pci_release': >>> vfio_pci.c:(.text+0xa98): undefined reference to `.vfio_spapr_pci_eeh_release' >>> drivers/vfio/pci/vfio_pci.o: In function `.vfio_pci_open': >>> vfio_pci.c:(.text+0x1420): undefined reference to `.vfio_spapr_pci_eeh_open' >>> >>> In this case, vfio_pci.c should use the empty definitions of >>> vfio_spapr_pci_eeh_open and vfio_spapr_pci_eeh_release functions. >>> >>> This patch fixes it by guarding these function definitions with >>> CONFIG_VFIO_SPAPR_EEH, the symbol that controls whether vfio_spapr_eeh.c is >>> built, which is where the non-empty versions of these functions are. We need to >>> make use of IS_ENABLED() macro because CONFIG_VFIO_SPAPR_EEH is a tristate >>> option. >>> >>> This issue was found during a randconfig build. Logs are here: >>> >>> http://kisskb.ellerman.id.au/kisskb/buildresult/12982362/ >>> >>> Signed-off-by: Murilo Opsfelder Araujo <mopsfelder@gmail.com> >>> --- >>> >>> Changes from v1: >>> - Rebased on top of next-20170718. >> >> Hi, Alex. >> >> Are you applying this? >> >> Thanks! >> >
On Tue, Jul 18, 2017 at 02:22:20PM -0300, Murilo Opsfelder Araujo wrote: > When CONFIG_EEH=y and CONFIG_VFIO_SPAPR_EEH=n, build fails with the > following: > > drivers/vfio/pci/vfio_pci.o: In function `.vfio_pci_release': > vfio_pci.c:(.text+0xa98): undefined reference to `.vfio_spapr_pci_eeh_release' > drivers/vfio/pci/vfio_pci.o: In function `.vfio_pci_open': > vfio_pci.c:(.text+0x1420): undefined reference to `.vfio_spapr_pci_eeh_open' > > In this case, vfio_pci.c should use the empty definitions of > vfio_spapr_pci_eeh_open and vfio_spapr_pci_eeh_release functions. > > This patch fixes it by guarding these function definitions with > CONFIG_VFIO_SPAPR_EEH, the symbol that controls whether vfio_spapr_eeh.c is > built, which is where the non-empty versions of these functions are. We need to > make use of IS_ENABLED() macro because CONFIG_VFIO_SPAPR_EEH is a tristate > option. > > This issue was found during a randconfig build. Logs are here: > > http://kisskb.ellerman.id.au/kisskb/buildresult/12982362/ > > Signed-off-by: Murilo Opsfelder Araujo <mopsfelder@gmail.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > > Changes from v1: > - Rebased on top of next-20170718. > > include/linux/vfio.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/vfio.h b/include/linux/vfio.h > index 586809a..a47b985 100644 > --- a/include/linux/vfio.h > +++ b/include/linux/vfio.h > @@ -152,7 +152,7 @@ extern int vfio_set_irqs_validate_and_prepare(struct vfio_irq_set *hdr, > size_t *data_size); > > struct pci_dev; > -#ifdef CONFIG_EEH > +#if IS_ENABLED(CONFIG_VFIO_SPAPR_EEH) > extern void vfio_spapr_pci_eeh_open(struct pci_dev *pdev); > extern void vfio_spapr_pci_eeh_release(struct pci_dev *pdev); > extern long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, > @@ -173,7 +173,7 @@ static inline long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, > { > return -ENOTTY; > } > -#endif /* CONFIG_EEH */ > +#endif /* CONFIG_VFIO_SPAPR_EEH */ > > /* > * IRQfd - generic
On Tue, 18 Jul 2017 14:22:20 -0300 Murilo Opsfelder Araujo <mopsfelder@gmail.com> wrote: > When CONFIG_EEH=y and CONFIG_VFIO_SPAPR_EEH=n, build fails with the > following: > > drivers/vfio/pci/vfio_pci.o: In function `.vfio_pci_release': > vfio_pci.c:(.text+0xa98): undefined reference to `.vfio_spapr_pci_eeh_release' > drivers/vfio/pci/vfio_pci.o: In function `.vfio_pci_open': > vfio_pci.c:(.text+0x1420): undefined reference to `.vfio_spapr_pci_eeh_open' > > In this case, vfio_pci.c should use the empty definitions of > vfio_spapr_pci_eeh_open and vfio_spapr_pci_eeh_release functions. > > This patch fixes it by guarding these function definitions with > CONFIG_VFIO_SPAPR_EEH, the symbol that controls whether vfio_spapr_eeh.c is > built, which is where the non-empty versions of these functions are. We need to > make use of IS_ENABLED() macro because CONFIG_VFIO_SPAPR_EEH is a tristate > option. > > This issue was found during a randconfig build. Logs are here: > > http://kisskb.ellerman.id.au/kisskb/buildresult/12982362/ > > Signed-off-by: Murilo Opsfelder Araujo <mopsfelder@gmail.com> > --- Applied to my for-linus branch with David and Alexey's R-b for v4.13. Thanks, Alex > > Changes from v1: > - Rebased on top of next-20170718. > > include/linux/vfio.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/vfio.h b/include/linux/vfio.h > index 586809a..a47b985 100644 > --- a/include/linux/vfio.h > +++ b/include/linux/vfio.h > @@ -152,7 +152,7 @@ extern int vfio_set_irqs_validate_and_prepare(struct vfio_irq_set *hdr, > size_t *data_size); > > struct pci_dev; > -#ifdef CONFIG_EEH > +#if IS_ENABLED(CONFIG_VFIO_SPAPR_EEH) > extern void vfio_spapr_pci_eeh_open(struct pci_dev *pdev); > extern void vfio_spapr_pci_eeh_release(struct pci_dev *pdev); > extern long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, > @@ -173,7 +173,7 @@ static inline long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, > { > return -ENOTTY; > } > -#endif /* CONFIG_EEH */ > +#endif /* CONFIG_VFIO_SPAPR_EEH */ > > /* > * IRQfd - generic > -- > 2.9.4
On 07/26/2017 04:37 PM, Alex Williamson wrote: [...] > Applied to my for-linus branch with David and Alexey's R-b for v4.13. > Thanks, > > Alex Thank you all!
diff --git a/include/linux/vfio.h b/include/linux/vfio.h index 586809a..a47b985 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -152,7 +152,7 @@ extern int vfio_set_irqs_validate_and_prepare(struct vfio_irq_set *hdr, size_t *data_size); struct pci_dev; -#ifdef CONFIG_EEH +#if IS_ENABLED(CONFIG_VFIO_SPAPR_EEH) extern void vfio_spapr_pci_eeh_open(struct pci_dev *pdev); extern void vfio_spapr_pci_eeh_release(struct pci_dev *pdev); extern long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, @@ -173,7 +173,7 @@ static inline long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, { return -ENOTTY; } -#endif /* CONFIG_EEH */ +#endif /* CONFIG_VFIO_SPAPR_EEH */ /* * IRQfd - generic
When CONFIG_EEH=y and CONFIG_VFIO_SPAPR_EEH=n, build fails with the following: drivers/vfio/pci/vfio_pci.o: In function `.vfio_pci_release': vfio_pci.c:(.text+0xa98): undefined reference to `.vfio_spapr_pci_eeh_release' drivers/vfio/pci/vfio_pci.o: In function `.vfio_pci_open': vfio_pci.c:(.text+0x1420): undefined reference to `.vfio_spapr_pci_eeh_open' In this case, vfio_pci.c should use the empty definitions of vfio_spapr_pci_eeh_open and vfio_spapr_pci_eeh_release functions. This patch fixes it by guarding these function definitions with CONFIG_VFIO_SPAPR_EEH, the symbol that controls whether vfio_spapr_eeh.c is built, which is where the non-empty versions of these functions are. We need to make use of IS_ENABLED() macro because CONFIG_VFIO_SPAPR_EEH is a tristate option. This issue was found during a randconfig build. Logs are here: http://kisskb.ellerman.id.au/kisskb/buildresult/12982362/ Signed-off-by: Murilo Opsfelder Araujo <mopsfelder@gmail.com> --- Changes from v1: - Rebased on top of next-20170718. include/linux/vfio.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.4