perf test: Fix bpf test sample mismatch reporting
authorMichael Petlan <mpetlan@redhat.com>
Thu, 5 Aug 2021 16:06:11 +0000 (18:06 +0200)
committerDom Cobley <popcornmix@gmail.com>
Thu, 14 Oct 2021 11:33:02 +0000 (12:33 +0100)
commit 3e11300cdfd5f1bc13a05dfc6dccf69aca5dd1dc upstream.

When the expected sample count in the condition changed, the message
needs to be changed too, otherwise we'll get:

  0x1001f2091d8: mmap mask[0]:
  BPF filter result incorrect, expected 56, got 56 samples

Fixes: 4b04e0decd2518e5 ("perf test: Fix basic bpf filtering test")
Signed-off-by: Michael Petlan <mpetlan@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
Link: https //lore.kernel.org/r/20210805160611.5542-1-mpetlan@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/perf/tests/bpf.c

index 8345ff4..e5832b7 100644 (file)
@@ -199,7 +199,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
        }
 
        if (count != expect * evlist->core.nr_entries) {
-               pr_debug("BPF filter result incorrect, expected %d, got %d samples\n", expect, count);
+               pr_debug("BPF filter result incorrect, expected %d, got %d samples\n", expect * evlist->core.nr_entries, count);
                goto out_delete_evlist;
        }