Commit 1e2d3c49 authored by David S. Miller's avatar David S. Miller
Browse files

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



Daniel Borkmann says:

====================
pull-request: bpf 2018-11-03

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

The main changes are:

1) Fix BPF prog kallsyms and bpf_prog_get_info_by_fd() jited address export
   to not use page start but actual start instead to work correctly with
   profiling e.g. finding hot instructions from stack traces. Also fix latter
   with regards to dumping address and jited len for !multi prog, from Song.

2) Fix bpf_prog_get_info_by_fd() for !root to zero info.nr_jited_func_lens
   instead of leaving the user provided length, from Daniel.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 96801552 28c2fae7

kernel/bpf/core.c

+1 −3
Original line number Diff line number Diff line
@@ -553,7 +553,6 @@ bool is_bpf_text_address(unsigned long addr) 
int bpf_get_kallsym(unsigned int symnum, unsigned long *value, char *type,

		    char *sym)

{

	unsigned long symbol_start, symbol_end;

	struct bpf_prog_aux *aux;

	unsigned int it = 0;

	int ret = -ERANGE;
@@ -566,10 +565,9 @@ int bpf_get_kallsym(unsigned int symnum, unsigned long *value, char *type, 
		if (it++ != symnum)

			continue;



		bpf_get_prog_addr_region(aux->prog, &symbol_start, &symbol_end);

		bpf_get_prog_name(aux->prog, sym);



		*value = symbol_start;

		*value = (unsigned long)aux->prog->bpf_func;

		*type  = BPF_SYM_ELF_TYPE;



		ret = 0;

kernel/bpf/syscall.c

+25 −10
Original line number Diff line number Diff line
@@ -2078,6 +2078,7 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog, 
		info.jited_prog_len = 0;

		info.xlated_prog_len = 0;

		info.nr_jited_ksyms = 0;

		info.nr_jited_func_lens = 0;

		goto done;

	}
@@ -2158,11 +2159,11 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog, 
	}



	ulen = info.nr_jited_ksyms;

	info.nr_jited_ksyms = prog->aux->func_cnt;

	info.nr_jited_ksyms = prog->aux->func_cnt ? : 1;

	if (info.nr_jited_ksyms && ulen) {

		if (bpf_dump_raw_ok()) {

			unsigned long ksym_addr;

			u64 __user *user_ksyms;

			ulong ksym_addr;

			u32 i;



			/* copy the address of the kernel symbol
@@ -2170,10 +2171,17 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog, 
			 */

			ulen = min_t(u32, info.nr_jited_ksyms, ulen);

			user_ksyms = u64_to_user_ptr(info.jited_ksyms);

			if (prog->aux->func_cnt) {

				for (i = 0; i < ulen; i++) {

				ksym_addr = (ulong) prog->aux->func[i]->bpf_func;

				ksym_addr &= PAGE_MASK;

				if (put_user((u64) ksym_addr, &user_ksyms[i]))

					ksym_addr = (unsigned long)

						prog->aux->func[i]->bpf_func;

					if (put_user((u64) ksym_addr,

						     &user_ksyms[i]))

						return -EFAULT;

				}

			} else {

				ksym_addr = (unsigned long) prog->bpf_func;

				if (put_user((u64) ksym_addr, &user_ksyms[0]))

					return -EFAULT;

			}

		} else {
@@ -2182,7 +2190,7 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog, 
	}



	ulen = info.nr_jited_func_lens;

	info.nr_jited_func_lens = prog->aux->func_cnt;

	info.nr_jited_func_lens = prog->aux->func_cnt ? : 1;

	if (info.nr_jited_func_lens && ulen) {

		if (bpf_dump_raw_ok()) {

			u32 __user *user_lens;
@@ -2191,11 +2199,18 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog, 
			/* copy the JITed image lengths for each function */

			ulen = min_t(u32, info.nr_jited_func_lens, ulen);

			user_lens = u64_to_user_ptr(info.jited_func_lens);

			if (prog->aux->func_cnt) {

				for (i = 0; i < ulen; i++) {

				func_len = prog->aux->func[i]->jited_len;

					func_len =

						prog->aux->func[i]->jited_len;

					if (put_user(func_len, &user_lens[i]))

						return -EFAULT;

				}

			} else {

				func_len = prog->jited_len;

				if (put_user(func_len, &user_lens[0]))

					return -EFAULT;

			}

		} else {

			info.jited_func_lens = 0;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE