linux-kernel - Re: [PATCH v2 3/6] perf trace-event: Always build trace-event-info.c

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <ZypUaPH9UjXQyXYz@x1>
Date: Tue, 5 Nov 2024 14:22:48 -0300
From: Arnaldo Carvalho de Melo <acme@...nel.org>
To: Ian Rogers <irogers@...gle.com>
Cc: Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...hat.com>,
	Namhyung Kim <namhyung@...nel.org>,
	Mark Rutland <mark.rutland@....com>,
	Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
	Jiri Olsa <jolsa@...nel.org>,
	Adrian Hunter <adrian.hunter@...el.com>,
	Kan Liang <kan.liang@...ux.intel.com>,
	Athira Jajeev <atrajeev@...ux.vnet.ibm.com>,
	James Clark <james.clark@...aro.org>,
	Dominique Martinet <asmadeus@...ewreck.org>,
	Yang Li <yang.lee@...ux.alibaba.com>,
	Colin Ian King <colin.i.king@...il.com>,
	Yang Jihong <yangjihong@...edance.com>,
	"Steinar H. Gunderson" <sesse@...gle.com>,
	Oliver Upton <oliver.upton@...ux.dev>,
	Ilkka Koskinen <ilkka@...amperecomputing.com>,
	Ze Gao <zegao2021@...il.com>, Weilin Wang <weilin.wang@...el.com>,
	Ben Gainey <ben.gainey@....com>,
	zhaimingbing <zhaimingbing@...s.chinamobile.com>,
	Zixian Cai <fzczx123@...il.com>, Andi Kleen <ak@...ux.intel.com>,
	Paran Lee <p4ranlee@...il.com>,
	Thomas Falcon <thomas.falcon@...el.com>,
	linux-kernel@...r.kernel.org, linux-perf-users@...r.kernel.org,
	"Steven Rostedt (Google)" <rostedt@...dmis.org>
Subject: Re: [PATCH v2 3/6] perf trace-event: Always build trace-event-info.c

On Sat, Nov 02, 2024 at 09:53:57AM -0700, Ian Rogers wrote:
> trace-event-info.c has no libtraceevent depdendencies, always build it
> and use it in builtin-record and perf_event_attr printing.

Acked-by: Arnaldo Carvalho de Melo <acme@...hat.com>

- Arnaldo
 
> Signed-off-by: Ian Rogers <irogers@...gle.com>
> ---
>  tools/perf/builtin-record.c               | 2 --
>  tools/perf/util/Build                     | 2 +-
>  tools/perf/util/perf_event_attr_fprintf.c | 4 ----
>  3 files changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
> index f83252472921..0b637cea4850 100644
> --- a/tools/perf/builtin-record.c
> +++ b/tools/perf/builtin-record.c
> @@ -1748,10 +1748,8 @@ static void record__init_features(struct record *rec)
>  	if (rec->no_buildid)
>  		perf_header__clear_feat(&session->header, HEADER_BUILD_ID);
>  
> -#ifdef HAVE_LIBTRACEEVENT
>  	if (!have_tracepoints(&rec->evlist->core.entries))
>  		perf_header__clear_feat(&session->header, HEADER_TRACING_DATA);
> -#endif
>  
>  	if (!rec->opts.branch_stack)
>  		perf_header__clear_feat(&session->header, HEADER_BRANCH_STACK);
> diff --git a/tools/perf/util/Build b/tools/perf/util/Build
> index 1eedead5f2f2..609c69995c51 100644
> --- a/tools/perf/util/Build
> +++ b/tools/perf/util/Build
> @@ -85,7 +85,7 @@ perf-util-y += pmu-flex.o
>  perf-util-y += pmu-bison.o
>  perf-util-y += tool_pmu.o
>  perf-util-y += svghelper.o
> -perf-util-$(CONFIG_LIBTRACEEVENT) += trace-event-info.o
> +perf-util-y += trace-event-info.o
>  perf-util-y += trace-event-scripting.o
>  perf-util-$(CONFIG_LIBTRACEEVENT) += trace-event.o
>  perf-util-$(CONFIG_LIBTRACEEVENT) += trace-event-parse.o
> diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
> index 59fbbba79697..a73c74b99a3b 100644
> --- a/tools/perf/util/perf_event_attr_fprintf.c
> +++ b/tools/perf/util/perf_event_attr_fprintf.c
> @@ -212,7 +212,6 @@ static void __p_config_hw_cache_id(char *buf, size_t size, u64 value)
>  	}
>  }
>  
> -#ifdef HAVE_LIBTRACEEVENT
>  static void __p_config_tracepoint_id(char *buf, size_t size, u64 value)
>  {
>  	char *str = tracepoint_id_to_name(value);
> @@ -220,7 +219,6 @@ static void __p_config_tracepoint_id(char *buf, size_t size, u64 value)
>  	print_id_hex(str);
>  	free(str);
>  }
> -#endif
>  
>  static void __p_config_id(struct perf_pmu *pmu, char *buf, size_t size, u32 type, u64 value)
>  {
> @@ -238,9 +236,7 @@ static void __p_config_id(struct perf_pmu *pmu, char *buf, size_t size, u32 type
>  	case PERF_TYPE_HW_CACHE:
>  		return __p_config_hw_cache_id(buf, size, value);
>  	case PERF_TYPE_TRACEPOINT:
> -#ifdef HAVE_LIBTRACEEVENT
>  		return __p_config_tracepoint_id(buf, size, value);
> -#endif
>  	case PERF_TYPE_RAW:
>  	case PERF_TYPE_BREAKPOINT:
>  	default:
> -- 
> 2.47.0.199.ga7371fff76-goog