Commit c2f5c57d 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 2021-06-23

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

We've added 14 non-merge commits during the last 6 day(s) which contain
a total of 13 files changed, 137 insertions(+), 64 deletions(-).

Note that when you merge net into net-next, there is a small merge conflict
between 9f2470fb ("skmsg: Improve udp_bpf_recvmsg() accuracy") from bpf
with c49661aa ("skmsg: Remove unused parameters of sk_msg_wait_data()")
from net-next. Resolution is to: i) net/ipv4/udp_bpf.c: take udp_msg_wait_data()
and remove err parameter from the function, ii) net/ipv4/tcp_bpf.c: take
tcp_msg_wait_data() and remove err parameter from the function, iii) for
net/core/skmsg.c and include/linux/skmsg.h: remove the sk_msg_wait_data()
implementation and its prototype in header.

The main changes are:

1) Fix BPF poke descriptor adjustments after insn rewrite, from John Fastabend.

2) Fix regression when using BPF_OBJ_GET with non-O_RDWR flags, from Maciej Żenczykowski.

3) Various bug and error handling fixes for UDP-related sock_map, from Cong Wang.

4) Fix patching of vmlinux BTF IDs with correct endianness, from Tony Ambardar.

5) Two fixes for TX descriptor validation in AF_XDP, from Magnus Karlsson.

6) Fix overflow in size calculation for bpf_map_area_alloc(), from Bui Quang Minh.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bcc3f2a8 7506d211

include/linux/skmsg.h

+0 −2
Original line number Diff line number Diff line
@@ -126,8 +126,6 @@ int sk_msg_zerocopy_from_iter(struct sock *sk, struct iov_iter *from, 
			      struct sk_msg *msg, u32 bytes);

int sk_msg_memcopy_from_iter(struct sock *sk, struct iov_iter *from,

			     struct sk_msg *msg, u32 bytes);

int sk_msg_wait_data(struct sock *sk, struct sk_psock *psock, int flags,

		     long timeo, int *err);

int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,

		   int len, int flags);

include/net/xsk_buff_pool.h

+7 −2
Original line number Diff line number Diff line
@@ -147,11 +147,16 @@ static inline bool xp_desc_crosses_non_contig_pg(struct xsk_buff_pool *pool, 
{

	bool cross_pg = (addr & (PAGE_SIZE - 1)) + len > PAGE_SIZE;



	if (pool->dma_pages_cnt && cross_pg) {

	if (likely(!cross_pg))

		return false;



	if (pool->dma_pages_cnt) {

		return !(pool->dma_pages[addr >> PAGE_SHIFT] &

			 XSK_NEXT_PG_CONTIG_MASK);

	}

	return false;



	/* skb path */

	return addr + len > pool->addrs_cnt;

}



static inline u64 xp_aligned_extract_addr(struct xsk_buff_pool *pool, u64 addr)

kernel/bpf/devmap.c

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static struct hlist_head *dev_map_create_hash(unsigned int entries, 
	int i;

	struct hlist_head *hash;



	hash = bpf_map_area_alloc(entries * sizeof(*hash), numa_node);

	hash = bpf_map_area_alloc((u64) entries * sizeof(*hash), numa_node);

	if (hash != NULL)

		for (i = 0; i < entries; i++)

			INIT_HLIST_HEAD(&hash[i]);
@@ -143,7 +143,7 @@ static int dev_map_init_map(struct bpf_dtab *dtab, union bpf_attr *attr) 


		spin_lock_init(&dtab->index_lock);

	} else {

		dtab->netdev_map = bpf_map_area_alloc(dtab->map.max_entries *

		dtab->netdev_map = bpf_map_area_alloc((u64) dtab->map.max_entries *

						      sizeof(struct bpf_dtab_netdev *),

						      dtab->map.numa_node);

		if (!dtab->netdev_map)

kernel/bpf/inode.c

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



	if (type == BPF_TYPE_PROG)

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

		ret = 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)

kernel/bpf/verifier.c

+4 −2
Original line number Diff line number Diff line
@@ -11459,7 +11459,7 @@ static void adjust_subprog_starts(struct bpf_verifier_env *env, u32 off, u32 len 
	}

}



static void adjust_poke_descs(struct bpf_prog *prog, u32 len)

static void adjust_poke_descs(struct bpf_prog *prog, u32 off, u32 len)

{

	struct bpf_jit_poke_descriptor *tab = prog->aux->poke_tab;

	int i, sz = prog->aux->size_poke_tab;
@@ -11467,6 +11467,8 @@ static void adjust_poke_descs(struct bpf_prog *prog, u32 len) 


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

		desc = &tab[i];

		if (desc->insn_idx <= off)

			continue;

		desc->insn_idx += len - 1;

	}

}
@@ -11487,7 +11489,7 @@ static struct bpf_prog *bpf_patch_insn_data(struct bpf_verifier_env *env, u32 of 
	if (adjust_insn_aux_data(env, new_prog, off, len))

		return NULL;

	adjust_subprog_starts(env, off, len);

	adjust_poke_descs(new_prog, len);

	adjust_poke_descs(new_prog, off, len);

	return new_prog;

}