Commit e56c53d1 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-03-20

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

We've added 5 non-merge commits during the last 3 day(s) which contain
a total of 8 files changed, 155 insertions(+), 12 deletions(-).

The main changes are:

1) Use correct nops in fexit trampoline, from Stanislav.

2) Fix BTF dump, from Jean-Philippe.

3) Fix umd memory leak, from Zqiang.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5aa3c334 b9082970

arch/x86/net/bpf_jit_comp.c

+2 −1
Original line number Diff line number Diff line
@@ -2012,7 +2012,8 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image, void *i 
		/* remember return value in a stack for bpf prog to access */

		emit_stx(&prog, BPF_DW, BPF_REG_FP, BPF_REG_0, -8);

		im->ip_after_call = prog;

		emit_nops(&prog, 5);

		memcpy(prog, ideal_nops[NOP_ATOMIC5], X86_PATCH_SIZE);

		prog += X86_PATCH_SIZE;

	}



	if (fmod_ret->nr_progs) {

include/linux/usermode_driver.h

+1 −0
Original line number Diff line number Diff line
@@ -14,5 +14,6 @@ struct umd_info { 
int umd_load_blob(struct umd_info *info, const void *data, size_t len);

int umd_unload_blob(struct umd_info *info);

int fork_usermode_driver(struct umd_info *info);

void umd_cleanup_helper(struct umd_info *info);



#endif /* __LINUX_USERMODE_DRIVER_H__ */

kernel/bpf/preload/bpf_preload_kern.c

+15 −4
Original line number Diff line number Diff line
@@ -60,9 +60,12 @@ static int finish(void) 
			 &magic, sizeof(magic), &pos);

	if (n != sizeof(magic))

		return -EPIPE;



	tgid = umd_ops.info.tgid;

	if (tgid) {

		wait_event(tgid->wait_pidfd, thread_group_exited(tgid));

	umd_ops.info.tgid = NULL;

		umd_cleanup_helper(&umd_ops.info);

	}

	return 0;

}
@@ -80,10 +83,18 @@ static int __init load_umd(void) 


static void __exit fini_umd(void)

{

	struct pid *tgid;



	bpf_preload_ops = NULL;



	/* kill UMD in case it's still there due to earlier error */

	kill_pid(umd_ops.info.tgid, SIGKILL, 1);

	umd_ops.info.tgid = NULL;

	tgid = umd_ops.info.tgid;

	if (tgid) {

		kill_pid(tgid, SIGKILL, 1);



		wait_event(tgid->wait_pidfd, thread_group_exited(tgid));

		umd_cleanup_helper(&umd_ops.info);

	}

	umd_unload_blob(&umd_ops.info);

}

late_initcall(load_umd);

kernel/usermode_driver.c

+15 −6
Original line number Diff line number Diff line
@@ -139,13 +139,22 @@ static void umd_cleanup(struct subprocess_info *info) 
	struct umd_info *umd_info = info->data;



	/* cleanup if umh_setup() was successful but exec failed */

	if (info->retval) {

		fput(umd_info->pipe_to_umh);

		fput(umd_info->pipe_from_umh);

		put_pid(umd_info->tgid);

		umd_info->tgid = NULL;

	if (info->retval)

		umd_cleanup_helper(umd_info);

}



/**

 * umd_cleanup_helper - release the resources which were allocated in umd_setup

 * @info: information about usermode driver

 */

void umd_cleanup_helper(struct umd_info *info)

{

	fput(info->pipe_to_umh);

	fput(info->pipe_from_umh);

	put_pid(info->tgid);

	info->tgid = NULL;

}

EXPORT_SYMBOL_GPL(umd_cleanup_helper);



/**

 * fork_usermode_driver - fork a usermode driver

tools/lib/bpf/btf_dump.c

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static int btf_dump_order_type(struct btf_dump *d, __u32 id, bool through_ptr) 
		return err;



	case BTF_KIND_ARRAY:

		return btf_dump_order_type(d, btf_array(t)->type, through_ptr);

		return btf_dump_order_type(d, btf_array(t)->type, false);



	case BTF_KIND_STRUCT:

	case BTF_KIND_UNION: {