This is a note to let you know that I've just added the patch titled perf parse-events: Fix driver config term to the 6.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: perf-parse-events-fix-driver-config-term.patch and it can be found in the queue-6.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 45fc4628c15ab2cb7b2f53354b21db63f0a41f81 Mon Sep 17 00:00:00 2001 From: Ian Rogers <irogers@xxxxxxxxxx> Date: Mon, 4 Sep 2023 20:38:05 -0700 Subject: perf parse-events: Fix driver config term From: Ian Rogers <irogers@xxxxxxxxxx> commit 45fc4628c15ab2cb7b2f53354b21db63f0a41f81 upstream. Inadvertently deleted in commit 30f4ade33d649aa0 ("perf tools: Revert enable indices setting syntax for BPF map"). Fixes: 30f4ade33d649aa0 ("perf tools: Revert enable indices setting syntax for BPF map") Reported-by: James Clark <james.clark@xxxxxxx> Reviewed-by: James Clark <james.clark@xxxxxxx> Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx> Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx> Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx> Cc: Jiri Olsa <jolsa@xxxxxxxxxx> Cc: Mark Rutland <mark.rutland@xxxxxxx> Cc: Namhyung Kim <namhyung@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Link: http://lore.kernel.org/lkml/20230905033805.3094293-1-irogers@xxxxxxxxxx Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- tools/perf/util/parse-events.y | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -870,6 +870,23 @@ PE_TERM $$ = term; } +| +PE_DRV_CFG_TERM +{ + struct parse_events_term *term; + char *config = strdup($1); + int err; + + if (!config) + YYNOMEM; + err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, config, $1, &@1, NULL); + if (err) { + free($1); + free(config); + PE_ABORT(err); + } + $$ = term; +} sep_dc: ':' | Patches currently in stable-queue which might be from irogers@xxxxxxxxxx are queue-6.5/perf-mem-events-avoid-uninitialized-read.patch queue-6.5/perf-tools-do-not-ignore-the-default-vmlinux.h.patch queue-6.5/perf-kwork-fix-incorrect-and-missing-free-atom-in-wo.patch queue-6.5/perf-parse-events-remove-unused-pe_kernel_pmu_event-.patch queue-6.5/perf-kwork-set-ordered_events-to-true-in-struct-perf.patch queue-6.5/perf-tools-revert-enable-indices-setting-syntax-for-.patch queue-6.5/perf-parse-events-fix-tracepoint-name-memory-leak.patch queue-6.5/perf-record-fix-btf-type-checks-in-the-off-cpu-profi.patch queue-6.5/perf-machine-avoid-out-of-bounds-lbr-memory-read.patch queue-6.5/perf-parse-events-fix-for-term-values-that-are-raw-e.patch queue-6.5/perf-stat-fix-aggr-mode-initialization.patch queue-6.5/perf-vendor-events-intel-fix-broadwellde-tma_info_sy.patch queue-6.5/perf-hist-add-missing-puts-to-hist__account_cycles.patch queue-6.5/libperf-rc_check-make-implicit-enabling-work-for-gcc.patch queue-6.5/perf-vendor-events-intel-add-broadwellde-two-metrics.patch queue-6.5/perf-parse-events-remove-unused-pe_pmu_event_fake-to.patch queue-6.5/perf-parse-events-remove-abort_on.patch queue-6.5/perf-build-add-missing-comment-about-no_libtraceeven.patch queue-6.5/perf-parse-events-fix-driver-config-term.patch queue-6.5/perf-kwork-add-the-supported-subcommands-to-the-docu.patch queue-6.5/perf-pmu-remove-logic-for-pmu-name-being-null.patch queue-6.5/perf-trace-use-the-right-bpf_probe_read-_str-variant.patch