bnxt_en: ethtool: Support unset l4proto on ip4/ip6 ntuple rules

Previously, trying to insert an ip4/ip6 ntuple rule with an unset
l4proto would get rejected with -EOPNOTSUPP. For example, the following
would fail:

    ethtool -N eth0 flow-type ip6 dst-ip $IP6 context 1

The reason was that all the l4proto validation was being run despite the
l4proto mask being set to 0x0. Fix by respecting the mask on l4proto and
treating a mask of 0x0 as wildcard l4proto.

Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
Reviewed-by: Michael Chan <michael.chan@broadcom.com>
Link: https://patch.msgid.link/1ac93a2836b25f79e7045f8874d9a17875229ffc.1730778566.git.dxu@dxuuu.xyz
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 41160aed94768718487434d718fca5eae849b842..cfd2c65b1c905beee7417d0e3cff6a4b268c7294 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -1124,7 +1124,12 @@ static int bnxt_grxclsrule(struct bnxt *bp, struct ethtool_rxnfc *cmd)
        fkeys = &fltr->fkeys;
        fmasks = &fltr->fmasks;
        if (fkeys->basic.n_proto == htons(ETH_P_IP)) {
-               if (fkeys->basic.ip_proto == IPPROTO_ICMP) {
+               if (fkeys->basic.ip_proto == BNXT_IP_PROTO_WILDCARD) {
+                       fs->flow_type = IP_USER_FLOW;
+                       fs->h_u.usr_ip4_spec.ip_ver = ETH_RX_NFC_IP4;
+                       fs->h_u.usr_ip4_spec.proto = BNXT_IP_PROTO_WILDCARD;
+                       fs->m_u.usr_ip4_spec.proto = 0;
+               } else if (fkeys->basic.ip_proto == IPPROTO_ICMP) {
                        fs->flow_type = IP_USER_FLOW;
                        fs->h_u.usr_ip4_spec.ip_ver = ETH_RX_NFC_IP4;
                        fs->h_u.usr_ip4_spec.proto = IPPROTO_ICMP;
@@ -1149,7 +1154,11 @@ static int bnxt_grxclsrule(struct bnxt *bp, struct ethtool_rxnfc *cmd)
                        fs->m_u.tcp_ip4_spec.pdst = fmasks->ports.dst;
                }
        } else {
-               if (fkeys->basic.ip_proto == IPPROTO_ICMPV6) {
+               if (fkeys->basic.ip_proto == BNXT_IP_PROTO_WILDCARD) {
+                       fs->flow_type = IPV6_USER_FLOW;
+                       fs->h_u.usr_ip6_spec.l4_proto = BNXT_IP_PROTO_WILDCARD;
+                       fs->m_u.usr_ip6_spec.l4_proto = 0;
+               } else if (fkeys->basic.ip_proto == IPPROTO_ICMPV6) {
                        fs->flow_type = IPV6_USER_FLOW;
                        fs->h_u.usr_ip6_spec.l4_proto = IPPROTO_ICMPV6;
                        fs->m_u.usr_ip6_spec.l4_proto = BNXT_IP_PROTO_FULL_MASK;
@@ -1274,10 +1283,12 @@ static int bnxt_add_l2_cls_rule(struct bnxt *bp,
 static bool bnxt_verify_ntuple_ip4_flow(struct ethtool_usrip4_spec *ip_spec,
                                        struct ethtool_usrip4_spec *ip_mask)
 {
+       u8 mproto = ip_mask->proto;
+       u8 sproto = ip_spec->proto;
+
        if (ip_mask->l4_4_bytes || ip_mask->tos ||
            ip_spec->ip_ver != ETH_RX_NFC_IP4 ||
-           ip_mask->proto != BNXT_IP_PROTO_FULL_MASK ||
-           ip_spec->proto != IPPROTO_ICMP)
+           (mproto && (mproto != BNXT_IP_PROTO_FULL_MASK || sproto != IPPROTO_ICMP)))
                return false;
        return true;
 }
@@ -1285,9 +1296,11 @@ static bool bnxt_verify_ntuple_ip4_flow(struct ethtool_usrip4_spec *ip_spec,
 static bool bnxt_verify_ntuple_ip6_flow(struct ethtool_usrip6_spec *ip_spec,
                                        struct ethtool_usrip6_spec *ip_mask)
 {
+       u8 mproto = ip_mask->l4_proto;
+       u8 sproto = ip_spec->l4_proto;
+
        if (ip_mask->l4_4_bytes || ip_mask->tclass ||
-           ip_mask->l4_proto != BNXT_IP_PROTO_FULL_MASK ||
-           ip_spec->l4_proto != IPPROTO_ICMPV6)
+           (mproto && (mproto != BNXT_IP_PROTO_FULL_MASK || sproto != IPPROTO_ICMPV6)))
                return false;
        return true;
 }
@@ -1341,7 +1354,8 @@ static int bnxt_add_ntuple_cls_rule(struct bnxt *bp,
                struct ethtool_usrip4_spec *ip_spec = &fs->h_u.usr_ip4_spec;
                struct ethtool_usrip4_spec *ip_mask = &fs->m_u.usr_ip4_spec;
 
-               fkeys->basic.ip_proto = ip_spec->proto;
+               fkeys->basic.ip_proto = ip_mask->proto ? ip_spec->proto
+                                                      : BNXT_IP_PROTO_WILDCARD;
                fkeys->basic.n_proto = htons(ETH_P_IP);
                fkeys->addrs.v4addrs.src = ip_spec->ip4src;
                fmasks->addrs.v4addrs.src = ip_mask->ip4src;
@@ -1372,7 +1386,8 @@ static int bnxt_add_ntuple_cls_rule(struct bnxt *bp,
                struct ethtool_usrip6_spec *ip_spec = &fs->h_u.usr_ip6_spec;
                struct ethtool_usrip6_spec *ip_mask = &fs->m_u.usr_ip6_spec;
 
-               fkeys->basic.ip_proto = ip_spec->l4_proto;
+               fkeys->basic.ip_proto = ip_mask->l4_proto ? ip_spec->l4_proto
+                                                         : BNXT_IP_PROTO_WILDCARD;
                fkeys->basic.n_proto = htons(ETH_P_IPV6);
                fkeys->addrs.v6addrs.src = *(struct in6_addr *)&ip_spec->ip6src;
                fmasks->addrs.v6addrs.src = *(struct in6_addr *)&ip_mask->ip6src;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h
index e2ee030237d4a8753c0653eb0612e34b538dcc6a..33b86ede1ce5fb6f6c620ed58391b983f776a026 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h
@@ -44,6 +44,7 @@ struct bnxt_led_cfg {
 #define BNXT_PXP_REG_LEN       0x3110
 
 #define BNXT_IP_PROTO_FULL_MASK        0xFF
+#define BNXT_IP_PROTO_WILDCARD 0x0
 
 extern const struct ethtool_ops bnxt_ethtool_ops;