ath10k: use rx descriptor for ppdu status extraction

[cascardo/linux.git] / tools / perf / builtin-kmem.c

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index bef3376..f295141 100644 (file)
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -256,7 +256,9 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
 static struct perf_tool perf_kmem = {
        .sample          = process_sample_event,
        .comm            = perf_event__process_comm,
-       .ordered_samples = true,
+       .mmap            = perf_event__process_mmap,
+       .mmap2           = perf_event__process_mmap2,
+       .ordered_events  = true,
 };
 
 static double fragmentation(unsigned long n_req, unsigned long n_alloc)
@@ -403,10 +405,9 @@ static void sort_result(void)
        __sort_result(&root_caller_stat, &root_caller_sorted, &caller_sort);
 }
 
-static int __cmd_kmem(void)
+static int __cmd_kmem(struct perf_session *session)
 {
        int err = -EINVAL;
-       struct perf_session *session;
        const struct perf_evsel_str_handler kmem_tracepoints[] = {
                { "kmem:kmalloc",               perf_evsel__process_alloc_event, },
                { "kmem:kmem_cache_alloc",      perf_evsel__process_alloc_event, },
@@ -415,34 +416,22 @@ static int __cmd_kmem(void)
                { "kmem:kfree",                 perf_evsel__process_free_event, },
                { "kmem:kmem_cache_free",       perf_evsel__process_free_event, },
        };
-       struct perf_data_file file = {
-               .path = input_name,
-               .mode = PERF_DATA_MODE_READ,
-       };
-
-       session = perf_session__new(&file, false, &perf_kmem);
-       if (session == NULL)
-               return -ENOMEM;
-
-       if (perf_session__create_kernel_maps(session) < 0)
-               goto out_delete;
 
        if (!perf_session__has_traces(session, "kmem record"))
-               goto out_delete;
+               goto out;
 
        if (perf_session__set_tracepoints_handlers(session, kmem_tracepoints)) {
                pr_err("Initializing perf session tracepoint handlers failed\n");
-               return -1;
+               goto out;
        }
 
        setup_pager();
        err = perf_session__process_events(session, &perf_kmem);
        if (err != 0)
-               goto out_delete;
+               goto out;
        sort_result();
        print_result(session);
-out_delete:
-       perf_session__delete(session);
+out:
        return err;
 }
 
@@ -689,29 +678,46 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
                NULL,
                NULL
        };
+       struct perf_session *session;
+       struct perf_data_file file = {
+               .path = input_name,
+               .mode = PERF_DATA_MODE_READ,
+       };
+       int ret = -1;
+
        argc = parse_options_subcommand(argc, argv, kmem_options,
                                        kmem_subcommands, kmem_usage, 0);
 
        if (!argc)
                usage_with_options(kmem_usage, kmem_options);
 
-       symbol__init();
-
        if (!strncmp(argv[0], "rec", 3)) {
+               symbol__init(NULL);
                return __cmd_record(argc, argv);
-       } else if (!strcmp(argv[0], "stat")) {
+       }
+
+       session = perf_session__new(&file, false, &perf_kmem);
+       if (session == NULL)
+               return -1;
+
+       symbol__init(&session->header.env);
+
+       if (!strcmp(argv[0], "stat")) {
                if (cpu__setup_cpunode_map())
-                       return -1;
+                       goto out_delete;
 
                if (list_empty(&caller_sort))
                        setup_sorting(&caller_sort, default_sort_order);
                if (list_empty(&alloc_sort))
                        setup_sorting(&alloc_sort, default_sort_order);
 
-               return __cmd_kmem();
+               ret = __cmd_kmem(session);
        } else
                usage_with_options(kmem_usage, kmem_options);
 
-       return 0;
+out_delete:
+       perf_session__delete(session);
+
+       return ret;
 }