ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Alexei Starovoitov says:

====================
pull-request: bpf 2021-01-07

We've added 4 non-merge commits during the last 10 day(s) which contain
a total of 4 files changed, 14 insertions(+), 7 deletions(-).

The main changes are:

1) Fix task_iter bug caused by the merge conflict resolution, from Yonghong.

2) Fix resolve_btfids for multiple type hierarchies, from Jiri.

* https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  bpftool: Fix compilation failure for net.o with older glibc
  tools/resolve_btfids: Warn when having multiple IDs for single type
  bpf: Fix a task_iter bug caused by a merge conflict resolution
  selftests/bpf: Fix a compile error for BPF_F_BPRM_SECUREEXEC
====================

Link: https://lore.kernel.org/r/20210107221555.64959-1-alexei.starovoitov@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2021-01-07 15:10:26 -08:00
parent 704a0f858e 6f02b540d7
commit 0565ff56cd
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/bpf/task_iter.c
View File

@@ -159,6 +159,7 @@ again:
} }
/* set info->task and info->tid */ /* set info->task and info->tid */
info->task = curr_task;
if (curr_tid == info->tid) { if (curr_tid == info->tid) {
curr_fd = info->fd; curr_fd = info->fd;
} else { } else {

1
tools/bpf/bpftool/net.c
View File

@@ -11,7 +11,6 @@
#include <bpf/bpf.h> #include <bpf/bpf.h>
#include <bpf/libbpf.h> #include <bpf/libbpf.h>
#include <net/if.h> #include <net/if.h>
#include <linux/if.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/socket.h> #include <linux/socket.h>
#include <linux/tc_act/tc_bpf.h> #include <linux/tc_act/tc_bpf.h>

17
tools/bpf/resolve_btfids/main.c
View File

@@ -139,6 +139,8 @@ int eprintf(int level, int var, const char *fmt, ...)
#define pr_debug2(fmt, ...) pr_debugN(2, pr_fmt(fmt), ##__VA_ARGS__) #define pr_debug2(fmt, ...) pr_debugN(2, pr_fmt(fmt), ##__VA_ARGS__)
#define pr_err(fmt, ...) \ #define pr_err(fmt, ...) \
eprintf(0, verbose, pr_fmt(fmt), ##__VA_ARGS__) eprintf(0, verbose, pr_fmt(fmt), ##__VA_ARGS__)
#define pr_info(fmt, ...) \
eprintf(0, verbose, pr_fmt(fmt), ##__VA_ARGS__)
static bool is_btf_id(const char *name) static bool is_btf_id(const char *name)
{ {
@@ -472,7 +474,7 @@ static int symbols_resolve(struct object *obj)
int nr_funcs = obj->nr_funcs; int nr_funcs = obj->nr_funcs;
int err, type_id; int err, type_id;
struct btf *btf; struct btf *btf;
__u32 nr; __u32 nr_types;
btf = btf__parse(obj->btf ?: obj->path, NULL); btf = btf__parse(obj->btf ?: obj->path, NULL);
err = libbpf_get_error(btf); err = libbpf_get_error(btf);
@@ -483,12 +485,12 @@ static int symbols_resolve(struct object *obj)
} }
err = -1; err = -1;
nr = btf__get_nr_types(btf); nr_types = btf__get_nr_types(btf);
/* /*
* Iterate all the BTF types and search for collected symbol IDs. * Iterate all the BTF types and search for collected symbol IDs.
*/ */
for (type_id = 1; type_id <= nr; type_id++) { for (type_id = 1; type_id <= nr_types; type_id++) {
const struct btf_type *type; const struct btf_type *type;
struct rb_root *root; struct rb_root *root;
struct btf_id *id; struct btf_id *id;
@@ -526,8 +528,13 @@ static int symbols_resolve(struct object *obj)
id = btf_id__find(root, str); id = btf_id__find(root, str);
if (id) { if (id) {
id->id = type_id; if (id->id) {
(*nr)--; pr_info("WARN: multiple IDs found for '%s': %d, %d - using %d\n",
str, id->id, type_id, id->id);
} else {
id->id = type_id;
(*nr)--;
}
} }
} }

2
tools/testing/selftests/bpf/progs/bprm_opts.c
View File

@@ -4,7 +4,7 @@
* Copyright 2020 Google LLC. * Copyright 2020 Google LLC.
*/ */
#include "vmlinux.h" #include <linux/bpf.h>
#include <errno.h> #include <errno.h>
#include <bpf/bpf_helpers.h> #include <bpf/bpf_helpers.h>
#include <bpf/bpf_tracing.h> #include <bpf/bpf_tracing.h>