Commit 28f2c362 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 



Daniel Borkmann says:

====================
pull-request: bpf-next 2019-09-16

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

The main changes are:

1) Now that initial BPF backend for gcc has been merged upstream, enable
   BPF kselftest suite for bpf-gcc. Also fix a BE issue with access to
   bpf_sysctl.file_pos, from Ilya.

2) Follow-up fix for link-vmlinux.sh to remove bash-specific extensions
   related to recent work on exposing BTF info through sysfs, from Andrii.

3) AF_XDP zero copy fixes for i40e and ixgbe driver which caused umem
   headroom to be added twice, from Ciara.

4) Refactoring work to convert sock opt tests into test_progs framework
   in BPF kselftests, from Stanislav.

5) Fix a general protection fault in dev_map_hash_update_elem(), from Toke.

6) Cleanup to use BPF_PROG_RUN() macro in KCM, from Sami.
====================

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

drivers/net/ethernet/intel/i40e/i40e_xsk.c

+2 −2
Original line number Diff line number Diff line
@@ -197,9 +197,9 @@ static int i40e_run_xdp_zc(struct i40e_ring *rx_ring, struct xdp_buff *xdp) 
{

	struct xdp_umem *umem = rx_ring->xsk_umem;

	int err, result = I40E_XDP_PASS;

	u64 offset = umem->headroom;

	struct i40e_ring *xdp_ring;

	struct bpf_prog *xdp_prog;

	u64 offset;

	u32 act;



	rcu_read_lock();
@@ -208,7 +208,7 @@ static int i40e_run_xdp_zc(struct i40e_ring *rx_ring, struct xdp_buff *xdp) 
	 */

	xdp_prog = READ_ONCE(rx_ring->xdp_prog);

	act = bpf_prog_run_xdp(xdp_prog, xdp);

	offset += xdp->data - xdp->data_hard_start;

	offset = xdp->data - xdp->data_hard_start;



	xdp->handle = xsk_umem_adjust_offset(umem, xdp->handle, offset);

drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c

+2 −2
Original line number Diff line number Diff line
@@ -145,15 +145,15 @@ static int ixgbe_run_xdp_zc(struct ixgbe_adapter *adapter, 
{

	struct xdp_umem *umem = rx_ring->xsk_umem;

	int err, result = IXGBE_XDP_PASS;

	u64 offset = umem->headroom;

	struct bpf_prog *xdp_prog;

	struct xdp_frame *xdpf;

	u64 offset;

	u32 act;



	rcu_read_lock();

	xdp_prog = READ_ONCE(rx_ring->xdp_prog);

	act = bpf_prog_run_xdp(xdp_prog, xdp);

	offset += xdp->data - xdp->data_hard_start;

	offset = xdp->data - xdp->data_hard_start;



	xdp->handle = xsk_umem_adjust_offset(umem, xdp->handle, offset);

include/linux/filter.h

+4 −4
Original line number Diff line number Diff line
@@ -749,14 +749,14 @@ bpf_ctx_narrow_access_ok(u32 off, u32 size, u32 size_default) 
}



static inline u8

bpf_ctx_narrow_load_shift(u32 off, u32 size, u32 size_default)

bpf_ctx_narrow_access_offset(u32 off, u32 size, u32 size_default)

{

	u8 load_off = off & (size_default - 1);

	u8 access_off = off & (size_default - 1);



#ifdef __LITTLE_ENDIAN

	return load_off * 8;

	return access_off;

#else

	return (size_default - (load_off + size)) * 8;

	return size_default - (access_off + size);

#endif

}

kernel/bpf/cgroup.c

+8 −2
Original line number Diff line number Diff line
@@ -1334,6 +1334,7 @@ static u32 sysctl_convert_ctx_access(enum bpf_access_type type, 
				     struct bpf_prog *prog, u32 *target_size)

{

	struct bpf_insn *insn = insn_buf;

	u32 read_size;



	switch (si->off) {

	case offsetof(struct bpf_sysctl, write):
@@ -1365,7 +1366,9 @@ static u32 sysctl_convert_ctx_access(enum bpf_access_type type, 
				treg, si->dst_reg,

				offsetof(struct bpf_sysctl_kern, ppos));

			*insn++ = BPF_STX_MEM(

				BPF_SIZEOF(u32), treg, si->src_reg, 0);

				BPF_SIZEOF(u32), treg, si->src_reg,

				bpf_ctx_narrow_access_offset(

					0, sizeof(u32), sizeof(loff_t)));

			*insn++ = BPF_LDX_MEM(

				BPF_DW, treg, si->dst_reg,

				offsetof(struct bpf_sysctl_kern, tmp_reg));
@@ -1374,8 +1377,11 @@ static u32 sysctl_convert_ctx_access(enum bpf_access_type type, 
				BPF_FIELD_SIZEOF(struct bpf_sysctl_kern, ppos),

				si->dst_reg, si->src_reg,

				offsetof(struct bpf_sysctl_kern, ppos));

			read_size = bpf_size_to_bytes(BPF_SIZE(si->code));

			*insn++ = BPF_LDX_MEM(

				BPF_SIZE(si->code), si->dst_reg, si->dst_reg, 0);

				BPF_SIZE(si->code), si->dst_reg, si->dst_reg,

				bpf_ctx_narrow_access_offset(

					0, read_size, sizeof(loff_t)));

		}

		*target_size = sizeof(u32);

		break;

kernel/bpf/devmap.c

+12 −5
Original line number Diff line number Diff line
@@ -650,19 +650,22 @@ static int __dev_map_hash_update_elem(struct net *net, struct bpf_map *map, 
	u32 ifindex = *(u32 *)value;

	u32 idx = *(u32 *)key;

	unsigned long flags;

	int err = -EEXIST;



	if (unlikely(map_flags > BPF_EXIST || !ifindex))

		return -EINVAL;



	spin_lock_irqsave(&dtab->index_lock, flags);



	old_dev = __dev_map_hash_lookup_elem(map, idx);

	if (old_dev && (map_flags & BPF_NOEXIST))

		return -EEXIST;

		goto out_err;



	dev = __dev_map_alloc_node(net, dtab, ifindex, idx);

	if (IS_ERR(dev))

		return PTR_ERR(dev);



	spin_lock_irqsave(&dtab->index_lock, flags);

	if (IS_ERR(dev)) {

		err = PTR_ERR(dev);

		goto out_err;

	}



	if (old_dev) {

		hlist_del_rcu(&old_dev->index_hlist);
@@ -683,6 +686,10 @@ static int __dev_map_hash_update_elem(struct net *net, struct bpf_map *map, 
		call_rcu(&old_dev->rcu, __dev_map_entry_free);



	return 0;



out_err:

	spin_unlock_irqrestore(&dtab->index_lock, flags);

	return err;

}



static int dev_map_hash_update_elem(struct bpf_map *map, void *key, void *value,

CRA Git | Maintained and supported by SUSTech CRA and CCSE