perf config: Bail out when a handler returns failure for a key-value pair
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 22d4621987faf651fee92c532a3eaba9a0e31ba0 Gitweb: https://git.kernel.org/tip/22d4621987faf651fee92c532a3eaba9a0e31ba0 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 6 Jun 2019 10:56:55 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 10 Jun 2019 15:50:01 -0300
perf config: Bail out when a handler returns failure for a key-value pair
So perf_config() uses:
int ret = 0;
perf_config_set__for_each_entry(config_set, section, item) {
...
ret = fn();
if (ret < 0)
break;
}return ret;
Expecting that that break will imediatelly go to function exit to return that error value (ret).
The problem is that perf_config_set__for_each_entry() expands into two nested for() loops, one traversing the sections in a config and the second the items in each of those sections, so we have to change that 'break' to a goto label right before that final 'return ret'.
With that, for instance 'perf trace' now correctly bails out when a event that is requested to be added via its 'trace.add_events' ~/.perfconfig entry gets rejected by the kernel BPF verifier:
# perf trace ls
event syntax error: '/home/acme/git/perf/tools/perf/examples/bpf/augmented_raw_syscalls.o'
\___ Kernel verifier blocks program loading (add -v to see detail)
Run 'perf list' for a list of valid events
Error: wrong config key-value pair trace.add_events=/home/acme/git/perf/tools/perf/examples/bpf/augmented_raw_syscalls.o #
While before it would continue and explode later, when trying to find maps that would have been in place had that augmented_raw_syscalls.o precompiled BPF proggie been accepted by the, humm, bast... rigorous kernel BPF verifier 8-)
--- tools/perf/util/config.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/perf/util/config.c +6 -2
@@ -739,11 +739,15 @@ int perf_config(config_fn_t fn, void *data)if (ret <0 ) {pr_err ("Error: wrong config key-value pair %s=%s\n" , key, value); -break ; +/* +* Can't be just a 'break', as perf_config_set__for_each_entry() +* expands to two nested for() loops. +*/ + goto out; } } } - +out:return ret; }