Commit 1437a9f0 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers UAPI: Sync fcntl.h with the kernel sources to pick F_DUPFD_QUERY 

There is no scrape script yet for those, but the warning pointed out we
need to update the array with the F_LINUX_SPECIFIC_BASE entries, do it.

Now 'perf trace' can decode that cmd and also use it in filter, as in:

  root@number:~# perf trace -e syscalls:*enter_fcntl --filter 'cmd != SETFL && cmd != GETFL'
     0.000 sssd_kcm/303828 syscalls:sys_enter_fcntl(fd: 13</var/lib/sss/secrets/secrets.ldb>, cmd: SETLK, arg: 0x7fffdc6a8a50)
     0.013 sssd_kcm/303828 syscalls:sys_enter_fcntl(fd: 13</var/lib/sss/secrets/secrets.ldb>, cmd: SETLKW, arg: 0x7fffdc6a8aa0)
     0.090 sssd_kcm/303828 syscalls:sys_enter_fcntl(fd: 13</var/lib/sss/secrets/secrets.ldb>, cmd: SETLKW, arg: 0x7fffdc6a88e0)
  ^Croot@number:~#

This picks up the changes in:

  c62b758b ("fcntl: add F_DUPFD_QUERY fcntl()")

Addressing this perf tools build warning:

  Warning: Kernel ABI header differences:
    diff -u tools/perf/trace/beauty/include/uapi/linux/fcntl.h include/uapi/linux/fcntl.h

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/lkml/ZlSqNQH9mFw2bmjq@x1


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0efc88e4

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ static const char *fcntl_cmds[] = { 
static DEFINE_STRARRAY(fcntl_cmds, "F_");



static const char *fcntl_linux_specific_cmds[] = {

	"SETLEASE", "GETLEASE", "NOTIFY", [5] =	"CANCELLK", "DUPFD_CLOEXEC",

	"SETLEASE", "GETLEASE", "NOTIFY", "DUPFD_QUERY", [5] = "CANCELLK", "DUPFD_CLOEXEC",

	"SETPIPE_SZ", "GETPIPE_SZ", "ADD_SEALS", "GET_SEALS",

	"GET_RW_HINT", "SET_RW_HINT", "GET_FILE_RW_HINT", "SET_FILE_RW_HINT",

};

tools/perf/trace/beauty/include/uapi/linux/fcntl.h

+8 −6
Original line number Diff line number Diff line
@@ -8,6 +8,14 @@ 
#define F_SETLEASE	(F_LINUX_SPECIFIC_BASE + 0)

#define F_GETLEASE	(F_LINUX_SPECIFIC_BASE + 1)



/*

 * Request nofications on a directory.

 * See below for events that may be notified.

 */

#define F_NOTIFY	(F_LINUX_SPECIFIC_BASE + 2)



#define F_DUPFD_QUERY	(F_LINUX_SPECIFIC_BASE + 3)



/*

 * Cancel a blocking posix lock; internal use only until we expose an

 * asynchronous lock api to userspace:
@@ -17,12 +25,6 @@ 
/* Create a file descriptor with FD_CLOEXEC set. */

#define F_DUPFD_CLOEXEC	(F_LINUX_SPECIFIC_BASE + 6)



/*

 * Request nofications on a directory.

 * See below for events that may be notified.

 */

#define F_NOTIFY	(F_LINUX_SPECIFIC_BASE+2)



/*

 * Set and get of pipe page size array

 */