Commit 29684d80 authored by David S. Miller's avatar David S. Miller
Browse files

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



Alexei Starovoitov says:

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

The following pull-request contains BPF updates for your *net* tree.

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

The main changes are:

1) xsk creation fixes, from Ciara.

2) bpf_get_task_stack fix, from Dave.

3) trampoline in modules fix, from Jiri.

4) bpf_obj_get fix for links and progs, from Lorenz.

5) struct_ops progs must be gpl compatible fix, from Toke.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9256ce33 6dcc4e38

include/linux/bpf.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ struct bpf_local_storage; 
struct bpf_local_storage_map;

struct kobject;

struct mem_cgroup;

struct module;



extern struct idr btf_idr;

extern spinlock_t btf_idr_lock;
@@ -623,6 +624,7 @@ struct bpf_trampoline { 
	/* Executable image of trampoline */

	struct bpf_tramp_image *cur_image;

	u64 selector;

	struct module *mod;

};



struct bpf_attach_target_info {

kernel/bpf/disasm.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static const char *const bpf_atomic_alu_string[16] = { 
	[BPF_ADD >> 4]  = "add",

	[BPF_AND >> 4]  = "and",

	[BPF_OR >> 4]  = "or",

	[BPF_XOR >> 4]  = "or",

	[BPF_XOR >> 4]  = "xor",

};



static const char *const bpf_ldst_string[] = {

kernel/bpf/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -543,11 +543,11 @@ int bpf_obj_get_user(const char __user *pathname, int flags) 
		return PTR_ERR(raw);



	if (type == BPF_TYPE_PROG)

		ret = bpf_prog_new_fd(raw);

		ret = (f_flags != O_RDWR) ? -EINVAL : bpf_prog_new_fd(raw);

	else if (type == BPF_TYPE_MAP)

		ret = bpf_map_new_fd(raw, f_flags);

	else if (type == BPF_TYPE_LINK)

		ret = bpf_link_new_fd(raw);

		ret = (f_flags != O_RDWR) ? -EINVAL : bpf_link_new_fd(raw);

	else

		return -ENOENT;

kernel/bpf/stackmap.c

+10 −2
Original line number Diff line number Diff line
@@ -517,9 +517,17 @@ const struct bpf_func_proto bpf_get_stack_proto = { 
BPF_CALL_4(bpf_get_task_stack, struct task_struct *, task, void *, buf,

	   u32, size, u64, flags)

{

	struct pt_regs *regs = task_pt_regs(task);

	struct pt_regs *regs;

	long res;



	return __bpf_get_stack(regs, task, NULL, buf, size, flags);

	if (!try_get_task_stack(task))

		return -EFAULT;



	regs = task_pt_regs(task);

	res = __bpf_get_stack(regs, task, NULL, buf, size, flags);

	put_task_stack(task);



	return res;

}



BTF_ID_LIST_SINGLE(bpf_get_task_stack_btf_ids, struct, task_struct)

kernel/bpf/trampoline.c

+30 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/btf.h>

#include <linux/rcupdate_trace.h>

#include <linux/rcupdate_wait.h>

#include <linux/module.h>



/* dummy _ops. The verifier will operate on target program's ops. */

const struct bpf_verifier_ops bpf_extension_verifier_ops = {
@@ -87,6 +88,26 @@ static struct bpf_trampoline *bpf_trampoline_lookup(u64 key) 
	return tr;

}



static int bpf_trampoline_module_get(struct bpf_trampoline *tr)

{

	struct module *mod;

	int err = 0;



	preempt_disable();

	mod = __module_text_address((unsigned long) tr->func.addr);

	if (mod && !try_module_get(mod))

		err = -ENOENT;

	preempt_enable();

	tr->mod = mod;

	return err;

}



static void bpf_trampoline_module_put(struct bpf_trampoline *tr)

{

	module_put(tr->mod);

	tr->mod = NULL;

}



static int is_ftrace_location(void *ip)

{

	long addr;
@@ -108,6 +129,9 @@ static int unregister_fentry(struct bpf_trampoline *tr, void *old_addr) 
		ret = unregister_ftrace_direct((long)ip, (long)old_addr);

	else

		ret = bpf_arch_text_poke(ip, BPF_MOD_CALL, old_addr, NULL);



	if (!ret)

		bpf_trampoline_module_put(tr);

	return ret;

}
@@ -134,10 +158,16 @@ static int register_fentry(struct bpf_trampoline *tr, void *new_addr) 
		return ret;

	tr->func.ftrace_managed = ret;



	if (bpf_trampoline_module_get(tr))

		return -ENOENT;



	if (tr->func.ftrace_managed)

		ret = register_ftrace_direct((long)ip, (long)new_addr);

	else

		ret = bpf_arch_text_poke(ip, BPF_MOD_CALL, NULL, new_addr);



	if (ret)

		bpf_trampoline_module_put(tr);

	return ret;

}