From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>,
Andrii Nakryiko <andrii@kernel•org>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Shakeel Butt <shakeel.butt@linux•dev>,
Sebastian Andrzej Siewior <bigeasy@linutronix•de>,
Vlastimil Babka <vbabka@suse•cz>, bpf <bpf@vger•kernel.org>,
Networking <netdev@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the bpf-next tree
Date: Wed, 12 Mar 2025 14:52:47 +1100 [thread overview]
Message-ID: <20250312145247.380c2aa5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 5745 bytes --]
Hi all,
After merging the bpf-next tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
In file included from include/asm-generic/percpu.h:7,
from arch/powerpc/include/asm/percpu.h:28,
from arch/powerpc/include/asm/smp.h:26,
from include/linux/smp.h:119,
from include/linux/lockdep.h:14,
from include/linux/radix-tree.h:14,
from include/linux/idr.h:15,
from include/linux/cgroup-defs.h:13,
from mm/memcontrol.c:28:
mm/memcontrol.c: In function 'memcg_hotplug_cpu_dead':
include/linux/percpu-defs.h:242:2: error: passing argument 1 of 'local_lock_acquire' from incompatible pointer type [-Wincompatible-pointer-types]
242 | ({ \
| ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| localtry_lock_t *
243 | __verify_pcpu_ptr(ptr); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
244 | arch_raw_cpu_ptr(ptr); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
245 | })
| ~~
include/linux/percpu-defs.h:254:27: note: in expansion of macro 'raw_cpu_ptr'
254 | #define this_cpu_ptr(ptr) raw_cpu_ptr(ptr)
| ^~~~~~~~~~~
include/linux/local_lock_internal.h:105:36: note: in expansion of macro 'this_cpu_ptr'
105 | local_lock_acquire(this_cpu_ptr(lock)); \
| ^~~~~~~~~~~~
include/linux/local_lock.h:31:9: note: in expansion of macro '__local_lock_irqsave'
31 | __local_lock_irqsave(lock, flags)
| ^~~~~~~~~~~~~~~~~~~~
mm/memcontrol.c:1960:9: note: in expansion of macro 'local_lock_irqsave'
1960 | local_lock_irqsave(&memcg_stock.stock_lock, flags);
| ^~~~~~~~~~~~~~~~~~
In file included from include/linux/local_lock.h:5,
from include/linux/mmzone.h:24,
from include/linux/gfp.h:7,
from include/linux/xarray.h:16,
from include/linux/radix-tree.h:21:
include/linux/local_lock_internal.h:59:53: note: expected 'local_lock_t *' but argument is of type 'localtry_lock_t *'
59 | static inline void local_lock_acquire(local_lock_t *l) { }
| ~~~~~~~~~~~~~~^
include/linux/percpu-defs.h:242:2: error: passing argument 1 of 'local_lock_release' from incompatible pointer type [-Wincompatible-pointer-types]
242 | ({ \
| ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| localtry_lock_t *
243 | __verify_pcpu_ptr(ptr); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
244 | arch_raw_cpu_ptr(ptr); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
245 | })
| ~~
include/linux/percpu-defs.h:254:27: note: in expansion of macro 'raw_cpu_ptr'
254 | #define this_cpu_ptr(ptr) raw_cpu_ptr(ptr)
| ^~~~~~~~~~~
include/linux/local_lock_internal.h:122:36: note: in expansion of macro 'this_cpu_ptr'
122 | local_lock_release(this_cpu_ptr(lock)); \
| ^~~~~~~~~~~~
include/linux/local_lock.h:52:9: note: in expansion of macro '__local_unlock_irqrestore'
52 | __local_unlock_irqrestore(lock, flags)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
mm/memcontrol.c:1962:9: note: in expansion of macro 'local_unlock_irqrestore'
1962 | local_unlock_irqrestore(&memcg_stock.stock_lock, flags);
| ^~~~~~~~~~~~~~~~~~~~~~~
include/linux/local_lock_internal.h:61:53: note: expected 'local_lock_t *' but argument is of type 'localtry_lock_t *'
61 | static inline void local_lock_release(local_lock_t *l) { }
| ~~~~~~~~~~~~~~^
Caused by commits
0aaddfb06882 ("locking/local_lock: Introduce localtry_lock_t")
01d37228d331 ("memcg: Use trylock to access memcg stock_lock.")
interacting with commit
885aa5fe7b1d ("memcg: drain obj stock on cpu hotplug teardown")
from the mm-hotfixes tree.
I applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 12 Mar 2025 14:18:03 +1100
Subject: [PATCH] fix up for "memcg: Use trylock to access memcg stock_lock"
interacting with "memcg: drain obj stock on cpu hotplug teardown" from
the mm-hotfixes tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
mm/memcontrol.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 8f88b8dd8097..87544df4c3b8 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1957,9 +1957,9 @@ static int memcg_hotplug_cpu_dead(unsigned int cpu)
stock = &per_cpu(memcg_stock, cpu);
/* drain_obj_stock requires stock_lock */
- local_lock_irqsave(&memcg_stock.stock_lock, flags);
+ localtry_lock_irqsave(&memcg_stock.stock_lock, flags);
old = drain_obj_stock(stock);
- local_unlock_irqrestore(&memcg_stock.stock_lock, flags);
+ localtry_unlock_irqrestore(&memcg_stock.stock_lock, flags);
drain_stock(stock);
obj_cgroup_put(old);
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-03-12 3:52 UTC|newest]
Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-12 3:52 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-05-26 12:13 linux-next: build failure after merge of the bpf-next tree Mark Brown
2026-05-26 22:08 ` Alexei Starovoitov
2026-05-27 13:24 ` Mark Brown
2026-05-27 19:27 ` Tejun Heo
2026-04-27 13:26 Thierry Reding
2026-04-27 13:34 ` Thierry Reding
2026-04-27 13:43 ` Alan Maguire
2025-03-19 2:33 Stephen Rothwell
2025-03-19 2:46 ` Alexei Starovoitov
2025-03-19 3:28 ` Stephen Rothwell
2025-03-19 13:37 ` Kumar Kartikeya Dwivedi
2025-03-19 13:43 ` Kumar Kartikeya Dwivedi
2025-03-19 14:36 ` Kumar Kartikeya Dwivedi
2025-03-19 14:55 ` Alexei Starovoitov
2025-03-19 15:11 ` Alexei Starovoitov
2025-03-19 16:06 ` Uros Bizjak
2025-03-19 18:56 ` Alexei Starovoitov
2025-03-19 19:43 ` Uros Bizjak
2025-03-19 23:16 ` Alexei Starovoitov
2025-03-20 7:49 ` Uros Bizjak
2025-03-20 23:17 ` Alexei Starovoitov
2025-03-21 7:15 ` Uros Bizjak
2025-03-19 5:03 ` Uros Bizjak
2024-10-16 6:05 Stephen Rothwell
2024-10-16 16:25 ` Alexei Starovoitov
2024-10-16 18:35 ` Namhyung Kim
2024-10-16 19:32 ` Alexei Starovoitov
2024-09-13 3:55 Stephen Rothwell
2024-09-13 4:00 ` Al Viro
2024-09-13 4:26 ` Andrii Nakryiko
2024-09-13 4:43 ` Al Viro
2024-09-15 23:30 ` Stephen Rothwell
2024-09-13 3:45 Stephen Rothwell
2024-09-13 3:48 ` Stephen Rothwell
2024-09-15 23:27 ` Stephen Rothwell
2024-09-13 3:32 Stephen Rothwell
2024-09-15 23:26 ` Stephen Rothwell
2024-08-14 1:25 Stephen Rothwell
2024-08-14 1:41 ` Al Viro
2024-08-14 2:37 ` Stephen Rothwell
2024-08-14 14:50 ` Christian Brauner
2024-08-30 1:32 ` Stephen Rothwell
2024-08-14 1:18 Stephen Rothwell
2024-06-17 18:15 Mark Brown
2024-06-22 8:17 ` kernel test robot
2024-06-22 8:28 ` kernel test robot
2024-06-25 1:22 ` Thinker Li
2024-06-25 15:54 ` Benjamin Tissoires
2024-06-25 16:03 ` Mark Brown
2024-06-25 17:14 ` Alexei Starovoitov
2024-06-27 7:14 ` Benjamin Tissoires
2024-07-09 23:13 ` Stephen Rothwell
2024-07-18 1:49 ` Stephen Rothwell
2024-07-18 7:42 ` Benjamin Tissoires
2023-03-19 23:26 Stephen Rothwell
2023-03-20 12:07 ` Alexander Lobakin
2023-03-21 22:35 ` Stephen Rothwell
2022-07-20 1:59 Stephen Rothwell
2022-07-20 3:42 ` Alexei Starovoitov
2022-07-20 3:44 ` Stanislav Fomichev
2022-04-19 1:56 Stephen Rothwell
2022-04-21 0:32 ` Stephen Rothwell
2022-04-21 9:45 ` Daniel Borkmann
2022-04-21 10:40 ` Maciej Fijalkowski
2022-02-09 0:21 Stephen Rothwell
2021-12-03 0:15 Stephen Rothwell
2021-09-14 1:37 Stephen Rothwell
2021-09-14 23:25 ` Andrii Nakryiko
2021-09-14 23:38 ` Stephen Rothwell
2021-09-14 23:40 ` Andrii Nakryiko
2021-09-14 23:59 ` Stephen Rothwell
2021-09-15 1:27 ` Alexei Starovoitov
2021-08-26 1:50 Stephen Rothwell
2021-08-26 2:01 ` Daniel Xu
2021-03-11 0:47 Stephen Rothwell
2021-03-11 6:47 ` Björn Töpel
2021-03-12 1:00 ` Stephen Rothwell
2021-03-26 1:18 ` Stephen Rothwell
2020-12-01 8:07 Stephen Rothwell
2020-12-01 14:55 ` Daniel Borkmann
2020-09-08 3:08 Stephen Rothwell
2020-09-08 17:54 ` Andrii Nakryiko
2020-08-21 1:11 Stephen Rothwell
2020-08-25 1:20 ` Stephen Rothwell
2020-08-25 1:25 ` Alexei Starovoitov
2020-08-25 3:04 ` Stephen Rothwell
2020-08-25 3:27 ` Alexei Starovoitov
2020-08-25 6:50 ` Stephen Rothwell
2020-08-25 14:33 ` Alexei Starovoitov
2020-08-25 21:10 ` Stephen Rothwell
2020-08-25 22:34 ` Alexei Starovoitov
2020-08-25 23:09 ` Stephen Rothwell
2020-07-14 2:22 Stephen Rothwell
2020-07-14 6:16 ` Jiri Olsa
2020-07-14 8:31 ` Jiri Olsa
2020-07-14 9:19 ` Geert Uytterhoeven
2019-07-01 4:57 Stephen Rothwell
2019-07-01 5:01 ` Stephen Rothwell
2019-04-18 1:57 Stephen Rothwell
2019-02-28 1:31 Stephen Rothwell
2019-02-28 2:18 ` Alexei Starovoitov
2018-10-03 3:18 Stephen Rothwell
2018-10-03 5:29 ` Joe Stringer
2018-09-07 0:19 Stephen Rothwell
2018-09-07 0:22 ` Alexei Starovoitov
2018-09-07 5:21 ` Björn Töpel
2018-09-07 5:45 ` Alexei Starovoitov
2017-12-13 1:32 Stephen Rothwell
2017-12-13 1:47 ` Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250312145247.380c2aa5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=andrii@kernel$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=bigeasy@linutronix$(echo .)de \
--cc=bpf@vger$(echo .)kernel.org \
--cc=daniel@iogearbox$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=shakeel.butt@linux$(echo .)dev \
--cc=vbabka@suse$(echo .)cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox