net/mlx5e: Fix ethtool -N flow-type ip4 to RSS context

JIRA: https://issues.redhat.com/browse/RHEL-72227
JIRA: https://issues.redhat.com/browse/RHEL-73520
Upstream-status: v6.15-rc1

commit 3865bec
Author: Maxim Mikityanskiy <maxtram95@gmail.com>
Date:   Wed Mar 19 14:45:08 2025 +0200

    net/mlx5e: Fix ethtool -N flow-type ip4 to RSS context

    There commands can be used to add an RSS context and steer some traffic
    into it:

        # ethtool -X eth0 context new
        New RSS context is 1
        # ethtool -N eth0 flow-type ip4 dst-ip 1.1.1.1 context 1
        Added rule with ID 1023

    However, the second command fails with EINVAL on mlx5e:

        # ethtool -N eth0 flow-type ip4 dst-ip 1.1.1.1 context 1
        rmgr: Cannot insert RX class rule: Invalid argument
        Cannot insert classification rule

    It happens when flow_get_tirn calls flow_type_to_traffic_type with
    flow_type = IP_USER_FLOW or IPV6_USER_FLOW. That function only handles
    IPV4_FLOW and IPV6_FLOW cases, but unlike all other cases which are
    common for hash and spec, IPv4 and IPv6 defines different contants for
    hash and for spec:

        #define     TCP_V4_FLOW     0x01    /* hash or spec (tcp_ip4_spec) */
        #define     UDP_V4_FLOW     0x02    /* hash or spec (udp_ip4_spec) */
        ...
        #define     IPV4_USER_FLOW  0x0d    /* spec only (usr_ip4_spec) */
        #define     IP_USER_FLOW    IPV4_USER_FLOW
        #define     IPV6_USER_FLOW  0x0e    /* spec only (usr_ip6_spec; nfc only) */
        #define     IPV4_FLOW       0x10    /* hash only */
        #define     IPV6_FLOW       0x11    /* hash only */

    Extend the switch in flow_type_to_traffic_type to support both, which
    fixes the failing ethtool -N command with flow-type ip4 or ip6.

    Fixes: 248d3b4 ("net/mlx5e: Support flow classification into RSS contexts")
    Signed-off-by: Maxim Mikityanskiy <maxim@isovalent.com>
    Tested-by: Daniel Borkmann <daniel@iogearbox.net>
    Reviewed-by: Joe Damato <jdamato@fastly.com>
    Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
    Link: https://patch.msgid.link/20250319124508.3979818-1-maxim@isovalent.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Signed-off-by: Benjamin Poirier <bpoirier@redhat.com>

Author: Benjamin Poirier

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

@@ -884,8 +884,10 @@ static int flow_type_to_traffic_type(u32 flow_type)
 	case ESP_V6_FLOW:
 		return MLX5_TT_IPV6_IPSEC_ESP;
 	case IPV4_FLOW:
+	case IP_USER_FLOW:
 		return MLX5_TT_IPV4;
 	case IPV6_FLOW:
+	case IPV6_USER_FLOW:
 		return MLX5_TT_IPV6;
 	default:
 		return -EINVAL;