| Message ID | 1407603887-1419-1-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, 2014-08-09 at 10:04 -0700, Guenter Roeck wrote: > The following build failure is seen with ppc:allmodconfig. > > ERROR: ".vfio_spapr_iommu_eeh_ioctl" [drivers/vfio/vfio_iommu_spapr_tce.ko] undefined! > ERROR: ".vfio_spapr_pci_eeh_open" [drivers/vfio/pci/vfio-pci.ko] undefined! > ERROR: ".vfio_spapr_pci_eeh_release" [drivers/vfio/pci/vfio-pci.ko] undefined! > > Simply exporting the missing symbols is insufficient, since drivers/vfio > can be built as module but drivers/vfio/vfio_spapr_eeh.c depends on > EEH which is boolean. The combination of obj-m for drivers/vfio and obj-y > for drivers/vfio/vfio_spapr_eeh.o results in the symbols being missed even > if exported. > > Export missing symbols and introduce new tristate configuration option > VFIO_EEH depending on both EEH and VFIO to fix the problem. > > Cc: Gavin Shan <gwshan@linux.vnet.ibm.com> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> Please try: git://github.com/awilliam/linux-vfio.git next This will be part of the next linux-next build, should resolve the problem, and I plan to ask for a pull early this coming week. Thanks, Alex > --- > drivers/vfio/Kconfig | 6 ++++++ > drivers/vfio/Makefile | 2 +- > drivers/vfio/vfio_spapr_eeh.c | 4 ++++ > 3 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/vfio/Kconfig b/drivers/vfio/Kconfig > index af7b204..06adecd 100644 > --- a/drivers/vfio/Kconfig > +++ b/drivers/vfio/Kconfig > @@ -8,12 +8,18 @@ config VFIO_IOMMU_SPAPR_TCE > depends on VFIO && SPAPR_TCE_IOMMU > default n > > +config VFIO_EEH > + tristate > + depends on VFIO && EEH > + default n > + > menuconfig VFIO > tristate "VFIO Non-Privileged userspace driver framework" > depends on IOMMU_API > select VFIO_IOMMU_TYPE1 if X86 > select VFIO_IOMMU_SPAPR_TCE if (PPC_POWERNV || PPC_PSERIES) > select ANON_INODES > + select VFIO_EEH if EEH > help > VFIO provides a framework for secure userspace device drivers. > See Documentation/vfio.txt for more details. > diff --git a/drivers/vfio/Makefile b/drivers/vfio/Makefile > index 50e30bc..26016cd 100644 > --- a/drivers/vfio/Makefile > +++ b/drivers/vfio/Makefile > @@ -1,5 +1,5 @@ > obj-$(CONFIG_VFIO) += vfio.o > obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o > obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o > -obj-$(CONFIG_EEH) += vfio_spapr_eeh.o > +obj-$(CONFIG_VFIO_EEH) += vfio_spapr_eeh.o > obj-$(CONFIG_VFIO_PCI) += pci/ > diff --git a/drivers/vfio/vfio_spapr_eeh.c b/drivers/vfio/vfio_spapr_eeh.c > index f834b4c..e827309 100644 > --- a/drivers/vfio/vfio_spapr_eeh.c > +++ b/drivers/vfio/vfio_spapr_eeh.c > @@ -9,6 +9,7 @@ > * published by the Free Software Foundation. > */ > > +#include <linux/export.h> > #include <linux/uaccess.h> > #include <linux/vfio.h> > #include <asm/eeh.h> > @@ -18,11 +19,13 @@ int vfio_spapr_pci_eeh_open(struct pci_dev *pdev) > { > return eeh_dev_open(pdev); > } > +EXPORT_SYMBOL_GPL(vfio_spapr_pci_eeh_open); > > void vfio_spapr_pci_eeh_release(struct pci_dev *pdev) > { > eeh_dev_release(pdev); > } > +EXPORT_SYMBOL(vfio_spapr_pci_eeh_release); > > long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, > unsigned int cmd, unsigned long arg) > @@ -85,3 +88,4 @@ long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, > > return ret; > } > +EXPORT_SYMBOL(vfio_spapr_iommu_eeh_ioctl); -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 08/09/2014 12:28 PM, Alex Williamson wrote: > On Sat, 2014-08-09 at 10:04 -0700, Guenter Roeck wrote: >> The following build failure is seen with ppc:allmodconfig. >> >> ERROR: ".vfio_spapr_iommu_eeh_ioctl" [drivers/vfio/vfio_iommu_spapr_tce.ko] undefined! >> ERROR: ".vfio_spapr_pci_eeh_open" [drivers/vfio/pci/vfio-pci.ko] undefined! >> ERROR: ".vfio_spapr_pci_eeh_release" [drivers/vfio/pci/vfio-pci.ko] undefined! >> >> Simply exporting the missing symbols is insufficient, since drivers/vfio >> can be built as module but drivers/vfio/vfio_spapr_eeh.c depends on >> EEH which is boolean. The combination of obj-m for drivers/vfio and obj-y >> for drivers/vfio/vfio_spapr_eeh.o results in the symbols being missed even >> if exported. >> >> Export missing symbols and introduce new tristate configuration option >> VFIO_EEH depending on both EEH and VFIO to fix the problem. >> >> Cc: Gavin Shan <gwshan@linux.vnet.ibm.com> >> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> >> Signed-off-by: Guenter Roeck <linux@roeck-us.net> > > Please try: > > git://github.com/awilliam/linux-vfio.git next > > This will be part of the next linux-next build, should resolve the > problem, and I plan to ask for a pull early this coming week. Thanks, > That should do for the most part, but it will select VFIO_SPAPR_EEH even if EEH is not configured. You would need something like select VFIO_SPAPR_EEH if (PPC_POWERNV || PPC_PSERIES) && EEH to prevent that. Guenter -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, 2014-08-09 at 15:28 -0700, Guenter Roeck wrote: > On 08/09/2014 12:28 PM, Alex Williamson wrote: > > On Sat, 2014-08-09 at 10:04 -0700, Guenter Roeck wrote: > >> The following build failure is seen with ppc:allmodconfig. > >> > >> ERROR: ".vfio_spapr_iommu_eeh_ioctl" [drivers/vfio/vfio_iommu_spapr_tce.ko] undefined! > >> ERROR: ".vfio_spapr_pci_eeh_open" [drivers/vfio/pci/vfio-pci.ko] undefined! > >> ERROR: ".vfio_spapr_pci_eeh_release" [drivers/vfio/pci/vfio-pci.ko] undefined! > >> > >> Simply exporting the missing symbols is insufficient, since drivers/vfio > >> can be built as module but drivers/vfio/vfio_spapr_eeh.c depends on > >> EEH which is boolean. The combination of obj-m for drivers/vfio and obj-y > >> for drivers/vfio/vfio_spapr_eeh.o results in the symbols being missed even > >> if exported. > >> > >> Export missing symbols and introduce new tristate configuration option > >> VFIO_EEH depending on both EEH and VFIO to fix the problem. > >> > >> Cc: Gavin Shan <gwshan@linux.vnet.ibm.com> > >> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > >> Signed-off-by: Guenter Roeck <linux@roeck-us.net> > > > > Please try: > > > > git://github.com/awilliam/linux-vfio.git next > > > > This will be part of the next linux-next build, should resolve the > > problem, and I plan to ask for a pull early this coming week. Thanks, > > > > That should do for the most part, but it will select VFIO_SPAPR_EEH > even if EEH is not configured. You would need something like > select VFIO_SPAPR_EEH if (PPC_POWERNV || PPC_PSERIES) && EEH > to prevent that. Feel free to post a patch against this branch. Thanks, Alex -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 08/09/2014 04:18 PM, Alex Williamson wrote: > On Sat, 2014-08-09 at 15:28 -0700, Guenter Roeck wrote: >> On 08/09/2014 12:28 PM, Alex Williamson wrote: >>> On Sat, 2014-08-09 at 10:04 -0700, Guenter Roeck wrote: >>>> The following build failure is seen with ppc:allmodconfig. >>>> >>>> ERROR: ".vfio_spapr_iommu_eeh_ioctl" [drivers/vfio/vfio_iommu_spapr_tce.ko] undefined! >>>> ERROR: ".vfio_spapr_pci_eeh_open" [drivers/vfio/pci/vfio-pci.ko] undefined! >>>> ERROR: ".vfio_spapr_pci_eeh_release" [drivers/vfio/pci/vfio-pci.ko] undefined! >>>> >>>> Simply exporting the missing symbols is insufficient, since drivers/vfio >>>> can be built as module but drivers/vfio/vfio_spapr_eeh.c depends on >>>> EEH which is boolean. The combination of obj-m for drivers/vfio and obj-y >>>> for drivers/vfio/vfio_spapr_eeh.o results in the symbols being missed even >>>> if exported. >>>> >>>> Export missing symbols and introduce new tristate configuration option >>>> VFIO_EEH depending on both EEH and VFIO to fix the problem. >>>> >>>> Cc: Gavin Shan <gwshan@linux.vnet.ibm.com> >>>> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> >>>> Signed-off-by: Guenter Roeck <linux@roeck-us.net> >>> >>> Please try: >>> >>> git://github.com/awilliam/linux-vfio.git next >>> >>> This will be part of the next linux-next build, should resolve the >>> problem, and I plan to ask for a pull early this coming week. Thanks, >>> >> >> That should do for the most part, but it will select VFIO_SPAPR_EEH >> even if EEH is not configured. You would need something like >> select VFIO_SPAPR_EEH if (PPC_POWERNV || PPC_PSERIES) && EEH >> to prevent that. > > Feel free to post a patch against this branch. Thanks, > I'll wait for -next to see if there are any problems in practice. Guenter -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/vfio/Kconfig b/drivers/vfio/Kconfig index af7b204..06adecd 100644 --- a/drivers/vfio/Kconfig +++ b/drivers/vfio/Kconfig @@ -8,12 +8,18 @@ config VFIO_IOMMU_SPAPR_TCE depends on VFIO && SPAPR_TCE_IOMMU default n +config VFIO_EEH + tristate + depends on VFIO && EEH + default n + menuconfig VFIO tristate "VFIO Non-Privileged userspace driver framework" depends on IOMMU_API select VFIO_IOMMU_TYPE1 if X86 select VFIO_IOMMU_SPAPR_TCE if (PPC_POWERNV || PPC_PSERIES) select ANON_INODES + select VFIO_EEH if EEH help VFIO provides a framework for secure userspace device drivers. See Documentation/vfio.txt for more details. diff --git a/drivers/vfio/Makefile b/drivers/vfio/Makefile index 50e30bc..26016cd 100644 --- a/drivers/vfio/Makefile +++ b/drivers/vfio/Makefile @@ -1,5 +1,5 @@ obj-$(CONFIG_VFIO) += vfio.o obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o -obj-$(CONFIG_EEH) += vfio_spapr_eeh.o +obj-$(CONFIG_VFIO_EEH) += vfio_spapr_eeh.o obj-$(CONFIG_VFIO_PCI) += pci/ diff --git a/drivers/vfio/vfio_spapr_eeh.c b/drivers/vfio/vfio_spapr_eeh.c index f834b4c..e827309 100644 --- a/drivers/vfio/vfio_spapr_eeh.c +++ b/drivers/vfio/vfio_spapr_eeh.c @@ -9,6 +9,7 @@ * published by the Free Software Foundation. */ +#include <linux/export.h> #include <linux/uaccess.h> #include <linux/vfio.h> #include <asm/eeh.h> @@ -18,11 +19,13 @@ int vfio_spapr_pci_eeh_open(struct pci_dev *pdev) { return eeh_dev_open(pdev); } +EXPORT_SYMBOL_GPL(vfio_spapr_pci_eeh_open); void vfio_spapr_pci_eeh_release(struct pci_dev *pdev) { eeh_dev_release(pdev); } +EXPORT_SYMBOL(vfio_spapr_pci_eeh_release); long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, unsigned int cmd, unsigned long arg) @@ -85,3 +88,4 @@ long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, return ret; } +EXPORT_SYMBOL(vfio_spapr_iommu_eeh_ioctl);
The following build failure is seen with ppc:allmodconfig. ERROR: ".vfio_spapr_iommu_eeh_ioctl" [drivers/vfio/vfio_iommu_spapr_tce.ko] undefined! ERROR: ".vfio_spapr_pci_eeh_open" [drivers/vfio/pci/vfio-pci.ko] undefined! ERROR: ".vfio_spapr_pci_eeh_release" [drivers/vfio/pci/vfio-pci.ko] undefined! Simply exporting the missing symbols is insufficient, since drivers/vfio can be built as module but drivers/vfio/vfio_spapr_eeh.c depends on EEH which is boolean. The combination of obj-m for drivers/vfio and obj-y for drivers/vfio/vfio_spapr_eeh.o results in the symbols being missed even if exported. Export missing symbols and introduce new tristate configuration option VFIO_EEH depending on both EEH and VFIO to fix the problem. Cc: Gavin Shan <gwshan@linux.vnet.ibm.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- drivers/vfio/Kconfig | 6 ++++++ drivers/vfio/Makefile | 2 +- drivers/vfio/vfio_spapr_eeh.c | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-)