Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 885e6319 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 2019-02-16

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

The main changes are:

1) numerous libbpf API improvements, from Andrii, Andrey, Yonghong.

2) test all bpf progs in alu32 mode, from Jiong.

3) skb->sk access and bpf_sk_fullsock(), bpf_tcp_sock() helpers, from Martin.

4) support for IP encap in lwt bpf progs, from Peter.

5) remove XDP_QUERY_XSK_UMEM dead code, from Jan.
====================

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

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

+0 −3
Original line number Diff line number Diff line
@@ -12128,9 +12128,6 @@ static int i40e_xdp(struct net_device *dev, 
	case XDP_QUERY_PROG:

		xdp->prog_id = vsi->xdp_prog ? vsi->xdp_prog->aux->id : 0;

		return 0;

	case XDP_QUERY_XSK_UMEM:

		return i40e_xsk_umem_query(vsi, &xdp->xsk.umem,

					   xdp->xsk.queue_id);

	case XDP_SETUP_XSK_UMEM:

		return i40e_xsk_umem_setup(vsi, xdp->xsk.umem,

					   xdp->xsk.queue_id);

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

+0 −28
Original line number Diff line number Diff line
@@ -154,34 +154,6 @@ static int i40e_xsk_umem_disable(struct i40e_vsi *vsi, u16 qid) 
	return 0;

}



/**

 * i40e_xsk_umem_query - Queries a certain ring/qid for its UMEM

 * @vsi: Current VSI

 * @umem: UMEM associated to the ring, if any

 * @qid: Rx ring to associate UMEM to

 *

 * This function will store, if any, the UMEM associated to certain ring.

 *

 * Returns 0 on success, <0 on failure

 **/

int i40e_xsk_umem_query(struct i40e_vsi *vsi, struct xdp_umem **umem,

			u16 qid)

{

	struct net_device *netdev = vsi->netdev;

	struct xdp_umem *queried_umem;



	if (vsi->type != I40E_VSI_MAIN)

		return -EINVAL;



	queried_umem = xdp_get_umem_from_qid(netdev, qid);



	if (!queried_umem)

		return -EINVAL;



	*umem = queried_umem;

	return 0;

}



/**

 * i40e_xsk_umem_setup - Enable/disassociate a UMEM to/from a ring/qid

 * @vsi: Current VSI

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

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ struct zero_copy_allocator; 


int i40e_queue_pair_disable(struct i40e_vsi *vsi, int queue_pair);

int i40e_queue_pair_enable(struct i40e_vsi *vsi, int queue_pair);

int i40e_xsk_umem_query(struct i40e_vsi *vsi, struct xdp_umem **umem,

			u16 qid);

int i40e_xsk_umem_setup(struct i40e_vsi *vsi, struct xdp_umem *umem,

			u16 qid);

void i40e_zca_free(struct zero_copy_allocator *alloc, unsigned long handle);

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

+0 −3
Original line number Diff line number Diff line
@@ -10280,9 +10280,6 @@ static int ixgbe_xdp(struct net_device *dev, struct netdev_bpf *xdp) 
		xdp->prog_id = adapter->xdp_prog ?

			adapter->xdp_prog->aux->id : 0;

		return 0;

	case XDP_QUERY_XSK_UMEM:

		return ixgbe_xsk_umem_query(adapter, &xdp->xsk.umem,

					    xdp->xsk.queue_id);

	case XDP_SETUP_XSK_UMEM:

		return ixgbe_xsk_umem_setup(adapter, xdp->xsk.umem,

					    xdp->xsk.queue_id);

drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ void ixgbe_txrx_ring_enable(struct ixgbe_adapter *adapter, int ring); 


struct xdp_umem *ixgbe_xsk_umem(struct ixgbe_adapter *adapter,

				struct ixgbe_ring *ring);

int ixgbe_xsk_umem_query(struct ixgbe_adapter *adapter, struct xdp_umem **umem,

			 u16 qid);

int ixgbe_xsk_umem_setup(struct ixgbe_adapter *adapter, struct xdp_umem *umem,

			 u16 qid);