linux-next: build failure after merge of the iommufd tree

linux-next: build failure after merge of the iommufd tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]

Hi all,

After merging the iommufd tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/iommu/iommufd/hw_pagetable.c: In function 'iommufd_hwpt_alloc':
drivers/iommu/iommufd/hw_pagetable.c:135:33: error: passing argument 1 of 'iommufd_get_ioas' from incompatible pointer type [-Werror=incompatible-pointer-types]
  135 |         ioas = iommufd_get_ioas(ucmd, cmd->pt_id);
      |                                 ^~~~
      |                                 |
      |                                 struct iommufd_ucmd *
In file included from drivers/iommu/iommufd/hw_pagetable.c:8:
drivers/iommu/iommufd/iommufd_private.h:216:73: note: expected 'struct iommufd_ctx *' but argument is of type 'struct iommufd_ucmd *'
  216 | static inline struct iommufd_ioas *iommufd_get_ioas(struct iommufd_ctx *ictx,
      |                                                     ~~~~~~~~~~~~~~~~~~~~^~~~

Caused by commit

  a7358b11764e ("iommu/iommufd: Pass iommufd_ctx pointer in iommufd_get_ioas()")

interacting with commit

  8295188cc9e6 ("iommufd: Add IOMMU_HWPT_ALLOC")

it should have been fixed up in the merge commit

  085121c1d1bb ("Merge branch 'ko-iommufd/wip/for-nesting' into k.o-iommufd/for-next")

I have used the iommufd tree from next-20230329 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the iommufd tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1811 bytes --]

Hi all,

After merging the iommufd tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/iommu/iommu.c: In function 'iommu_device_register_bus':
drivers/iommu/iommu.c:335:15: error: too few arguments to function 'bus_iommu_probe'
  335 |         err = bus_iommu_probe(bus);
      |               ^~~~~~~~~~~~~~~
In file included from drivers/iommu/iommu.c:20:
include/linux/iommu.h:474:12: note: declared here
  474 | extern int bus_iommu_probe(const struct bus_type *bus,
      |            ^~~~~~~~~~~~~~~

Caused by commit

  23a1b46f15d5 ("iommufd/selftest: Make the mock iommu driver into a real driver")

interacting with commit

  2b4de976b360 ("iommu: Pass in the iommu_device to probe for in bus_iommu_probe()")

from the iommu tree.

I have applied the following fix up patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Aug 2023 20:50:05 +1000
Subject: [PATCH] fix up for "iommufd/selftest: Make the mock iommu driver into a real driver"

interacting with commit

  2b4de976b360 ("iommu: Pass in the iommu_device to probe for in bus_iommu_probe()")

from the iommu tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/iommu/iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 20c9a0501760..1e017e1bf5ea 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -332,7 +332,7 @@ int iommu_device_register_bus(struct iommu_device *iommu,
 	spin_unlock(&iommu_device_lock);
 
 	bus->iommu_ops = ops;
-	err = bus_iommu_probe(bus);
+	err = bus_iommu_probe(bus, iommu);
 	if (err) {
 		iommu_device_unregister_bus(iommu, bus, nb);
 		return err;
-- 
2.40.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the iommufd tree

[Jason Gunthorpe]

On Tue, Aug 15, 2023 at 09:04:37PM +1000, Stephen Rothwell wrote:
> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> index 20c9a0501760..1e017e1bf5ea 100644
> --- a/drivers/iommu/iommu.c
> +++ b/drivers/iommu/iommu.c
> @@ -332,7 +332,7 @@ int iommu_device_register_bus(struct iommu_device *iommu,
>  	spin_unlock(&iommu_device_lock);
>  
>  	bus->iommu_ops = ops;
> -	err = bus_iommu_probe(bus);
> +	err = bus_iommu_probe(bus, iommu);
>  	if (err) {
>  		iommu_device_unregister_bus(iommu, bus, nb);
>  		return err;

This is the right fix

Thanks,
Jason

linux-next: build failure after merge of the iommufd tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2125 bytes --]

Hi all,

After merging the iommufd tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from include/linux/container_of.h:5,
                 from include/linux/list.h:5,
                 from include/linux/wait.h:7,
                 from include/linux/wait_bit.h:8,
                 from include/linux/fs.h:6,
                 from drivers/iommu/iommufd/fault.c:7:
drivers/iommu/iommufd/fault.c: In function 'iommufd_fault_fops_write':
drivers/iommu/iommufd/fault.c:308:57: error: comparison between 'enum iommufd_page_response_code' and 'enum iommu_page_response_code' [-Werror=enum-compare]
  308 |                 static_assert(IOMMUFD_PAGE_RESP_SUCCESS ==
      |                                                         ^~
include/linux/build_bug.h:78:56: note: in definition of macro '__static_assert'
   78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
      |                                                        ^~~~
drivers/iommu/iommufd/fault.c:308:17: note: in expansion of macro 'static_assert'
  308 |                 static_assert(IOMMUFD_PAGE_RESP_SUCCESS ==
      |                 ^~~~~~~~~~~~~
drivers/iommu/iommufd/fault.c:310:57: error: comparison between 'enum iommufd_page_response_code' and 'enum iommu_page_response_code' [-Werror=enum-compare]
  310 |                 static_assert(IOMMUFD_PAGE_RESP_INVALID ==
      |                                                         ^~
include/linux/build_bug.h:78:56: note: in definition of macro '__static_assert'
   78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
      |                                                        ^~~~
drivers/iommu/iommufd/fault.c:310:17: note: in expansion of macro 'static_assert'
  310 |                 static_assert(IOMMUFD_PAGE_RESP_INVALID ==
      |                 ^~~~~~~~~~~~~
cc1: all warnings being treated as errors

Caused by commit

  c7a0991733cc ("iommufd: Add check on user response code")

I have used the iommufd tree from next-20240711 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the iommufd tree

[Jason Gunthorpe]

On Fri, Jul 12, 2024 at 03:58:42PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the iommufd tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from include/linux/container_of.h:5,
>                  from include/linux/list.h:5,
>                  from include/linux/wait.h:7,
>                  from include/linux/wait_bit.h:8,
>                  from include/linux/fs.h:6,
>                  from drivers/iommu/iommufd/fault.c:7:
> drivers/iommu/iommufd/fault.c: In function 'iommufd_fault_fops_write':
> drivers/iommu/iommufd/fault.c:308:57: error: comparison between 'enum iommufd_page_response_code' and 'enum iommu_page_response_code' [-Werror=enum-compare]
>   308 |                 static_assert(IOMMUFD_PAGE_RESP_SUCCESS ==
>       |                                                         ^~

Oh my compiler didn't complain, I added some casts

Thanks,
Jason