linux-next: manual merge of the iommu tree with the rdma-fixes tree

linux-next: manual merge of the iommu tree with the rdma-fixes tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the iommu tree got a conflict in:

  drivers/infiniband/hw/usnic/usnic_uiom.c

between commit:

  b7e08a5a63a1 ("RDMA/usnic: use iommu_map_atomic() under spin_lock()")

from the rdma-fixes tree and commits:

  1369459b2e21 ("iommu: Add a gfp parameter to iommu_map()")
  4dc6376af596 ("iommu: Remove iommu_map_atomic()")

from the iommu tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/infiniband/hw/usnic/usnic_uiom.c
index a2857accc427,aeeaca65ace9..000000000000
--- a/drivers/infiniband/hw/usnic/usnic_uiom.c
+++ b/drivers/infiniband/hw/usnic/usnic_uiom.c
@@@ -276,8 -276,8 +276,8 @@@ iter_chunk
  				size = pa_end - pa_start + PAGE_SIZE;
  				usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x",
  					va_start, &pa_start, size, flags);
- 				err = iommu_map_atomic(pd->domain, va_start,
- 						       pa_start, size, flags);
+ 				err = iommu_map(pd->domain, va_start, pa_start,
 -						size, flags, GFP_KERNEL);
++						size, flags, GFP_ATOMIC);
  				if (err) {
  					usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",
  						va_start, &pa_start, size, err);
@@@ -293,8 -293,8 +293,8 @@@
  				size = pa - pa_start + PAGE_SIZE;
  				usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x\n",
  					va_start, &pa_start, size, flags);
- 				err = iommu_map_atomic(pd->domain, va_start,
- 						       pa_start, size, flags);
+ 				err = iommu_map(pd->domain, va_start, pa_start,
 -						size, flags, GFP_KERNEL);
++						size, flags, GFP_ATOMIC);
  				if (err) {
  					usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",
  						va_start, &pa_start, size, err);

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

Re: linux-next: manual merge of the iommu tree with the rdma-fixes tree

[Jason Gunthorpe]

On Wed, Feb 01, 2023 at 12:14:02PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the iommu tree got a conflict in:
> 
>   drivers/infiniband/hw/usnic/usnic_uiom.c
> 
> between commit:
> 
>   b7e08a5a63a1 ("RDMA/usnic: use iommu_map_atomic() under spin_lock()")
> 
> from the rdma-fixes tree and commits:
> 
>   1369459b2e21 ("iommu: Add a gfp parameter to iommu_map()")
>   4dc6376af596 ("iommu: Remove iommu_map_atomic()")
> 
> from the iommu tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Looks good thank you

Jason