Commit af785e75 authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

perf parse-regs: Add generic support for arch__intr/user_reg_mask() 



There may be different register mask for use with intr or user on some
platforms, e.g. Icelake.

Add weak functions arch__intr_reg_mask() and arch__user_reg_mask() to
return intr and user register mask respectively.

Check mask before printing or comparing the register name.

Generic code always return PERF_REGS_MASK. No functional change.

Suggested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Tested-by: default avatarRavi Bangoria <ravi.bangoria@linux.ibm.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/1557865174-56264-2-git-send-email-kan.liang@linux.intel.com


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

tools/perf/util/parse-regs-options.c

+10 −3
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ __parse_regs(const struct option *opt, const char *str, int unset, bool intr) 
	const struct sample_reg *r;

	char *s, *os = NULL, *p;

	int ret = -1;

	uint64_t mask;



	if (unset)

		return 0;
@@ -22,6 +23,11 @@ __parse_regs(const struct option *opt, const char *str, int unset, bool intr) 
	if (*mode)

		return -1;



	if (intr)

		mask = arch__intr_reg_mask();

	else

		mask = arch__user_reg_mask();



	/* str may be NULL in case no arg is passed to -I */

	if (str) {

		/* because str is read-only */
@@ -37,6 +43,7 @@ __parse_regs(const struct option *opt, const char *str, int unset, bool intr) 
			if (!strcmp(s, "?")) {

				fprintf(stderr, "available registers: ");

				for (r = sample_reg_masks; r->name; r++) {

					if (r->mask & mask)

						fprintf(stderr, "%s ", r->name);

				}

				fputc('\n', stderr);
@@ -44,7 +51,7 @@ __parse_regs(const struct option *opt, const char *str, int unset, bool intr) 
				return -1;

			}

			for (r = sample_reg_masks; r->name; r++) {

				if (!strcasecmp(s, r->name))

				if ((r->mask & mask) && !strcasecmp(s, r->name))

					break;

			}

			if (!r->name) {
@@ -65,7 +72,7 @@ __parse_regs(const struct option *opt, const char *str, int unset, bool intr) 


	/* default to all possible regs */

	if (*mode == 0)

		*mode = PERF_REGS_MASK;

		*mode = mask;

error:

	free(os);

	return ret;

tools/perf/util/perf_regs.c

+10 −0
Original line number Diff line number Diff line
@@ -13,6 +13,16 @@ int __weak arch_sdt_arg_parse_op(char *old_op __maybe_unused, 
	return SDT_ARG_SKIP;

}



uint64_t __weak arch__intr_reg_mask(void)

{

	return PERF_REGS_MASK;

}



uint64_t __weak arch__user_reg_mask(void)

{

	return PERF_REGS_MASK;

}



#ifdef HAVE_PERF_REGS_SUPPORT

int perf_reg_value(u64 *valp, struct regs_dump *regs, int id)

{

tools/perf/util/perf_regs.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ enum { 
};



int arch_sdt_arg_parse_op(char *old_op, char **new_op);

uint64_t arch__intr_reg_mask(void);

uint64_t arch__user_reg_mask(void);



#ifdef HAVE_PERF_REGS_SUPPORT

#include <perf_regs.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE