Re: [PATCH/RFT] Re: [PATCH v5 1/8] perf trace: Fix iteration of syscall ids in syscalltbl->entries

[Jiri Slaby]

On 10. 10. 24, 23:02, Arnaldo Carvalho de Melo wrote:
> On Thu, Oct 10, 2024 at 09:31:54AM -0700, Namhyung Kim wrote:
> > On Thu, Oct 10, 2024 at 09:29:01AM -0700, Namhyung Kim wrote:
> > > On Thu, Oct 10, 2024 at 10:22:12AM +0200, Jiri Slaby wrote:
> > > >  From 3d4f06d79c949a8f155c20652b4f685540899ad4 Mon Sep 17 00:00:00 2001
> > > > From: Jiri Slaby <jslaby@xxxxxxx>
> > > > Date: Thu, 10 Oct 2024 09:57:07 +0200
> > > > Subject: [PATCH] perf: fix non-listed archs
>
> > > > Suggested-by: Howard Chu <howardchu95@xxxxxxxxx>
> > > > Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
>
> > > Acked-by: Namhyung Kim <namhyung@xxxxxxxxxx>
>   
> > Also with,
>   
> > Fixes: 7a2fb5619cc1fb53 ("perf trace: Fix iteration of syscall ids in syscalltbl->entries")
>   
> > > Arnaldo, can you please pick this up for v6.12?
>
> Sure, probably the safest bet now, but just in case, Jiri, can you test
> the following?
>
> - Arnaldo
>
>  From a93dff5b66fb319d700c968de1906a0868a505dc Mon Sep 17 00:00:00 2001
> From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> Date: Thu, 10 Oct 2024 17:52:19 -0300
> Subject: [PATCH 1/1] perf tools arm: Generate syscalltbl.c from arm's
>   syscall.tbl
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit

With this:
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -31,7 +31,7 @@ $(call detected_var,SRCARCH)
 ifneq ($(NO_SYSCALL_TABLE),1)
   NO_SYSCALL_TABLE := 1

-  ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 powerpc arm64 s390 mips 
loongarch))
+  ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 powerpc arm arm64 s390 mips 
loongarch))
     NO_SYSCALL_TABLE := 0
   endif



and this:
--- a/tools/perf/util/syscalltbl.c
+++ b/tools/perf/util/syscalltbl.c
@@ -39,7 +39,7 @@ static const char *const *syscalltbl_native = 
syscalltbl_powerpc_32;
 const int syscalltbl_native_max_id = SYSCALLTBL_ARM64_MAX_ID;
 static const char *const *syscalltbl_native = syscalltbl_arm64;
 #elif defined(__arm__)
-#include <asm/syscalls.c>
+#include <asm/syscalls_32.c>
 const int syscalltbl_native_max_id = SYSCALLTBL_ARM_MAX_ID;
 static const char *const *syscalltbl_native = syscalltbl_arm;
 #elif defined(__mips__)



and this:
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -61,6 +61,7 @@ ifeq ($(SRCARCH),x86)
 endif

 ifeq ($(SRCARCH),arm)
+  CFLAGS += -I$(OUTPUT)arch/arm/include/generated
   LIBUNWIND_LIBS = -lunwind -lunwind-arm
 endif



it builds ;).

thanks,
--
js
suse labs