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 E15F8A054A for ; Tue, 25 Oct 2022 17:08:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B79FE42C34; Tue, 25 Oct 2022 17:08:36 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 847CB42C34 for ; Tue, 25 Oct 2022 17:08:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710515; 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=6urn4n9J5jJFaexkCLXYLa5EOq3dszsCA4hy1aqZras=; b=Rzs2Q1bUZypbp3YAoepOpIsRfvsFSlugzb7ino7McILnrN+gW+XsmxOPpUHGdY5gYRUyG5 5R6gU1Noxxo9NpeV+sHe8nsMS77g/15iexbqGkv17lvqZ7lcyePxmuysjaMIitDJ7pIHN2 0/4KzZKX3bKW9SPl46wE7MNA6DqcBNw= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-42-ECHFL6arPWKJW9oDErZOBA-1; Tue, 25 Oct 2022 11:08:30 -0400 X-MC-Unique: ECHFL6arPWKJW9oDErZOBA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BA97438149A3; Tue, 25 Oct 2022 15:08:21 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5D6C477F55; Tue, 25 Oct 2022 15:08:20 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: fix IPv6 flow rule' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:11 +0100 Message-Id: <20221025150734.142189-16-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 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 21.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 11/01/22. 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/d47522ba5cfa5340cb556edc4f4e99d13e08d8a1 Thanks. Kevin --- >From d47522ba5cfa5340cb556edc4f4e99d13e08d8a1 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 2 Sep 2022 11:00:03 +0800 Subject: [PATCH] net/txgbe: fix IPv6 flow rule [ upstream commit 7147c01a49a0020b62608ab6605cae421a773685 ] Convert the correct packet type and flow type, to fix IPv6 rule in FDIR. Fixes: b973ee26747a ("net/txgbe: parse flow director filter") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_flow.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/drivers/net/txgbe/txgbe_flow.c b/drivers/net/txgbe/txgbe_flow.c index 6d7fd18428..ac9e8605c1 100644 --- a/drivers/net/txgbe/txgbe_flow.c +++ b/drivers/net/txgbe/txgbe_flow.c @@ -1584,7 +1584,5 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, */ memset(rule, 0, sizeof(struct txgbe_fdir_rule)); - memset(&rule->mask, 0xFF, sizeof(struct txgbe_hw_fdir_mask)); - rule->mask.vlan_tci_mask = 0; - rule->mask.flex_bytes_mask = 0; + memset(&rule->mask, 0, sizeof(struct txgbe_hw_fdir_mask)); /** @@ -1868,5 +1866,8 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, */ rule->input.flow_type |= TXGBE_ATR_L4TYPE_TCP; - ptype = txgbe_ptype_table[TXGBE_PT_IPV4_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]; /*Not supported last point for range*/ if (item->last) { @@ -1932,5 +1933,8 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, */ rule->input.flow_type |= TXGBE_ATR_L4TYPE_UDP; - ptype = txgbe_ptype_table[TXGBE_PT_IPV4_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]; /*Not supported last point for range*/ if (item->last) { @@ -1991,5 +1995,8 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, */ rule->input.flow_type |= TXGBE_ATR_L4TYPE_SCTP; - ptype = txgbe_ptype_table[TXGBE_PT_IPV4_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]; /*Not supported last point for range*/ if (item->last) { @@ -2142,4 +2149,14 @@ 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; + } + return txgbe_parse_fdir_act_attr(attr, actions, rule, error); } @@ -2828,6 +2845,8 @@ txgbe_flow_create(struct rte_eth_dev *dev, &fdir_rule.mask, sizeof(struct txgbe_hw_fdir_mask)); - if (ret) + if (ret) { + PMD_DRV_LOG(ERR, "only support one global mask"); goto out; + } if (fdir_info->flex_bytes_offset != -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:58.930641201 +0100 +++ 0016-net-txgbe-fix-IPv6-flow-rule.patch 2022-10-25 14:18:58.366797930 +0100 @@ -1 +1 @@ -From 7147c01a49a0020b62608ab6605cae421a773685 Mon Sep 17 00:00:00 2001 +From d47522ba5cfa5340cb556edc4f4e99d13e08d8a1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7147c01a49a0020b62608ab6605cae421a773685 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index 9288af05b2..7b18dca7e8 100644 +index 6d7fd18428..ac9e8605c1 100644 @@ -74 +75 @@ -@@ -2835,6 +2852,8 @@ txgbe_flow_create(struct rte_eth_dev *dev, +@@ -2828,6 +2845,8 @@ txgbe_flow_create(struct rte_eth_dev *dev,