Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-block.git] / tools / perf / util / bpf-loader.c

diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index 4631cac3957f0b3c614882357ee5b6c243f9ec79..ef2832b4d5ccdd8bc19306ce032b60833f45f567 100644 (file)
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -424,7 +424,7 @@ preproc_gen_prologue(struct bpf_program *prog, int n,
        size_t prologue_cnt = 0;
        int i, err;
 
-       if (IS_ERR(priv) || !priv || priv->is_tp)
+       if (IS_ERR_OR_NULL(priv) || priv->is_tp)
                goto errout;
 
        pev = &priv->pev;
@@ -573,7 +573,7 @@ static int hook_load_preprocessor(struct bpf_program *prog)
        bool need_prologue = false;
        int err, i;
 
-       if (IS_ERR(priv) || !priv) {
+       if (IS_ERR_OR_NULL(priv)) {
                pr_debug("Internal error when hook preprocessor\n");
                return -BPF_LOADER_ERRNO__INTERNAL;
        }
@@ -645,8 +645,11 @@ int bpf__probe(struct bpf_object *obj)
                        goto out;
 
                priv = bpf_program__priv(prog);
-               if (IS_ERR(priv) || !priv) {
-                       err = PTR_ERR(priv);
+               if (IS_ERR_OR_NULL(priv)) {
+                       if (!priv)
+                               err = -BPF_LOADER_ERRNO__INTERNAL;
+                       else
+                               err = PTR_ERR(priv);
                        goto out;
                }
 
@@ -696,7 +699,7 @@ int bpf__unprobe(struct bpf_object *obj)
                struct bpf_prog_priv *priv = bpf_program__priv(prog);
                int i;
 
-               if (IS_ERR(priv) || !priv || priv->is_tp)
+               if (IS_ERR_OR_NULL(priv) || priv->is_tp)
                        continue;
 
                for (i = 0; i < priv->pev.ntevs; i++) {
@@ -754,7 +757,7 @@ int bpf__foreach_event(struct bpf_object *obj,
                struct perf_probe_event *pev;
                int i, fd;
 
-               if (IS_ERR(priv) || !priv) {
+               if (IS_ERR_OR_NULL(priv)) {
                        pr_debug("bpf: failed to get private field\n");
                        return -BPF_LOADER_ERRNO__INTERNAL;
                }