Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf kvm: Fix subcommand matching error

Currently the 'diff', 'top', 'buildid-list' and 'stat' perf commands use
strncmp() to match subcommands. As a result, matching does not meet
expectation.

For example:
# perf kvm diff1234
# Event 'cycles'
#
# Baseline Delta Abs Shared Object Symbol
# ........ ......... ............. ......
#

# Event 'dummy:HG'
#
# Baseline Delta Abs Shared Object Symbol
# ........ ......... ............. ......
#
# echo $?
0
#

Invalid information should be returned, but success is actually returned.

Solution: Use strstarts() to match subcommands.

After:
# perf kvm diff1234

Usage: perf kvm [<options>] {top|record|report|diff|buildid-list|stat}

-i, --input <file> Input file name
-o, --output <file> Output file name
-v, --verbose be more verbose (show counter open errors, etc)
--guest Collect guest os data
--guest-code Guest code can be found in hypervisor process
--guestkallsyms <file>
file saving guest os /proc/kallsyms
--guestmodules <file>
file saving guest os /proc/modules
--guestmount <directory>
guest mount directory under which every guest os instance has a subdir
--guestvmlinux <file>
file saving guest os vmlinux
--host Collect host os data

# echo $?
129
#

Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220808092408.107399-2-yangjihong1@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Yang Jihong and committed by
Arnaldo Carvalho de Melo
d2f30b79 4bf6dcaa

+4 -4
+4 -4
tools/perf/builtin-kvm.c
··· 1638 1638 return __cmd_record(file_name, argc, argv); 1639 1639 else if (strlen(argv[0]) > 2 && strstarts("report", argv[0])) 1640 1640 return __cmd_report(file_name, argc, argv); 1641 - else if (!strncmp(argv[0], "diff", 4)) 1641 + else if (strlen(argv[0]) > 2 && strstarts("diff", argv[0])) 1642 1642 return cmd_diff(argc, argv); 1643 - else if (!strncmp(argv[0], "top", 3)) 1643 + else if (!strcmp(argv[0], "top")) 1644 1644 return cmd_top(argc, argv); 1645 - else if (!strncmp(argv[0], "buildid-list", 12)) 1645 + else if (strlen(argv[0]) > 2 && strstarts("buildid-list", argv[0])) 1646 1646 return __cmd_buildid_list(file_name, argc, argv); 1647 1647 #ifdef HAVE_KVM_STAT_SUPPORT 1648 - else if (!strncmp(argv[0], "stat", 4)) 1648 + else if (strlen(argv[0]) > 2 && strstarts("stat", argv[0])) 1649 1649 return kvm_cmd_stat(file_name, argc, argv); 1650 1650 #endif 1651 1651 else