When the application does not supply an RSS key, these drivers built the default key a byte at a time from rte_rand(). That generator is a fast non-cryptographic PRNG whose state is recoverable from its output, so the resulting key is predictable. Linux fills its default RSS key from get_random_bytes() for the same reason.
Use rte_random_bytes() which takes randomness from the operating system, and propagate the error where the caller can report it. ice_get_default_rss_key() has no way to return an error to its caller, so it keeps rte_rand() as a fallback if the system random generator is unavailable. Signed-off-by: Stephen Hemminger <[email protected]> --- drivers/net/intel/cpfl/cpfl_ethdev.c | 5 +++-- drivers/net/intel/iavf/iavf_ethdev.c | 8 +++++--- drivers/net/intel/ice/ice_dcf.c | 10 ++++++---- drivers/net/intel/ice/ice_ethdev.c | 11 ++++++++--- drivers/net/intel/idpf/idpf_ethdev.c | 5 +++-- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/drivers/net/intel/cpfl/cpfl_ethdev.c b/drivers/net/intel/cpfl/cpfl_ethdev.c index 4315adb68c..c3f18686bb 100644 --- a/drivers/net/intel/cpfl/cpfl_ethdev.c +++ b/drivers/net/intel/cpfl/cpfl_ethdev.c @@ -478,8 +478,9 @@ cpfl_init_rss(struct idpf_vport *vport) nb_q = dev_data->nb_rx_queues; if (rss_conf->rss_key == NULL) { - for (i = 0; i < vport->rss_key_size; i++) - vport->rss_key[i] = (uint8_t)rte_rand(); + ret = rte_random_bytes(vport->rss_key, vport->rss_key_size); + if (ret != 0) + return ret; } else if (rss_conf->rss_key_len != vport->rss_key_size) { PMD_INIT_LOG(ERR, "Invalid RSS key length in RSS configuration, should be %d", vport->rss_key_size); diff --git a/drivers/net/intel/iavf/iavf_ethdev.c b/drivers/net/intel/iavf/iavf_ethdev.c index d601ec3b6a..fcef1eb26a 100644 --- a/drivers/net/intel/iavf/iavf_ethdev.c +++ b/drivers/net/intel/iavf/iavf_ethdev.c @@ -565,12 +565,14 @@ iavf_init_rss(struct iavf_adapter *adapter) /* configure RSS key */ if (!rss_conf->rss_key) { /* Calculate the default hash key */ - for (i = 0; i < vf->vf_res->rss_key_size; i++) - vf->rss_key[i] = (uint8_t)rte_rand(); - } else + ret = rte_random_bytes(vf->rss_key, vf->vf_res->rss_key_size); + if (ret != 0) + return ret; + } else { memcpy(vf->rss_key, rss_conf->rss_key, RTE_MIN(rss_conf->rss_key_len, vf->vf_res->rss_key_size)); + } /* init RSS LUT table */ for (i = 0, j = 0; i < vf->vf_res->rss_lut_size; i++, j++) { diff --git a/drivers/net/intel/ice/ice_dcf.c b/drivers/net/intel/ice/ice_dcf.c index 3b635c0822..b73af13d5b 100644 --- a/drivers/net/intel/ice/ice_dcf.c +++ b/drivers/net/intel/ice/ice_dcf.c @@ -1125,14 +1125,16 @@ ice_dcf_init_rss(struct ice_dcf_hw *hw) */ /* configure RSS key */ - if (!rss_conf->rss_key) + if (!rss_conf->rss_key) { /* Calculate the default hash key */ - for (i = 0; i < hw->vf_res->rss_key_size; i++) - hw->rss_key[i] = (uint8_t)rte_rand(); - else + ret = rte_random_bytes(hw->rss_key, hw->vf_res->rss_key_size); + if (ret != 0) + return ret; + } else { memcpy(hw->rss_key, rss_conf->rss_key, RTE_MIN(rss_conf->rss_key_len, hw->vf_res->rss_key_size)); + } /* init RSS LUT table */ for (i = 0, j = 0; i < hw->vf_res->rss_lut_size; i++, j++) { diff --git a/drivers/net/intel/ice/ice_ethdev.c b/drivers/net/intel/ice/ice_ethdev.c index 76b8ff0a72..105a6636c0 100644 --- a/drivers/net/intel/ice/ice_ethdev.c +++ b/drivers/net/intel/ice/ice_ethdev.c @@ -3778,9 +3778,14 @@ ice_get_default_rss_key(uint8_t *rss_key, uint32_t rss_key_size) } if (!default_key_done) { - /* Calculate the default hash key */ - for (i = 0; i < sizeof(default_key); i++) - key[i] = (uint8_t)rte_rand(); + /* Calculate the default hash key. Fall back to rte_rand() + * if the system random generator is not available, this + * function cannot report an error. + */ + if (rte_random_bytes(key, sizeof(default_key)) != 0) { + for (i = 0; i < sizeof(default_key); i++) + key[i] = (uint8_t)rte_rand(); + } default_key_done = true; } memcpy(rss_key, key, RTE_MIN(rss_key_size, sizeof(default_key))); diff --git a/drivers/net/intel/idpf/idpf_ethdev.c b/drivers/net/intel/idpf/idpf_ethdev.c index c13505416a..ab4d007a22 100644 --- a/drivers/net/intel/idpf/idpf_ethdev.c +++ b/drivers/net/intel/idpf/idpf_ethdev.c @@ -432,8 +432,9 @@ idpf_init_rss(struct idpf_vport *vport) nb_q = dev_data->nb_rx_queues; if (rss_conf->rss_key == NULL) { - for (i = 0; i < vport->rss_key_size; i++) - vport->rss_key[i] = (uint8_t)rte_rand(); + ret = rte_random_bytes(vport->rss_key, vport->rss_key_size); + if (ret != 0) + return ret; } else if (rss_conf->rss_key_len != vport->rss_key_size) { PMD_INIT_LOG(ERR, "Invalid RSS key length in RSS configuration, should be %d", vport->rss_key_size); -- 2.53.0
