Commit 844ae5b4 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf trace: Fix ioctl 'request' beautifier build problems on !(i386 || x86_64) arches 

Supporting decoding the ioctl 'request' parameter needs more work to
properly support more architectures, the current approach doesn't work
on at least powerpc and sparc, as reported by Ben Hutchings in
http://lkml.kernel.org/r/1391593985.3003.48.camel@deadeye.wl.decadent.org.uk

 .

Work around that by making it to be ifdefed for the architectures known
to work with the current, limited approach, i386 and x86_64 till better
code is written.

Reported-by: default avatarBen Hutchings <ben@decadent.org.uk>
Acked-by: default avatarBen Hutchings <ben@decadent.org.uk>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: <stable@vger.kernel.org> # 3.13 Fixes: 78645cf3 ("perf trace: Initial beautifier for ioctl's 'cmd' arg")
Link: http://lkml.kernel.org/n/tip-ss04k11insqlu329xh5g02q0@git.kernel.org


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

tools/perf/builtin-trace.c

+18 −0
Original line number Diff line number Diff line
@@ -283,6 +283,11 @@ static size_t syscall_arg__scnprintf_strarray(char *bf, size_t size, 


#define SCA_STRARRAY syscall_arg__scnprintf_strarray



#if defined(__i386__) || defined(__x86_64__)

/*

 * FIXME: Make this available to all arches as soon as the ioctl beautifier

 * 	  gets rewritten to support all arches.

 */

static size_t syscall_arg__scnprintf_strhexarray(char *bf, size_t size,

						 struct syscall_arg *arg)

{
@@ -290,6 +295,7 @@ static size_t syscall_arg__scnprintf_strhexarray(char *bf, size_t size, 
}



#define SCA_STRHEXARRAY syscall_arg__scnprintf_strhexarray

#endif /* defined(__i386__) || defined(__x86_64__) */



static size_t syscall_arg__scnprintf_fd(char *bf, size_t size,

					struct syscall_arg *arg);
@@ -843,6 +849,10 @@ static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscal 


#define SCA_SIGNUM syscall_arg__scnprintf_signum



#if defined(__i386__) || defined(__x86_64__)

/*

 * FIXME: Make this available to all arches.

 */

#define TCGETS		0x5401



static const char *tioctls[] = {
@@ -864,6 +874,7 @@ static const char *tioctls[] = { 
};



static DEFINE_STRARRAY_OFFSET(tioctls, 0x5401);

#endif /* defined(__i386__) || defined(__x86_64__) */



#define STRARRAY(arg, name, array) \

	  .arg_scnprintf = { [arg] = SCA_STRARRAY, }, \
@@ -945,9 +956,16 @@ static struct syscall_fmt { 
	{ .name	    = "getrlimit",  .errmsg = true, STRARRAY(0, resource, rlimit_resources), },

	{ .name	    = "ioctl",	    .errmsg = true,

	  .arg_scnprintf = { [0] = SCA_FD, /* fd */ 

#if defined(__i386__) || defined(__x86_64__)

/*

 * FIXME: Make this available to all arches.

 */

			     [1] = SCA_STRHEXARRAY, /* cmd */

			     [2] = SCA_HEX, /* arg */ },

	  .arg_parm	 = { [1] = &strarray__tioctls, /* cmd */ }, },

#else

			     [2] = SCA_HEX, /* arg */ }, },

#endif

	{ .name	    = "kill",	    .errmsg = true,

	  .arg_scnprintf = { [1] = SCA_SIGNUM, /* sig */ }, },

	{ .name	    = "linkat",	    .errmsg = true,

CRA Git | Maintained and supported by SUSTech CRA and CCSE