Commit 0fd26005 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 2019-12-19

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

We've added 10 non-merge commits during the last 8 day(s) which contain
a total of 21 files changed, 269 insertions(+), 108 deletions(-).

The main changes are:

1) Fix lack of synchronization between xsk wakeup and destroying resources
   used by xsk wakeup, from Maxim Mikityanskiy.

2) Fix pruning with tail call patching, untrack programs in case of verifier
   error and fix a cgroup local storage tracking bug, from Daniel Borkmann.

3) Fix clearing skb->tstamp in bpf_redirect() when going from ingress to
   egress which otherwise cause issues e.g. on fq qdisc, from Lorenz Bauer.

4) Fix compile warning of unused proc_dointvec_minmax_bpf_restricted() when
   only cBPF is present, from Alexander Lobakin.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6fa9a115 3123d801

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

+1 −1
Original line number Diff line number Diff line
@@ -1152,7 +1152,7 @@ void i40e_set_fec_in_flags(u8 fec_cfg, u32 *flags); 


static inline bool i40e_enabled_xdp_vsi(struct i40e_vsi *vsi)

{

	return !!vsi->xdp_prog;

	return !!READ_ONCE(vsi->xdp_prog);

}



int i40e_create_queue_channel(struct i40e_vsi *vsi, struct i40e_channel *ch);

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

+7 −3
Original line number Diff line number Diff line
@@ -6823,8 +6823,8 @@ void i40e_down(struct i40e_vsi *vsi) 
	for (i = 0; i < vsi->num_queue_pairs; i++) {

		i40e_clean_tx_ring(vsi->tx_rings[i]);

		if (i40e_enabled_xdp_vsi(vsi)) {

			/* Make sure that in-progress ndo_xdp_xmit

			 * calls are completed.

			/* Make sure that in-progress ndo_xdp_xmit and

			 * ndo_xsk_wakeup calls are completed.

			 */

			synchronize_rcu();

			i40e_clean_tx_ring(vsi->xdp_rings[i]);
@@ -12546,8 +12546,12 @@ static int i40e_xdp_setup(struct i40e_vsi *vsi, 


	old_prog = xchg(&vsi->xdp_prog, prog);



	if (need_reset)

	if (need_reset) {

		if (!prog)

			/* Wait until ndo_xsk_wakeup completes. */

			synchronize_rcu();

		i40e_reset_and_rebuild(pf, true, true);

	}



	for (i = 0; i < vsi->num_queue_pairs; i++)

		WRITE_ONCE(vsi->rx_rings[i]->xdp_prog, vsi->xdp_prog);

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

+4 −0
Original line number Diff line number Diff line
@@ -787,8 +787,12 @@ int i40e_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags) 
{

	struct i40e_netdev_priv *np = netdev_priv(dev);

	struct i40e_vsi *vsi = np->vsi;

	struct i40e_pf *pf = vsi->back;

	struct i40e_ring *ring;



	if (test_bit(__I40E_CONFIG_BUSY, pf->state))

		return -ENETDOWN;



	if (test_bit(__I40E_VSI_DOWN, vsi->state))

		return -ENETDOWN;

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

+6 −1
Original line number Diff line number Diff line
@@ -10261,7 +10261,12 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog) 


	/* If transitioning XDP modes reconfigure rings */

	if (need_reset) {

		int err = ixgbe_setup_tc(dev, adapter->hw_tcs);

		int err;



		if (!prog)

			/* Wait until ndo_xsk_wakeup completes. */

			synchronize_rcu();

		err = ixgbe_setup_tc(dev, adapter->hw_tcs);



		if (err) {

			rcu_assign_pointer(adapter->xdp_prog, old_prog);

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

+6 −2
Original line number Diff line number Diff line
@@ -709,10 +709,14 @@ int ixgbe_xsk_wakeup(struct net_device *dev, u32 qid, u32 flags) 
	if (qid >= adapter->num_xdp_queues)

		return -ENXIO;



	if (!adapter->xdp_ring[qid]->xsk_umem)

	ring = adapter->xdp_ring[qid];



	if (test_bit(__IXGBE_TX_DISABLED, &ring->state))

		return -ENETDOWN;



	if (!ring->xsk_umem)

		return -ENXIO;



	ring = adapter->xdp_ring[qid];

	if (!napi_if_scheduled_mark_missed(&ring->q_vector->napi)) {

		u64 eics = BIT_ULL(ring->q_vector->v_idx);

CRA Git | Maintained and supported by SUSTech CRA and CCSE