* [PATCH 2/3] lib/raid6: Include <asm/ppc-opcode.h> for `VPERMXOR`
2022-01-26 11:41 [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3 Paul Menzel
@ 2022-01-26 11:41 ` Paul Menzel
2022-01-26 11:41 ` [PATCH 3/3] lib/raid6/test: Rename variable to avoid `raid6_call` name clash Paul Menzel
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Paul Menzel @ 2022-01-26 11:41 UTC (permalink / raw)
To: Song Liu; +Cc: linux-raid, Paul Menzel, Matt Brown, linuxppc-dev
On Ubuntu 21.10 (ppc64le) building `raid6test` with gcc (Ubuntu
11.2.0-7ubuntu2) 11.2.0 fails with the error below.
gcc -I.. -I ../../../include -g -O2 -I../../../arch/powerpc/include -DCONFIG_ALTIVEC -c -o vpermxor1.o vpermxor1.c
vpermxor1.c: In function ‘raid6_vpermxor1_gen_syndrome_real’:
vpermxor1.c:64:29: error: expected string literal before ‘VPERMXOR’
64 | asm(VPERMXOR(%0,%1,%2,%3):"=v"(wq0):"v"(gf_high), "v"(gf_low), "v"(wq0));
| ^~~~~~~~
make: *** [Makefile:58: vpermxor1.o] Error 1
So, include the header `asm/ppc-opcode.h` defining this macro also when
not building the Linux kernel but only this too.
Cc: Matt Brown <matthew.brown.dev@gmail.com>
Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
---
lib/raid6/vpermxor.uc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/raid6/vpermxor.uc b/lib/raid6/vpermxor.uc
index 10475dc423c1..1bfb127fbfe8 100644
--- a/lib/raid6/vpermxor.uc
+++ b/lib/raid6/vpermxor.uc
@@ -24,9 +24,9 @@
#ifdef CONFIG_ALTIVEC
#include <altivec.h>
+#include <asm/ppc-opcode.h>
#ifdef __KERNEL__
#include <asm/cputable.h>
-#include <asm/ppc-opcode.h>
#include <asm/switch_to.h>
#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] lib/raid6/test: Rename variable to avoid `raid6_call` name clash
2022-01-26 11:41 [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3 Paul Menzel
2022-01-26 11:41 ` [PATCH 2/3] lib/raid6: Include <asm/ppc-opcode.h> for `VPERMXOR` Paul Menzel
@ 2022-01-26 11:41 ` Paul Menzel
2022-01-26 12:06 ` [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3 David Laight
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Paul Menzel @ 2022-01-26 11:41 UTC (permalink / raw)
To: Song Liu; +Cc: linux-raid, Paul Menzel, Matt Brown, linuxppc-dev
On Ubuntu 21.10 (ppc64le) building `raid6test` with gcc (Ubuntu
11.2.0-7ubuntu2) 11.2.0 fails with the error below.
$ cd lib/raid6/test
$ make
[…]
gcc -I.. -I ../../../include -g -O2 -I../../../arch/powerpc/include -DCONFIG_ALTIVEC -o raid6test test.c raid6.a
/usr/bin/ld: raid6.a(algos.o):/dev/shm/linux/lib/raid6/test/algos.c:28: multiple definition of `raid6_call'; /scratch/local/ccHnUnID.o:/dev/shm/linux/lib/raid6/test/test.c:22: first defined here
collect2: error: ld returned 1 exit status
make: *** [Makefile:74: raid6test] Error 1
Renaming the variable in `test.c` to `raid6_call2` works around that.
The resulting binary terminates with a segmentation fault:
$ ./raid6test
using recovery intx1
Segmentation fault (core dumped)
$ dmesg | tail -3
[75519.758988] raid6test[1891185]: segfault (11) at 0 nip 0 lr 708aa3fe197c code 1 in libc.so.6[708aa3ca0000+260000]
[75519.759006] raid6test[1891185]: code: XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX
[75519.759024] raid6test[1891185]: code: XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX
Cc: Matt Brown <matthew.brown.dev@gmail.com>
Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
---
lib/raid6/test/test.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/raid6/test/test.c b/lib/raid6/test/test.c
index a3cf071941ab..937d2a8bb294 100644
--- a/lib/raid6/test/test.c
+++ b/lib/raid6/test/test.c
@@ -19,7 +19,7 @@
#define NDISKS 16 /* Including P and Q */
const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE)));
-struct raid6_calls raid6_call;
+struct raid6_calls raid6_call2;
char *dataptrs[NDISKS];
char data[NDISKS][PAGE_SIZE] __attribute__((aligned(PAGE_SIZE)));
@@ -71,7 +71,7 @@ static int test_disks(int i, int j)
erra = errb = 0;
} else {
printf("algo=%-8s faila=%3d(%c) failb=%3d(%c) %s\n",
- raid6_call.name,
+ raid6_call2.name,
i, disk_type(i),
j, disk_type(j),
(!erra && !errb) ? "OK" :
@@ -107,30 +107,30 @@ int main(int argc, char *argv[])
if ((*algo)->valid && !(*algo)->valid())
continue;
- raid6_call = **algo;
+ raid6_call2 = **algo;
/* Nuke syndromes */
memset(data[NDISKS-2], 0xee, 2*PAGE_SIZE);
/* Generate assumed good syndrome */
- raid6_call.gen_syndrome(NDISKS, PAGE_SIZE,
+ raid6_call2.gen_syndrome(NDISKS, PAGE_SIZE,
(void **)&dataptrs);
for (i = 0; i < NDISKS-1; i++)
for (j = i+1; j < NDISKS; j++)
err += test_disks(i, j);
- if (!raid6_call.xor_syndrome)
+ if (!raid6_call2.xor_syndrome)
continue;
for (p1 = 0; p1 < NDISKS-2; p1++)
for (p2 = p1; p2 < NDISKS-2; p2++) {
/* Simulate rmw run */
- raid6_call.xor_syndrome(NDISKS, p1, p2, PAGE_SIZE,
+ raid6_call2.xor_syndrome(NDISKS, p1, p2, PAGE_SIZE,
(void **)&dataptrs);
makedata(p1, p2);
- raid6_call.xor_syndrome(NDISKS, p1, p2, PAGE_SIZE,
+ raid6_call2.xor_syndrome(NDISKS, p1, p2, PAGE_SIZE,
(void **)&dataptrs);
for (i = 0; i < NDISKS-1; i++)
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* RE: [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3
2022-01-26 11:41 [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3 Paul Menzel
2022-01-26 11:41 ` [PATCH 2/3] lib/raid6: Include <asm/ppc-opcode.h> for `VPERMXOR` Paul Menzel
2022-01-26 11:41 ` [PATCH 3/3] lib/raid6/test: Rename variable to avoid `raid6_call` name clash Paul Menzel
@ 2022-01-26 12:06 ` David Laight
2022-01-26 12:12 ` Paul Menzel
2022-01-26 14:38 ` a pound's a pound the whole world 'round (was "Re: [PATCH 1/3] ... Use `$(pound)` instead ...") David T-G
2022-02-08 6:43 ` [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3 Song Liu
2022-02-08 18:44 ` Wols Lists
4 siblings, 2 replies; 9+ messages in thread
From: David Laight @ 2022-01-26 12:06 UTC (permalink / raw)
To: 'Paul Menzel', Song Liu; +Cc: linux-raid, linuxppc-dev, Matt Brown
From: Paul Menzel
> Sent: 26 January 2022 11:42
>
..
> +pound := \#
Please use 'hash' not 'pound'.
Only american greengrocers use that horrid name.
A 'pound' is '£'.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3
2022-01-26 12:06 ` [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3 David Laight
@ 2022-01-26 12:12 ` Paul Menzel
2022-01-26 19:29 ` Tim Small
2022-01-26 14:38 ` a pound's a pound the whole world 'round (was "Re: [PATCH 1/3] ... Use `$(pound)` instead ...") David T-G
1 sibling, 1 reply; 9+ messages in thread
From: Paul Menzel @ 2022-01-26 12:12 UTC (permalink / raw)
To: David Laight; +Cc: linux-raid, Song Liu, linuxppc-dev, Matt Brown
Dear David,
Am 26.01.22 um 13:06 schrieb David Laight:
> From: Paul Menzel
>> Sent: 26 January 2022 11:42
> ..
>> +pound := \#
>
> Please use 'hash' not 'pound'.
> Only american greengrocers use that horrid name.
>
> A 'pound' is '£'.
Sure, I can change that, if you send a patch cleaning this up for the
other files already using that in the tree? ;-) Or can it be different
all over the Linux code base?
Kind regards,
Paul
PS:
> -
> Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
> Registration No: 1397386 (Wales)
If you care, the standard signature delimiter is `-- ` [1].
[1]: https://en.wikipedia.org/wiki/Signature_block#Standard_delimiter
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3
2022-01-26 12:12 ` Paul Menzel
@ 2022-01-26 19:29 ` Tim Small
0 siblings, 0 replies; 9+ messages in thread
From: Tim Small @ 2022-01-26 19:29 UTC (permalink / raw)
To: Paul Menzel, David Laight; +Cc: linux-raid, Song Liu, linuxppc-dev, Matt Brown
On 26/01/2022 12:12, Paul Menzel wrote:
> Sure, I can change that,
FWIW, the GNU Make documentation uses "Number signs" to refer to "#",
and I think that may cause the least confusion across speakers of
different dialects of English.
Tim.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: a pound's a pound the whole world 'round (was "Re: [PATCH 1/3] ... Use `$(pound)` instead ...")
2022-01-26 12:06 ` [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3 David Laight
2022-01-26 12:12 ` Paul Menzel
@ 2022-01-26 14:38 ` David T-G
1 sibling, 0 replies; 9+ messages in thread
From: David T-G @ 2022-01-26 14:38 UTC (permalink / raw)
To: linux-raid; +Cc: linuxppc-dev
David, et al --
...and then David Laight said...
%
% From: Paul Menzel
% > Sent: 26 January 2022 11:42
% >
% ..
% > +pound := \#
%
% Please use 'hash' not 'pound'.
Ahem ... Everyone knows that hash is best served hot and that
that symbol is an octothorpe.
% Only american greengrocers use that horrid name.
[snip]
*grin*
HAND
:-D
--
David T-G
See http://justpickone.org/davidtg/email/
See http://justpickone.org/davidtg/tofu.txt
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3
2022-01-26 11:41 [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3 Paul Menzel
` (2 preceding siblings ...)
2022-01-26 12:06 ` [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3 David Laight
@ 2022-02-08 6:43 ` Song Liu
2022-02-08 18:44 ` Wols Lists
4 siblings, 0 replies; 9+ messages in thread
From: Song Liu @ 2022-02-08 6:43 UTC (permalink / raw)
To: Paul Menzel; +Cc: linux-raid, linuxppc-dev, Matt Brown
Hi Paul,
Sorry for the delayed reply.
On Wed, Jan 26, 2022 at 3:42 AM Paul Menzel <pmenzel@molgen.mpg.de> wrote:
>
> Buidling `raid6test` on Ubuntu 21.10 (ppc64le) with GNU Make 4.3 shows the
> errors below:
Please do not use `xxx` in the commit log (and subject).
>
> $ cd lib/raid6/test/
> $ make
> <stdin>:1:1: error: stray ‘\’ in program
> <stdin>:1:2: error: stray ‘#’ in program
> <stdin>:1:11: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘<’ token
> cp -f ../int.uc int.uc
> awk -f ../unroll.awk -vN=1 < int.uc > int1.c
> gcc -I.. -I ../../../include -g -O2 -c -o int1.o int1.c
> awk -f ../unroll.awk -vN=2 < int.uc > int2.c
> gcc -I.. -I ../../../include -g -O2 -c -o int2.o int2.c
> awk -f ../unroll.awk -vN=4 < int.uc > int4.c
> gcc -I.. -I ../../../include -g -O2 -c -o int4.o int4.c
> awk -f ../unroll.awk -vN=8 < int.uc > int8.c
> gcc -I.. -I ../../../include -g -O2 -c -o int8.o int8.c
> awk -f ../unroll.awk -vN=16 < int.uc > int16.c
> gcc -I.. -I ../../../include -g -O2 -c -o int16.o int16.c
> awk -f ../unroll.awk -vN=32 < int.uc > int32.c
> gcc -I.. -I ../../../include -g -O2 -c -o int32.o int32.c
> rm -f raid6.a
> ar cq raid6.a int1.o int2.o int4.o int8.o int16.o int32.o recov.o algos.o tables.o
> ranlib raid6.a
> gcc -I.. -I ../../../include -g -O2 -o raid6test test.c raid6.a
> /usr/bin/ld: raid6.a(algos.o):/dev/shm/linux/lib/raid6/test/algos.c:28: multiple definition of `raid6_call'; /scratch/local/ccIJjN8s.o:/dev/shm/linux/lib/raid6/test/test.c:22: first defined here
> collect2: error: ld returned 1 exit status
> make: *** [Makefile:72: raid6test] Error 1
>
> The errors come from the `HAS_ALTIVEC` test, which fails, and the POWER
> optimized versions are not built. That’s also reason nobody noticed on the
> other architectures.
>
> GNU Make 4.3 does not remove the backslash anymore. From the 4.3 release
> announcment:
>
> > * WARNING: Backward-incompatibility!
> > Number signs (#) appearing inside a macro reference or function invocation
> > no longer introduce comments and should not be escaped with backslashes:
> > thus a call such as:
> > foo := $(shell echo '#')
> > is legal. Previously the number sign needed to be escaped, for example:
> > foo := $(shell echo '\#')
> > Now this latter will resolve to "\#". If you want to write makefiles
> > portable to both versions, assign the number sign to a variable:
> > H := \#
> > foo := $(shell echo '$H')
> > This was claimed to be fixed in 3.81, but wasn't, for some reason.
> > To detect this change search for 'nocomment' in the .FEATURES variable.
>
> So, do the same as commit 9564a8cf422d (Kbuild: fix # escaping in .cmd
> files for future Make) and commit 929bef467771 (bpf: Use $(pound) instead
> of \# in Makefiles) and define and use a `$(pound)` variable.
Please run ./scripts/checkpatch.pl against the patch files, and fix
errors/warnings
as much as possible.
Thanks,
Song
>
> Reference for the change in make:
> https://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b57
>
> Cc: Matt Brown <matthew.brown.dev@gmail.com>
> Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
> ---
> lib/raid6/test/Makefile | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/lib/raid6/test/Makefile b/lib/raid6/test/Makefile
> index a4c7cd74cff5..4fb7700a741b 100644
> --- a/lib/raid6/test/Makefile
> +++ b/lib/raid6/test/Makefile
> @@ -4,6 +4,8 @@
> # from userspace.
> #
>
> +pound := \#
> +
> CC = gcc
> OPTFLAGS = -O2 # Adjust as desired
> CFLAGS = -I.. -I ../../../include -g $(OPTFLAGS)
> @@ -42,7 +44,7 @@ else ifeq ($(HAS_NEON),yes)
> OBJS += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o
> CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1
> else
> - HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\
> + HAS_ALTIVEC := $(shell printf '$(pound)include <altivec.h>\nvector int a;\n' |\
> gcc -c -x c - >/dev/null && rm ./-.o && echo yes)
> ifeq ($(HAS_ALTIVEC),yes)
> CFLAGS += -I../../../arch/powerpc/include
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3
2022-01-26 11:41 [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3 Paul Menzel
` (3 preceding siblings ...)
2022-02-08 6:43 ` [PATCH 1/3] lib/raid6/test/Makefile: Use `$(pound)` instead of `\#` for Make 4.3 Song Liu
@ 2022-02-08 18:44 ` Wols Lists
4 siblings, 0 replies; 9+ messages in thread
From: Wols Lists @ 2022-02-08 18:44 UTC (permalink / raw)
To: Paul Menzel, Song Liu; +Cc: linux-raid, linuxppc-dev, Matt Brown
On 26/01/2022 11:41, Paul Menzel wrote:
> So, do the same as commit 9564a8cf422d (Kbuild: fix # escaping in .cmd
> files for future Make) and commit 929bef467771 (bpf: Use $(pound) instead
> of \# in Makefiles) and define and use a `$(pound)` variable.
Ouch!
In the English (as opposed to American) speaking world this will be very
confusing! The pound sign is £ not #.
If this is not dictated by some sort of upstream PLEASE can we make it
$(hash) not $(pound)
Cheers,
Wol
^ permalink raw reply [flat|nested] 9+ messages in thread