linux-kernel - Re: linux-next: build failure after merge of the drm-xe tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20250311131338.23a27793@canb.auug.org.au>
Date: Tue, 11 Mar 2025 13:13:38 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>, Dave Airlie
 <airlied@...hat.com>
Cc: Lucas De Marchi <lucas.demarchi@...el.com>, Thomas Hellström <thomas.hellstrom@...ux.intel.com>, Matthew Brost
 <matthew.brost@...el.com>, Alistair Popple <apopple@...dia.com>, Balbir
 Singh <balbirs@...dia.com>, DRM XE List <intel-xe@...ts.freedesktop.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, DRI
 <dri-devel@...ts.freedesktop.org>
Subject: Re: linux-next: build failure after merge of the drm-xe tree

Hi all,

On Fri, 7 Mar 2025 12:58:03 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> After merging the drm-xe tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/drm_gpusvm.c: In function 'drm_gpusvm_range_get_pages':
> drivers/gpu/drm/drm_gpusvm.c:1404:44: error: 'struct page' has no member named 'pgmap'
>  1404 |                         if (pagemap != page->pgmap) {
>       |                                            ^~
> drivers/gpu/drm/drm_gpusvm.c:1410:47: error: 'struct page' has no member named 'pgmap'
>  1410 |                                 pagemap = page->pgmap;
>       |                                               ^~
> 
> Caused by commit
> 
>   99624bdff867 ("drm/gpusvm: Add support for GPU Shared Virtual Memory")
> 
> interacting with commit
> 
>   089b22f60a0f ("mm: allow compound zone device pages")
> 
> from the mm-unstable branch of the mm tree.
> 
> I have applied the following merge fix patch for today.
> 
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Fri, 7 Mar 2025 12:48:32 +1100
> Subject: [PATCH] fix up for "drm/gpusvm: Add support for GPU Shared Virtual
>  Memory"
> 
> interacting with commit
> 
>   089b22f60a0f ("mm: allow compound zone device pages")
> 
> from the mm-unstable branch of the mm tree.
> 
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  drivers/gpu/drm/drm_gpusvm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_gpusvm.c b/drivers/gpu/drm/drm_gpusvm.c
> index f314f5c4af0f..5e9b18ce65f8 100644
> --- a/drivers/gpu/drm/drm_gpusvm.c
> +++ b/drivers/gpu/drm/drm_gpusvm.c
> @@ -1401,13 +1401,13 @@ int drm_gpusvm_range_get_pages(struct drm_gpusvm *gpusvm,
>  				goto err_unmap;
>  			}
>  			zdd = page->zone_device_data;
> -			if (pagemap != page->pgmap) {
> +			if (pagemap != page_pgmap(page)) {
>  				if (i > 0) {
>  					err = -EOPNOTSUPP;
>  					goto err_unmap;
>  				}
>  
> -				pagemap = page->pgmap;
> +				pagemap = page_pgmap(page);
>  				dpagemap = zdd->devmem_allocation->dpagemap;
>  				if (drm_WARN_ON(gpusvm->drm, !dpagemap)) {
>  					/*
> -- 
> 2.45.2

This is now a semantic conflict between the mm tree and the drm tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped