Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ixgbe: Merge RSS and flow director ring register caching and configuration

Browse source 
There are really only 3 modes that can control the number of queues.  Those
are RSS, DCB, and VMDq/SR-IOV.  Currently we have things much more broken
up than they need to be for how we are configuring the rings.  In order to
try and straiten some of this out I am going to start merging similar
functionality into single functions.  To start with I am merging the Flow
Director ring configuration into the RSS ring configuration since Flow
Director cannot function with DCB or SR-IOV.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Alexander Duyck 2012-05-05 05:31:04 +00:00 • committed by Jeff Kirsher
parent 45e9baa515
commit 0b7f5d0b65
1 changed files with 24 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
View file

@ -138,30 +138,6 @@ static inline bool ixgbe_cache_ring_dcb(struct ixgbe_adapter *adapter)
} }
#endif #endif
/**
* ixgbe_cache_ring_fdir - Descriptor ring to register mapping for Flow Director
* @adapter: board private structure to initialize
*
* Cache the descriptor ring offsets for Flow Director to the assigned rings.
*
**/
static inline bool ixgbe_cache_ring_fdir(struct ixgbe_adapter *adapter)
{
int i;
bool ret = false;
if ((adapter->flags & IXGBE_FLAG_RSS_ENABLED) &&
(adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)) {
for (i = 0; i < adapter->num_rx_queues; i++)
adapter->rx_ring[i]->reg_idx = i;
for (i = 0; i < adapter->num_tx_queues; i++)
adapter->tx_ring[i]->reg_idx = i;
ret = true;
}
return ret;
}
#ifdef IXGBE_FCOE #ifdef IXGBE_FCOE
/** /**
* ixgbe_cache_ring_fcoe - Descriptor ring to register mapping for the FCoE * ixgbe_cache_ring_fcoe - Descriptor ring to register mapping for the FCoE
@ -180,10 +156,7 @@ static inline bool ixgbe_cache_ring_fcoe(struct ixgbe_adapter *adapter)
return false; return false;
if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) { if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) ixgbe_cache_ring_rss(adapter);
ixgbe_cache_ring_fdir(adapter);
else
ixgbe_cache_ring_rss(adapter);
fcoe_rx_i = f->offset; fcoe_rx_i = f->offset;
fcoe_tx_i = f->offset; fcoe_tx_i = f->offset;
@ -244,9 +217,6 @@ static void ixgbe_cache_ring_register(struct ixgbe_adapter *adapter)
return; return;
#endif /* IXGBE_FCOE */ #endif /* IXGBE_FCOE */
if (ixgbe_cache_ring_fdir(adapter))
return;
if (ixgbe_cache_ring_rss(adapter)) if (ixgbe_cache_ring_rss(adapter))
return; return;
} }
@ -272,53 +242,39 @@ static inline bool ixgbe_set_sriov_queues(struct ixgbe_adapter *adapter)
* to allocate one Rx queue per CPU, and if available, one Tx queue per CPU. * to allocate one Rx queue per CPU, and if available, one Tx queue per CPU.
* *
**/ **/
static inline bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter) static bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter)
{ {
bool ret = false; struct ixgbe_ring_feature *f;
struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_RSS]; u16 rss_i;
if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) { if (!(adapter->flags & IXGBE_FLAG_RSS_ENABLED)) {
f->mask = 0xF; adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
adapter->num_rx_queues = f->indices; return false;
adapter->num_tx_queues = f->indices;
ret = true;
} }
return ret; /* set mask for 16 queue limit of RSS */
} f = &adapter->ring_feature[RING_F_RSS];
rss_i = f->limit;
/** f->indices = rss_i;
* ixgbe_set_fdir_queues - Allocate queues for Flow Director f->mask = 0xF;
* @adapter: board private structure to initialize
*
* Flow Director is an advanced Rx filter, attempting to get Rx flows back
* to the original CPU that initiated the Tx session. This runs in addition
* to RSS, so if a packet doesn't match an FDIR filter, we can still spread the
* Rx load across CPUs using RSS.
*
**/
static inline bool ixgbe_set_fdir_queues(struct ixgbe_adapter *adapter)
{
bool ret = false;
struct ixgbe_ring_feature *f_fdir = &adapter->ring_feature[RING_F_FDIR];
f_fdir->indices = min_t(int, num_online_cpus(), f_fdir->limit);
f_fdir->mask = 0;
/* /*
* Use RSS in addition to Flow Director to ensure the best * Use Flow Director in addition to RSS to ensure the best
* distribution of flows across cores, even when an FDIR flow * distribution of flows across cores, even when an FDIR flow
* isn't matched. * isn't matched.
*/ */
if ((adapter->flags & IXGBE_FLAG_RSS_ENABLED) && if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
(adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)) { f = &adapter->ring_feature[RING_F_FDIR];
adapter->num_tx_queues = f_fdir->indices;
adapter->num_rx_queues = f_fdir->indices; f->indices = min_t(u16, num_online_cpus(), f->limit);
ret = true; rss_i = max_t(u16, rss_i, f->indices);
} else {
adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
} }
return ret;
adapter->num_rx_queues = rss_i;
adapter->num_tx_queues = rss_i;
return true;
} }
#ifdef IXGBE_FCOE #ifdef IXGBE_FCOE
@ -343,10 +299,7 @@ static inline bool ixgbe_set_fcoe_queues(struct ixgbe_adapter *adapter)
if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) { if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
e_info(probe, "FCoE enabled with RSS\n"); e_info(probe, "FCoE enabled with RSS\n");
if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) ixgbe_set_rss_queues(adapter);
ixgbe_set_fdir_queues(adapter);
else
ixgbe_set_rss_queues(adapter);
} }
/* adding FCoE rx rings to the end */ /* adding FCoE rx rings to the end */
@ -438,9 +391,6 @@ static int ixgbe_set_num_queues(struct ixgbe_adapter *adapter)
goto done; goto done;
#endif /* IXGBE_FCOE */ #endif /* IXGBE_FCOE */
if (ixgbe_set_fdir_queues(adapter))
goto done;
if (ixgbe_set_rss_queues(adapter)) if (ixgbe_set_rss_queues(adapter))
goto done; goto done;