2 files changed, 10 insertions, 6 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 6969ba98ff2f..0b3b4e4984b9 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2609,7 +2609,7 @@ static void evlist__set_evsel_handler(struct perf_evlist *evlist, void *handler)
 
 int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused)
 {
-        const char * const trace_usage[] = {
+        const char *trace_usage[] = {
                 "perf trace [<options>] [<command>]",
                 "perf trace [<options>] -- <command> [<options>]",
                 "perf trace record [<options>] [<command>]",
@@ -2684,6 +2684,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused)
         OPT_BOOLEAN(0, "syscalls", &trace.trace_syscalls, "Trace syscalls"),
         OPT_END()
         };
+        const char * const trace_subcommands[] = { "record", NULL };
         int err;
         char bf[BUFSIZ];
 
@@ -2699,8 +2700,8 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused)
                 goto out;
         }
 
-        argc = parse_options(argc, argv, trace_options, trace_usage,
-                             PARSE_OPT_STOP_AT_NON_OPTION);
+        argc = parse_options_subcommand(argc, argv, trace_options, trace_subcommands,
+                                 trace_usage, PARSE_OPT_STOP_AT_NON_OPTION);
 
         if (trace.trace_pgfaults) {
                 trace.opts.sample_address = true;
diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index a33d2ef53ae4..bdd40350870a 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -120,6 +120,7 @@ __perf_prev_skip_opts ()
                 ((i--))
         done
 }
+
 __perf_main ()
 {
         local cmd
@@ -137,13 +138,15 @@ __perf_main ()
                         cmds=$($cmd --list-cmds)
                 fi
                 __perfcomp "$cmds" "$cur"
-        # List possible events for -e and --event option
-        elif [[ $prev == @("-e"|"--event") && $prev_skip_opts == @(record|stat|top) ]]; then
+        # List possible events for -e option
+        elif [[ $prev == @("-e"|"--event") &&
+                $prev_skip_opts == @(record|stat|top) ]]; then
                 evts=$($cmd list --raw-dump)
                 __perfcomp_colon "$evts" "$cur"
         else
                 # List subcommands for perf commands
-                if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|data|help|script|test|timechart) ]]; then
+                if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|
+                        |data|help|script|test|timechart|trace) ]]; then
                         subcmds=$($cmd $prev_skip_opts --list-cmds)
                         __perfcomp_colon "$subcmds" "$cur"
                 fi