[v2] net/i40e: fix max frame size config at port level
Checks
Commit Message
From: Wenxuan Wu <wenxuanx.wu@intel.com>
Previously, max frame size can only be set when link is up, and the wait
time is 1 sec. For media type of I40E_10G_BASET would consume longer
time which is too short to up would result in error.
Acctually, max frame size of media type I40E_MEDIA_TYPE_BASET can be set
regardless of link status.
This patch omitted the status check of 10G_MEDIA_TYPE_BASET.
Fixes: a4ba77367923 ("net/i40e: enable maximum frame size at port level")
Cc: stable@dpdk.org
Signed-off-by: Wenxuan Wu <wenxuanx.wu@intel.com>
---
drivers/net/i40e/i40e_ethdev.c | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
Comments
Hi Wenxuan,
> -----Original Message-----
> From: Wu, WenxuanX <wenxuanx.wu@intel.com>
> Sent: Wednesday, May 11, 2022 12:05 PM
> To: Xing, Beilei <beilei.xing@intel.com>; Zhang, Yuying
> <yuying.zhang@intel.com>; dev@dpdk.org
> Cc: Wu, WenxuanX <wenxuanx.wu@intel.com>; Zhou, YidingX
> <yidingx.zhou@intel.com>; stable@dpdk.org
> Subject: [PATCH v2] net/i40e: fix max frame size config at port level
>
> From: Wenxuan Wu <wenxuanx.wu@intel.com>
>
> Previously, max frame size can only be set when link is up, and the wait time
> is 1 sec. For media type of I40E_10G_BASET would consume longer time
> which is too short to up would result in error.
Above sentence lacks of subject.
"This time is too short for some media types such as I40E_10G_BASET to uplink
which results in error."
>
> Acctually, max frame size of media type I40E_MEDIA_TYPE_BASET can be set
> regardless of link status.
>
> This patch omitted the status check of 10G_MEDIA_TYPE_BASET.
>
> Fixes: a4ba77367923 ("net/i40e: enable maximum frame size at port level")
> Cc: stable@dpdk.org
>
> Signed-off-by: Wenxuan Wu <wenxuanx.wu@intel.com>
> ---
> drivers/net/i40e/i40e_ethdev.c | 32 +++++++++++++++++---------------
> 1 file changed, 17 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 755786dc10..383e9a542e 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -12102,23 +12102,25 @@ i40e_set_mac_max_frame(struct rte_eth_dev
> *dev, uint16_t size)
> struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> uint32_t rep_cnt = MAX_REPEAT_TIME;
> struct rte_eth_link link;
> - enum i40e_status_code status;
> -
> - do {
> - update_link_reg(hw, &link);
> - if (link.link_status)
> - break;
> -
> - rte_delay_ms(CHECK_INTERVAL);
> - } while (--rep_cnt);
> + enum i40e_status_code status = I40E_ERR_DEVICE_NOT_SUPPORTED;
> + bool can_be_set = true;
> +
> + /* I40E_MEDIA_TYPE_BASET link up can be ignored */
> + if (hw->phy.media_type != I40E_MEDIA_TYPE_BASET) {
> + do {
> + update_link_reg(hw, &link);
> + if (link.link_status)
> + break;
> + rte_delay_ms(CHECK_INTERVAL);
> + } while (--rep_cnt);
> + can_be_set = link.link_status != 0;
> + }
>
> - if (link.link_status) {
> + if (can_be_set)
> status = i40e_aq_set_mac_config(hw, size, TRUE, 0, false,
> NULL);
> - if (status != I40E_SUCCESS)
> - PMD_DRV_LOG(ERR, "Failed to set max frame size at
> port level");
> - } else {
> - PMD_DRV_LOG(ERR, "Set max frame size at port level not
> applicable on link down");
You can reserve above LOG to reduce the change of other types.
> - }
> +
> + if (status != I40E_SUCCESS)
> + PMD_DRV_LOG(ERR, "Failed to set max frame size at port
> level");
> }
>
> RTE_LOG_REGISTER_SUFFIX(i40e_logtype_init, init, NOTICE);
> --
> 2.25.1
@@ -12102,23 +12102,25 @@ i40e_set_mac_max_frame(struct rte_eth_dev *dev, uint16_t size)
struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
uint32_t rep_cnt = MAX_REPEAT_TIME;
struct rte_eth_link link;
- enum i40e_status_code status;
-
- do {
- update_link_reg(hw, &link);
- if (link.link_status)
- break;
-
- rte_delay_ms(CHECK_INTERVAL);
- } while (--rep_cnt);
+ enum i40e_status_code status = I40E_ERR_DEVICE_NOT_SUPPORTED;
+ bool can_be_set = true;
+
+ /* I40E_MEDIA_TYPE_BASET link up can be ignored */
+ if (hw->phy.media_type != I40E_MEDIA_TYPE_BASET) {
+ do {
+ update_link_reg(hw, &link);
+ if (link.link_status)
+ break;
+ rte_delay_ms(CHECK_INTERVAL);
+ } while (--rep_cnt);
+ can_be_set = link.link_status != 0;
+ }
- if (link.link_status) {
+ if (can_be_set)
status = i40e_aq_set_mac_config(hw, size, TRUE, 0, false, NULL);
- if (status != I40E_SUCCESS)
- PMD_DRV_LOG(ERR, "Failed to set max frame size at port level");
- } else {
- PMD_DRV_LOG(ERR, "Set max frame size at port level not applicable on link down");
- }
+
+ if (status != I40E_SUCCESS)
+ PMD_DRV_LOG(ERR, "Failed to set max frame size at port level");
}
RTE_LOG_REGISTER_SUFFIX(i40e_logtype_init, init, NOTICE);