Commit 9fbe1c25 authored by Moosa Baransi's avatar Moosa Baransi Committed by Saeed Mahameed
Browse files

net/mlx5i: Enable Rx steering for IPoIB via ethtool 



Enable steering IPoIB packets via ethtool, the same way it is done today
for Ethernet packets.

Signed-off-by: default avatarMoosa Baransi <moosab@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 17ac528d

drivers/net/ethernet/mellanox/mlx5/core/en/fs.h

+4 −4
Original line number Diff line number Diff line
@@ -125,15 +125,15 @@ struct mlx5e_ethtool_steering { 


void mlx5e_ethtool_init_steering(struct mlx5e_priv *priv);

void mlx5e_ethtool_cleanup_steering(struct mlx5e_priv *priv);

int mlx5e_ethtool_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd);

int mlx5e_ethtool_get_rxnfc(struct net_device *dev,

int mlx5e_ethtool_set_rxnfc(struct mlx5e_priv *priv, struct ethtool_rxnfc *cmd);

int mlx5e_ethtool_get_rxnfc(struct mlx5e_priv *priv,

			    struct ethtool_rxnfc *info, u32 *rule_locs);

#else

static inline void mlx5e_ethtool_init_steering(struct mlx5e_priv *priv)    { }

static inline void mlx5e_ethtool_cleanup_steering(struct mlx5e_priv *priv) { }

static inline int mlx5e_ethtool_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)

static inline int mlx5e_ethtool_set_rxnfc(struct mlx5e_priv *priv, struct ethtool_rxnfc *cmd)

{ return -EOPNOTSUPP; }

static inline int mlx5e_ethtool_get_rxnfc(struct net_device *dev,

static inline int mlx5e_ethtool_get_rxnfc(struct mlx5e_priv *priv,

					  struct ethtool_rxnfc *info, u32 *rule_locs)

{ return -EOPNOTSUPP; }

#endif /* CONFIG_MLX5_EN_RXNFC */

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

+4 −2
Original line number Diff line number Diff line
@@ -2137,12 +2137,14 @@ int mlx5e_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, 
		return 0;

	}



	return mlx5e_ethtool_get_rxnfc(dev, info, rule_locs);

	return mlx5e_ethtool_get_rxnfc(priv, info, rule_locs);

}



int mlx5e_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)

{

	return mlx5e_ethtool_set_rxnfc(dev, cmd);

	struct mlx5e_priv *priv = netdev_priv(dev);



	return mlx5e_ethtool_set_rxnfc(priv, cmd);

}



static int query_port_status_opcode(struct mlx5_core_dev *mdev, u32 *status_opcode)

drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c

+2 −4
Original line number Diff line number Diff line
@@ -937,9 +937,8 @@ static int mlx5e_get_rss_hash_opt(struct mlx5e_priv *priv, 
	return 0;

}



int mlx5e_ethtool_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)

int mlx5e_ethtool_set_rxnfc(struct mlx5e_priv *priv, struct ethtool_rxnfc *cmd)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	int err = 0;



	switch (cmd->cmd) {
@@ -960,10 +959,9 @@ int mlx5e_ethtool_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd) 
	return err;

}



int mlx5e_ethtool_get_rxnfc(struct net_device *dev,

int mlx5e_ethtool_get_rxnfc(struct mlx5e_priv *priv,

			    struct ethtool_rxnfc *info, u32 *rule_locs)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	int err = 0;



	switch (info->cmd) {

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c

+30 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ 
#include "en.h"

#include "ipoib.h"



static u32 mlx5i_flow_type_mask(u32 flow_type)

{

	return flow_type & ~(FLOW_EXT | FLOW_MAC_EXT | FLOW_RSS);

}



static void mlx5i_get_drvinfo(struct net_device *dev,

			      struct ethtool_drvinfo *drvinfo)

{
@@ -217,6 +222,27 @@ static int mlx5i_get_link_ksettings(struct net_device *netdev, 
	return 0;

}



#ifdef CONFIG_MLX5_EN_RXNFC

static int mlx5i_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)

{

	struct mlx5e_priv *priv = mlx5i_epriv(dev);

	struct ethtool_rx_flow_spec *fs = &cmd->fs;



	if (mlx5i_flow_type_mask(fs->flow_type) == ETHER_FLOW)

		return -EINVAL;



	return mlx5e_ethtool_set_rxnfc(priv, cmd);

}



static int mlx5i_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,

			   u32 *rule_locs)

{

	struct mlx5e_priv *priv = mlx5i_epriv(dev);



	return mlx5e_ethtool_get_rxnfc(priv, info, rule_locs);

}

#endif



const struct ethtool_ops mlx5i_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES |
@@ -233,6 +259,10 @@ const struct ethtool_ops mlx5i_ethtool_ops = { 
	.get_coalesce       = mlx5i_get_coalesce,

	.set_coalesce       = mlx5i_set_coalesce,

	.get_ts_info        = mlx5i_get_ts_info,

#ifdef CONFIG_MLX5_EN_RXNFC

	.get_rxnfc          = mlx5i_get_rxnfc,

	.set_rxnfc          = mlx5i_set_rxnfc,

#endif

	.get_link_ksettings = mlx5i_get_link_ksettings,

	.get_link           = ethtool_op_get_link,

};

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c

+3 −0
Original line number Diff line number Diff line
@@ -336,6 +336,8 @@ static int mlx5i_create_flow_steering(struct mlx5e_priv *priv) 
		goto err_destroy_arfs_tables;

	}



	mlx5e_ethtool_init_steering(priv);



	return 0;



err_destroy_arfs_tables:
@@ -348,6 +350,7 @@ static void mlx5i_destroy_flow_steering(struct mlx5e_priv *priv) 
{

	mlx5e_destroy_ttc_table(priv);

	mlx5e_arfs_destroy_tables(priv);

	mlx5e_ethtool_cleanup_steering(priv);

}



static int mlx5i_init_rx(struct mlx5e_priv *priv)