The `auto_reconfig` devarg controlled whether the promiscuous and all-multicast states were restored after a VF reset. Remove it and always restore those states after a reset, for two reasons.
First, a VF almost always wants those states restored after a reset. For the rare cases where a different post-reset state is wanted, a post-reset callback can be registered and used to adjust the state once the reset completes. Second, the devarg was inconsistent: it only affected promiscuous and all-multicast, while MAC addresses, the multicast address list, VLAN configuration and RSS were restored regardless of its value. The "reconfig" name was also ambiguous, potentially suggesting it governed all settings when it did not. Signed-off-by: Ciara Loftus <[email protected]> --- doc/guides/nics/intel_vf.rst | 5 ----- doc/guides/rel_notes/deprecation.rst | 7 ------- doc/guides/rel_notes/release_26_11.rst | 5 +++++ drivers/net/intel/iavf/iavf.h | 1 - drivers/net/intel/iavf/iavf_ethdev.c | 28 ++++++-------------------- 5 files changed, 11 insertions(+), 35 deletions(-) diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst index 8f8ce32cac..d287a78672 100644 --- a/doc/guides/nics/intel_vf.rst +++ b/doc/guides/nics/intel_vf.rst @@ -106,11 +106,6 @@ IAVF PMD parameters To disable this functionality, set the ``auto_reset`` devarg to zero: ``-a 18:01.0,auto_reset=0`` -``auto_reconfig`` - Restore settings (unicast and multicast promiscuous states) on the VF after a reset event. - Enabled by default. - To disable it: ``-a 18:01.0,auto_reconfig=0`` - ``no-poll-on-link-down`` Stop polling Rx/Tx hardware queue when link is down. This is enabled by default because it is required when ``auto_reset`` is enabled diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 6ad7698c6b..691d3dd071 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -170,10 +170,3 @@ Deprecation Notices * net/iavf: The dynamic mbuf field used to detect LLDP packets on the transmit path in the iavf PMD will be removed in a future release. After removal, only packet type-based detection will be supported. - -* net/iavf: The ``auto_reconfig`` devarg is deprecated - and will be removed in a future release. - It allows disabling the automatic restoration of device settings - after a VF reset, but this is of questionable value - since most applications expect their settings to be preserved - transparently across a reset. diff --git a/doc/guides/rel_notes/release_26_11.rst b/doc/guides/rel_notes/release_26_11.rst index c8cc86295d..8292279c27 100644 --- a/doc/guides/rel_notes/release_26_11.rst +++ b/doc/guides/rel_notes/release_26_11.rst @@ -77,6 +77,11 @@ Removed Items ``rte_rib6_is_equal`` * table: ``RTE_LPM_IPV6_ADDR_SIZE`` +* net/iavf: Removed the ``auto_reconfig`` devarg. + + The restoration of the promiscuous and all-multicast settings after a VF reset is + now unconditional. + API Changes ----------- diff --git a/drivers/net/intel/iavf/iavf.h b/drivers/net/intel/iavf/iavf.h index 293adaf6c9..143ab3c1c0 100644 --- a/drivers/net/intel/iavf/iavf.h +++ b/drivers/net/intel/iavf/iavf.h @@ -323,7 +323,6 @@ struct iavf_devargs { uint16_t quanta_size; uint32_t watchdog_period; int auto_reset; - int auto_reconfig; int no_poll_on_link_down; uint64_t mbuf_check; int enable_ptype_lldp; diff --git a/drivers/net/intel/iavf/iavf_ethdev.c b/drivers/net/intel/iavf/iavf_ethdev.c index d601ec3b6a..829573983a 100644 --- a/drivers/net/intel/iavf/iavf_ethdev.c +++ b/drivers/net/intel/iavf/iavf_ethdev.c @@ -42,7 +42,6 @@ #define IAVF_QUANTA_SIZE_ARG "quanta_size" #define IAVF_RESET_WATCHDOG_ARG "watchdog_period" #define IAVF_ENABLE_AUTO_RESET_ARG "auto_reset" -#define IAVF_ENABLE_AUTO_RECONFIG_ARG "auto_reconfig" #define IAVF_NO_POLL_ON_LINK_DOWN_ARG "no-poll-on-link-down" #define IAVF_MBUF_CHECK_ARG "mbuf_check" #define IAVF_ENABLE_PTYPE_LLDP_ARG "enable_ptype_lldp" @@ -55,7 +54,6 @@ static const char * const iavf_valid_args[] = { IAVF_QUANTA_SIZE_ARG, IAVF_RESET_WATCHDOG_ARG, IAVF_ENABLE_AUTO_RESET_ARG, - IAVF_ENABLE_AUTO_RECONFIG_ARG, IAVF_NO_POLL_ON_LINK_DOWN_ARG, IAVF_MBUF_CHECK_ARG, IAVF_ENABLE_PTYPE_LLDP_ARG, @@ -2468,7 +2466,6 @@ static int iavf_parse_devargs(struct rte_eth_dev *dev) ad->devargs.auto_reset = 1; ad->devargs.no_poll_on_link_down = 1; - ad->devargs.auto_reconfig = 1; if (!devargs) return 0; @@ -2531,11 +2528,6 @@ static int iavf_parse_devargs(struct rte_eth_dev *dev) ad->devargs.no_poll_on_link_down = 1; } - ret = rte_kvargs_process(kvlist, IAVF_ENABLE_AUTO_RECONFIG_ARG, - &parse_bool, &ad->devargs.auto_reconfig); - if (ret) - goto bail; - ret = rte_kvargs_process(kvlist, IAVF_ENABLE_PTYPE_LLDP_ARG, &parse_bool, &ad->devargs.enable_ptype_lldp); if (ret) @@ -3358,7 +3350,7 @@ iavf_is_reset_detected(struct iavf_adapter *adapter) static int iavf_post_reset_reconfig(struct rte_eth_dev *dev) { - int ret, status = 0; + int ret = 0; bool allmulti = false, allunicast = false; struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); @@ -3377,10 +3369,9 @@ iavf_post_reset_reconfig(struct rte_eth_dev *dev) PMD_DRV_LOG(DEBUG, "Restored unicast promiscuous mode (%s) " "and multicast promiscuous mode (%s)", allunicast ? "on" : "off", allmulti ? "on" : "off"); - status |= ret; } - return status; + return ret; } /* @@ -3435,17 +3426,10 @@ iavf_handle_hw_reset(struct rte_eth_dev *dev, bool vf_initiated_reset) } /* Restore settings after the reset */ - if (adapter->devargs.auto_reconfig) { - ret = iavf_post_reset_reconfig(dev); - if (ret) { - PMD_DRV_LOG(ERR, "Failed to restore VF settings after reset"); - goto error; - } - } else { - dev->data->promiscuous = 0; - dev->data->all_multicast = 0; - vf->promisc_unicast_enabled = false; - vf->promisc_multicast_enabled = false; + ret = iavf_post_reset_reconfig(dev); + if (ret) { + PMD_DRV_LOG(ERR, "Failed to restore VF settings after reset"); + goto error; } goto exit; -- 2.43.0
