Commit 7f93d129 authored by David S. Miller's avatar David S. Miller
Browse files

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



Alexei Starovoitov says:

====================
pull-request: bpf 2018-07-07

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

Plenty of fixes for different components:

1) A set of critical fixes for sockmap and sockhash, from John Fastabend.

2) fixes for several race conditions in af_xdp, from Magnus Karlsson.

3) hash map refcnt fix, from Mauricio Vasquez.

4) samples/bpf fixes, from Taeung Song.

5) ifup+mtu check for xdp_redirect, from Toshiaki Makita.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f6f2a4a2 d8d7218a

include/linux/filter.h

+3 −3
Original line number Diff line number Diff line
@@ -765,8 +765,8 @@ static inline bool bpf_dump_raw_ok(void) 
struct bpf_prog *bpf_patch_insn_single(struct bpf_prog *prog, u32 off,

				       const struct bpf_insn *patch, u32 len);



static inline int __xdp_generic_ok_fwd_dev(struct sk_buff *skb,

					   struct net_device *fwd)

static inline int xdp_ok_fwd_dev(const struct net_device *fwd,

				 unsigned int pktlen)

{

	unsigned int len;
@@ -774,7 +774,7 @@ static inline int __xdp_generic_ok_fwd_dev(struct sk_buff *skb, 
		return -ENETDOWN;



	len = fwd->mtu + fwd->hard_header_len + VLAN_HLEN;

	if (skb->len > len)

	if (pktlen > len)

		return -EMSGSIZE;



	return 0;

include/net/tcp.h

+4 −0
Original line number Diff line number Diff line
@@ -828,6 +828,10 @@ struct tcp_skb_cb { 


#define TCP_SKB_CB(__skb)	((struct tcp_skb_cb *)&((__skb)->cb[0]))



static inline void bpf_compute_data_end_sk_skb(struct sk_buff *skb)

{

	TCP_SKB_CB(skb)->bpf.data_end = skb->data + skb_headlen(skb);

}



#if IS_ENABLED(CONFIG_IPV6)

/* This is the variant of inet6_iif() that must be used by TCP,

include/net/xdp_sock.h

+4 −0
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ struct xdp_sock { 
	bool zc;

	/* Protects multiple processes in the control path */

	struct mutex mutex;

	/* Mutual exclusion of NAPI TX thread and sendmsg error paths

	 * in the SKB destructor callback.

	 */

	spinlock_t tx_completion_lock;

	u64 rx_dropped;

};

kernel/bpf/devmap.c

+6 −1
Original line number Diff line number Diff line
@@ -334,10 +334,15 @@ int dev_map_enqueue(struct bpf_dtab_netdev *dst, struct xdp_buff *xdp, 
{

	struct net_device *dev = dst->dev;

	struct xdp_frame *xdpf;

	int err;



	if (!dev->netdev_ops->ndo_xdp_xmit)

		return -EOPNOTSUPP;



	err = xdp_ok_fwd_dev(dev, xdp->data_end - xdp->data);

	if (unlikely(err))

		return err;



	xdpf = convert_to_xdp_frame(xdp);

	if (unlikely(!xdpf))

		return -EOVERFLOW;
@@ -350,7 +355,7 @@ int dev_map_generic_redirect(struct bpf_dtab_netdev *dst, struct sk_buff *skb, 
{

	int err;



	err = __xdp_generic_ok_fwd_dev(skb, dst->dev);

	err = xdp_ok_fwd_dev(dst->dev, skb->len);

	if (unlikely(err))

		return err;

	skb->dev = dst->dev;

kernel/bpf/hashtab.c

+11 −5
Original line number Diff line number Diff line
@@ -747,13 +747,15 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key, 
				 * old element will be freed immediately.

				 * Otherwise return an error

				 */

				atomic_dec(&htab->count);

				return ERR_PTR(-E2BIG);

				l_new = ERR_PTR(-E2BIG);

				goto dec_count;

			}

		l_new = kmalloc_node(htab->elem_size, GFP_ATOMIC | __GFP_NOWARN,

				     htab->map.numa_node);

		if (!l_new)

			return ERR_PTR(-ENOMEM);

		if (!l_new) {

			l_new = ERR_PTR(-ENOMEM);

			goto dec_count;

		}

	}



	memcpy(l_new->key, key, key_size);
@@ -766,7 +768,8 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key, 
						  GFP_ATOMIC | __GFP_NOWARN);

			if (!pptr) {

				kfree(l_new);

				return ERR_PTR(-ENOMEM);

				l_new = ERR_PTR(-ENOMEM);

				goto dec_count;

			}

		}
@@ -780,6 +783,9 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key, 


	l_new->hash = hash;

	return l_new;

dec_count:

	atomic_dec(&htab->count);

	return l_new;

}



static int check_flags(struct bpf_htab *htab, struct htab_elem *l_old,

CRA Git | Maintained and supported by SUSTech CRA and CCSE