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

Commit 7aac8425 authored by John Fastabend's avatar John Fastabend Committed by Jeff Kirsher
Browse files

ixgbe: Allow flow director to use entire queue space 



Flow director is exported to user space using the ethtool ntuple
support. However, currently it only supports steering traffic to a
subset of the queues in use by the hardware. This change allows
flow director to specify queues that have been assigned to virtual
functions by partitioning the ring_cookie into a 8bit VF specifier
followed by 32bit queue index. At the moment we don't have any
ethernet drivers with more than 2^32 queues on a single function
as best I can tell and nor do I expect this to happen anytime
soon. This way the ring_cookie's normal use for specifying a queue
on a specific PCI function continues to work as expected.

CC: Alex Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 8cf6f497

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

+24 −10
Original line number Diff line number Diff line
@@ -2594,19 +2594,36 @@ static int ixgbe_add_ethtool_fdir_entry(struct ixgbe_adapter *adapter, 
	struct ixgbe_hw *hw = &adapter->hw;

	struct ixgbe_fdir_filter *input;

	union ixgbe_atr_input mask;

	u8 queue;

	int err;



	if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))

		return -EOPNOTSUPP;



	/*

	 * Don't allow programming if the action is a queue greater than

	 * the number of online Rx queues.

	/* ring_cookie is a masked into a set of queues and ixgbe pools or

	 * we use the drop index.

	 */

	if ((fsp->ring_cookie != RX_CLS_FLOW_DISC) &&

	    (fsp->ring_cookie >= adapter->num_rx_queues))

	if (fsp->ring_cookie == RX_CLS_FLOW_DISC) {

		queue = IXGBE_FDIR_DROP_QUEUE;

	} else {

		u32 ring = ethtool_get_flow_spec_ring(fsp->ring_cookie);

		u8 vf = ethtool_get_flow_spec_ring_vf(fsp->ring_cookie);



		if (!vf && (ring >= adapter->num_rx_queues))

			return -EINVAL;

		else if (vf &&

			 ((vf > adapter->num_vfs) ||

			   ring >= adapter->num_rx_queues_per_pool))

			return -EINVAL;



		/* Map the ring onto the absolute queue index */

		if (!vf)

			queue = adapter->rx_ring[ring]->reg_idx;

		else

			queue = ((vf - 1) *

				adapter->num_rx_queues_per_pool) + ring;

	}



	/* Don't allow indexes to exist outside of available space */

	if (fsp->location >= ((1024 << adapter->fdir_pballoc) - 2)) {

		e_err(drv, "Location out of range\n");
@@ -2683,10 +2700,7 @@ static int ixgbe_add_ethtool_fdir_entry(struct ixgbe_adapter *adapter, 


	/* program filters to filter memory */

	err = ixgbe_fdir_write_perfect_filter_82599(hw,

				&input->filter, input->sw_idx,

				(input->action == IXGBE_FDIR_DROP_QUEUE) ?

				IXGBE_FDIR_DROP_QUEUE :

				adapter->rx_ring[input->action]->reg_idx);

				&input->filter, input->sw_idx, queue);

	if (err)

		goto err_out_w_lock;