• Arnaldo Carvalho de Melo's avatar
    tools headers UAPI: Sync s390 syscall table file changed by new futex_waitv syscall · 71a16df1
    Arnaldo Carvalho de Melo authored
    To pick the changes in these csets:
    
      6c122360 ("s390: wire up sys_futex_waitv system call")
    
    That add support for this new syscall in tools such as 'perf trace'.
    
    For instance, this is now possible (adapted from the x86_64 test output):
    
      # perf trace -e futex_waitv
      ^C#
      # perf trace -v -e futex_waitv
      event qualifier tracepoint filter: (common_pid != 807333 && common_pid != 3564) && (id == 449)
      ^C#
      # perf trace -v -e futex* --max-events 10
      event qualifier tracepoint filter: (common_pid != 812168 && common_pid != 3564) && (id == 238 || id == 449)
               ? (         ): Timer/219310  ... [continued]: futex())                                            = -1 ETIMEDOUT (Connection timed out)
           0.012 ( 0.002 ms): Timer/219310 futex(uaddr: 0x7fd0b152d3c8, op: WAKE|PRIVATE_FLAG, val: 1)           = 0
           0.024 ( 0.060 ms): Timer/219310 futex(uaddr: 0x7fd0b152d420, op: WAIT_BITSET|PRIVATE_FLAG, utime: 0x7fd0b1657840, val3: MATCH_ANY) = 0
           0.086 ( 0.001 ms): Timer/219310 futex(uaddr: 0x7fd0b152d3c8, op: WAKE|PRIVATE_FLAG, val: 1)           = 0
           0.088 (         ): Timer/219310 futex(uaddr: 0x7fd0b152d424, op: WAIT_BITSET|PRIVATE_FLAG, utime: 0x7fd0b1657840, val3: MATCH_ANY) ...
           0.075 ( 0.005 ms): Web Content/219299 futex(uaddr: 0x7fd0b152d420, op: WAKE|PRIVATE_FLAG, val: 1)     = 1
           0.169 ( 0.004 ms): Web Content/219299 futex(uaddr: 0x7fd0b152d424, op: WAKE|PRIVATE_FLAG, val: 1)     = 1
           0.088 ( 0.089 ms): Timer/219310  ... [continued]: futex())                                            = 0
           0.179 ( 0.001 ms): Timer/219310 futex(uaddr: 0x7fd0b152d3c8, op: WAKE|PRIVATE_FLAG, val: 1)           = 0
           0.181 (         ): Timer/219310 futex(uaddr: 0x7fd0b152d420, op: WAIT_BITSET|PRIVATE_FLAG, utime: 0x7fd0b1657840, val3: MATCH_ANY) ...
      #
    
    That is the filter expression attached to the raw_syscalls:sys_{enter,exit}
    tracepoints.
    
      $ grep futex tools/perf/arch/s390/entry/syscalls/syscall.tbl
      238  common	futex			sys_futex			sys_futex_time32
      422	32	futex_time64		-				sys_futex
      449  common	futex_waitv		sys_futex_waitv			sys_futex_waitv
      $
    
    This addresses this perf build warnings:
    
      Warning: Kernel ABI header at 'tools/perf/arch/s390/entry/syscalls/syscall.tbl' differs from latest version at 'arch/s390/kernel/syscalls/syscall.tbl'
      diff -u tools/perf/arch/s390/entry/syscalls/syscall.tbl arch/s390/kernel/syscalls/syscall.tbl
    Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
    Cc: Adrian Hunter <adrian.hunter@intel.com>,
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Vasily Gorbik <gor@linux.ibm.com>
    Link: https://lore.kernel.org/lkml/YZ%2F2qRW%2FTScYTP1U@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    71a16df1
syscall.tbl 22.8 KB