Page MenuHomeFreeBSD
Files F140100159

D8910.diff
No OneTemporary
Actions

D8910.diff
View Options

Index: head/sys/dev/sfxge/sfxge.h
===================================================================
--- head/sys/dev/sfxge/sfxge.h
+++ head/sys/dev/sfxge/sfxge.h
@@ -301,7 +301,7 @@
unsigned int max_rss_channels;
uma_zone_t rxq_cache;
struct sfxge_rxq *rxq[SFXGE_RX_SCALE_MAX];
- unsigned int rx_indir_table[SFXGE_RX_SCALE_MAX];
+ unsigned int rx_indir_table[EFX_RSS_TBL_SIZE];
struct sfxge_txq *txq[SFXGE_TXQ_NTYPES + SFXGE_RX_SCALE_MAX];
Index: head/sys/dev/sfxge/sfxge_rx.c
===================================================================
--- head/sys/dev/sfxge/sfxge_rx.c
+++ head/sys/dev/sfxge/sfxge_rx.c
@@ -1128,7 +1128,7 @@
/*
* Set up the scale table. Enable all hash types and hash insertion.
*/
- for (index = 0; index < SFXGE_RX_SCALE_MAX; index++)
+ for (index = 0; index < nitems(sc->rx_indir_table); index++)
#ifdef RSS
sc->rx_indir_table[index] =
rss_get_indirection_to_bucket(index) % sc->rxq_count;
@@ -1136,7 +1136,7 @@
sc->rx_indir_table[index] = index % sc->rxq_count;
#endif
if ((rc = efx_rx_scale_tbl_set(sc->enp, sc->rx_indir_table,
- SFXGE_RX_SCALE_MAX)) != 0)
+ nitems(sc->rx_indir_table))) != 0)
goto fail;
(void)efx_rx_scale_mode_set(sc->enp, EFX_RX_HASHALG_TOEPLITZ,
(1 << EFX_RX_HASH_IPV4) | (1 << EFX_RX_HASH_TCPIPV4) |
Index: head/sys/dev/sfxge/sfxge_tx.c
===================================================================
--- head/sys/dev/sfxge/sfxge_tx.c
+++ head/sys/dev/sfxge/sfxge_tx.c
@@ -838,8 +838,9 @@
/* check if flowid is set */
if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) {
uint32_t hash = m->m_pkthdr.flowid;
+ uint32_t idx = hash % nitems(sc->rx_indir_table);
- index = sc->rx_indir_table[hash % SFXGE_RX_SCALE_MAX];
+ index = sc->rx_indir_table[idx];
}
#endif
#if SFXGE_TX_PARSE_EARLY

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 21, 5:40 AM (40 m, 22 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27108188
Default Alt Text
D8910.diff (1 KB)

Event Timeline