From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9069B46BAE for ; Fri, 18 Jul 2025 21:37:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B1C540B8F; Fri, 18 Jul 2025 21:37:47 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 6865840611 for ; Fri, 18 Jul 2025 21:37:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iffCH2Tg2qPNCnXjqcMAJXboRxXprT29k9xaVJQesn8=; b=chXC1TomTtVtB0SFB2pUMB87YmjQIsfpTATlIw+3jXxswo4nU0D3pG5BtvZx9lY3ev6gBo BdZWsqo5O+C4/5LWg64/IVUCco6BftW8nsFd0S6qyazk2E8gXju3cd+h0/C8+VifO4rQKR 5ctnu+JEupzJTaDzLhEkik8Why9BchE= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-379-RN7HMN0zNwWx1FAjLXAuXA-1; Fri, 18 Jul 2025 15:37:44 -0400 X-MC-Unique: RN7HMN0zNwWx1FAjLXAuXA-1 X-Mimecast-MFC-AGG-ID: RN7HMN0zNwWx1FAjLXAuXA_1752867463 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2CF571800365; Fri, 18 Jul 2025 19:37:43 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CA6A918003FC; Fri, 18 Jul 2025 19:37:41 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: fix packet type for FDIR filter' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:31:13 +0100 Message-ID: <20250718193247.1008129-139-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: vFhGl-ZddngKnD0i47tIc5JmSIRLZ-zA5uj58tFNgCQ_1752867463 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 24.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/6ed8313d388c3d5d66b2f4f319f908f65a4751ac Thanks. Kevin --- >From 6ed8313d388c3d5d66b2f4f319f908f65a4751ac Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 13 Jun 2025 16:41:46 +0800 Subject: [PATCH] net/txgbe: fix packet type for FDIR filter [ upstream commit 8d10841e5acd381c7831e421103872d12e806780 ] To match the packet type more flexibly when the pattern is default, add packet type mask for FDIR filters. Fixes: b973ee26747a ("net/txgbe: parse flow director filter") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_type.h | 20 +-- drivers/net/txgbe/txgbe_ethdev.h | 3 +- drivers/net/txgbe/txgbe_fdir.c | 16 +-- drivers/net/txgbe/txgbe_flow.c | 188 +++++++++++++++------------- 4 files changed, 116 insertions(+), 111 deletions(-) diff --git a/drivers/net/txgbe/base/txgbe_type.h b/drivers/net/txgbe/base/txgbe_type.h index 4371876649..383438ea3c 100644 --- a/drivers/net/txgbe/base/txgbe_type.h +++ b/drivers/net/txgbe/base/txgbe_type.h @@ -89,6 +89,9 @@ enum { #define TXGBE_ATR_L4TYPE_TCP 0x2 #define TXGBE_ATR_L4TYPE_SCTP 0x3 -#define TXGBE_ATR_TUNNEL_MASK 0x10 -#define TXGBE_ATR_TUNNEL_ANY 0x10 +#define TXGBE_ATR_TYPE_MASK_TUN 0x80 +#define TXGBE_ATR_TYPE_MASK_TUN_OUTIP 0x40 +#define TXGBE_ATR_TYPE_MASK_TUN_TYPE 0x20 +#define TXGBE_ATR_TYPE_MASK_L3P 0x10 +#define TXGBE_ATR_TYPE_MASK_L4P 0x08 enum txgbe_atr_flow_type { TXGBE_ATR_FLOW_TYPE_IPV4 = 0x0, @@ -100,12 +103,4 @@ enum txgbe_atr_flow_type { TXGBE_ATR_FLOW_TYPE_TCPV6 = 0x6, TXGBE_ATR_FLOW_TYPE_SCTPV6 = 0x7, - TXGBE_ATR_FLOW_TYPE_TUNNELED_IPV4 = 0x10, - TXGBE_ATR_FLOW_TYPE_TUNNELED_UDPV4 = 0x11, - TXGBE_ATR_FLOW_TYPE_TUNNELED_TCPV4 = 0x12, - TXGBE_ATR_FLOW_TYPE_TUNNELED_SCTPV4 = 0x13, - TXGBE_ATR_FLOW_TYPE_TUNNELED_IPV6 = 0x14, - TXGBE_ATR_FLOW_TYPE_TUNNELED_UDPV6 = 0x15, - TXGBE_ATR_FLOW_TYPE_TUNNELED_TCPV6 = 0x16, - TXGBE_ATR_FLOW_TYPE_TUNNELED_SCTPV6 = 0x17, }; @@ -117,9 +112,6 @@ struct txgbe_atr_input { * vm_pool - 1 byte * flow_type - 1 byte - * vlan_id - 2 bytes + * pkt_type - 2 bytes * src_ip - 16 bytes - * inner_mac - 6 bytes - * cloud_mode - 2 bytes - * tni_vni - 4 bytes * dst_ip - 16 bytes * src_port - 2 bytes diff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h index 50a81ca1ec..5134c3d99e 100644 --- a/drivers/net/txgbe/txgbe_ethdev.h +++ b/drivers/net/txgbe/txgbe_ethdev.h @@ -92,6 +92,5 @@ struct txgbe_hw_fdir_mask { uint16_t flex_bytes_mask; uint8_t mac_addr_byte_mask; - uint32_t tunnel_id_mask; - uint8_t tunnel_type_mask; + uint8_t pkt_type_mask; /* reversed mask for hw */ }; diff --git a/drivers/net/txgbe/txgbe_fdir.c b/drivers/net/txgbe/txgbe_fdir.c index 75bf30c00c..0d12fb9a11 100644 --- a/drivers/net/txgbe/txgbe_fdir.c +++ b/drivers/net/txgbe/txgbe_fdir.c @@ -188,16 +188,10 @@ txgbe_fdir_set_input_mask(struct rte_eth_dev *dev) } - /* - * Program the relevant mask registers. If src/dst_port or src/dst_addr - * are zero, then assume a full mask for that field. Also assume that - * a VLAN of 0 is unspecified, so mask that out as well. L4type - * cannot be masked out in this implementation. - */ - if (info->mask.dst_port_mask == 0 && info->mask.src_port_mask == 0) { - /* use the L4 protocol mask for raw IPv4/IPv6 traffic */ - fdirm |= TXGBE_FDIRMSK_L4P; - } + /* use the L4 protocol mask for raw IPv4/IPv6 traffic */ + if (info->mask.pkt_type_mask == 0 && info->mask.dst_port_mask == 0 && + info->mask.src_port_mask == 0) + info->mask.pkt_type_mask |= TXGBE_FDIRMSK_L4P; - /* TBD: don't support encapsulation yet */ + fdirm |= info->mask.pkt_type_mask; wr32(hw, TXGBE_FDIRMSK, fdirm); diff --git a/drivers/net/txgbe/txgbe_flow.c b/drivers/net/txgbe/txgbe_flow.c index 210928a4fe..abed0c1e00 100644 --- a/drivers/net/txgbe/txgbe_flow.c +++ b/drivers/net/txgbe/txgbe_flow.c @@ -1488,6 +1488,39 @@ static inline uint8_t signature_match(const struct rte_flow_item pattern[]) } +static void +txgbe_fdir_parse_flow_type(struct txgbe_atr_input *input, u8 ptid, bool tun) +{ + if (!tun) + ptid = TXGBE_PTID_PKT_IP; + + switch (input->flow_type & TXGBE_ATR_L4TYPE_MASK) { + case TXGBE_ATR_L4TYPE_UDP: + ptid |= TXGBE_PTID_TYP_UDP; + break; + case TXGBE_ATR_L4TYPE_TCP: + ptid |= TXGBE_PTID_TYP_TCP; + break; + case TXGBE_ATR_L4TYPE_SCTP: + ptid |= TXGBE_PTID_TYP_SCTP; + break; + default: + break; + } + + switch (input->flow_type & TXGBE_ATR_L3TYPE_MASK) { + case TXGBE_ATR_L3TYPE_IPV4: + break; + case TXGBE_ATR_L3TYPE_IPV6: + ptid |= TXGBE_PTID_PKT_IPV6; + break; + default: + break; + } + + input->pkt_type = cpu_to_be16(ptid); +} + /** - * Parse the rule to see if it is a IP or MAC VLAN flow director rule. + * Parse the rule to see if it is a IP flow director rule. * And get the flow director filter info BTW. * UDP/TCP/SCTP PATTERN: @@ -1556,5 +1589,4 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, const struct rte_flow_item_raw *raw_mask; const struct rte_flow_item_raw *raw_spec; - u32 ptype = 0; uint8_t j; @@ -1586,4 +1618,7 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, memset(rule, 0, sizeof(struct txgbe_fdir_rule)); memset(&rule->mask, 0, sizeof(struct txgbe_hw_fdir_mask)); + rule->mask.pkt_type_mask = TXGBE_ATR_TYPE_MASK_L3P | + TXGBE_ATR_TYPE_MASK_L4P; + memset(&rule->input, 0, sizeof(struct txgbe_atr_input)); /** @@ -1688,5 +1723,7 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, } else { if (item->type != RTE_FLOW_ITEM_TYPE_IPV4 && - item->type != RTE_FLOW_ITEM_TYPE_VLAN) { + item->type != RTE_FLOW_ITEM_TYPE_VLAN && + item->type != RTE_FLOW_ITEM_TYPE_IPV6 && + item->type != RTE_FLOW_ITEM_TYPE_RAW) { memset(rule, 0, sizeof(struct txgbe_fdir_rule)); rte_flow_error_set(error, EINVAL, @@ -1696,4 +1733,6 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, } } + if (item->type == RTE_FLOW_ITEM_TYPE_VLAN) + item = next_no_fuzzy_pattern(pattern, item); } @@ -1705,5 +1744,5 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, */ rule->input.flow_type = TXGBE_ATR_FLOW_TYPE_IPV4; - ptype = txgbe_ptype_table[TXGBE_PT_IPV4]; + rule->mask.pkt_type_mask &= ~TXGBE_ATR_TYPE_MASK_L3P; /*Not supported last point for range*/ if (item->last) { @@ -1717,29 +1756,24 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, * others should be masked. */ - if (!item->mask) { - memset(rule, 0, sizeof(struct txgbe_fdir_rule)); - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, "Not supported by fdir filter"); - return -rte_errno; + if (item->mask) { + rule->b_mask = TRUE; + ipv4_mask = item->mask; + if (ipv4_mask->hdr.version_ihl || + ipv4_mask->hdr.type_of_service || + ipv4_mask->hdr.total_length || + ipv4_mask->hdr.packet_id || + ipv4_mask->hdr.fragment_offset || + ipv4_mask->hdr.time_to_live || + ipv4_mask->hdr.next_proto_id || + ipv4_mask->hdr.hdr_checksum) { + memset(rule, 0, sizeof(struct txgbe_fdir_rule)); + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, "Not supported by fdir filter"); + return -rte_errno; + } + rule->mask.dst_ipv4_mask = ipv4_mask->hdr.dst_addr; + rule->mask.src_ipv4_mask = ipv4_mask->hdr.src_addr; } - rule->b_mask = TRUE; - ipv4_mask = item->mask; - if (ipv4_mask->hdr.version_ihl || - ipv4_mask->hdr.type_of_service || - ipv4_mask->hdr.total_length || - ipv4_mask->hdr.packet_id || - ipv4_mask->hdr.fragment_offset || - ipv4_mask->hdr.time_to_live || - ipv4_mask->hdr.next_proto_id || - ipv4_mask->hdr.hdr_checksum) { - memset(rule, 0, sizeof(struct txgbe_fdir_rule)); - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, "Not supported by fdir filter"); - return -rte_errno; - } - rule->mask.dst_ipv4_mask = ipv4_mask->hdr.dst_addr; - rule->mask.src_ipv4_mask = ipv4_mask->hdr.src_addr; if (item->spec) { @@ -1777,14 +1811,12 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, */ rule->input.flow_type = TXGBE_ATR_FLOW_TYPE_IPV6; - ptype = txgbe_ptype_table[TXGBE_PT_IPV6]; + rule->mask.pkt_type_mask &= ~TXGBE_ATR_TYPE_MASK_L3P; /** * 1. must signature match * 2. not support last - * 3. mask must not null */ if (rule->mode != RTE_FDIR_MODE_SIGNATURE || - item->last || - !item->mask) { + item->last) { memset(rule, 0, sizeof(struct txgbe_fdir_rule)); rte_flow_error_set(error, EINVAL, @@ -1794,22 +1826,11 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, } - rule->b_mask = TRUE; - ipv6_mask = item->mask; - if (ipv6_mask->hdr.vtc_flow || - ipv6_mask->hdr.payload_len || - ipv6_mask->hdr.proto || - ipv6_mask->hdr.hop_limits) { - memset(rule, 0, sizeof(struct txgbe_fdir_rule)); - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, "Not supported by fdir filter"); - return -rte_errno; - } - - /* check src addr mask */ - for (j = 0; j < 16; j++) { - if (ipv6_mask->hdr.src_addr.a[j] == UINT8_MAX) { - rule->mask.src_ipv6_mask |= 1 << j; - } else if (ipv6_mask->hdr.src_addr.a[j] != 0) { + if (item->mask) { + rule->b_mask = TRUE; + ipv6_mask = item->mask; + if (ipv6_mask->hdr.vtc_flow || + ipv6_mask->hdr.payload_len || + ipv6_mask->hdr.proto || + ipv6_mask->hdr.hop_limits) { memset(rule, 0, sizeof(struct txgbe_fdir_rule)); rte_flow_error_set(error, EINVAL, @@ -1818,16 +1839,29 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, return -rte_errno; } - } - /* check dst addr mask */ - for (j = 0; j < 16; j++) { - if (ipv6_mask->hdr.dst_addr.a[j] == UINT8_MAX) { - rule->mask.dst_ipv6_mask |= 1 << j; - } else if (ipv6_mask->hdr.dst_addr.a[j] != 0) { - memset(rule, 0, sizeof(struct txgbe_fdir_rule)); - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, "Not supported by fdir filter"); - return -rte_errno; + /* check src addr mask */ + for (j = 0; j < 16; j++) { + if (ipv6_mask->hdr.src_addr.a[j] == UINT8_MAX) { + rule->mask.src_ipv6_mask |= 1 << j; + } else if (ipv6_mask->hdr.src_addr.a[j] != 0) { + memset(rule, 0, sizeof(struct txgbe_fdir_rule)); + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, "Not supported by fdir filter"); + return -rte_errno; + } + } + + /* check dst addr mask */ + for (j = 0; j < 16; j++) { + if (ipv6_mask->hdr.dst_addr.a[j] == UINT8_MAX) { + rule->mask.dst_ipv6_mask |= 1 << j; + } else if (ipv6_mask->hdr.dst_addr.a[j] != 0) { + memset(rule, 0, sizeof(struct txgbe_fdir_rule)); + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, "Not supported by fdir filter"); + return -rte_errno; + } } } @@ -1867,8 +1901,6 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, */ rule->input.flow_type |= TXGBE_ATR_L4TYPE_TCP; - if (rule->input.flow_type & TXGBE_ATR_FLOW_TYPE_IPV6) - ptype = txgbe_ptype_table[TXGBE_PT_IPV6_TCP]; - else - ptype = txgbe_ptype_table[TXGBE_PT_IPV4_TCP]; + rule->mask.pkt_type_mask &= ~TXGBE_ATR_TYPE_MASK_L4P; + /*Not supported last point for range*/ if (item->last) { @@ -1934,8 +1966,6 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, */ rule->input.flow_type |= TXGBE_ATR_L4TYPE_UDP; - if (rule->input.flow_type & TXGBE_ATR_FLOW_TYPE_IPV6) - ptype = txgbe_ptype_table[TXGBE_PT_IPV6_UDP]; - else - ptype = txgbe_ptype_table[TXGBE_PT_IPV4_UDP]; + rule->mask.pkt_type_mask &= ~TXGBE_ATR_TYPE_MASK_L4P; + /*Not supported last point for range*/ if (item->last) { @@ -1996,8 +2026,6 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, */ rule->input.flow_type |= TXGBE_ATR_L4TYPE_SCTP; - if (rule->input.flow_type & TXGBE_ATR_FLOW_TYPE_IPV6) - ptype = txgbe_ptype_table[TXGBE_PT_IPV6_SCTP]; - else - ptype = txgbe_ptype_table[TXGBE_PT_IPV4_SCTP]; + rule->mask.pkt_type_mask &= ~TXGBE_ATR_TYPE_MASK_L4P; + /*Not supported last point for range*/ if (item->last) { @@ -2164,15 +2192,5 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, } - rule->input.pkt_type = cpu_to_be16(txgbe_encode_ptype(ptype)); - - if (rule->input.flow_type & TXGBE_ATR_FLOW_TYPE_IPV6) { - if (rule->input.flow_type & TXGBE_ATR_L4TYPE_MASK) - rule->input.pkt_type &= 0xFFFF; - else - rule->input.pkt_type &= 0xF8FF; - - rule->input.flow_type &= TXGBE_ATR_L3TYPE_MASK | - TXGBE_ATR_L4TYPE_MASK; - } + txgbe_fdir_parse_flow_type(&rule->input, 0, false); return txgbe_parse_fdir_act_attr(attr, actions, rule, error); @@ -2861,4 +2879,6 @@ txgbe_flow_create(struct rte_eth_dev *dev, } + fdir_info->mask.pkt_type_mask = + fdir_rule.mask.pkt_type_mask; ret = txgbe_fdir_set_input_mask(dev); if (ret) -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:15.915467725 +0100 +++ 0139-net-txgbe-fix-packet-type-for-FDIR-filter.patch 2025-07-18 20:29:11.104907864 +0100 @@ -1 +1 @@ -From 8d10841e5acd381c7831e421103872d12e806780 Mon Sep 17 00:00:00 2001 +From 6ed8313d388c3d5d66b2f4f319f908f65a4751ac Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8d10841e5acd381c7831e421103872d12e806780 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -61 +62 @@ -index 0a3c634937..01e8a9fc05 100644 +index 50a81ca1ec..5134c3d99e 100644 @@ -99 +100 @@ -index 8670c3e1d7..bce88aebd3 100644 +index 210928a4fe..abed0c1e00 100644 @@ -367 +368 @@ -@@ -2864,4 +2882,6 @@ txgbe_flow_create(struct rte_eth_dev *dev, +@@ -2861,4 +2879,6 @@ txgbe_flow_create(struct rte_eth_dev *dev,