| Message ID | 20201123184016.693fe464@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b6b79dd53082db11070b4368d85dd6699ff0b063 |
| Headers | show |
| Series | linux-next: build failure in Linus' tree | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/merge (9d1aa2f025c6cc516125c42c70f6a9ce087c49ea) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/next (3cea11cd5e3b00d91caf0b4730194039b45c5891) |
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch linus/master (418baf2c28f3473039f2f7377760bd8f6897ae18) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | warning | total: 1 errors, 1 warnings, 0 checks, 8 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch fixes a commit that hasn't been released yet |
On Mon, 23 Nov 2020 18:40:16 +1100, Stephen Rothwell wrote: > After merging most of the trees, today's linux-next build (powerpc64 > allnoconfig) failed like this: > > In file included from arch/powerpc/include/asm/kup.h:18, > from arch/powerpc/include/asm/uaccess.h:9, > from include/linux/uaccess.h:11, > from include/linux/sched/task.h:11, > from include/linux/sched/signal.h:9, > from include/linux/rcuwait.h:6, > from include/linux/percpu-rwsem.h:7, > from include/linux/fs.h:33, > from include/linux/compat.h:17, > from arch/powerpc/kernel/asm-offsets.c:14: > arch/powerpc/include/asm/book3s/64/kup-radix.h:66:1: warning: data definition has no type or storage class > 66 | DECLARE_STATIC_KEY_FALSE(uaccess_flush_key); > | ^~~~~~~~~~~~~~~~~~~~~~~~ > arch/powerpc/include/asm/book3s/64/kup-radix.h:66:1: error: type defaults to 'int' in declaration of 'DECLARE_STATIC_KEY_FALSE' [-Werror=implicit-int] > arch/powerpc/include/asm/book3s/64/kup-radix.h:66:1: warning: parameter names (without types) in function declaration > arch/powerpc/include/asm/book3s/64/kup-radix.h: In function 'prevent_user_access': > arch/powerpc/include/asm/book3s/64/kup-radix.h:180:6: error: implicit declaration of function 'static_branch_unlikely' [-Werror=implicit-function-declaration] > 180 | if (static_branch_unlikely(&uaccess_flush_key)) > | ^~~~~~~~~~~~~~~~~~~~~~ > arch/powerpc/include/asm/book3s/64/kup-radix.h:180:30: error: 'uaccess_flush_key' undeclared (first use in this function) > 180 | if (static_branch_unlikely(&uaccess_flush_key)) > | ^~~~~~~~~~~~~~~~~ > arch/powerpc/include/asm/book3s/64/kup-radix.h:180:30: note: each undeclared identifier is reported only once for each function it appears in > arch/powerpc/include/asm/book3s/64/kup-radix.h: In function 'prevent_user_access_return': > arch/powerpc/include/asm/book3s/64/kup-radix.h:189:30: error: 'uaccess_flush_key' undeclared (first use in this function) > 189 | if (static_branch_unlikely(&uaccess_flush_key)) > | ^~~~~~~~~~~~~~~~~ > arch/powerpc/include/asm/book3s/64/kup-radix.h: In function 'restore_user_access': > arch/powerpc/include/asm/book3s/64/kup-radix.h:198:30: error: 'uaccess_flush_key' undeclared (first use in this function) > 198 | if (static_branch_unlikely(&uaccess_flush_key) && flags == AMR_KUAP_BLOCKED) > | ^~~~~~~~~~~~~~~~~ > > [...] Applied to powerpc/fixes. [1/1] powerpc/64s: Fix allnoconfig build since uaccess flush https://git.kernel.org/powerpc/c/b6b79dd53082db11070b4368d85dd6699ff0b063 cheers
Thanks sfr and mpe. > Applied to powerpc/fixes. > > [1/1] powerpc/64s: Fix allnoconfig build since uaccess flush > https://git.kernel.org/powerpc/c/b6b79dd53082db11070b4368d85dd6699ff0b063 We also needed a similar fix for stable, which has also been applied. I guess I should build some sort of build process that tests a whole range of configs. I did test a few but clearly not enough. Is there a known list that I should be using? Something from kisskb? Kind regards, Daniel Michael Ellerman <patch-notifications@ellerman.id.au> writes: > On Mon, 23 Nov 2020 18:40:16 +1100, Stephen Rothwell wrote: >> After merging most of the trees, today's linux-next build (powerpc64 >> allnoconfig) failed like this: >> >> In file included from arch/powerpc/include/asm/kup.h:18, >> from arch/powerpc/include/asm/uaccess.h:9, >> from include/linux/uaccess.h:11, >> from include/linux/sched/task.h:11, >> from include/linux/sched/signal.h:9, >> from include/linux/rcuwait.h:6, >> from include/linux/percpu-rwsem.h:7, >> from include/linux/fs.h:33, >> from include/linux/compat.h:17, >> from arch/powerpc/kernel/asm-offsets.c:14: >> arch/powerpc/include/asm/book3s/64/kup-radix.h:66:1: warning: data definition has no type or storage class >> 66 | DECLARE_STATIC_KEY_FALSE(uaccess_flush_key); >> | ^~~~~~~~~~~~~~~~~~~~~~~~ >> arch/powerpc/include/asm/book3s/64/kup-radix.h:66:1: error: type defaults to 'int' in declaration of 'DECLARE_STATIC_KEY_FALSE' [-Werror=implicit-int] >> arch/powerpc/include/asm/book3s/64/kup-radix.h:66:1: warning: parameter names (without types) in function declaration >> arch/powerpc/include/asm/book3s/64/kup-radix.h: In function 'prevent_user_access': >> arch/powerpc/include/asm/book3s/64/kup-radix.h:180:6: error: implicit declaration of function 'static_branch_unlikely' [-Werror=implicit-function-declaration] >> 180 | if (static_branch_unlikely(&uaccess_flush_key)) >> | ^~~~~~~~~~~~~~~~~~~~~~ >> arch/powerpc/include/asm/book3s/64/kup-radix.h:180:30: error: 'uaccess_flush_key' undeclared (first use in this function) >> 180 | if (static_branch_unlikely(&uaccess_flush_key)) >> | ^~~~~~~~~~~~~~~~~ >> arch/powerpc/include/asm/book3s/64/kup-radix.h:180:30: note: each undeclared identifier is reported only once for each function it appears in >> arch/powerpc/include/asm/book3s/64/kup-radix.h: In function 'prevent_user_access_return': >> arch/powerpc/include/asm/book3s/64/kup-radix.h:189:30: error: 'uaccess_flush_key' undeclared (first use in this function) >> 189 | if (static_branch_unlikely(&uaccess_flush_key)) >> | ^~~~~~~~~~~~~~~~~ >> arch/powerpc/include/asm/book3s/64/kup-radix.h: In function 'restore_user_access': >> arch/powerpc/include/asm/book3s/64/kup-radix.h:198:30: error: 'uaccess_flush_key' undeclared (first use in this function) >> 198 | if (static_branch_unlikely(&uaccess_flush_key) && flags == AMR_KUAP_BLOCKED) >> | ^~~~~~~~~~~~~~~~~ >> >> [...] >
Daniel Axtens <dja@axtens.net> writes: > Thanks sfr and mpe. > >> Applied to powerpc/fixes. >> >> [1/1] powerpc/64s: Fix allnoconfig build since uaccess flush >> https://git.kernel.org/powerpc/c/b6b79dd53082db11070b4368d85dd6699ff0b063 > > We also needed a similar fix for stable, which has also been applied. > > I guess I should build some sort of build process that tests a whole > range of configs. I did test a few but clearly not enough. Is there a > known list that I should be using? Something from kisskb? It's basically unsolvable in general. I guess allnoconfig is a good one to build, although by default that gets you a 32-bit config. I'll send a patch to add ppc64le_allnoconfig. cheers
diff --git a/arch/powerpc/include/asm/book3s/64/kup-radix.h b/arch/powerpc/include/asm/book3s/64/kup-radix.h index 28716e2f13e3..a39e2d193fdc 100644 --- a/arch/powerpc/include/asm/book3s/64/kup-radix.h +++ b/arch/powerpc/include/asm/book3s/64/kup-radix.h @@ -63,6 +63,8 @@ #else /* !__ASSEMBLY__ */ +#include <linux/jump_label.h> + DECLARE_STATIC_KEY_FALSE(uaccess_flush_key); #ifdef CONFIG_PPC_KUAP
Hi all, After merging most of the trees, today's linux-next build (powerpc64 allnoconfig) failed like this: In file included from arch/powerpc/include/asm/kup.h:18, from arch/powerpc/include/asm/uaccess.h:9, from include/linux/uaccess.h:11, from include/linux/sched/task.h:11, from include/linux/sched/signal.h:9, from include/linux/rcuwait.h:6, from include/linux/percpu-rwsem.h:7, from include/linux/fs.h:33, from include/linux/compat.h:17, from arch/powerpc/kernel/asm-offsets.c:14: arch/powerpc/include/asm/book3s/64/kup-radix.h:66:1: warning: data definition has no type or storage class 66 | DECLARE_STATIC_KEY_FALSE(uaccess_flush_key); | ^~~~~~~~~~~~~~~~~~~~~~~~ arch/powerpc/include/asm/book3s/64/kup-radix.h:66:1: error: type defaults to 'int' in declaration of 'DECLARE_STATIC_KEY_FALSE' [-Werror=implicit-int] arch/powerpc/include/asm/book3s/64/kup-radix.h:66:1: warning: parameter names (without types) in function declaration arch/powerpc/include/asm/book3s/64/kup-radix.h: In function 'prevent_user_access': arch/powerpc/include/asm/book3s/64/kup-radix.h:180:6: error: implicit declaration of function 'static_branch_unlikely' [-Werror=implicit-function-declaration] 180 | if (static_branch_unlikely(&uaccess_flush_key)) | ^~~~~~~~~~~~~~~~~~~~~~ arch/powerpc/include/asm/book3s/64/kup-radix.h:180:30: error: 'uaccess_flush_key' undeclared (first use in this function) 180 | if (static_branch_unlikely(&uaccess_flush_key)) | ^~~~~~~~~~~~~~~~~ arch/powerpc/include/asm/book3s/64/kup-radix.h:180:30: note: each undeclared identifier is reported only once for each function it appears in arch/powerpc/include/asm/book3s/64/kup-radix.h: In function 'prevent_user_access_return': arch/powerpc/include/asm/book3s/64/kup-radix.h:189:30: error: 'uaccess_flush_key' undeclared (first use in this function) 189 | if (static_branch_unlikely(&uaccess_flush_key)) | ^~~~~~~~~~~~~~~~~ arch/powerpc/include/asm/book3s/64/kup-radix.h: In function 'restore_user_access': arch/powerpc/include/asm/book3s/64/kup-radix.h:198:30: error: 'uaccess_flush_key' undeclared (first use in this function) 198 | if (static_branch_unlikely(&uaccess_flush_key) && flags == AMR_KUAP_BLOCKED) | ^~~~~~~~~~~~~~~~~ Caused by commit 9a32a7e78bd0 ("powerpc/64s: flush L1D after user accesses") I have applied the following patch for today: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 23 Nov 2020 18:35:02 +1100 Subject: [PATCH] powerpc/64s: using DECLARE_STATIC_KEY_FALSE needs linux/jump_table.h Fixes: 9a32a7e78bd0 ("powerpc/64s: flush L1D after user accesses") Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/powerpc/include/asm/book3s/64/kup-radix.h | 2 ++ 1 file changed, 2 insertions(+)