Re: [PATCH 11/11] perf tools: Fix build error on generated/fs_at_flags_array.c

[James Clark]

On 03/12/2024 3:53 am, Namhyung Kim wrote:
> It should only have generic flags in the array but the recent header
> sync brought a new flags to fcntl.h and caused a build error.  Let's
> update the shell script to exclude flags specific to name_to_handle_at().
>
>      CC      trace/beauty/fs_at_flags.o
>    In file included from trace/beauty/fs_at_flags.c:21:
>    tools/perf/trace/beauty/generated/fs_at_flags_array.c:13:30: error: initialized field overwritten [-Werror=override-init]
>       13 |         [ilog2(0x002) + 1] = "HANDLE_CONNECTABLE",
>          |                              ^~~~~~~~~~~~~~~~~~~~
>    tools/perf/trace/beauty/generated/fs_at_flags_array.c:13:30: note: (near initialization for ‘fs_at_flags[2]’)
>
> Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>

Hi Namhyung,

Is it possible to fix this before the updates to keep it buildable? 
Maybe it's not feasible, I didn't check.

I did notice a build issue in the kvm tests after this update:

$ make O=../build/local/ summary=1 TARGETS=kvm kselftest

In file included from aarch64/aarch32_id_regs.c:14:
include/aarch64/processor.h:15:10: fatal error: asm/brk-imm.h: No such 
file or directory
   15 | #include <asm/brk-imm.h>

But I tried the same on v6.13-rc1 and got a different error, so I don't 
know if it's any worse.

Thanks
James

> ---
>   tools/perf/trace/beauty/fs_at_flags.sh | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/trace/beauty/fs_at_flags.sh b/tools/perf/trace/beauty/fs_at_flags.sh
> index e3f13f96a27c227c..fac4d0c049fcc89f 100755
> --- a/tools/perf/trace/beauty/fs_at_flags.sh
> +++ b/tools/perf/trace/beauty/fs_at_flags.sh
> @@ -13,13 +13,14 @@ printf "static const char *fs_at_flags[] = {\n"
>   regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+AT_([^_]+[[:alnum:]_]+)[[:space:]]+(0x[[:xdigit:]]+)[[:space:]]*.*'
>   # AT_EACCESS is only meaningful to faccessat, so we will special case it there...
>   # AT_STATX_SYNC_TYPE is not a bit, its a mask of AT_STATX_SYNC_AS_STAT, AT_STATX_FORCE_SYNC and AT_STATX_DONT_SYNC
> -# AT_HANDLE_FID and AT_HANDLE_MNT_ID_UNIQUE are reusing values and are valid only for name_to_handle_at()
> +# AT_HANDLE_FID, AT_HANDLE_MNT_ID_UNIQUE and AT_HANDLE_CONNECTABLE are reusing values and are valid only for name_to_handle_at()
>   # AT_RENAME_NOREPLACE reuses 0x1 and is valid only for renameat2()
>   grep -E $regex ${linux_fcntl} | \
>   	grep -v AT_EACCESS | \
>   	grep -v AT_STATX_SYNC_TYPE | \
>   	grep -v AT_HANDLE_FID | \
>   	grep -v AT_HANDLE_MNT_ID_UNIQUE | \
> +	grep -v AT_HANDLE_CONNECTABLE | \
>   	grep -v AT_RENAME_NOREPLACE | \
>   	sed -r "s/$regex/\2 \1/g"	| \
>   	xargs printf "\t[ilog2(%s) + 1] = \"%s\",\n"