Commit e5e66adf authored by Dapeng Mi's avatar Dapeng Mi Committed by Arnaldo Carvalho de Melo
Browse files

perf regs: Remove __weak attributive arch_sdt_arg_parse_op() function 



In line with the previous patch, the __weak arch_sdt_arg_parse_op()
function is removed.

Architectural-specific implementations in the arch/ directory are now
converted into sub-functions within the util/perf-regs-arch/ directory.

The perf_sdt_arg_parse_op() function will call these sub-functions based
on the EM_HOST.

This change enables cross-architecture calls to arch_sdt_arg_parse_op().

No functional changes are intended.

Suggested-by: default avatarIan Rogers <irogers@google.com>
Reviewed-by: default avatarIan Rogers <irogers@google.com>
Signed-off-by: default avatarDapeng Mi <dapeng1.mi@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Guo Ren <guoren@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <pjw@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Falcon <thomas.falcon@intel.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xudong Hao <xudong.hao@intel.com>
Cc: Zide Chen <zide.chen@intel.com>
[ Fixed up somme fuzz with powerpc and x86 Build files wrt removing perf_regs.o ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 16dccbb8

tools/perf/arch/arm64/util/Build

+0 −1
Original line number Diff line number Diff line
@@ -7,6 +7,5 @@ perf-util-y += header.o 
perf-util-y += hisi-ptt.o

perf-util-y += machine.o

perf-util-y += mem-events.o

perf-util-y += perf_regs.o

perf-util-y += pmu.o

perf-util-y += tsc.o

tools/perf/arch/arm64/util/perf_regs.c

deleted100644 → 0
+0 −105
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <errno.h>

#include <regex.h>

#include <string.h>

#include <sys/auxv.h>

#include <linux/kernel.h>

#include <linux/zalloc.h>



#include "perf_regs.h"

#include "../../../perf-sys.h"

#include "../../../util/debug.h"

#include "../../../util/event.h"

#include "../../../util/perf_regs.h"



#define SMPL_REG_MASK(b) (1ULL << (b))



#ifndef HWCAP_SVE

#define HWCAP_SVE	(1 << 22)

#endif



/* %xNUM */

#define SDT_OP_REGEX1  "^(x[1-2]?[0-9]|3[0-1])$"



/* [sp], [sp, NUM] */

#define SDT_OP_REGEX2  "^\\[sp(, )?([0-9]+)?\\]$"



static regex_t sdt_op_regex1, sdt_op_regex2;



static int sdt_init_op_regex(void)

{

	static int initialized;

	int ret = 0;



	if (initialized)

		return 0;



	ret = regcomp(&sdt_op_regex1, SDT_OP_REGEX1, REG_EXTENDED);

	if (ret)

		goto error;



	ret = regcomp(&sdt_op_regex2, SDT_OP_REGEX2, REG_EXTENDED);

	if (ret)

		goto free_regex1;



	initialized = 1;

	return 0;



free_regex1:

	regfree(&sdt_op_regex1);

error:

	pr_debug4("Regex compilation error.\n");

	return ret;

}



/*

 * SDT marker arguments on Arm64 uses %xREG or [sp, NUM], currently

 * support these two formats.

 */

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

{

	int ret, new_len;

	regmatch_t rm[5];



	ret = sdt_init_op_regex();

	if (ret < 0)

		return ret;



	if (!regexec(&sdt_op_regex1, old_op, 3, rm, 0)) {

		/* Extract xNUM */

		new_len = 2;	/* % NULL */

		new_len += (int)(rm[1].rm_eo - rm[1].rm_so);



		*new_op = zalloc(new_len);

		if (!*new_op)

			return -ENOMEM;



		scnprintf(*new_op, new_len, "%%%.*s",

			(int)(rm[1].rm_eo - rm[1].rm_so), old_op + rm[1].rm_so);

	} else if (!regexec(&sdt_op_regex2, old_op, 5, rm, 0)) {

		/* [sp], [sp, NUM] or [sp,NUM] */

		new_len = 7;	/* + ( % s p ) NULL */



		/* If the argument is [sp], need to fill offset '0' */

		if (rm[2].rm_so == -1)

			new_len += 1;

		else

			new_len += (int)(rm[2].rm_eo - rm[2].rm_so);



		*new_op = zalloc(new_len);

		if (!*new_op)

			return -ENOMEM;



		if (rm[2].rm_so == -1)

			scnprintf(*new_op, new_len, "+0(%%sp)");

		else

			scnprintf(*new_op, new_len, "+%.*s(%%sp)",

				  (int)(rm[2].rm_eo - rm[2].rm_so),

				  old_op + rm[2].rm_so);

	} else {

		pr_debug4("Skipping unsupported SDT argument: %s\n", old_op);

		return SDT_ARG_SKIP;

	}



	return SDT_ARG_VALID;

}

tools/perf/arch/powerpc/util/Build

+0 −1
Original line number Diff line number Diff line 
perf-util-y += header.o

perf-util-y += perf_regs.o

perf-util-y += mem-events.o

perf-util-y += pmu.o

perf-util-y += sym-handling.o

tools/perf/arch/powerpc/util/perf_regs.c

deleted100644 → 0
+0 −125
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <errno.h>

#include <string.h>

#include <regex.h>

#include <linux/zalloc.h>



#include "perf_regs.h"

#include "../../../util/perf_regs.h"

#include "../../../util/debug.h"

#include "../../../util/event.h"

#include "../../../util/header.h"

#include "../../../perf-sys.h"

#include "utils_header.h"



#include <linux/kernel.h>



#define PVR_POWER9		0x004E

#define PVR_POWER10		0x0080

#define PVR_POWER11		0x0082



/* REG or %rREG */

#define SDT_OP_REGEX1  "^(%r)?([1-2]?[0-9]|3[0-1])$"



/* -NUM(REG) or NUM(REG) or -NUM(%rREG) or NUM(%rREG) */

#define SDT_OP_REGEX2  "^(\\-)?([0-9]+)\\((%r)?([1-2]?[0-9]|3[0-1])\\)$"



static regex_t sdt_op_regex1, sdt_op_regex2;



static int sdt_init_op_regex(void)

{

	static int initialized;

	int ret = 0;



	if (initialized)

		return 0;



	ret = regcomp(&sdt_op_regex1, SDT_OP_REGEX1, REG_EXTENDED);

	if (ret)

		goto error;



	ret = regcomp(&sdt_op_regex2, SDT_OP_REGEX2, REG_EXTENDED);

	if (ret)

		goto free_regex1;



	initialized = 1;

	return 0;



free_regex1:

	regfree(&sdt_op_regex1);

error:

	pr_debug4("Regex compilation error.\n");

	return ret;

}



/*

 * Parse OP and convert it into uprobe format, which is, +/-NUM(%gprREG).

 * Possible variants of OP are:

 *	Format		Example

 *	-------------------------

 *	NUM(REG)	48(18)

 *	-NUM(REG)	-48(18)

 *	NUM(%rREG)	48(%r18)

 *	-NUM(%rREG)	-48(%r18)

 *	REG		18

 *	%rREG		%r18

 *	iNUM		i0

 *	i-NUM		i-1

 *

 * SDT marker arguments on Powerpc uses %rREG form with -mregnames flag

 * and REG form with -mno-regnames. Here REG is general purpose register,

 * which is in 0 to 31 range.

 */

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

{

	int ret, new_len;

	regmatch_t rm[5];

	char prefix;



	/* Constant argument. Uprobe does not support it */

	if (old_op[0] == 'i') {

		pr_debug4("Skipping unsupported SDT argument: %s\n", old_op);

		return SDT_ARG_SKIP;

	}



	ret = sdt_init_op_regex();

	if (ret < 0)

		return ret;



	if (!regexec(&sdt_op_regex1, old_op, 3, rm, 0)) {

		/* REG or %rREG --> %gprREG */



		new_len = 5;	/* % g p r NULL */

		new_len += (int)(rm[2].rm_eo - rm[2].rm_so);



		*new_op = zalloc(new_len);

		if (!*new_op)

			return -ENOMEM;



		scnprintf(*new_op, new_len, "%%gpr%.*s",

			(int)(rm[2].rm_eo - rm[2].rm_so), old_op + rm[2].rm_so);

	} else if (!regexec(&sdt_op_regex2, old_op, 5, rm, 0)) {

		/*

		 * -NUM(REG) or NUM(REG) or -NUM(%rREG) or NUM(%rREG) -->

		 *	+/-NUM(%gprREG)

		 */

		prefix = (rm[1].rm_so == -1) ? '+' : '-';



		new_len = 8;	/* +/- ( % g p r ) NULL */

		new_len += (int)(rm[2].rm_eo - rm[2].rm_so);

		new_len += (int)(rm[4].rm_eo - rm[4].rm_so);



		*new_op = zalloc(new_len);

		if (!*new_op)

			return -ENOMEM;



		scnprintf(*new_op, new_len, "%c%.*s(%%gpr%.*s)", prefix,

			(int)(rm[2].rm_eo - rm[2].rm_so), old_op + rm[2].rm_so,

			(int)(rm[4].rm_eo - rm[4].rm_so), old_op + rm[4].rm_so);

	} else {

		pr_debug4("Skipping unsupported SDT argument: %s\n", old_op);

		return SDT_ARG_SKIP;

	}



	return SDT_ARG_VALID;

}

tools/perf/arch/x86/util/Build

+0 −1
Original line number Diff line number Diff line 
perf-util-y += header.o

perf-util-y += tsc.o

perf-util-y += pmu.o

perf-util-y += perf_regs.o

perf-util-y += topdown.o

perf-util-y += machine.o

perf-util-y += event.o