Commit a5384c42 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf cap: Add __NR_capget to arch/x86 unistd 



As there are duplicated kernel headers in tools/include libc can pick
up the wrong definitions. This was causing the wrong system call for
capget in perf.

Reported-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Fixes: e25ebda7 ("perf cap: Tidy up and improve capability testing")
Closes: https://lore.kernel.org/lkml/cc7d6bdf-1aeb-4179-9029-4baf50b59342@intel.com/


Signed-off-by: default avatarIan Rogers <irogers@google.com>
Tested-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20241026055448.312247-1-irogers@google.com


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

tools/arch/x86/include/uapi/asm/unistd_32.h

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ 
#ifndef __NR_getpgid

#define __NR_getpgid 132

#endif

#ifndef __NR_capget

#define __NR_capget 184

#endif

#ifndef __NR_gettid

#define __NR_gettid 224

#endif

tools/arch/x86/include/uapi/asm/unistd_64.h

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ 
#ifndef __NR_getpgid

#define __NR_getpgid 121

#endif

#ifndef __NR_capget

#define __NR_capget 125

#endif

#ifndef __NR_gettid

#define __NR_gettid 186

#endif

tools/perf/util/cap.c

+3 −7
Original line number Diff line number Diff line
@@ -7,13 +7,9 @@ 
#include "debug.h"

#include <errno.h>

#include <string.h>

#include <unistd.h>

#include <linux/capability.h>

#include <sys/syscall.h>



#ifndef SYS_capget

#define SYS_capget 90

#endif

#include <unistd.h>



#define MAX_LINUX_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_3
@@ -21,9 +17,9 @@ bool perf_cap__capable(int cap, bool *used_root) 
{

	struct __user_cap_header_struct header = {

		.version = _LINUX_CAPABILITY_VERSION_3,

		.pid = getpid(),

		.pid = 0,

	};

	struct __user_cap_data_struct data[MAX_LINUX_CAPABILITY_U32S];

	struct __user_cap_data_struct data[MAX_LINUX_CAPABILITY_U32S] = {};

	__u32 cap_val;



	*used_root = false;