diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2019-11-22 21:07:56 +0100 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2019-11-24 17:04:11 -0800 |
| commit | 2beee5f57441413b64a9c2bd657e17beabb98d1c (patch) | |
| tree | 8ad85ac286a4c8a435ac2b83204f610b4e8e2cfa /kernel/bpf/core.c | |
| parent | 6332be04c039a72fca32ed0a4265bac58d606bb6 (diff) | |
| download | linux-stable-2beee5f57441413b64a9c2bd657e17beabb98d1c.tar.gz linux-stable-2beee5f57441413b64a9c2bd657e17beabb98d1c.tar.bz2 linux-stable-2beee5f57441413b64a9c2bd657e17beabb98d1c.zip | |
bpf: Move owner type, jited info into array auxiliary data
We're going to extend this with further information which is only
relevant for prog array at this point. Given this info is not used
in critical path, move it into its own structure such that the main
array map structure can be kept on diet.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/b9ddccdb0f6f7026489ee955f16c96381e1e7238.1574452833.git.daniel@iogearbox.net
Diffstat (limited to 'kernel/bpf/core.c')
| -rw-r--r-- | kernel/bpf/core.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 0e825c164f1a..07af9c1d9cf1 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -1691,18 +1691,17 @@ bool bpf_prog_array_compatible(struct bpf_array *array, if (fp->kprobe_override) return false; - if (!array->owner_prog_type) { + if (!array->aux->type) { /* There's no owner yet where we could check for * compatibility. */ - array->owner_prog_type = fp->type; - array->owner_jited = fp->jited; - + array->aux->type = fp->type; + array->aux->jited = fp->jited; return true; } - return array->owner_prog_type == fp->type && - array->owner_jited == fp->jited; + return array->aux->type == fp->type && + array->aux->jited == fp->jited; } static int bpf_check_tail_call(const struct bpf_prog *fp) |