Currently, there are multiple places where we need a default RSS key, but in each of those places we define it as a local variable. Make it global constant, and adjust all callers to use the global constant. When dealing with adminq, we cannot send down the constant because adminq commands do not guarantee const-ness, so copy RSS key into a local buffer before sending it down to hardware.
Signed-off-by: Anatoly Burakov <[email protected]> --- drivers/net/intel/i40e/i40e_ethdev.c | 22 ++++++++++------------ drivers/net/intel/i40e/i40e_hash.c | 23 +++++++++++++++++------ drivers/net/intel/i40e/i40e_hash.h | 3 +++ 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/drivers/net/intel/i40e/i40e_ethdev.c b/drivers/net/intel/i40e/i40e_ethdev.c index c8153f3351..2deb87b01b 100644 --- a/drivers/net/intel/i40e/i40e_ethdev.c +++ b/drivers/net/intel/i40e/i40e_ethdev.c @@ -9082,23 +9082,21 @@ i40e_pf_reset_rss_reta(struct i40e_pf *pf) int i40e_pf_reset_rss_key(struct i40e_pf *pf) { - const uint8_t key_len = (I40E_PFQF_HKEY_MAX_INDEX + 1) * - sizeof(uint32_t); - uint8_t *rss_key; + uint8_t key_buf[I40E_RSS_KEY_LEN]; + const uint8_t *rss_key; /* Reset key */ rss_key = pf->dev_data->dev_conf.rx_adv_conf.rss_conf.rss_key; - if (!rss_key || - pf->dev_data->dev_conf.rx_adv_conf.rss_conf.rss_key_len < key_len) { - static uint32_t rss_key_default[] = {0x6b793944, - 0x23504cb5, 0x5bea75b6, 0x309f4f12, 0x3dc0a2b8, - 0x024ddcdf, 0x339b8ca0, 0x4c4af64a, 0x34fac605, - 0x55d85839, 0x3a58997d, 0x2ec938e1, 0x66031581}; + if (!rss_key || pf->dev_data->dev_conf.rx_adv_conf.rss_conf.rss_key_len < sizeof(key_buf)) + rss_key = i40e_rss_key_default; - rss_key = (uint8_t *)rss_key_default; - } + /* + * adminq does not guarantee const-ness of RSS key once a command is sent down, so make a + * local copy. + */ + memcpy(&key_buf, rss_key, sizeof(key_buf)); - return i40e_set_rss_key(pf->main_vsi, rss_key, key_len); + return i40e_set_rss_key(pf->main_vsi, key_buf, sizeof(key_buf)); } static int diff --git a/drivers/net/intel/i40e/i40e_hash.c b/drivers/net/intel/i40e/i40e_hash.c index 3149682197..f20b40e7d0 100644 --- a/drivers/net/intel/i40e/i40e_hash.c +++ b/drivers/net/intel/i40e/i40e_hash.c @@ -233,6 +233,22 @@ struct i40e_hash_match_pattern { RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ RTE_ETH_RSS_NONFRAG_IPV6_SCTP) +const uint8_t i40e_rss_key_default[] = { + 0x44, 0x39, 0x79, 0x6b, + 0xb5, 0x4c, 0x50, 0x23, + 0xb6, 0x75, 0xea, 0x5b, + 0x12, 0x4f, 0x9f, 0x30, + 0xb8, 0xa2, 0xc0, 0x3d, + 0xdf, 0xdc, 0x4d, 0x02, + 0xa0, 0x8c, 0x9b, 0x33, + 0x4a, 0xf6, 0x4a, 0x4c, + 0x05, 0xc6, 0xfa, 0x34, + 0x39, 0x58, 0xd8, 0x55, + 0x7d, 0x99, 0x58, 0x3a, + 0xe1, 0x38, 0xc9, 0x2e, + 0x81, 0x15, 0x03, 0x66 +}; + /* Current supported patterns and RSS types. * All items that have the same pattern types are together. */ @@ -910,17 +926,12 @@ i40e_hash_parse_key(const struct rte_flow_action_rss *rss_act, const uint8_t *key = rss_act->key; if (!key || rss_act->key_len != sizeof(rss_conf->key)) { - const uint32_t rss_key_default[] = {0x6b793944, - 0x23504cb5, 0x5bea75b6, 0x309f4f12, 0x3dc0a2b8, - 0x024ddcdf, 0x339b8ca0, 0x4c4af64a, 0x34fac605, - 0x55d85839, 0x3a58997d, 0x2ec938e1, 0x66031581}; - if (rss_act->key_len != sizeof(rss_conf->key)) PMD_DRV_LOG(WARNING, "RSS key length invalid, must be %u bytes, now set key to default", (uint32_t)sizeof(rss_conf->key)); - memcpy(rss_conf->key, rss_key_default, sizeof(rss_conf->key)); + memcpy(rss_conf->key, i40e_rss_key_default, sizeof(rss_conf->key)); } else { memcpy(rss_conf->key, key, sizeof(rss_conf->key)); } diff --git a/drivers/net/intel/i40e/i40e_hash.h b/drivers/net/intel/i40e/i40e_hash.h index ff8c91c030..2513d84565 100644 --- a/drivers/net/intel/i40e/i40e_hash.h +++ b/drivers/net/intel/i40e/i40e_hash.h @@ -27,6 +27,9 @@ int i40e_hash_filter_destroy(struct i40e_pf *pf, const struct i40e_rss_filter *rss_filter); int i40e_hash_filter_flush(struct i40e_pf *pf); +#define I40E_RSS_KEY_LEN ((I40E_PFQF_HKEY_MAX_INDEX + 1) * sizeof(uint32_t)) +extern const uint8_t i40e_rss_key_default[I40E_RSS_KEY_LEN]; + #ifdef __cplusplus } #endif -- 2.47.3
