drm/xe/pf: fix VFIO link error

[PATCH] drm/xe/pf: fix VFIO link error

Posted by Arnd Bergmann 2 weeks, 1 day ago

From: Arnd Bergmann <arnd@arndb.de>

The Makefile logic for building xe_sriov_vfio.o was added incorrectly,
as setting CONFIG_XE_VFIO_PCI=m means it doesn't get included into a
built-in xe driver:

ERROR: modpost: "xe_sriov_vfio_stop_copy_enter" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
ERROR: modpost: "xe_sriov_vfio_stop_copy_exit" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
ERROR: modpost: "xe_sriov_vfio_suspend_device" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
ERROR: modpost: "xe_sriov_vfio_wait_flr_done" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
ERROR: modpost: "xe_sriov_vfio_error" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
ERROR: modpost: "xe_sriov_vfio_resume_data_enter" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
ERROR: modpost: "xe_sriov_vfio_resume_device" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
ERROR: modpost: "xe_sriov_vfio_resume_data_exit" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
ERROR: modpost: "xe_sriov_vfio_data_write" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
ERROR: modpost: "xe_sriov_vfio_migration_supported" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
WARNING: modpost: suppressed 3 unresolved symbol warnings because there were too many)

Check for CONFIG_XE_VFIO_PCI being enabled in the Makefile to decide whether to
include the the object instead.

Fixes: 17f22465c5a5 ("drm/xe/pf: Export helpers for VFIO")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpu/drm/xe/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index dfc2ded01455..e5f3c2ec9e9a 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -185,8 +185,8 @@ xe-$(CONFIG_PCI_IOV) += \
 	xe_sriov_pf_sysfs.o \
 	xe_tile_sriov_pf_debugfs.o
 
-ifeq ($(CONFIG_PCI_IOV),y)
-	xe-$(CONFIG_XE_VFIO_PCI) += xe_sriov_vfio.o
+ifdef CONFIG_XE_VFIO_PCI
+	xe-$(CONFIG_PCI_IOV) += xe_sriov_vfio.o
 endif
 
 # include helpers for tests even when XE is built-in
-- 
2.39.5

Re: [PATCH] drm/xe/pf: fix VFIO link error

Posted by Thomas Hellström 2 weeks, 1 day ago

On Thu, 2025-12-04 at 10:41 +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The Makefile logic for building xe_sriov_vfio.o was added
> incorrectly,
> as setting CONFIG_XE_VFIO_PCI=m means it doesn't get included into a
> built-in xe driver:
> 
> ERROR: modpost: "xe_sriov_vfio_stop_copy_enter"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_stop_copy_exit"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_suspend_device"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_wait_flr_done"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_error" [drivers/vfio/pci/xe/xe-vfio-
> pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_resume_data_enter"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_resume_device"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_resume_data_exit"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_data_write" [drivers/vfio/pci/xe/xe-
> vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_migration_supported"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> WARNING: modpost: suppressed 3 unresolved symbol warnings because
> there were too many)
> 
> Check for CONFIG_XE_VFIO_PCI being enabled in the Makefile to decide
> whether to
> include the the object instead.

s/the the/the/ found by CI.
Same question here, Do you want to resent or should I fix up when
commiting?

Thanks,
Thomas


> 
> Fixes: 17f22465c5a5 ("drm/xe/pf: Export helpers for VFIO")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/gpu/drm/xe/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/Makefile
> b/drivers/gpu/drm/xe/Makefile
> index dfc2ded01455..e5f3c2ec9e9a 100644
> --- a/drivers/gpu/drm/xe/Makefile
> +++ b/drivers/gpu/drm/xe/Makefile
> @@ -185,8 +185,8 @@ xe-$(CONFIG_PCI_IOV) += \
>  	xe_sriov_pf_sysfs.o \
>  	xe_tile_sriov_pf_debugfs.o
>  
> -ifeq ($(CONFIG_PCI_IOV),y)
> -	xe-$(CONFIG_XE_VFIO_PCI) += xe_sriov_vfio.o
> +ifdef CONFIG_XE_VFIO_PCI
> +	xe-$(CONFIG_PCI_IOV) += xe_sriov_vfio.o
>  endif
>  
>  # include helpers for tests even when XE is built-in

Re: [PATCH] drm/xe/pf: fix VFIO link error

Posted by Arnd Bergmann 2 weeks, 1 day ago

On Thu, Dec 4, 2025, at 13:19, Thomas Hellström wrote:
> On Thu, 2025-12-04 at 10:41 +0100, Arnd Bergmann wrote:
>> 
>> Check for CONFIG_XE_VFIO_PCI being enabled in the Makefile to decide
>> whether to
>> include the the object instead.
>
> s/the the/the/ found by CI.
> Same question here, Do you want to resent or should I fix up when
> commiting?
>

I'd prefer if you can fix up both so I don't have to send it again.

     Arnd

Re: [PATCH] drm/xe/pf: fix VFIO link error

Posted by Thomas Hellström 2 weeks, 1 day ago

On Thu, 2025-12-04 at 14:43 +0100, Arnd Bergmann wrote:
> On Thu, Dec 4, 2025, at 13:19, Thomas Hellström wrote:
> > On Thu, 2025-12-04 at 10:41 +0100, Arnd Bergmann wrote:
> > > 
> > > Check for CONFIG_XE_VFIO_PCI being enabled in the Makefile to
> > > decide
> > > whether to
> > > include the the object instead.
> > 
> > s/the the/the/ found by CI.
> > Same question here, Do you want to resent or should I fix up when
> > commiting?
> > 
> 
> I'd prefer if you can fix up both so I don't have to send it again.
> 
>      Arnd

OK, I will.
Thanks,
Thomas

Re: [PATCH] drm/xe/pf: fix VFIO link error

Posted by Michal Wajdeczko 2 weeks, 1 day ago


On 12/4/2025 10:41 AM, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The Makefile logic for building xe_sriov_vfio.o was added incorrectly,
> as setting CONFIG_XE_VFIO_PCI=m means it doesn't get included into a
> built-in xe driver:
> 
> ERROR: modpost: "xe_sriov_vfio_stop_copy_enter" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_stop_copy_exit" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_suspend_device" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_wait_flr_done" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_error" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_resume_data_enter" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_resume_device" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_resume_data_exit" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_data_write" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_migration_supported" [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> WARNING: modpost: suppressed 3 unresolved symbol warnings because there were too many)
> 
> Check for CONFIG_XE_VFIO_PCI being enabled in the Makefile to decide whether to
> include the the object instead.
> 
> Fixes: 17f22465c5a5 ("drm/xe/pf: Export helpers for VFIO")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>

> ---
>  drivers/gpu/drm/xe/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
> index dfc2ded01455..e5f3c2ec9e9a 100644
> --- a/drivers/gpu/drm/xe/Makefile
> +++ b/drivers/gpu/drm/xe/Makefile
> @@ -185,8 +185,8 @@ xe-$(CONFIG_PCI_IOV) += \
>  	xe_sriov_pf_sysfs.o \
>  	xe_tile_sriov_pf_debugfs.o
>  
> -ifeq ($(CONFIG_PCI_IOV),y)
> -	xe-$(CONFIG_XE_VFIO_PCI) += xe_sriov_vfio.o
> +ifdef CONFIG_XE_VFIO_PCI
> +	xe-$(CONFIG_PCI_IOV) += xe_sriov_vfio.o
>  endif
>  
>  # include helpers for tests even when XE is built-in