Re: + csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch added to mm-hotfixes-unstable branch

[Mike Rapoport <rppt@kernel.org>]

On Wed, Oct 15, 2025 at 03:36:46PM -0700, Andrew Morton wrote:
> On Wed, 15 Oct 2025 23:29:27 +0100 Matthew Wilcox <willy@infradead.org> wrote:
> 
> > > > Again, it seems churlish to merge Mike's patch insteaad of Thomas' that
> > > > was sent two weeks ago.
> > > 
> > > I can't find such a patch from Thomas and the message-id you sent
> > > didn't work for me  - what was the Subject:?
> > 
> > Date: Mon, 06 Oct 2025 14:13:37 +0200
> > From: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> > To: Guo Ren <guoren@kernel.org>, "Matthew Wilcox (Oracle)"
> >         <willy@infradead.org>, Zi Yan <ziy@nvidia.com>, Andrew Morton
> >         <akpm@linux-foundation.org>
> > Cc: linux-csky@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Weißschuh
> >         <thomas.weissschuh@linutronix.de>
> > Subject: [PATCH] csky: abiv2: Adapt to new folio flags field
> 
> Ah, thanks, I expect "^csky: abiv2" was as far as my filter got ;)
> 
> I'll adopt Thomas's version.

Here's Thomas's version with additional fix in
arch/csky/abiv2/cacheflush.c:

From 022c7e7c4a9ff413f283ffc442c14a96f8f91b81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas.weissschuh@linutronix.de>
Date: Mon, 6 Oct 2025 14:13:37 +0200
Subject: [PATCH] csky: abiv2: Adapt to new folio flags field
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Recent changes require the raw folio flags to be accessed via ".f".
The merge commit introducing this change adapted most architecture code
but forgot the csky abiv2.

Fixes: 53fbef56e07d ("mm: introduce memdesc_flags_t")
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Acked-by: Guo Ren <guoren@kernel.org>
Acked-by: Zi Yan <ziy@nvidia.com>
[rppt: added fix for arch/csky/abiv2/cacheflush.c]
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
---
 arch/csky/abiv2/cacheflush.c         | 2 +-
 arch/csky/abiv2/inc/abi/cacheflush.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/csky/abiv2/cacheflush.c b/arch/csky/abiv2/cacheflush.c
index 876028b1083f..064b0f0f95ca 100644
--- a/arch/csky/abiv2/cacheflush.c
+++ b/arch/csky/abiv2/cacheflush.c
@@ -21,7 +21,7 @@ void update_mmu_cache_range(struct vm_fault *vmf, struct vm_area_struct *vma,
 
 	folio = page_folio(pfn_to_page(pfn));
 
-	if (test_and_set_bit(PG_dcache_clean, &folio->flags))
+	if (test_and_set_bit(PG_dcache_clean, &folio->flags.f))
 		return;
 
 	icache_inv_range(address, address + nr*PAGE_SIZE);
diff --git a/arch/csky/abiv2/inc/abi/cacheflush.h b/arch/csky/abiv2/inc/abi/cacheflush.h
index 6513ac5d2578..da51a0f02391 100644
--- a/arch/csky/abiv2/inc/abi/cacheflush.h
+++ b/arch/csky/abiv2/inc/abi/cacheflush.h
@@ -20,8 +20,8 @@
 
 static inline void flush_dcache_folio(struct folio *folio)
 {
-	if (test_bit(PG_dcache_clean, &folio->flags))
-		clear_bit(PG_dcache_clean, &folio->flags);
+	if (test_bit(PG_dcache_clean, &folio->flags.f))
+		clear_bit(PG_dcache_clean, &folio->flags.f);
 }
 #define flush_dcache_folio flush_dcache_folio
 
-- 
2.50.1


-- 
Sincerely yours,
Mike.