Skip to content

Commit

Permalink
perf session: Return error code for perf_session__new() function on f…
Browse files Browse the repository at this point in the history
…ailure

This patch is to return error code of perf_new_session function on
failure instead of NULL.

Test Results:

Before Fix:

  $ perf c2c report -input
  failed to open nput: No such file or directory

  $ echo $?
  0
  $

After Fix:

  $ perf c2c report -input
  failed to open nput: No such file or directory

  $ echo $?
  254
  $

Committer notes:

Fix 'perf tests topology' case, where we use that TEST_ASSERT_VAL(...,
session), i.e. we need to pass zero in case of failure, which was the
case before when NULL was returned by perf_session__new() for failure,
but now we need to negate the result of IS_ERR(session) to respect that
TEST_ASSERT_VAL) expectation of zero meaning failure.

Reported-by: Nageswara R Sastry <[email protected]>
Signed-off-by: Mamatha Inamdar <[email protected]>
Tested-by: Arnaldo Carvalho de Melo <[email protected]>
Tested-by: Nageswara R Sastry <[email protected]>
Acked-by: Ravi Bangoria <[email protected]>
Reviewed-by: Jiri Olsa <[email protected]>
Reviewed-by: Mukesh Ojha <[email protected]>
Cc: Adrian Hunter <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Alexey Budankov <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Jeremie Galarneau <[email protected]>
Cc: Kate Stewart <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Shawn Landden <[email protected]>
Cc: Song Liu <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Tzvetomir Stoyanov <[email protected]>
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
  • Loading branch information
Mamatha Inamdar authored and acmel committed Sep 20, 2019
1 parent 9e6124d commit 6ef81c5
Show file tree
Hide file tree
Showing 22 changed files with 86 additions and 57 deletions.
5 changes: 3 additions & 2 deletions tools/perf/builtin-annotate.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include <dlfcn.h>
#include <errno.h>
#include <linux/bitmap.h>
#include <linux/err.h>

struct perf_annotate {
struct perf_tool tool;
Expand Down Expand Up @@ -584,8 +585,8 @@ int cmd_annotate(int argc, const char **argv)
data.path = input_name;

annotate.session = perf_session__new(&data, false, &annotate.tool);
if (annotate.session == NULL)
return -1;
if (IS_ERR(annotate.session))
return PTR_ERR(annotate.session);

annotate.has_br_stack = perf_header__has_feat(&annotate.session->header,
HEADER_BRANCH_STACK);
Expand Down
5 changes: 3 additions & 2 deletions tools/perf/builtin-buildid-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "util/util.h"
#include "util/probe-file.h"
#include <linux/string.h>
#include <linux/err.h>

static int build_id_cache__kcore_buildid(const char *proc_dir, char *sbuildid)
{
Expand Down Expand Up @@ -422,8 +423,8 @@ int cmd_buildid_cache(int argc, const char **argv)
data.force = force;

session = perf_session__new(&data, false, NULL);
if (session == NULL)
return -1;
if (IS_ERR(session))
return PTR_ERR(session);
}

if (symbol__init(session ? &session->header.env : NULL) < 0)
Expand Down
5 changes: 3 additions & 2 deletions tools/perf/builtin-buildid-list.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "util/symbol.h"
#include "util/data.h"
#include <errno.h>
#include <linux/err.h>

static int sysfs__fprintf_build_id(FILE *fp)
{
Expand Down Expand Up @@ -65,8 +66,8 @@ static int perf_session__list_build_ids(bool force, bool with_hits)
goto out;

session = perf_session__new(&data, false, &build_id__mark_dso_hit_ops);
if (session == NULL)
return -1;
if (IS_ERR(session))
return PTR_ERR(session);

/*
* We take all buildids when the file contains AUX area tracing data
Expand Down
6 changes: 4 additions & 2 deletions tools/perf/builtin-c2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <errno.h>
#include <inttypes.h>
#include <linux/compiler.h>
#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/stringify.h>
#include <linux/zalloc.h>
Expand Down Expand Up @@ -2781,8 +2782,9 @@ static int perf_c2c__report(int argc, const char **argv)
}

session = perf_session__new(&data, 0, &c2c.tool);
if (session == NULL) {
pr_debug("No memory for session\n");
if (IS_ERR(session)) {
err = PTR_ERR(session);
pr_debug("Error creating perf session\n");
goto out;
}

Expand Down
9 changes: 5 additions & 4 deletions tools/perf/builtin-diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "util/time-utils.h"
#include "util/annotate.h"
#include "util/map.h"
#include <linux/err.h>
#include <linux/zalloc.h>
#include <subcmd/pager.h>
#include <subcmd/parse-options.h>
Expand Down Expand Up @@ -1153,9 +1154,9 @@ static int check_file_brstack(void)

data__for_each_file(i, d) {
d->session = perf_session__new(&d->data, false, &pdiff.tool);
if (!d->session) {
if (IS_ERR(d->session)) {
pr_err("Failed to open %s\n", d->data.path);
return -1;
return PTR_ERR(d->session);
}

has_br_stack = perf_header__has_feat(&d->session->header,
Expand Down Expand Up @@ -1185,9 +1186,9 @@ static int __cmd_diff(void)

data__for_each_file(i, d) {
d->session = perf_session__new(&d->data, false, &pdiff.tool);
if (!d->session) {
if (IS_ERR(d->session)) {
ret = PTR_ERR(d->session);
pr_err("Failed to open %s\n", d->data.path);
ret = -1;
goto out_delete;
}

Expand Down
5 changes: 3 additions & 2 deletions tools/perf/builtin-evlist.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "util/session.h"
#include "util/data.h"
#include "util/debug.h"
#include <linux/err.h>

static int __cmd_evlist(const char *file_name, struct perf_attr_details *details)
{
Expand All @@ -28,8 +29,8 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *details
bool has_tracepoint = false;

session = perf_session__new(&data, 0, NULL);
if (session == NULL)
return -1;
if (IS_ERR(session))
return PTR_ERR(session);

evlist__for_each_entry(session->evlist, pos) {
perf_evsel__fprintf(pos, details, stdout);
Expand Down
5 changes: 3 additions & 2 deletions tools/perf/builtin-inject.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "util/symbol.h"
#include "util/synthetic-events.h"
#include "util/thread.h"
#include <linux/err.h>

#include <subcmd/parse-options.h>

Expand Down Expand Up @@ -835,8 +836,8 @@ int cmd_inject(int argc, const char **argv)

data.path = inject.input_name;
inject.session = perf_session__new(&data, true, &inject.tool);
if (inject.session == NULL)
return -1;
if (IS_ERR(inject.session))
return PTR_ERR(inject.session);

if (zstd_init(&(inject.session->zstd_data), 0) < 0)
pr_warning("Decompression initialization failed.\n");
Expand Down
5 changes: 3 additions & 2 deletions tools/perf/builtin-kmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "util/tool.h"
#include "util/callchain.h"
#include "util/time-utils.h"
#include <linux/err.h>

#include <subcmd/pager.h>
#include <subcmd/parse-options.h>
Expand Down Expand Up @@ -1956,8 +1957,8 @@ int cmd_kmem(int argc, const char **argv)
data.path = input_name;

kmem_session = session = perf_session__new(&data, false, &perf_kmem);
if (session == NULL)
return -1;
if (IS_ERR(session))
return PTR_ERR(session);

ret = -1;

Expand Down
9 changes: 5 additions & 4 deletions tools/perf/builtin-kvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <sys/stat.h>
#include <fcntl.h>

#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/time64.h>
Expand Down Expand Up @@ -1091,9 +1092,9 @@ static int read_events(struct perf_kvm_stat *kvm)

kvm->tool = eops;
kvm->session = perf_session__new(&file, false, &kvm->tool);
if (!kvm->session) {
if (IS_ERR(kvm->session)) {
pr_err("Initializing perf session failed\n");
return -1;
return PTR_ERR(kvm->session);
}

symbol__init(&kvm->session->header.env);
Expand Down Expand Up @@ -1446,8 +1447,8 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,
* perf session
*/
kvm->session = perf_session__new(&data, false, &kvm->tool);
if (kvm->session == NULL) {
err = -1;
if (IS_ERR(kvm->session)) {
err = PTR_ERR(kvm->session);
goto out;
}
kvm->session->evlist = kvm->evlist;
Expand Down
5 changes: 3 additions & 2 deletions tools/perf/builtin-lock.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <linux/hash.h>
#include <linux/kernel.h>
#include <linux/zalloc.h>
#include <linux/err.h>

static struct perf_session *session;

Expand Down Expand Up @@ -872,9 +873,9 @@ static int __cmd_report(bool display_info)
};

session = perf_session__new(&data, false, &eops);
if (!session) {
if (IS_ERR(session)) {
pr_err("Initializing perf session failed\n");
return -1;
return PTR_ERR(session);
}

symbol__init(&session->header.env);
Expand Down
5 changes: 3 additions & 2 deletions tools/perf/builtin-mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "util/dso.h"
#include "util/map.h"
#include "util/symbol.h"
#include <linux/err.h>

#define MEM_OPERATION_LOAD 0x1
#define MEM_OPERATION_STORE 0x2
Expand Down Expand Up @@ -249,8 +250,8 @@ static int report_raw_events(struct perf_mem *mem)
struct perf_session *session = perf_session__new(&data, false,
&mem->tool);

if (session == NULL)
return -1;
if (IS_ERR(session))
return PTR_ERR(session);

if (mem->cpu_list) {
ret = perf_session__cpu_bitmap(session, mem->cpu_list,
Expand Down
5 changes: 3 additions & 2 deletions tools/perf/builtin-record.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#include <signal.h>
#include <sys/mman.h>
#include <sys/wait.h>
#include <linux/err.h>
#include <linux/string.h>
#include <linux/time64.h>
#include <linux/zalloc.h>
Expand Down Expand Up @@ -1354,9 +1355,9 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
}

session = perf_session__new(data, false, tool);
if (session == NULL) {
if (IS_ERR(session)) {
pr_err("Perf session creation failed.\n");
return -1;
return PTR_ERR(session);
}

fd = perf_data__fd(data);
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/builtin-report.c
Original file line number Diff line number Diff line change
Expand Up @@ -1269,8 +1269,8 @@ int cmd_report(int argc, const char **argv)

repeat:
session = perf_session__new(&data, false, &report.tool);
if (session == NULL)
return -1;
if (IS_ERR(session))
return PTR_ERR(session);

ret = evswitch__init(&report.evswitch, session->evlist, stderr);
if (ret)
Expand Down
11 changes: 6 additions & 5 deletions tools/perf/builtin-sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include <api/fs/fs.h>
#include <perf/cpumap.h>
#include <linux/time64.h>
#include <linux/err.h>

#include <linux/ctype.h>

Expand Down Expand Up @@ -1797,9 +1798,9 @@ static int perf_sched__read_events(struct perf_sched *sched)
int rc = -1;

session = perf_session__new(&data, false, &sched->tool);
if (session == NULL) {
pr_debug("No Memory for session\n");
return -1;
if (IS_ERR(session)) {
pr_debug("Error creating perf session");
return PTR_ERR(session);
}

symbol__init(&session->header.env);
Expand Down Expand Up @@ -2989,8 +2990,8 @@ static int perf_sched__timehist(struct perf_sched *sched)
symbol_conf.use_callchain = sched->show_callchain;

session = perf_session__new(&data, false, &sched->tool);
if (session == NULL)
return -ENOMEM;
if (IS_ERR(session))
return PTR_ERR(session);

evlist = session->evlist;

Expand Down
9 changes: 5 additions & 4 deletions tools/perf/builtin-script.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
#include <unistd.h>
#include <subcmd/pager.h>
#include <perf/evlist.h>
#include <linux/err.h>
#include "util/record.h"
#include "util/util.h"
#include "perf.h"
Expand Down Expand Up @@ -3083,8 +3084,8 @@ int find_scripts(char **scripts_array, char **scripts_path_array, int num,
int i = 0;

session = perf_session__new(&data, false, NULL);
if (!session)
return -1;
if (IS_ERR(session))
return PTR_ERR(session);

snprintf(scripts_path, MAXPATHLEN, "%s/scripts", get_argv_exec_path());

Expand Down Expand Up @@ -3754,8 +3755,8 @@ int cmd_script(int argc, const char **argv)
}

session = perf_session__new(&data, false, &script.tool);
if (session == NULL)
return -1;
if (IS_ERR(session))
return PTR_ERR(session);

if (header || header_only) {
script.tool.show_feat_hdr = SHOW_FEAT_HEADER;
Expand Down
11 changes: 6 additions & 5 deletions tools/perf/builtin-stat.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
#include <unistd.h>
#include <sys/time.h>
#include <sys/resource.h>
#include <linux/err.h>

#include <linux/ctype.h>
#include <perf/evlist.h>
Expand Down Expand Up @@ -1436,9 +1437,9 @@ static int __cmd_record(int argc, const char **argv)
}

session = perf_session__new(data, false, NULL);
if (session == NULL) {
pr_err("Perf session creation failed.\n");
return -1;
if (IS_ERR(session)) {
pr_err("Perf session creation failed\n");
return PTR_ERR(session);
}

init_features(session);
Expand Down Expand Up @@ -1635,8 +1636,8 @@ static int __cmd_report(int argc, const char **argv)
perf_stat.data.mode = PERF_DATA_MODE_READ;

session = perf_session__new(&perf_stat.data, false, &perf_stat.tool);
if (session == NULL)
return -1;
if (IS_ERR(session))
return PTR_ERR(session);

perf_stat.session = session;
stat_config.output = stderr;
Expand Down
5 changes: 3 additions & 2 deletions tools/perf/builtin-timechart.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include "util/tool.h"
#include "util/data.h"
#include "util/debug.h"
#include <linux/err.h>

#ifdef LACKS_OPEN_MEMSTREAM_PROTOTYPE
FILE *open_memstream(char **ptr, size_t *sizeloc);
Expand Down Expand Up @@ -1601,8 +1602,8 @@ static int __cmd_timechart(struct timechart *tchart, const char *output_name)
&tchart->tool);
int ret = -EINVAL;

if (session == NULL)
return -1;
if (IS_ERR(session))
return PTR_ERR(session);

symbol__init(&session->header.env);

Expand Down
5 changes: 3 additions & 2 deletions tools/perf/builtin-top.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
#include <linux/stringify.h>
#include <linux/time64.h>
#include <linux/types.h>
#include <linux/err.h>

#include <linux/ctype.h>

Expand Down Expand Up @@ -1672,8 +1673,8 @@ int cmd_top(int argc, const char **argv)
}

top.session = perf_session__new(NULL, false, NULL);
if (top.session == NULL) {
status = -1;
if (IS_ERR(top.session)) {
status = PTR_ERR(top.session);
goto out_delete_evlist;
}

Expand Down
Loading

0 comments on commit 6ef81c5

Please sign in to comment.