Re: [PATCH net-next v09 4/5] hinic3: Add ethtool rss ops

[Dimitri Daskalakis <dimitri.daskalakis1@gmail.com>]

On 6/9/26 11:59 PM, Fan Gong wrote:
>   Implement following ethtool callback function:
> .get_rxnfc
> .set_rxnfc
> .get_channels
> .set_channels
> .get_rxfh_indir_size
> .get_rxfh_key_size
> .get_rxfh
> .set_rxfh
> 
>   These callbacks allow users to utilize ethtool for detailed
> RSS parameters configuration and monitoring.
> 
> Co-developed-by: Wu Di <wudi234@huawei.com>
> Signed-off-by: Wu Di <wudi234@huawei.com>
> Co-developed-by: Teng Peisen <tengpeisen@huawei.com>
> Signed-off-by: Teng Peisen <tengpeisen@huawei.com>
> Signed-off-by: Fan Gong <gongfan1@huawei.com>
> ---
>  .../ethernet/huawei/hinic3/hinic3_ethtool.c   |   9 +
>  .../huawei/hinic3/hinic3_mgmt_interface.h     |   2 +
>  .../net/ethernet/huawei/hinic3/hinic3_rss.c   | 539 +++++++++++++++++-
>  .../net/ethernet/huawei/hinic3/hinic3_rss.h   |  19 +
>  4 files changed, 567 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_ethtool.c b/drivers/net/ethernet/huawei/hinic3/hinic3_ethtool.c
> index 11c8eb0f5d2a..78818de9a946 100644
> --- a/drivers/net/ethernet/huawei/hinic3/hinic3_ethtool.c
> +++ b/drivers/net/ethernet/huawei/hinic3/hinic3_ethtool.c
> @@ -16,6 +16,7 @@
>  #include "hinic3_hw_comm.h"
>  #include "hinic3_nic_dev.h"
>  #include "hinic3_nic_cfg.h"
> +#include "hinic3_rss.h"
>  
>  #define HINIC3_MGMT_VERSION_MAX_LEN     32
>  /* Coalesce time properties in microseconds */
> @@ -1238,6 +1239,14 @@ static const struct ethtool_ops hinic3_ethtool_ops = {
>  	.get_pause_stats                = hinic3_get_pause_stats,
>  	.get_coalesce                   = hinic3_get_coalesce,
>  	.set_coalesce                   = hinic3_set_coalesce,
> +	.get_rxnfc                      = hinic3_get_rxnfc,
> +	.set_rxnfc                      = hinic3_set_rxnfc,
> +	.get_channels                   = hinic3_get_channels,
> +	.set_channels                   = hinic3_set_channels,
> +	.get_rxfh_indir_size            = hinic3_get_rxfh_indir_size,
> +	.get_rxfh_key_size              = hinic3_get_rxfh_key_size,
> +	.get_rxfh                       = hinic3_get_rxfh,
> +	.set_rxfh                       = hinic3_set_rxfh,
>  };
>  
>  void hinic3_set_ethtool_ops(struct net_device *netdev)
> diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_mgmt_interface.h b/drivers/net/ethernet/huawei/hinic3/hinic3_mgmt_interface.h
> index 76c691f82703..3c1263ff99ff 100644
> --- a/drivers/net/ethernet/huawei/hinic3/hinic3_mgmt_interface.h
> +++ b/drivers/net/ethernet/huawei/hinic3/hinic3_mgmt_interface.h
> @@ -282,6 +282,7 @@ enum l2nic_cmd {
>  	L2NIC_CMD_SET_VLAN_FILTER_EN  = 26,
>  	L2NIC_CMD_SET_RX_VLAN_OFFLOAD = 27,
>  	L2NIC_CMD_CFG_RSS             = 60,
> +	L2NIC_CMD_GET_RSS_CTX_TBL     = 62,
>  	L2NIC_CMD_CFG_RSS_HASH_KEY    = 63,
>  	L2NIC_CMD_CFG_RSS_HASH_ENGINE = 64,
>  	L2NIC_CMD_SET_RSS_CTX_TBL     = 65,
> @@ -301,6 +302,7 @@ enum l2nic_ucode_cmd {
>  	L2NIC_UCODE_CMD_MODIFY_QUEUE_CTX  = 0,
>  	L2NIC_UCODE_CMD_CLEAN_QUEUE_CTX   = 1,
>  	L2NIC_UCODE_CMD_SET_RSS_INDIR_TBL = 4,
> +	L2NIC_UCODE_CMD_GET_RSS_INDIR_TBL = 6,
>  };
>  
>  /* hilink mac group command */
> diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_rss.c b/drivers/net/ethernet/huawei/hinic3/hinic3_rss.c
> index 25db74d8c7dd..811a6b491e74 100644
> --- a/drivers/net/ethernet/huawei/hinic3/hinic3_rss.c
> +++ b/drivers/net/ethernet/huawei/hinic3/hinic3_rss.c
> @@ -155,7 +155,7 @@ static int hinic3_set_rss_type(struct hinic3_hwdev *hwdev,
>  				       L2NIC_CMD_SET_RSS_CTX_TBL, &msg_params);
>  
>  	if (ctx_tbl.msg_head.status == MGMT_STATUS_CMD_UNSUPPORTED) {
> -		return MGMT_STATUS_CMD_UNSUPPORTED;
> +		return -EOPNOTSUPP;
>  	} else if (err || ctx_tbl.msg_head.status) {
>  		dev_err(hwdev->dev, "mgmt Failed to set rss context offload, err: %d, status: 0x%x\n",
>  			err, ctx_tbl.msg_head.status);
> @@ -165,6 +165,41 @@ static int hinic3_set_rss_type(struct hinic3_hwdev *hwdev,
>  	return 0;
>  }
>  
> +static int hinic3_get_rss_type(struct hinic3_hwdev *hwdev,
> +			       struct hinic3_rss_type *rss_type)
> +{
> +	struct l2nic_cmd_rss_ctx_tbl ctx_tbl = {};
> +	struct mgmt_msg_params msg_params = {};
> +	int err;
> +
> +	ctx_tbl.func_id = hinic3_global_func_id(hwdev);
> +
> +	mgmt_msg_params_init_default(&msg_params, &ctx_tbl, sizeof(ctx_tbl));
> +
> +	err = hinic3_send_mbox_to_mgmt(hwdev, MGMT_MOD_L2NIC,
> +				       L2NIC_CMD_GET_RSS_CTX_TBL,
> +				       &msg_params);
> +	if (ctx_tbl.msg_head.status == MGMT_STATUS_CMD_UNSUPPORTED) {
> +		return -EOPNOTSUPP;
> +	} else if (err || ctx_tbl.msg_head.status) {
> +		dev_err(hwdev->dev, "Failed to get hash type, err: %d, status: 0x%x\n",
> +			err, ctx_tbl.msg_head.status);
> +		return -EINVAL;
> +	}
> +
> +	rss_type->ipv4         = L2NIC_RSS_TYPE_GET(ctx_tbl.context, IPV4);
> +	rss_type->ipv6         = L2NIC_RSS_TYPE_GET(ctx_tbl.context, IPV6);
> +	rss_type->ipv6_ext     = L2NIC_RSS_TYPE_GET(ctx_tbl.context, IPV6_EXT);
> +	rss_type->tcp_ipv4     = L2NIC_RSS_TYPE_GET(ctx_tbl.context, TCP_IPV4);
> +	rss_type->tcp_ipv6     = L2NIC_RSS_TYPE_GET(ctx_tbl.context, TCP_IPV6);
> +	rss_type->tcp_ipv6_ext = L2NIC_RSS_TYPE_GET(ctx_tbl.context,
> +						    TCP_IPV6_EXT);
> +	rss_type->udp_ipv4     = L2NIC_RSS_TYPE_GET(ctx_tbl.context, UDP_IPV4);
> +	rss_type->udp_ipv6     = L2NIC_RSS_TYPE_GET(ctx_tbl.context, UDP_IPV6);
> +
> +	return 0;
> +}
> +
>  static int hinic3_rss_cfg_hash_type(struct hinic3_hwdev *hwdev, u8 opcode,
>  				    enum hinic3_rss_hash_type *type)
>  {
> @@ -264,7 +299,8 @@ static int hinic3_set_hw_rss_parameters(struct net_device *netdev, u8 rss_en)
>  	if (err)
>  		return err;
>  
> -	hinic3_fillout_indir_tbl(netdev, nic_dev->rss_indir);
> +	if (!netif_is_rxfh_configured(netdev))
> +		hinic3_fillout_indir_tbl(netdev, nic_dev->rss_indir);
>  
>  	err = hinic3_config_rss_hw_resource(netdev, nic_dev->rss_indir);
>  	if (err)
> @@ -334,3 +370,502 @@ void hinic3_try_to_enable_rss(struct net_device *netdev)
>  	clear_bit(HINIC3_RSS_ENABLE, &nic_dev->flags);
>  	nic_dev->q_params.num_qps = nic_dev->max_qps;
>  }
> +
> +static int hinic3_set_l4_rss_hash_ops(const struct ethtool_rxnfc *cmd,
> +				      struct hinic3_rss_type *rss_type)
> +{
> +	u8 rss_l4_en;
> +
> +	switch (cmd->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
> +	case 0:
> +		rss_l4_en = 0;
> +		break;
> +	case (RXH_L4_B_0_1 | RXH_L4_B_2_3):
> +		rss_l4_en = 1;
> +		break;
> +	default:
> +		return -EINVAL;
> +	}
> +
> +	switch (cmd->flow_type) {
> +	case TCP_V4_FLOW:
> +		rss_type->tcp_ipv4 = rss_l4_en;
> +		break;
> +	case TCP_V6_FLOW:
> +		rss_type->tcp_ipv6 = rss_l4_en;
> +		break;
> +	case UDP_V4_FLOW:
> +		rss_type->udp_ipv4 = rss_l4_en;
> +		break;
> +	case UDP_V6_FLOW:
> +		rss_type->udp_ipv6 = rss_l4_en;
> +		break;
> +	default:
> +		return -EINVAL;
> +	}
> +
> +	return 0;
> +}
> +
> +static int hinic3_update_rss_hash_opts(struct net_device *netdev,
> +				       struct ethtool_rxnfc *cmd,
> +				       struct hinic3_rss_type *rss_type)
> +{
> +	int err;
> +
> +	switch (cmd->flow_type) {
> +	case TCP_V4_FLOW:
> +	case TCP_V6_FLOW:
> +	case UDP_V4_FLOW:
> +	case UDP_V6_FLOW:
> +		err = hinic3_set_l4_rss_hash_ops(cmd, rss_type);
> +		if (err)
> +			return err;
> +
> +		break;
> +	case IPV4_FLOW:
> +		rss_type->ipv4 = 1;
> +		break;
> +	case IPV6_FLOW:
> +		rss_type->ipv6 = 1;
> +		break;
> +	default:
> +		netdev_err(netdev, "Unsupported flow type\n");
> +		return -EINVAL;
> +	}
> +
> +	return 0;
> +}
> +
> +static int hinic3_set_rss_hash_opts(struct net_device *netdev,
> +				    struct ethtool_rxnfc *cmd)
> +{
> +	struct hinic3_nic_dev *nic_dev = netdev_priv(netdev);
> +	struct hinic3_rss_type rss_type;
> +	int err;
> +
> +	if (!test_bit(HINIC3_RSS_ENABLE, &nic_dev->flags)) {
> +		cmd->data = 0;
> +		netdev_err(netdev, "RSS is disable, not support to set flow-hash\n");
> +		return -EOPNOTSUPP;
> +	}
> +
> +	/* RSS only supports hashing of IP addresses and L4 ports */
> +	if (cmd->data & ~(RXH_IP_SRC | RXH_IP_DST |
> +			  RXH_L4_B_0_1 | RXH_L4_B_2_3))
> +		return -EINVAL;
> +
> +	/* Both IP addresses must be part of the hash tuple */
> +	if (!(cmd->data & RXH_IP_SRC) || !(cmd->data & RXH_IP_DST))
> +		return -EINVAL;
> +
> +	/* L4 hash bits are not valid for pure L3 flow types */
> +	if ((cmd->flow_type == IPV4_FLOW || cmd->flow_type == IPV6_FLOW) &&
> +	    (cmd->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)))
> +		return -EINVAL;
> +
> +	err = hinic3_get_rss_type(nic_dev->hwdev, &rss_type);
> +	if (err) {
> +		netdev_err(netdev, "Failed to get rss type\n");
> +		return err;
> +	}
> +
> +	err = hinic3_update_rss_hash_opts(netdev, cmd, &rss_type);
> +	if (err)
> +		return err;
> +
> +	err = hinic3_set_rss_type(nic_dev->hwdev, rss_type);
> +	if (err) {
> +		netdev_err(netdev, "Failed to set rss type\n");
> +		return err;
> +	}
> +
> +	nic_dev->rss_type = rss_type;
> +
> +	return 0;
> +}
> +
> +static void convert_rss_l3_type(u8 rss_opt, struct ethtool_rxnfc *cmd)
> +{
> +	if (!rss_opt)
> +		cmd->data &= ~(RXH_IP_SRC | RXH_IP_DST);
> +}
> +
> +static void convert_rss_l4_type(u8 rss_opt, struct ethtool_rxnfc *cmd)
> +{
> +	if (rss_opt)
> +		cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;
> +}
> +
> +static int hinic3_convert_rss_type(struct net_device *netdev,
> +				   struct hinic3_rss_type *rss_type,
> +				   struct ethtool_rxnfc *cmd)
> +{
> +	cmd->data = RXH_IP_SRC | RXH_IP_DST;
> +	switch (cmd->flow_type) {
> +	case TCP_V4_FLOW:
> +		convert_rss_l4_type(rss_type->tcp_ipv4, cmd);
> +		break;
> +	case TCP_V6_FLOW:
> +		convert_rss_l4_type(rss_type->tcp_ipv6, cmd);
> +		break;
> +	case UDP_V4_FLOW:
> +		convert_rss_l4_type(rss_type->udp_ipv4, cmd);
> +		break;
> +	case UDP_V6_FLOW:
> +		convert_rss_l4_type(rss_type->udp_ipv6, cmd);
> +		break;
> +	case IPV4_FLOW:
> +		convert_rss_l3_type(rss_type->ipv4, cmd);
> +		break;
> +	case IPV6_FLOW:
> +		convert_rss_l3_type(rss_type->ipv6, cmd);
> +		break;
> +	default:
> +		netdev_err(netdev, "Unsupported flow type\n");
> +		cmd->data = 0;
> +		return -EINVAL;
> +	}
> +
> +	return 0;
> +}
> +
> +static int hinic3_get_rss_hash_opts(struct net_device *netdev,
> +				    struct ethtool_rxnfc *cmd)
> +{
> +	struct hinic3_nic_dev *nic_dev = netdev_priv(netdev);
> +	struct hinic3_rss_type rss_type;
> +	int err;
> +
> +	cmd->data = 0;
> +
> +	if (!test_bit(HINIC3_RSS_ENABLE, &nic_dev->flags))
> +		return 0;
> +
> +	err = hinic3_get_rss_type(nic_dev->hwdev, &rss_type);
> +	if (err) {
> +		netdev_err(netdev, "Failed to get rss type\n");
> +		return err;
> +	}
> +
> +	return hinic3_convert_rss_type(netdev, &rss_type, cmd);
> +}
> +
> +int hinic3_get_rxnfc(struct net_device *netdev,
> +		     struct ethtool_rxnfc *cmd, u32 *rule_locs)
> +{
> +	struct hinic3_nic_dev *nic_dev = netdev_priv(netdev);
> +	int err = 0;
> +
> +	switch (cmd->cmd) {
> +	case ETHTOOL_GRXRINGS:
> +		cmd->data = nic_dev->q_params.num_qps;
> +		break;

You should probably implement the get_rx_ring_count ethtool op instead.
See
https://lore.kernel.org/netdev/20260122-grxring_big_v4-v2-0-94dbe4dcaa10@debian.org/