Commit 75455b90 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next 

Daniel Borkmann says:

====================
pull-request: bpf-next 2023-05-26

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

The main changes are:

1) Add the capability to destroy sockets in BPF through a new kfunc,
   from Aditi Ghag.

2) Support O_PATH fds in BPF_OBJ_PIN and BPF_OBJ_GET commands,
   from Andrii Nakryiko.

3) Add capability for libbpf to resize datasec maps when backed via mmap,
   from JP Kobryn.

4) Move all the test kfuncs for CI out of the kernel and into bpf_testmod,
   from Jiri Olsa.

5) Big batch of xsk selftest improvements to prep for multi-buffer testing,
   from Magnus Karlsson.

6) Show the target_{obj,btf}_id in tracing link's fdinfo and dump it
   via bpftool, from Yafang Shao.

7) Various misc BPF selftest improvements to work with upcoming LLVM 17,
   from Yonghong Song.

8) Extend bpftool to specify netdevice for resolving XDP hints,
   from Larysa Zaremba.

9) Document masking in shift operations for the insn set document,
   from Dave Thaler.

10) Extend BPF selftests to check xdp_feature support for bond driver,
    from Lorenzo Bianconi.

* tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next: (54 commits)
  bpf: Fix bad unlock balance on freeze_mutex
  libbpf: Ensure FD >= 3 during bpf_map__reuse_fd()
  libbpf: Ensure libbpf always opens files with O_CLOEXEC
  selftests/bpf: Check whether to run selftest
  libbpf: Change var type in datasec resize func
  bpf: drop unnecessary bpf_capable() check in BPF_MAP_FREEZE command
  libbpf: Selftests for resizing datasec maps
  libbpf: Add capability for resizing datasec maps
  selftests/bpf: Add path_fd-based BPF_OBJ_PIN and BPF_OBJ_GET tests
  libbpf: Add opts-based bpf_obj_pin() API and add support for path_fd
  bpf: Support O_PATH FDs in BPF_OBJ_PIN and BPF_OBJ_GET commands
  libbpf: Start v1.3 development cycle
  bpf: Validate BPF object in BPF_OBJ_PIN before calling LSM
  bpftool: Specify XDP Hints ifname when loading program
  selftests/bpf: Add xdp_feature selftest for bond device
  selftests/bpf: Test bpf_sock_destroy
  selftests/bpf: Add helper to get port using getsockname
  bpf: Add bpf_sock_destroy kfunc
  bpf: Add kfunc filter function to 'struct btf_kfunc_id_set'
  bpf: udp: Implement batching for sockets iterator
  ...
====================

Link: https://lore.kernel.org/r/20230526222747.17775-1-daniel@iogearbox.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4781e965 4266f41f

Documentation/bpf/instruction-set.rst

+6 −3
Original line number Diff line number Diff line
@@ -163,13 +163,13 @@ BPF_MUL 0x20 dst \*= src 
BPF_DIV   0x30   dst = (src != 0) ? (dst / src) : 0

BPF_OR    0x40   dst \|= src

BPF_AND   0x50   dst &= src

BPF_LSH   0x60   dst <<= src

BPF_RSH   0x70   dst >>= src

BPF_LSH   0x60   dst <<= (src & mask)

BPF_RSH   0x70   dst >>= (src & mask)

BPF_NEG   0x80   dst = ~src

BPF_MOD   0x90   dst = (src != 0) ? (dst % src) : dst

BPF_XOR   0xa0   dst ^= src

BPF_MOV   0xb0   dst = src

BPF_ARSH  0xc0   sign extending shift right

BPF_ARSH  0xc0   sign extending dst >>= (src & mask)

BPF_END   0xd0   byte swap operations (see `Byte swap instructions`_ below)

========  =====  ==========================================================
@@ -204,6 +204,9 @@ for ``BPF_ALU64``, 'imm' is first sign extended to 64 bits and the result 
interpreted as an unsigned 64-bit value. There are no instructions for

signed division or modulo.



Shift operations use a mask of 0x3F (63) for 64-bit operations and 0x1F (31)

for 32-bit operations.



Byte swap instructions

~~~~~~~~~~~~~~~~~~~~~~

include/linux/bpf.h

+2 −2
Original line number Diff line number Diff line
@@ -2077,8 +2077,8 @@ struct file *bpf_link_new_file(struct bpf_link *link, int *reserved_fd); 
struct bpf_link *bpf_link_get_from_fd(u32 ufd);

struct bpf_link *bpf_link_get_curr_or_next(u32 *id);



int bpf_obj_pin_user(u32 ufd, const char __user *pathname);

int bpf_obj_get_user(const char __user *pathname, int flags);

int bpf_obj_pin_user(u32 ufd, int path_fd, const char __user *pathname);

int bpf_obj_get_user(int path_fd, const char __user *pathname, int flags);



#define BPF_ITER_FUNC_PREFIX "bpf_iter_"

#define DEFINE_BPF_ITER_FUNC(target, args...)			\

include/linux/btf.h

+11 −7
Original line number Diff line number Diff line
@@ -98,10 +98,14 @@ struct btf_type; 
union bpf_attr;

struct btf_show;

struct btf_id_set;

struct bpf_prog;



typedef int (*btf_kfunc_filter_t)(const struct bpf_prog *prog, u32 kfunc_id);



struct btf_kfunc_id_set {

	struct module *owner;

	struct btf_id_set8 *set;

	btf_kfunc_filter_t filter;

};



struct btf_id_dtor_kfunc {
@@ -479,7 +483,6 @@ static inline void *btf_id_set8_contains(const struct btf_id_set8 *set, u32 id) 
	return bsearch(&id, set->pairs, set->cnt, sizeof(set->pairs[0]), btf_id_cmp_func);

}



struct bpf_prog;

struct bpf_verifier_log;



#ifdef CONFIG_BPF_SYSCALL
@@ -487,10 +490,10 @@ const struct btf_type *btf_type_by_id(const struct btf *btf, u32 type_id); 
const char *btf_name_by_offset(const struct btf *btf, u32 offset);

struct btf *btf_parse_vmlinux(void);

struct btf *bpf_prog_get_target_btf(const struct bpf_prog *prog);

u32 *btf_kfunc_id_set_contains(const struct btf *btf,

			       enum bpf_prog_type prog_type,

			       u32 kfunc_btf_id);

u32 *btf_kfunc_is_modify_return(const struct btf *btf, u32 kfunc_btf_id);

u32 *btf_kfunc_id_set_contains(const struct btf *btf, u32 kfunc_btf_id,

			       const struct bpf_prog *prog);

u32 *btf_kfunc_is_modify_return(const struct btf *btf, u32 kfunc_btf_id,

				const struct bpf_prog *prog);

int register_btf_kfunc_id_set(enum bpf_prog_type prog_type,

			      const struct btf_kfunc_id_set *s);

int register_btf_fmodret_id_set(const struct btf_kfunc_id_set *kset);
@@ -517,8 +520,9 @@ static inline const char *btf_name_by_offset(const struct btf *btf, 
	return NULL;

}

static inline u32 *btf_kfunc_id_set_contains(const struct btf *btf,

					     enum bpf_prog_type prog_type,

					     u32 kfunc_btf_id)

					     u32 kfunc_btf_id,

					     struct bpf_prog *prog)



{

	return NULL;

}

include/net/udp.h

+0 −1
Original line number Diff line number Diff line
@@ -437,7 +437,6 @@ struct udp_seq_afinfo { 
struct udp_iter_state {

	struct seq_net_private  p;

	int			bucket;

	struct udp_seq_afinfo	*bpf_seq_afinfo;

};



void *udp_seq_start(struct seq_file *seq, loff_t *pos);

include/uapi/linux/bpf.h

+10 −0
Original line number Diff line number Diff line
@@ -1272,6 +1272,9 @@ enum { 


/* Create a map that will be registered/unregesitered by the backed bpf_link */

	BPF_F_LINK		= (1U << 13),



/* Get path from provided FD in BPF_OBJ_PIN/BPF_OBJ_GET commands */

	BPF_F_PATH_FD		= (1U << 14),

};



/* Flags for BPF_PROG_QUERY. */
@@ -1420,6 +1423,13 @@ union bpf_attr { 
		__aligned_u64	pathname;

		__u32		bpf_fd;

		__u32		file_flags;

		/* Same as dirfd in openat() syscall; see openat(2)

		 * manpage for details of path FD and pathname semantics;

		 * path_fd should accompanied by BPF_F_PATH_FD flag set in

		 * file_flags field, otherwise it should be set to zero;

		 * if BPF_F_PATH_FD flag is not set, AT_FDCWD is assumed.

		 */

		__s32		path_fd;

	};



	struct { /* anonymous struct used by BPF_PROG_ATTACH/DETACH commands */