Received-SPF: pass (google.com: domain of linux-kernel+bounces-180484-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Thu, 16 May 2024 09:24:01 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoph Hellwig <hch@lst.de>
Cc: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>,
 Paolo Abeni <pabeni@redhat.com>, Alexander Lobakin
 <aleksander.lobakin@intel.com>, Tony Nguyen <anthony.l.nguyen@intel.com>,
 Networking <netdev@vger.kernel.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with the
 dma-mapping tree
Message-ID: <20240516092401.5257bf0e@canb.auug.org.au>
In-Reply-To: <20240509115307.71ae8787@canb.auug.org.au>
References: <20240509115307.71ae8787@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/XcPvDPn//a2UViAc0ysycQ_";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

On Thu, 9 May 2024 11:53:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
>=20
>   net/core/page_pool.c
>=20
> between commit:
>=20
>   4321de4497b2 ("page_pool: check for DMA sync shortcut earlier")
>=20
> from the dma-mapping tree and commit:
>=20
>   ef9226cd56b7 ("page_pool: constify some read-only function arguments")
>=20
> from the net-next tree.
>=20
> 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
>=20
> diff --cc net/core/page_pool.c
> index 4f9d1bd7f4d1,8bcc7014a61a..000000000000
> --- a/net/core/page_pool.c
> +++ b/net/core/page_pool.c
> @@@ -398,26 -384,16 +399,26 @@@ static struct page *__page_pool_get_cac
>   	return page;
>   }
>  =20
>  -static void page_pool_dma_sync_for_device(const struct page_pool *pool,
>  -					  const struct page *page,
>  -					  unsigned int dma_sync_size)
>  +static void __page_pool_dma_sync_for_device(const struct page_pool *poo=
l,
> - 					    struct page *page,
> ++					    const struct page *page,
>  +					    u32 dma_sync_size)
>   {
>  +#if defined(CONFIG_HAS_DMA) && defined(CONFIG_DMA_NEED_SYNC)
>   	dma_addr_t dma_addr =3D page_pool_get_dma_addr(page);
>  =20
>   	dma_sync_size =3D min(dma_sync_size, pool->p.max_len);
>  -	dma_sync_single_range_for_device(pool->p.dev, dma_addr,
>  -					 pool->p.offset, dma_sync_size,
>  -					 pool->p.dma_dir);
>  +	__dma_sync_single_for_device(pool->p.dev, dma_addr + pool->p.offset,
>  +				     dma_sync_size, pool->p.dma_dir);
>  +#endif
>  +}
>  +
>  +static __always_inline void
>  +page_pool_dma_sync_for_device(const struct page_pool *pool,
> - 			      struct page *page,
> ++			      const struct page *page,
>  +			      u32 dma_sync_size)
>  +{
>  +	if (pool->dma_sync && dma_dev_need_sync(pool->p.dev))
>  +		__page_pool_dma_sync_for_device(pool, page, dma_sync_size);
>   }
>  =20
>   static bool page_pool_dma_map(struct page_pool *pool, struct page *page)
> @@@ -708,10 -688,11 +710,9 @@@ __page_pool_put_page(struct page_pool *
>   	if (likely(__page_pool_page_can_be_recycled(page))) {
>   		/* Read barrier done in page_ref_count / READ_ONCE */
>  =20
>  -		if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV)
>  -			page_pool_dma_sync_for_device(pool, page,
>  -						      dma_sync_size);
>  +		page_pool_dma_sync_for_device(pool, page, dma_sync_size);
>  =20
> - 		if (allow_direct && in_softirq() &&
> - 		    page_pool_recycle_in_cache(page, pool))
> + 		if (allow_direct && page_pool_recycle_in_cache(page, pool))
>   			return NULL;
>  =20
>   		/* Page found as candidate for recycling */

This is now a conflict between the dma-mapping tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZFRBEACgkQAVBC80lX
0GyBLAgAjOyX7LRNLBPiTsX9UYXq3Dj5vzSJE9dv5mqGbXU+39GRYPRVpADcZaXo
8cNjiP7nkub+BQYXPFndeyB/J3hngcEPdMt1fY1qMBikrRBpIkt1XPuiRP1K8YR7
p9Kb4C4GZ/UR2m6xSGXhXDROgMXYknqOcHX3SNQUXn/lc+MyAxl5PKHGxcoLqGnw
BG7UTF8Fs0J4MUIZ31hzgw23q37ULLLULk6uzFtjZgI+UcSMHRVLkBzVYSDZvzlF
xO08zGVXSqtih/VwzDRNtLR6GLiroTa/FR1K+9v6glrfoUNuSpA+ncqWcoqTQQjh
vt0nklB3T5+hFrlsveDZsjhNWvaWrw==
=hnQX
-----END PGP SIGNATURE-----

--Sig_/XcPvDPn//a2UViAc0ysycQ_--