* + csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch added to mm-hotfixes-unstable branch
@ 2025-10-15 21:50 Andrew Morton
2025-10-15 21:58 ` Matthew Wilcox
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2025-10-15 21:50 UTC (permalink / raw)
To: mm-commits, willy, guoren, rppt, akpm
The patch titled
Subject: csky/mm: fix build errors cause by folio flags changes
has been added to the -mm mm-hotfixes-unstable branch. Its filename is
csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch
This patch will later appear in the mm-hotfixes-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>
Subject: csky/mm: fix build errors cause by folio flags changes
Date: Wed, 15 Oct 2025 09:47:59 +0300
Kernel compilation on csky fails because csky was not updated during
conversion of folio flags to memdesc_flags_t:
arch/csky/abiv2/inc/abi/cacheflush.h: In function 'flush_dcache_folio':
arch/csky/abiv2/inc/abi/cacheflush.h:23:39: error: passing argument 2 of 'const_test_bit' from incompatible pointer type [-Werror=incompatible-pointer-types]
23 | if (test_bit(PG_dcache_clean, &folio->flags))
| ^~~~~~~~~~~~~
| |
| memdesc_flags_t *
include/linux/bitops.h:47:24: note: in definition of macro 'bitop'
47 | const##op(nr, addr) : op(nr, addr))
| ^~~~
arch/csky/abiv2/inc/abi/cacheflush.h:23:13: note: in expansion of macro 'test_bit'
23 | if (test_bit(PG_dcache_clean, &folio->flags))
| ^~~~~~~~
Update references of folio->flags in arch/csky.
Link: https://lkml.kernel.org/r/20251015064759.2993842-1-rppt@kernel.org
Fixes: 53fbef56e07d ("mm: introduce memdesc_flags_t")
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: Guo Ren <guoren@kernel.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
arch/csky/abiv2/cacheflush.c | 2 +-
arch/csky/abiv2/inc/abi/cacheflush.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--- a/arch/csky/abiv2/cacheflush.c~csky-mm-fix-build-errors-cause-by-folio-flags-changes
+++ a/arch/csky/abiv2/cacheflush.c
@@ -21,7 +21,7 @@ void update_mmu_cache_range(struct vm_fa
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);
--- a/arch/csky/abiv2/inc/abi/cacheflush.h~csky-mm-fix-build-errors-cause-by-folio-flags-changes
+++ a/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
_
Patches currently in -mm which might be from rppt@kernel.org are
csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch
kho-drop-notifiers.patch
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: + csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch added to mm-hotfixes-unstable branch
2025-10-15 21:50 + csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch added to mm-hotfixes-unstable branch Andrew Morton
@ 2025-10-15 21:58 ` Matthew Wilcox
2025-10-15 22:10 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Matthew Wilcox @ 2025-10-15 21:58 UTC (permalink / raw)
To: Andrew Morton; +Cc: mm-commits, guoren, rppt, Thomas Weißschuh
On Wed, Oct 15, 2025 at 02:50:59PM -0700, Andrew Morton wrote:
>
> The patch titled
> Subject: csky/mm: fix build errors cause by folio flags changes
> has been added to the -mm mm-hotfixes-unstable branch. Its filename is
> csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch
Again, it seems churlish to merge Mike's patch insteaad of Thomas' that
was sent two weeks ago.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: + csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch added to mm-hotfixes-unstable branch
2025-10-15 21:58 ` Matthew Wilcox
@ 2025-10-15 22:10 ` Andrew Morton
2025-10-15 22:29 ` Matthew Wilcox
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2025-10-15 22:10 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: mm-commits, guoren, rppt, Thomas Weißschuh
On Wed, 15 Oct 2025 22:58:25 +0100 Matthew Wilcox <willy@infradead.org> wrote:
> On Wed, Oct 15, 2025 at 02:50:59PM -0700, Andrew Morton wrote:
> >
> > The patch titled
> > Subject: csky/mm: fix build errors cause by folio flags changes
> > has been added to the -mm mm-hotfixes-unstable branch. Its filename is
> > csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch
>
> 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:?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: + csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch added to mm-hotfixes-unstable branch
2025-10-15 22:10 ` Andrew Morton
@ 2025-10-15 22:29 ` Matthew Wilcox
2025-10-15 22:36 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Matthew Wilcox @ 2025-10-15 22:29 UTC (permalink / raw)
To: Andrew Morton; +Cc: mm-commits, guoren, rppt, Thomas Weißschuh
On Wed, Oct 15, 2025 at 03:10:16PM -0700, Andrew Morton wrote:
> On Wed, 15 Oct 2025 22:58:25 +0100 Matthew Wilcox <willy@infradead.org> wrote:
>
> > On Wed, Oct 15, 2025 at 02:50:59PM -0700, Andrew Morton wrote:
> > >
> > > The patch titled
> > > Subject: csky/mm: fix build errors cause by folio flags changes
> > > has been added to the -mm mm-hotfixes-unstable branch. Its filename is
> > > csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch
> >
> > 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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: + csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch added to mm-hotfixes-unstable branch
2025-10-15 22:29 ` Matthew Wilcox
@ 2025-10-15 22:36 ` Andrew Morton
2025-10-16 5:38 ` Mike Rapoport
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2025-10-15 22:36 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: mm-commits, guoren, rppt, Thomas Weißschuh
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: + csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch added to mm-hotfixes-unstable branch
2025-10-15 22:36 ` Andrew Morton
@ 2025-10-16 5:38 ` Mike Rapoport
0 siblings, 0 replies; 6+ messages in thread
From: Mike Rapoport @ 2025-10-16 5:38 UTC (permalink / raw)
To: Andrew Morton; +Cc: Matthew Wilcox, mm-commits, guoren, Thomas Weißschuh
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.
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-10-16 5:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-15 21:50 + csky-mm-fix-build-errors-cause-by-folio-flags-changes.patch added to mm-hotfixes-unstable branch Andrew Morton
2025-10-15 21:58 ` Matthew Wilcox
2025-10-15 22:10 ` Andrew Morton
2025-10-15 22:29 ` Matthew Wilcox
2025-10-15 22:36 ` Andrew Morton
2025-10-16 5:38 ` Mike Rapoport
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.