| Message ID | 20221109152016.66326-1-tirthendu.sarkar@intel.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [intel-next] i40e: allow toggling loopback mode via | expand |
From: Tirthendu Sarkar <tirthendu.sarkar@intel.com> Date: Wed, 9 Nov 2022 20:50:16 +0530 > Add support for NETIF_F_LOOPBACK. This feature can be set via: > $ ethtool -K eth0 loopback <on|off> > > This sets the MAC Tx->Rx loopback. > > This feature is used for the xsk selftests, and might have other uses > too. > > Signed-off-by: Tirthendu Sarkar <tirthendu.sarkar@intel.com> > --- > drivers/net/ethernet/intel/i40e/i40e_common.c | 22 +++++++++++++++ > drivers/net/ethernet/intel/i40e/i40e_main.c | 28 +++++++++++++++++++ > .../net/ethernet/intel/i40e/i40e_prototype.h | 3 ++ > 3 files changed, 53 insertions(+) [...] > @@ -13721,6 +13747,8 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) > if (!(pf->flags & I40E_FLAG_MFP_ENABLED)) > hw_features |= NETIF_F_NTUPLE | NETIF_F_HW_TC; > > + hw_features |= NETIF_F_LOOPBACK; > + > netdev->hw_features |= hw_features; > > netdev->features |= hw_features | NETIF_F_HW_VLAN_CTAG_FILTER; So here it will be enabled by default, which shouldn't happen as it breaks traffic flow. Just add it directly to netdev->hw_features one line above. > diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h > index ebdcde6f1aeb..9a71121420c3 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h > +++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h > @@ -105,6 +105,9 @@ enum i40e_status_code i40e_aq_set_phy_config(struct i40e_hw *hw, > struct i40e_asq_cmd_details *cmd_details); > enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures, > bool atomic_reset); > +i40e_status i40e_aq_set_mac_loopback(struct i40e_hw *hw, > + bool ena_lpbk, > + struct i40e_asq_cmd_details *cmd_details); > i40e_status i40e_aq_set_phy_int_mask(struct i40e_hw *hw, u16 mask, > struct i40e_asq_cmd_details *cmd_details); > i40e_status i40e_aq_clear_pxe_mode(struct i40e_hw *hw, > -- > 2.34.1 Thanks, Olek
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c index 4f01e2a6b6bb..73d2c700dc35 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_common.c +++ b/drivers/net/ethernet/intel/i40e/i40e_common.c @@ -1830,6 +1830,28 @@ i40e_status i40e_aq_set_phy_int_mask(struct i40e_hw *hw, return status; } +/** + * i40e_aq_set_mac_loopback + * @hw: pointer to the HW struct + * @ena_lpbk: Enable or Disable loopback + * @cmd_details: pointer to command details structure or NULL + * + * Enable/disable loopback on a given port + */ +i40e_status i40e_aq_set_mac_loopback(struct i40e_hw *hw, bool ena_lpbk, + struct i40e_asq_cmd_details *cmd_details) +{ + struct i40e_aq_desc desc; + struct i40e_aqc_set_lb_mode *cmd = + (struct i40e_aqc_set_lb_mode *)&desc.params.raw; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_set_lb_modes); + if (ena_lpbk) + cmd->lb_mode = cpu_to_le16(I40E_AQ_LB_MAC_LOCAL); + + return i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details); +} + /** * i40e_aq_set_phy_debug * @hw: pointer to the hw struct diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 1a1fab94205d..04d2922f7646 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -12919,6 +12919,28 @@ static void i40e_clear_rss_lut(struct i40e_vsi *vsi) } } +/** + * i40e_set_loopback - turn on/off loopback mode on underlying PF + * @vsi: ptr to VSI + * @ena: flag to indicate the on/off setting + */ +static int i40e_set_loopback(struct i40e_vsi *vsi, bool ena) +{ + bool if_running = netif_running(vsi->netdev); + int ret; + + if (if_running && !test_and_set_bit(__I40E_VSI_DOWN, vsi->state)) + i40e_down(vsi); + + ret = i40e_aq_set_mac_loopback(&vsi->back->hw, ena, NULL); + if (ret) + netdev_err(vsi->netdev, "Failed to toggle loopback state\n"); + if (if_running) + i40e_up(vsi); + + return ret; +} + /** * i40e_set_features - set the netdev feature flags * @netdev: ptr to the netdev being adjusted @@ -12959,6 +12981,10 @@ static int i40e_set_features(struct net_device *netdev, if (need_reset) i40e_do_reset(pf, I40E_PF_RESET_FLAG, true); + if (features & NETIF_F_LOOPBACK) + if (i40e_set_loopback(vsi, !!(features & NETIF_F_LOOPBACK))) + return -EINVAL; + return 0; } @@ -13721,6 +13747,8 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) if (!(pf->flags & I40E_FLAG_MFP_ENABLED)) hw_features |= NETIF_F_NTUPLE | NETIF_F_HW_TC; + hw_features |= NETIF_F_LOOPBACK; + netdev->hw_features |= hw_features; netdev->features |= hw_features | NETIF_F_HW_VLAN_CTAG_FILTER; diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h index ebdcde6f1aeb..9a71121420c3 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h +++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h @@ -105,6 +105,9 @@ enum i40e_status_code i40e_aq_set_phy_config(struct i40e_hw *hw, struct i40e_asq_cmd_details *cmd_details); enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures, bool atomic_reset); +i40e_status i40e_aq_set_mac_loopback(struct i40e_hw *hw, + bool ena_lpbk, + struct i40e_asq_cmd_details *cmd_details); i40e_status i40e_aq_set_phy_int_mask(struct i40e_hw *hw, u16 mask, struct i40e_asq_cmd_details *cmd_details); i40e_status i40e_aq_clear_pxe_mode(struct i40e_hw *hw,
Add support for NETIF_F_LOOPBACK. This feature can be set via: $ ethtool -K eth0 loopback <on|off> This sets the MAC Tx->Rx loopback. This feature is used for the xsk selftests, and might have other uses too. Signed-off-by: Tirthendu Sarkar <tirthendu.sarkar@intel.com> --- drivers/net/ethernet/intel/i40e/i40e_common.c | 22 +++++++++++++++ drivers/net/ethernet/intel/i40e/i40e_main.c | 28 +++++++++++++++++++ .../net/ethernet/intel/i40e/i40e_prototype.h | 3 ++ 3 files changed, 53 insertions(+)