License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 14:07:57 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2022-08-31 17:49:22 +00:00
|
|
|
#include "util/cputopo.h"
|
2017-03-20 20:17:05 +00:00
|
|
|
#include "util/debug.h"
|
|
|
|
|
#include "util/expr.h"
|
2022-11-09 18:49:11 +00:00
|
|
|
#include "util/hashmap.h"
|
2022-07-18 16:43:12 +00:00
|
|
|
#include "util/header.h"
|
2021-09-23 07:46:15 +00:00
|
|
|
#include "util/smt.h"
|
2017-03-20 20:17:05 +00:00
|
|
|
#include "tests.h"
|
2022-07-18 16:43:12 +00:00
|
|
|
#include <math.h>
|
2017-03-20 20:17:05 +00:00
|
|
|
#include <stdlib.h>
|
2019-08-29 19:18:59 +00:00
|
|
|
#include <string.h>
|
2019-07-04 15:06:20 +00:00
|
|
|
#include <linux/zalloc.h>
|
2017-03-20 20:17:05 +00:00
|
|
|
|
2021-09-23 07:46:11 +00:00
|
|
|
static int test_ids_union(void)
|
|
|
|
|
{
|
|
|
|
|
struct hashmap *ids1, *ids2;
|
|
|
|
|
|
|
|
|
|
/* Empty union. */
|
|
|
|
|
ids1 = ids__new();
|
|
|
|
|
TEST_ASSERT_VAL("ids__new", ids1);
|
|
|
|
|
ids2 = ids__new();
|
|
|
|
|
TEST_ASSERT_VAL("ids__new", ids2);
|
|
|
|
|
|
|
|
|
|
ids1 = ids__union(ids1, ids2);
|
|
|
|
|
TEST_ASSERT_EQUAL("union", (int)hashmap__size(ids1), 0);
|
|
|
|
|
|
|
|
|
|
/* Union {foo, bar} against {}. */
|
|
|
|
|
ids2 = ids__new();
|
|
|
|
|
TEST_ASSERT_VAL("ids__new", ids2);
|
|
|
|
|
|
2021-10-15 17:21:20 +00:00
|
|
|
TEST_ASSERT_EQUAL("ids__insert", ids__insert(ids1, strdup("foo")), 0);
|
|
|
|
|
TEST_ASSERT_EQUAL("ids__insert", ids__insert(ids1, strdup("bar")), 0);
|
2021-09-23 07:46:11 +00:00
|
|
|
|
|
|
|
|
ids1 = ids__union(ids1, ids2);
|
|
|
|
|
TEST_ASSERT_EQUAL("union", (int)hashmap__size(ids1), 2);
|
|
|
|
|
|
|
|
|
|
/* Union {foo, bar} against {foo}. */
|
|
|
|
|
ids2 = ids__new();
|
|
|
|
|
TEST_ASSERT_VAL("ids__new", ids2);
|
2021-10-15 17:21:20 +00:00
|
|
|
TEST_ASSERT_EQUAL("ids__insert", ids__insert(ids2, strdup("foo")), 0);
|
2021-09-23 07:46:11 +00:00
|
|
|
|
|
|
|
|
ids1 = ids__union(ids1, ids2);
|
|
|
|
|
TEST_ASSERT_EQUAL("union", (int)hashmap__size(ids1), 2);
|
|
|
|
|
|
|
|
|
|
/* Union {foo, bar} against {bar,baz}. */
|
|
|
|
|
ids2 = ids__new();
|
|
|
|
|
TEST_ASSERT_VAL("ids__new", ids2);
|
2021-10-15 17:21:20 +00:00
|
|
|
TEST_ASSERT_EQUAL("ids__insert", ids__insert(ids2, strdup("bar")), 0);
|
|
|
|
|
TEST_ASSERT_EQUAL("ids__insert", ids__insert(ids2, strdup("baz")), 0);
|
2021-09-23 07:46:11 +00:00
|
|
|
|
|
|
|
|
ids1 = ids__union(ids1, ids2);
|
|
|
|
|
TEST_ASSERT_EQUAL("union", (int)hashmap__size(ids1), 3);
|
|
|
|
|
|
|
|
|
|
ids__free(ids1);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-01 20:33:34 +00:00
|
|
|
static int test(struct expr_parse_ctx *ctx, const char *e, double val2)
|
2017-03-20 20:17:05 +00:00
|
|
|
{
|
|
|
|
|
double val;
|
|
|
|
|
|
2021-10-15 17:21:16 +00:00
|
|
|
if (expr__parse(&val, ctx, e))
|
2017-03-20 20:17:05 +00:00
|
|
|
TEST_ASSERT_VAL("parse test failed", 0);
|
|
|
|
|
TEST_ASSERT_VAL("unexpected value", val == val2);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-04 06:41:51 +00:00
|
|
|
static int test__expr(struct test_suite *t __maybe_unused, int subtest __maybe_unused)
|
2017-03-20 20:17:05 +00:00
|
|
|
{
|
2020-07-12 13:26:18 +00:00
|
|
|
struct expr_id_data *val_ptr;
|
2017-03-20 20:17:05 +00:00
|
|
|
const char *p;
|
2021-11-11 00:21:07 +00:00
|
|
|
double val, num_cpus, num_cores, num_dies, num_packages;
|
2020-05-15 22:17:32 +00:00
|
|
|
int ret;
|
2021-09-23 07:46:04 +00:00
|
|
|
struct expr_parse_ctx *ctx;
|
2022-07-18 16:43:12 +00:00
|
|
|
bool is_intel = false;
|
|
|
|
|
char buf[128];
|
|
|
|
|
|
|
|
|
|
if (!get_cpuid(buf, sizeof(buf)))
|
|
|
|
|
is_intel = strstr(buf, "Intel") != NULL;
|
2017-03-20 20:17:05 +00:00
|
|
|
|
2021-09-23 07:46:11 +00:00
|
|
|
TEST_ASSERT_EQUAL("ids_union", test_ids_union(), 0);
|
|
|
|
|
|
2021-09-23 07:46:04 +00:00
|
|
|
ctx = expr__ctx_new();
|
|
|
|
|
TEST_ASSERT_VAL("expr__ctx_new", ctx);
|
|
|
|
|
expr__add_id_val(ctx, strdup("FOO"), 1);
|
|
|
|
|
expr__add_id_val(ctx, strdup("BAR"), 2);
|
2017-03-20 20:17:05 +00:00
|
|
|
|
2021-09-23 07:46:04 +00:00
|
|
|
ret = test(ctx, "1+1", 2);
|
|
|
|
|
ret |= test(ctx, "FOO+BAR", 3);
|
|
|
|
|
ret |= test(ctx, "(BAR/2)%2", 1);
|
|
|
|
|
ret |= test(ctx, "1 - -4", 5);
|
|
|
|
|
ret |= test(ctx, "(FOO-1)*2 + (BAR/2)%2 - -4", 5);
|
|
|
|
|
ret |= test(ctx, "1-1 | 1", 1);
|
|
|
|
|
ret |= test(ctx, "1-1 & 1", 0);
|
|
|
|
|
ret |= test(ctx, "min(1,2) + 1", 2);
|
|
|
|
|
ret |= test(ctx, "max(1,2) + 1", 3);
|
|
|
|
|
ret |= test(ctx, "1+1 if 3*4 else 0", 2);
|
2022-10-04 02:15:50 +00:00
|
|
|
ret |= test(ctx, "100 if 1 else 200 if 1 else 300", 100);
|
|
|
|
|
ret |= test(ctx, "100 if 0 else 200 if 1 else 300", 200);
|
|
|
|
|
ret |= test(ctx, "100 if 1 else 200 if 0 else 300", 100);
|
|
|
|
|
ret |= test(ctx, "100 if 0 else 200 if 0 else 300", 300);
|
2021-09-23 07:46:04 +00:00
|
|
|
ret |= test(ctx, "1.1 + 2.1", 3.2);
|
|
|
|
|
ret |= test(ctx, ".1 + 2.", 2.1);
|
|
|
|
|
ret |= test(ctx, "d_ratio(1, 2)", 0.5);
|
|
|
|
|
ret |= test(ctx, "d_ratio(2.5, 0)", 0);
|
|
|
|
|
ret |= test(ctx, "1.1 < 2.2", 1);
|
|
|
|
|
ret |= test(ctx, "2.2 > 1.1", 1);
|
|
|
|
|
ret |= test(ctx, "1.1 < 1.1", 0);
|
|
|
|
|
ret |= test(ctx, "2.2 > 2.2", 0);
|
|
|
|
|
ret |= test(ctx, "2.2 < 1.1", 0);
|
|
|
|
|
ret |= test(ctx, "1.1 > 2.2", 0);
|
2022-05-27 02:06:53 +00:00
|
|
|
ret |= test(ctx, "1.1e10 < 1.1e100", 1);
|
|
|
|
|
ret |= test(ctx, "1.1e2 > 1.1e-2", 1);
|
2017-03-20 20:17:05 +00:00
|
|
|
|
2021-09-23 07:46:04 +00:00
|
|
|
if (ret) {
|
|
|
|
|
expr__ctx_free(ctx);
|
2017-03-20 20:17:05 +00:00
|
|
|
return ret;
|
2021-09-23 07:46:04 +00:00
|
|
|
}
|
2017-03-20 20:17:05 +00:00
|
|
|
|
|
|
|
|
p = "FOO/0";
|
2021-10-15 17:21:16 +00:00
|
|
|
ret = expr__parse(&val, ctx, p);
|
2020-02-28 09:36:16 +00:00
|
|
|
TEST_ASSERT_VAL("division by zero", ret == -1);
|
2017-03-20 20:17:05 +00:00
|
|
|
|
|
|
|
|
p = "BAR/";
|
2021-10-15 17:21:16 +00:00
|
|
|
ret = expr__parse(&val, ctx, p);
|
2020-02-28 09:36:16 +00:00
|
|
|
TEST_ASSERT_VAL("missing operand", ret == -1);
|
2017-03-20 20:17:05 +00:00
|
|
|
|
2021-09-23 07:46:04 +00:00
|
|
|
expr__ctx_clear(ctx);
|
2021-09-23 07:46:10 +00:00
|
|
|
TEST_ASSERT_VAL("find ids",
|
|
|
|
|
expr__find_ids("FOO + BAR + BAZ + BOZO", "FOO",
|
2021-10-15 17:21:16 +00:00
|
|
|
ctx) == 0);
|
2021-09-23 07:46:10 +00:00
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__size(ctx->ids) == 3);
|
libbpf: Hashmap interface update to allow both long and void* keys/values
An update for libbpf's hashmap interface from void* -> void* to a
polymorphic one, allowing both long and void* keys and values.
This simplifies many use cases in libbpf as hashmaps there are mostly
integer to integer.
Perf copies hashmap implementation from libbpf and has to be
updated as well.
Changes to libbpf, selftests/bpf and perf are packed as a single
commit to avoid compilation issues with any future bisect.
Polymorphic interface is acheived by hiding hashmap interface
functions behind auxiliary macros that take care of necessary
type casts, for example:
#define hashmap_cast_ptr(p) \
({ \
_Static_assert((p) == NULL || sizeof(*(p)) == sizeof(long),\
#p " pointee should be a long-sized integer or a pointer"); \
(long *)(p); \
})
bool hashmap_find(const struct hashmap *map, long key, long *value);
#define hashmap__find(map, key, value) \
hashmap_find((map), (long)(key), hashmap_cast_ptr(value))
- hashmap__find macro casts key and value parameters to long
and long* respectively
- hashmap_cast_ptr ensures that value pointer points to a memory
of appropriate size.
This hack was suggested by Andrii Nakryiko in [1].
This is a follow up for [2].
[1] https://lore.kernel.org/bpf/CAEf4BzZ8KFneEJxFAaNCCFPGqp20hSpS2aCj76uRk3-qZUH5xg@mail.gmail.com/
[2] https://lore.kernel.org/bpf/af1facf9-7bc8-8a3d-0db4-7b3f333589a2@meta.com/T/#m65b28f1d6d969fcd318b556db6a3ad499a42607d
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20221109142611.879983-2-eddyz87@gmail.com
2022-11-09 14:26:09 +00:00
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "BAR", &val_ptr));
|
|
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "BAZ", &val_ptr));
|
|
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "BOZO", &val_ptr));
|
2019-03-16 08:05:55 +00:00
|
|
|
|
2021-09-23 07:46:04 +00:00
|
|
|
expr__ctx_clear(ctx);
|
2022-08-31 17:49:21 +00:00
|
|
|
ctx->sctx.runtime = 3;
|
2021-09-23 07:46:10 +00:00
|
|
|
TEST_ASSERT_VAL("find ids",
|
|
|
|
|
expr__find_ids("EVENT1\\,param\\=?@ + EVENT2\\,param\\=?@",
|
2021-10-15 17:21:16 +00:00
|
|
|
NULL, ctx) == 0);
|
2021-09-23 07:46:10 +00:00
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__size(ctx->ids) == 2);
|
libbpf: Hashmap interface update to allow both long and void* keys/values
An update for libbpf's hashmap interface from void* -> void* to a
polymorphic one, allowing both long and void* keys and values.
This simplifies many use cases in libbpf as hashmaps there are mostly
integer to integer.
Perf copies hashmap implementation from libbpf and has to be
updated as well.
Changes to libbpf, selftests/bpf and perf are packed as a single
commit to avoid compilation issues with any future bisect.
Polymorphic interface is acheived by hiding hashmap interface
functions behind auxiliary macros that take care of necessary
type casts, for example:
#define hashmap_cast_ptr(p) \
({ \
_Static_assert((p) == NULL || sizeof(*(p)) == sizeof(long),\
#p " pointee should be a long-sized integer or a pointer"); \
(long *)(p); \
})
bool hashmap_find(const struct hashmap *map, long key, long *value);
#define hashmap__find(map, key, value) \
hashmap_find((map), (long)(key), hashmap_cast_ptr(value))
- hashmap__find macro casts key and value parameters to long
and long* respectively
- hashmap_cast_ptr ensures that value pointer points to a memory
of appropriate size.
This hack was suggested by Andrii Nakryiko in [1].
This is a follow up for [2].
[1] https://lore.kernel.org/bpf/CAEf4BzZ8KFneEJxFAaNCCFPGqp20hSpS2aCj76uRk3-qZUH5xg@mail.gmail.com/
[2] https://lore.kernel.org/bpf/af1facf9-7bc8-8a3d-0db4-7b3f333589a2@meta.com/T/#m65b28f1d6d969fcd318b556db6a3ad499a42607d
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20221109142611.879983-2-eddyz87@gmail.com
2022-11-09 14:26:09 +00:00
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "EVENT1,param=3@", &val_ptr));
|
|
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "EVENT2,param=3@", &val_ptr));
|
2020-04-01 20:33:38 +00:00
|
|
|
|
2021-11-11 00:21:02 +00:00
|
|
|
expr__ctx_clear(ctx);
|
|
|
|
|
TEST_ASSERT_VAL("find ids",
|
|
|
|
|
expr__find_ids("dash\\-event1 - dash\\-event2",
|
|
|
|
|
NULL, ctx) == 0);
|
|
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__size(ctx->ids) == 2);
|
libbpf: Hashmap interface update to allow both long and void* keys/values
An update for libbpf's hashmap interface from void* -> void* to a
polymorphic one, allowing both long and void* keys and values.
This simplifies many use cases in libbpf as hashmaps there are mostly
integer to integer.
Perf copies hashmap implementation from libbpf and has to be
updated as well.
Changes to libbpf, selftests/bpf and perf are packed as a single
commit to avoid compilation issues with any future bisect.
Polymorphic interface is acheived by hiding hashmap interface
functions behind auxiliary macros that take care of necessary
type casts, for example:
#define hashmap_cast_ptr(p) \
({ \
_Static_assert((p) == NULL || sizeof(*(p)) == sizeof(long),\
#p " pointee should be a long-sized integer or a pointer"); \
(long *)(p); \
})
bool hashmap_find(const struct hashmap *map, long key, long *value);
#define hashmap__find(map, key, value) \
hashmap_find((map), (long)(key), hashmap_cast_ptr(value))
- hashmap__find macro casts key and value parameters to long
and long* respectively
- hashmap_cast_ptr ensures that value pointer points to a memory
of appropriate size.
This hack was suggested by Andrii Nakryiko in [1].
This is a follow up for [2].
[1] https://lore.kernel.org/bpf/CAEf4BzZ8KFneEJxFAaNCCFPGqp20hSpS2aCj76uRk3-qZUH5xg@mail.gmail.com/
[2] https://lore.kernel.org/bpf/af1facf9-7bc8-8a3d-0db4-7b3f333589a2@meta.com/T/#m65b28f1d6d969fcd318b556db6a3ad499a42607d
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20221109142611.879983-2-eddyz87@gmail.com
2022-11-09 14:26:09 +00:00
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "dash-event1", &val_ptr));
|
|
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "dash-event2", &val_ptr));
|
2021-11-11 00:21:02 +00:00
|
|
|
|
2021-09-23 07:46:15 +00:00
|
|
|
/* Only EVENT1 or EVENT2 need be measured depending on the value of smt_on. */
|
2022-08-31 17:49:22 +00:00
|
|
|
{
|
2023-02-19 09:28:04 +00:00
|
|
|
bool smton = smt_on();
|
2022-08-31 17:49:26 +00:00
|
|
|
bool corewide = core_wide(/*system_wide=*/false,
|
2023-02-19 09:28:04 +00:00
|
|
|
/*user_requested_cpus=*/false);
|
2022-08-31 17:49:22 +00:00
|
|
|
|
|
|
|
|
expr__ctx_clear(ctx);
|
|
|
|
|
TEST_ASSERT_VAL("find ids",
|
|
|
|
|
expr__find_ids("EVENT1 if #smt_on else EVENT2",
|
|
|
|
|
NULL, ctx) == 0);
|
|
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__size(ctx->ids) == 1);
|
|
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids,
|
|
|
|
|
smton ? "EVENT1" : "EVENT2",
|
libbpf: Hashmap interface update to allow both long and void* keys/values
An update for libbpf's hashmap interface from void* -> void* to a
polymorphic one, allowing both long and void* keys and values.
This simplifies many use cases in libbpf as hashmaps there are mostly
integer to integer.
Perf copies hashmap implementation from libbpf and has to be
updated as well.
Changes to libbpf, selftests/bpf and perf are packed as a single
commit to avoid compilation issues with any future bisect.
Polymorphic interface is acheived by hiding hashmap interface
functions behind auxiliary macros that take care of necessary
type casts, for example:
#define hashmap_cast_ptr(p) \
({ \
_Static_assert((p) == NULL || sizeof(*(p)) == sizeof(long),\
#p " pointee should be a long-sized integer or a pointer"); \
(long *)(p); \
})
bool hashmap_find(const struct hashmap *map, long key, long *value);
#define hashmap__find(map, key, value) \
hashmap_find((map), (long)(key), hashmap_cast_ptr(value))
- hashmap__find macro casts key and value parameters to long
and long* respectively
- hashmap_cast_ptr ensures that value pointer points to a memory
of appropriate size.
This hack was suggested by Andrii Nakryiko in [1].
This is a follow up for [2].
[1] https://lore.kernel.org/bpf/CAEf4BzZ8KFneEJxFAaNCCFPGqp20hSpS2aCj76uRk3-qZUH5xg@mail.gmail.com/
[2] https://lore.kernel.org/bpf/af1facf9-7bc8-8a3d-0db4-7b3f333589a2@meta.com/T/#m65b28f1d6d969fcd318b556db6a3ad499a42607d
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20221109142611.879983-2-eddyz87@gmail.com
2022-11-09 14:26:09 +00:00
|
|
|
&val_ptr));
|
2022-08-31 17:49:26 +00:00
|
|
|
|
|
|
|
|
expr__ctx_clear(ctx);
|
|
|
|
|
TEST_ASSERT_VAL("find ids",
|
|
|
|
|
expr__find_ids("EVENT1 if #core_wide else EVENT2",
|
|
|
|
|
NULL, ctx) == 0);
|
|
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__size(ctx->ids) == 1);
|
|
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids,
|
|
|
|
|
corewide ? "EVENT1" : "EVENT2",
|
libbpf: Hashmap interface update to allow both long and void* keys/values
An update for libbpf's hashmap interface from void* -> void* to a
polymorphic one, allowing both long and void* keys and values.
This simplifies many use cases in libbpf as hashmaps there are mostly
integer to integer.
Perf copies hashmap implementation from libbpf and has to be
updated as well.
Changes to libbpf, selftests/bpf and perf are packed as a single
commit to avoid compilation issues with any future bisect.
Polymorphic interface is acheived by hiding hashmap interface
functions behind auxiliary macros that take care of necessary
type casts, for example:
#define hashmap_cast_ptr(p) \
({ \
_Static_assert((p) == NULL || sizeof(*(p)) == sizeof(long),\
#p " pointee should be a long-sized integer or a pointer"); \
(long *)(p); \
})
bool hashmap_find(const struct hashmap *map, long key, long *value);
#define hashmap__find(map, key, value) \
hashmap_find((map), (long)(key), hashmap_cast_ptr(value))
- hashmap__find macro casts key and value parameters to long
and long* respectively
- hashmap_cast_ptr ensures that value pointer points to a memory
of appropriate size.
This hack was suggested by Andrii Nakryiko in [1].
This is a follow up for [2].
[1] https://lore.kernel.org/bpf/CAEf4BzZ8KFneEJxFAaNCCFPGqp20hSpS2aCj76uRk3-qZUH5xg@mail.gmail.com/
[2] https://lore.kernel.org/bpf/af1facf9-7bc8-8a3d-0db4-7b3f333589a2@meta.com/T/#m65b28f1d6d969fcd318b556db6a3ad499a42607d
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20221109142611.879983-2-eddyz87@gmail.com
2022-11-09 14:26:09 +00:00
|
|
|
&val_ptr));
|
2022-08-31 17:49:26 +00:00
|
|
|
|
2022-08-31 17:49:22 +00:00
|
|
|
}
|
2021-09-23 07:46:16 +00:00
|
|
|
/* The expression is a constant 1.0 without needing to evaluate EVENT1. */
|
|
|
|
|
expr__ctx_clear(ctx);
|
|
|
|
|
TEST_ASSERT_VAL("find ids",
|
|
|
|
|
expr__find_ids("1.0 if EVENT1 > 100.0 else 1.0",
|
2021-10-15 17:21:16 +00:00
|
|
|
NULL, ctx) == 0);
|
2021-09-23 07:46:16 +00:00
|
|
|
TEST_ASSERT_VAL("find ids", hashmap__size(ctx->ids) == 0);
|
|
|
|
|
|
2021-11-11 00:21:07 +00:00
|
|
|
/* Test toplogy constants appear well ordered. */
|
|
|
|
|
expr__ctx_clear(ctx);
|
|
|
|
|
TEST_ASSERT_VAL("#num_cpus", expr__parse(&num_cpus, ctx, "#num_cpus") == 0);
|
|
|
|
|
TEST_ASSERT_VAL("#num_cores", expr__parse(&num_cores, ctx, "#num_cores") == 0);
|
|
|
|
|
TEST_ASSERT_VAL("#num_cpus >= #num_cores", num_cpus >= num_cores);
|
|
|
|
|
TEST_ASSERT_VAL("#num_dies", expr__parse(&num_dies, ctx, "#num_dies") == 0);
|
|
|
|
|
TEST_ASSERT_VAL("#num_cores >= #num_dies", num_cores >= num_dies);
|
|
|
|
|
TEST_ASSERT_VAL("#num_packages", expr__parse(&num_packages, ctx, "#num_packages") == 0);
|
2021-11-29 11:23:39 +00:00
|
|
|
|
|
|
|
|
if (num_dies) // Some platforms do not have CPU die support, for example s390
|
|
|
|
|
TEST_ASSERT_VAL("#num_dies >= #num_packages", num_dies >= num_packages);
|
2021-11-11 00:21:07 +00:00
|
|
|
|
2022-07-18 16:43:12 +00:00
|
|
|
TEST_ASSERT_VAL("#system_tsc_freq", expr__parse(&val, ctx, "#system_tsc_freq") == 0);
|
|
|
|
|
if (is_intel)
|
|
|
|
|
TEST_ASSERT_VAL("#system_tsc_freq > 0", val > 0);
|
|
|
|
|
else
|
|
|
|
|
TEST_ASSERT_VAL("#system_tsc_freq == 0", fpclassify(val) == FP_ZERO);
|
|
|
|
|
|
2021-11-11 00:21:09 +00:00
|
|
|
/*
|
|
|
|
|
* Source count returns the number of events aggregating in a leader
|
|
|
|
|
* event including the leader. Check parsing yields an id.
|
|
|
|
|
*/
|
|
|
|
|
expr__ctx_clear(ctx);
|
|
|
|
|
TEST_ASSERT_VAL("source count",
|
|
|
|
|
expr__find_ids("source_count(EVENT1)",
|
|
|
|
|
NULL, ctx) == 0);
|
|
|
|
|
TEST_ASSERT_VAL("source count", hashmap__size(ctx->ids) == 1);
|
libbpf: Hashmap interface update to allow both long and void* keys/values
An update for libbpf's hashmap interface from void* -> void* to a
polymorphic one, allowing both long and void* keys and values.
This simplifies many use cases in libbpf as hashmaps there are mostly
integer to integer.
Perf copies hashmap implementation from libbpf and has to be
updated as well.
Changes to libbpf, selftests/bpf and perf are packed as a single
commit to avoid compilation issues with any future bisect.
Polymorphic interface is acheived by hiding hashmap interface
functions behind auxiliary macros that take care of necessary
type casts, for example:
#define hashmap_cast_ptr(p) \
({ \
_Static_assert((p) == NULL || sizeof(*(p)) == sizeof(long),\
#p " pointee should be a long-sized integer or a pointer"); \
(long *)(p); \
})
bool hashmap_find(const struct hashmap *map, long key, long *value);
#define hashmap__find(map, key, value) \
hashmap_find((map), (long)(key), hashmap_cast_ptr(value))
- hashmap__find macro casts key and value parameters to long
and long* respectively
- hashmap_cast_ptr ensures that value pointer points to a memory
of appropriate size.
This hack was suggested by Andrii Nakryiko in [1].
This is a follow up for [2].
[1] https://lore.kernel.org/bpf/CAEf4BzZ8KFneEJxFAaNCCFPGqp20hSpS2aCj76uRk3-qZUH5xg@mail.gmail.com/
[2] https://lore.kernel.org/bpf/af1facf9-7bc8-8a3d-0db4-7b3f333589a2@meta.com/T/#m65b28f1d6d969fcd318b556db6a3ad499a42607d
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20221109142611.879983-2-eddyz87@gmail.com
2022-11-09 14:26:09 +00:00
|
|
|
TEST_ASSERT_VAL("source count", hashmap__find(ctx->ids, "EVENT1", &val_ptr));
|
2021-11-11 00:21:09 +00:00
|
|
|
|
2021-09-23 07:46:04 +00:00
|
|
|
expr__ctx_free(ctx);
|
2017-03-20 20:17:05 +00:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2021-11-04 06:41:50 +00:00
|
|
|
|
|
|
|
|
DEFINE_SUITE("Simple expression parser", expr);
|