Date:   Fri, 27 Jan 2023 14:13:30 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Joerg Roedel <joro@8bytes.org>
Cc:     Alex Williamson <alex.williamson@redhat.com>,
        Jason Gunthorpe <jgg@nvidia.com>,
        Jason Gunthorpe <jgg@ziepe.ca>, Joerg Roedel <jroedel@suse.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Niklas Schnelle <schnelle@linux.ibm.com>
Subject: linux-next: manual merge of the iommu tree with Linus' tree
Message-ID: <20230127141330.28b2c653@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/pEcXxS3iKVnJ67XBS3dbI4A";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/pEcXxS3iKVnJ67XBS3dbI4A
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/vfio/vfio_iommu_type1.c

between commit:

  895c0747f726 ("vfio/type1: Respect IOMMU reserved regions in vfio_test_do=
main_fgsp()")

from Linus' tree and commit:

  1369459b2e21 ("iommu: Add a gfp parameter to iommu_map()")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/vfio/vfio_iommu_type1.c
index 2209372f236d,e14f86a8ef52..000000000000
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@@ -1867,22 -1866,15 +1868,22 @@@ static void vfio_test_domain_fgsp(struc
  	if (!pages)
  		return;
 =20
 -	ret =3D iommu_map(domain->domain, 0, page_to_phys(pages), PAGE_SIZE * 2,
 -			IOMMU_READ | IOMMU_WRITE | IOMMU_CACHE, GFP_KERNEL);
 -	if (!ret) {
 -		size_t unmapped =3D iommu_unmap(domain->domain, 0, PAGE_SIZE);
 +	list_for_each_entry(region, regions, list) {
 +		start =3D ALIGN(region->start, PAGE_SIZE * 2);
 +		if (start >=3D region->end || (region->end - start < PAGE_SIZE * 2))
 +			continue;
 =20
 -		if (unmapped =3D=3D PAGE_SIZE)
 -			iommu_unmap(domain->domain, PAGE_SIZE, PAGE_SIZE);
 -		else
 -			domain->fgsp =3D true;
 +		ret =3D iommu_map(domain->domain, start, page_to_phys(pages), PAGE_SIZE=
 * 2,
- 				IOMMU_READ | IOMMU_WRITE | IOMMU_CACHE);
++				IOMMU_READ | IOMMU_WRITE | IOMMU_CACHE, GFP_KERNEL);
 +		if (!ret) {
 +			size_t unmapped =3D iommu_unmap(domain->domain, start, PAGE_SIZE);
 +
 +			if (unmapped =3D=3D PAGE_SIZE)
 +				iommu_unmap(domain->domain, start + PAGE_SIZE, PAGE_SIZE);
 +			else
 +				domain->fgsp =3D true;
 +		}
 +		break;
  	}
 =20
  	__free_pages(pages, order);

--Sig_/pEcXxS3iKVnJ67XBS3dbI4A
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPTQVoACgkQAVBC80lX
0GzpSggAjQ0cijcA0aYrv+5HJroyntZE06pT+zzi2WB/c0q1TMpQE6+dkTCiqxxS
ncBArX1QWKKAE2q9YRWlX70wtW1a4pHqsJ7hy7Cc8m7tqSE5P1vCy/ows5UiTdJ6
LdEOvAkn+0sCqDYPhb+sAae4iJne2o3URApWZ+9qlpKjV/KzTueVXrRuQOVBl8aU
Wh1ye0EOFN7eZ2E4ftvaysVswg9P1eyvU0sWzoHNHKOqrx11RareGyPYzRi7qmfQ
9v3DlLB4J7t7o7bnG83Qpv418nQUI24vuBSIzQPA+zjfIybjEpmCDziyEXsPVKEJ
vTg8tcdCCWqsJ0eMrJBq6ILa+1RWYw==
=RJ+8
-----END PGP SIGNATURE-----

--Sig_/pEcXxS3iKVnJ67XBS3dbI4A--