2023-11-18 02:52:27

by Yang Jihong

Subject: [PATCH 0/3] A few fixes for i386 build errors

Yang Jihong (3):
perf kwork: Fix a build error on 32-bit
perf lock contention: Fix a build error on 32-bit
perf bench sched-seccomp-notify: Fix __NR_seccomp undeclared build
error on i386

tools/arch/x86/include/uapi/asm/unistd_32.h | 2 +-
tools/perf/builtin-kwork.c | 2 +-
tools/perf/util/bpf_lock_contention.c | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)

--
2.34.1

2023-11-18 02:52:27

by Yang Jihong

Subject: [PATCH 3/3] perf bench sched-seccomp-notify: Fix __NR_seccomp undeclared build error on i386

Fix a build error on i386 system:

bench/sched-seccomp-notify.c: In function 'seccomp':
bench/sched-seccomp-notify.c:46:17: error: '__NR_seccomp' undeclared (first use in this function); did you mean 'seccomp'?
return syscall(__NR_seccomp, op, flags, args);
^~~~~~~~~~~~
seccomp
bench/sched-seccomp-notify.c:46:17: note: each undeclared identifier is reported only once for each function it appears in
bench/sched-seccomp-notify.c:47:1: error: control reaches end of non-void function [-Werror=return-type]
}
^
cc1: all warnings being treated as errors

Fixes: 7d5cb68af638 ("perf/benchmark: add a new benchmark for seccom_unotify")
Signed-off-by: Yang Jihong <[email protected]>
---
tools/arch/x86/include/uapi/asm/unistd_32.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/arch/x86/include/uapi/asm/unistd_32.h b/tools/arch/x86/include/uapi/asm/unistd_32.h
index 4798f9d18fe8..9de35df1afc3 100644
--- a/tools/arch/x86/include/uapi/asm/unistd_32.h
+++ b/tools/arch/x86/include/uapi/asm/unistd_32.h
@@ -26,6 +26,6 @@
#ifndef __NR_setns
#define __NR_setns 346
#endif
-#ifdef __NR_seccomp
+#ifndef __NR_seccomp
#define __NR_seccomp 354
#endif
--
2.34.1

2023-11-21 05:25:13

by Namhyung Kim

Subject: Re: [PATCH 0/3] A few fixes for i386 build errors

Hello,

On Fri, Nov 17, 2023 at 6:51 PM Yang Jihong <[email protected]> wrote:
>
> Yang Jihong (3):
> perf kwork: Fix a build error on 32-bit
> perf lock contention: Fix a build error on 32-bit
> perf bench sched-seccomp-notify: Fix __NR_seccomp undeclared build
> error on i386

Acked-by: Namhyung Kim <[email protected]>

Thanks for the fix!
Namhyung

>
> tools/arch/x86/include/uapi/asm/unistd_32.h | 2 +-
> tools/perf/builtin-kwork.c | 2 +-
> tools/perf/util/bpf_lock_contention.c | 3 ++-
> 3 files changed, 4 insertions(+), 3 deletions(-)
>
> --
> 2.34.1
>

2023-11-21 18:57:46

by Namhyung Kim

Subject: Re: [PATCH 3/3] perf bench sched-seccomp-notify: Fix __NR_seccomp undeclared build error on i386

Hello,

On Fri, Nov 17, 2023 at 6:51 PM Yang Jihong <[email protected]> wrote:
>
> Fix a build error on i386 system:
>
> bench/sched-seccomp-notify.c: In function 'seccomp':
> bench/sched-seccomp-notify.c:46:17: error: '__NR_seccomp' undeclared (first use in this function); did you mean 'seccomp'?
> return syscall(__NR_seccomp, op, flags, args);
> ^~~~~~~~~~~~
> seccomp
> bench/sched-seccomp-notify.c:46:17: note: each undeclared identifier is reported only once for each function it appears in
> bench/sched-seccomp-notify.c:47:1: error: control reaches end of non-void function [-Werror=return-type]
> }
> ^
> cc1: all warnings being treated as errors
>
> Fixes: 7d5cb68af638 ("perf/benchmark: add a new benchmark for seccom_unotify")
> Signed-off-by: Yang Jihong <[email protected]>

This is already fixed by:
https://lore.kernel.org/all/[email protected]/

Thanks,
Namhyung


> ---
> tools/arch/x86/include/uapi/asm/unistd_32.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/arch/x86/include/uapi/asm/unistd_32.h b/tools/arch/x86/include/uapi/asm/unistd_32.h
> index 4798f9d18fe8..9de35df1afc3 100644
> --- a/tools/arch/x86/include/uapi/asm/unistd_32.h
> +++ b/tools/arch/x86/include/uapi/asm/unistd_32.h
> @@ -26,6 +26,6 @@
> #ifndef __NR_setns
> #define __NR_setns 346
> #endif
> -#ifdef __NR_seccomp
> +#ifndef __NR_seccomp
> #define __NR_seccomp 354
> #endif
> --
> 2.34.1
>

2023-11-22 01:02:28

by Yang Jihong

Subject: Re: [PATCH 3/3] perf bench sched-seccomp-notify: Fix __NR_seccomp undeclared build error on i386

Hello,

On 2023/11/22 2:57, Namhyung Kim wrote:
> Hello,
>
> On Fri, Nov 17, 2023 at 6:51 PM Yang Jihong <[email protected]> wrote:
>>
>> Fix a build error on i386 system:
>>
>> bench/sched-seccomp-notify.c: In function 'seccomp':
>> bench/sched-seccomp-notify.c:46:17: error: '__NR_seccomp' undeclared (first use in this function); did you mean 'seccomp'?
>> return syscall(__NR_seccomp, op, flags, args);
>> ^~~~~~~~~~~~
>> seccomp
>> bench/sched-seccomp-notify.c:46:17: note: each undeclared identifier is reported only once for each function it appears in
>> bench/sched-seccomp-notify.c:47:1: error: control reaches end of non-void function [-Werror=return-type]
>> }
>> ^
>> cc1: all warnings being treated as errors
>>
>> Fixes: 7d5cb68af638 ("perf/benchmark: add a new benchmark for seccom_unotify")
>> Signed-off-by: Yang Jihong <[email protected]>
>
> This is already fixed by:
> https://lore.kernel.org/all/[email protected]/
>

I didn't notice this patch... okay, please ignore it.

Thanks,
Yang

2023-11-22 19:27:01

by Namhyung Kim

Subject: Re: [PATCH 0/3] A few fixes for i386 build errors

On Sat, 18 Nov 2023 02:48:55 +0000, Yang Jihong wrote:
> Yang Jihong (3):
> perf kwork: Fix a build error on 32-bit
> perf lock contention: Fix a build error on 32-bit
> perf bench sched-seccomp-notify: Fix __NR_seccomp undeclared build
> error on i386
>
> tools/arch/x86/include/uapi/asm/unistd_32.h | 2 +-
> tools/perf/builtin-kwork.c | 2 +-
> tools/perf/util/bpf_lock_contention.c | 3 ++-
> 3 files changed, 4 insertions(+), 3 deletions(-)
>
> [...]

Applied patch 1 and 2 to perf-tools, thanks!