mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-26 13:15:09 +07:00
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: John Fastabend <john.r.fastabend@intel.com> Tested-by: Krishneil Singh <krishneil.k.singh@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
parent
8cf6f497de
commit
7aac842596
@ -2594,18 +2594,35 @@ static int ixgbe_add_ethtool_fdir_entry(struct ixgbe_adapter *adapter,
|
|||||||
struct ixgbe_hw *hw = &adapter->hw;
|
struct ixgbe_hw *hw = &adapter->hw;
|
||||||
struct ixgbe_fdir_filter *input;
|
struct ixgbe_fdir_filter *input;
|
||||||
union ixgbe_atr_input mask;
|
union ixgbe_atr_input mask;
|
||||||
|
u8 queue;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))
|
if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
/*
|
/* ring_cookie is a masked into a set of queues and ixgbe pools or
|
||||||
* Don't allow programming if the action is a queue greater than
|
* we use the drop index.
|
||||||
* the number of online Rx queues.
|
|
||||||
*/
|
*/
|
||||||
if ((fsp->ring_cookie != RX_CLS_FLOW_DISC) &&
|
if (fsp->ring_cookie == RX_CLS_FLOW_DISC) {
|
||||||
(fsp->ring_cookie >= adapter->num_rx_queues))
|
queue = IXGBE_FDIR_DROP_QUEUE;
|
||||||
return -EINVAL;
|
} 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 */
|
/* Don't allow indexes to exist outside of available space */
|
||||||
if (fsp->location >= ((1024 << adapter->fdir_pballoc) - 2)) {
|
if (fsp->location >= ((1024 << adapter->fdir_pballoc) - 2)) {
|
||||||
@ -2683,10 +2700,7 @@ static int ixgbe_add_ethtool_fdir_entry(struct ixgbe_adapter *adapter,
|
|||||||
|
|
||||||
/* program filters to filter memory */
|
/* program filters to filter memory */
|
||||||
err = ixgbe_fdir_write_perfect_filter_82599(hw,
|
err = ixgbe_fdir_write_perfect_filter_82599(hw,
|
||||||
&input->filter, input->sw_idx,
|
&input->filter, input->sw_idx, queue);
|
||||||
(input->action == IXGBE_FDIR_DROP_QUEUE) ?
|
|
||||||
IXGBE_FDIR_DROP_QUEUE :
|
|
||||||
adapter->rx_ring[input->action]->reg_idx);
|
|
||||||
if (err)
|
if (err)
|
||||||
goto err_out_w_lock;
|
goto err_out_w_lock;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user