Commit 5f6c2f53 authored by David S. Miller's avatar David S. Miller
Browse files

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



Alexei Starovoitov says:

====================
pull-request: bpf-next 2021-04-23

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

We've added 69 non-merge commits during the last 22 day(s) which contain
a total of 69 files changed, 3141 insertions(+), 866 deletions(-).

The main changes are:

1) Add BPF static linker support for extern resolution of global, from Andrii.

2) Refine retval for bpf_get_task_stack helper, from Dave.

3) Add a bpf_snprintf helper, from Florent.

4) A bunch of miscellaneous improvements from many developers.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b2f0ca00 350a62ca

Documentation/bpf/bpf_devel_QA.rst

+21 −9
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ list: 
This may also include issues related to XDP, BPF tracing, etc.



Given netdev has a high volume of traffic, please also add the BPF

maintainers to Cc (from kernel MAINTAINERS_ file):

maintainers to Cc (from kernel ``MAINTAINERS`` file):



* Alexei Starovoitov <ast@kernel.org>

* Daniel Borkmann <daniel@iogearbox.net>
@@ -234,11 +234,11 @@ be subject to change. 


Q: samples/bpf preference vs selftests?

---------------------------------------

Q: When should I add code to `samples/bpf/`_ and when to BPF kernel

Q: When should I add code to ``samples/bpf/`` and when to BPF kernel

selftests_?



A: In general, we prefer additions to BPF kernel selftests_ rather than

`samples/bpf/`_. The rationale is very simple: kernel selftests are

``samples/bpf/``. The rationale is very simple: kernel selftests are

regularly run by various bots to test for kernel regressions.



The more test cases we add to BPF selftests, the better the coverage
@@ -246,9 +246,9 @@ and the less likely it is that those could accidentally break. It is 
not that BPF kernel selftests cannot demo how a specific feature can

be used.



That said, `samples/bpf/`_ may be a good place for people to get started,

That said, ``samples/bpf/`` may be a good place for people to get started,

so it might be advisable that simple demos of features could go into

`samples/bpf/`_, but advanced functional and corner-case testing rather

``samples/bpf/``, but advanced functional and corner-case testing rather

into kernel selftests.



If your sample looks like a test case, then go for BPF kernel selftests
@@ -449,6 +449,19 @@ from source at 


https://github.com/acmel/dwarves



pahole starts to use libbpf definitions and APIs since v1.13 after the

commit 21507cd3e97b ("pahole: add libbpf as submodule under lib/bpf").

It works well with the git repository because the libbpf submodule will

use "git submodule update --init --recursive" to update.



Unfortunately, the default github release source code does not contain

libbpf submodule source code and this will cause build issues, the tarball

from https://git.kernel.org/pub/scm/devel/pahole/pahole.git/ is same with

github, you can get the source tarball with corresponding libbpf submodule

codes from



https://fedorapeople.org/~acme/dwarves



Some distros have pahole version 1.16 packaged already, e.g.

Fedora, Gentoo.
@@ -645,10 +658,9 @@ when: 


.. Links

.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/

.. _MAINTAINERS: ../../MAINTAINERS

.. _netdev-FAQ: ../networking/netdev-FAQ.rst

.. _samples/bpf/: ../../samples/bpf/

.. _selftests: ../../tools/testing/selftests/bpf/

.. _selftests:

   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/bpf/

.. _Documentation/dev-tools/kselftest.rst:

   https://www.kernel.org/doc/html/latest/dev-tools/kselftest.html

.. _Documentation/bpf/btf.rst: btf.rst

include/linux/bpf-cgroup.h

+0 −1
Original line number Diff line number Diff line
@@ -458,7 +458,6 @@ int cgroup_bpf_prog_query(const union bpf_attr *attr, 
			  union bpf_attr __user *uattr);

#else



struct bpf_prog;

struct cgroup_bpf {};

static inline int cgroup_bpf_inherit(struct cgroup *cgrp) { return 0; }

static inline void cgroup_bpf_offline(struct cgroup *cgrp) {}

include/linux/bpf.h

+22 −1
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ enum bpf_arg_type { 
	ARG_PTR_TO_PERCPU_BTF_ID,	/* pointer to in-kernel percpu type */

	ARG_PTR_TO_FUNC,	/* pointer to a bpf program function */

	ARG_PTR_TO_STACK_OR_NULL,	/* pointer to stack or NULL */

	ARG_PTR_TO_CONST_STR,	/* pointer to a null terminated read-only string */

	__BPF_ARG_TYPE_MAX,

};
@@ -930,7 +931,6 @@ struct bpf_link_primer { 
};



struct bpf_struct_ops_value;

struct btf_type;

struct btf_member;



#define BPF_STRUCT_OPS_MAX_NR_MEMBERS 64
@@ -1955,6 +1955,7 @@ extern const struct bpf_func_proto bpf_skc_to_tcp_request_sock_proto; 
extern const struct bpf_func_proto bpf_skc_to_udp6_sock_proto;

extern const struct bpf_func_proto bpf_copy_from_user_proto;

extern const struct bpf_func_proto bpf_snprintf_btf_proto;

extern const struct bpf_func_proto bpf_snprintf_proto;

extern const struct bpf_func_proto bpf_per_cpu_ptr_proto;

extern const struct bpf_func_proto bpf_this_cpu_ptr_proto;

extern const struct bpf_func_proto bpf_ktime_get_coarse_ns_proto;
@@ -2080,4 +2081,24 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type t, 
struct btf_id_set;

bool btf_id_set_contains(const struct btf_id_set *set, u32 id);



enum bpf_printf_mod_type {

	BPF_PRINTF_INT,

	BPF_PRINTF_LONG,

	BPF_PRINTF_LONG_LONG,

};



/* Workaround for getting va_list handling working with different argument type

 * combinations generically for 32 and 64 bit archs.

 */

#define BPF_CAST_FMT_ARG(arg_nb, args, mod)				\

	(mod[arg_nb] == BPF_PRINTF_LONG_LONG ||				\

	 (mod[arg_nb] == BPF_PRINTF_LONG && __BITS_PER_LONG == 64)	\

	  ? (u64)args[arg_nb]						\

	  : (u32)args[arg_nb])



int bpf_printf_prepare(char *fmt, u32 fmt_size, const u64 *raw_args,

		       u64 *final_args, enum bpf_printf_mod_type *mod,

		       u32 num_args);

void bpf_printf_cleanup(void);



#endif /* _LINUX_BPF_H */

include/linux/bpf_verifier.h

+9 −0
Original line number Diff line number Diff line
@@ -487,6 +487,15 @@ static inline u64 bpf_trampoline_compute_key(const struct bpf_prog *tgt_prog, 
		return ((u64)btf_obj_id(btf) << 32) | 0x80000000 | btf_id;

}



/* unpack the IDs from the key as constructed above */

static inline void bpf_trampoline_unpack_key(u64 key, u32 *obj_id, u32 *btf_id)

{

	if (obj_id)

		*obj_id = key >> 32;

	if (btf_id)

		*btf_id = key & 0x7FFFFFFF;

}



int bpf_check_attach_target(struct bpf_verifier_log *log,

			    const struct bpf_prog *prog,

			    const struct bpf_prog *tgt_prog,

include/linux/skmsg.h

+3 −2
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ struct sk_psock { 
	void (*saved_close)(struct sock *sk, long timeout);

	void (*saved_write_space)(struct sock *sk);

	void (*saved_data_ready)(struct sock *sk);

	int  (*psock_update_sk_prot)(struct sock *sk, bool restore);

	int  (*psock_update_sk_prot)(struct sock *sk, struct sk_psock *psock,

				     bool restore);

	struct proto			*sk_proto;

	struct mutex			work_mutex;

	struct sk_psock_work_state	work_state;
@@ -404,7 +405,7 @@ static inline void sk_psock_restore_proto(struct sock *sk, 
					  struct sk_psock *psock)

{

	if (psock->psock_update_sk_prot)

		psock->psock_update_sk_prot(sk, true);

		psock->psock_update_sk_prot(sk, psock, true);

}



static inline void sk_psock_set_state(struct sk_psock *psock,