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 6F3A246B72 for ; Mon, 14 Jul 2025 17:12:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6959F40612; Mon, 14 Jul 2025 17:12:17 +0200 (CEST) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id 824654042C for ; Mon, 14 Jul 2025 17:12:15 +0200 (CEST) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-3a6f2c6715fso3622446f8f.1 for ; Mon, 14 Jul 2025 08:12:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752505935; x=1753110735; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y/YpbPdW5r1NjRwhSOWXoRSA8Ndqlepsl1eytx0w+HE=; b=Srj1k3WFbJ9hh039fDJbMK6gobncvUYAkx5U6lEbCv/AHRns8c/b4SJc4fzhNNrhyy QA4N3fHHQN+O24CBQBIzJSUbdB51jshbYdxrAQv2p4clIs35O7+mJNKeulz1b3YpGV7r /2Ogz52cDpI3ECb/QTQtyZT1myrqwH16+qoNT7mkv+SnxMzZnHgv3OuEbf3uPBeiZhc6 nmn0RxdvIPMBltjTzmJorXOJkoxo72D5n+7k4/Cfbpl5z3zEQF7M0gUOiPEf324ipIH0 ceXUkR8a5uxwGyBWV4LVvyeen00gW8/nMggqmvOe7EgmIwPT+g1ET0O5c58NofuCCa0X 86vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752505935; x=1753110735; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y/YpbPdW5r1NjRwhSOWXoRSA8Ndqlepsl1eytx0w+HE=; b=CE4JsTXAlwg1cyBhCC3HOqIRWdwNTUKSLsD0onzW1E3n2Q4hXX4FNqxarBWqwqmyNh zdDw8ux0hGyah1aACuEmTsHIOVy8jCEWJAzfKeb/e/NUCsfp7ieaiaJSbDBMiWxXeIIr ChheHMgSi8W7lTs/MaoMkNwZI8q1QpbjYob8lcb9yw7/g4Qe34NGHGTbArcnUZHM4zwu hUnk+JcRWXlA4ryGnKfqq1NpeL/PJbYUJ/ziYQT8npcnR6PBhGZ4hE4/E//JZgkHE1RE W30toQAtQLPhMIuSdvlcEF0wEp41dvcRt/LoeoLUFaQswOEJupRDBjXc3kHPzxY7kDsX bu3Q== X-Gm-Message-State: AOJu0YwNjWv4EYyRc3eXe61UT2oxabRM5Ug3AUCBYZLHv6m4P2zoInEB Lw2S24e5EPmVxCiOKimqJciBebP16r04IaVmI1DWMQTqUUiKuefVz7jb X-Gm-Gg: ASbGncthXp6So/nd1vMFSrFztgdMAxUvBR1FF4CSICpFDlSH6jjiz18VpNfUPR4Llp+ IPfJa5/3g84Pm7bftZSxZNW23eEq4wnOqwqaq7nrqThAAApNDSUn666Uh1mZfqA9TiVI5Jx2ciK nRk17EU3y8vguhKEuH9f6MWIW7SpK9KmCwniEBynDjuZMyUPygRTHWUQqoi9vKap7HWaSj2+Lvm hKIfpBsZnHx9dDw9aA24Rhs3QkICYNxYZUyeZUp/6I3Zo0kqBnhDvcad6I3TCpmx1nM/e9IsKOM ye8IfurPpVKGqSqcNWjwWzYNptFcQZQv4C0Myk5VFf7M3TcYKSm2kNOOIvD9bNpZ3BQCyaqRPCD s1+QE7A3FsYJKNVhKcbjbh6Xk6UlR X-Google-Smtp-Source: AGHT+IGWeHOyAFtXV3TNuwJrW0zhT0x4vV9AyCRgzoH1cS5rwkJck+Y24byjoB6ApxiE73YEu+he2g== X-Received: by 2002:a05:6000:40d9:b0:3a4:fbd9:58e6 with SMTP id ffacd0b85a97d-3b5f2e298d0mr9335464f8f.50.1752505934978; Mon, 14 Jul 2025 08:12:14 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:a923:75e5:f97f:ef33]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3b5e8e1e332sm12751599f8f.79.2025.07.14.08.12.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jul 2025 08:12:14 -0700 (PDT) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: fix FDIR perfect mode for IPv6' has been queued to stable release 22.11.9 Date: Mon, 14 Jul 2025 16:11:00 +0100 Message-ID: <20250714151121.219866-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250714151121.219866-1-luca.boccassi@gmail.com> References: <20250630122556.1133654-23-luca.boccassi@gmail.com> <20250714151121.219866-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.9 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/16/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f10daba2b278c89a823e25387fd9529bed4b0947 Thanks. Luca Boccassi --- >From f10daba2b278c89a823e25387fd9529bed4b0947 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 13 Jun 2025 16:41:48 +0800 Subject: [PATCH] net/txgbe: fix FDIR perfect mode for IPv6 [ upstream commit db4878838ad0e978352cad411f4a72d0cead81fe ] Perfect mode of FDIR rules to filter IPv6 packets is supported by hardware. Remove the restriction and fix the setting. Fixes: b973ee26747a ("net/txgbe: parse flow director filter") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_fdir.c | 22 ++++++++-------------- drivers/net/txgbe/txgbe_flow.c | 7 +------ 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/drivers/net/txgbe/txgbe_fdir.c b/drivers/net/txgbe/txgbe_fdir.c index 0d12fb9a11..0efd43b59a 100644 --- a/drivers/net/txgbe/txgbe_fdir.c +++ b/drivers/net/txgbe/txgbe_fdir.c @@ -210,15 +210,12 @@ txgbe_fdir_set_input_mask(struct rte_eth_dev *dev) wr32(hw, TXGBE_FDIRSIP4MSK, ~info->mask.src_ipv4_mask); wr32(hw, TXGBE_FDIRDIP4MSK, ~info->mask.dst_ipv4_mask); - if (mode == RTE_FDIR_MODE_SIGNATURE) { - /* - * Store source and destination IPv6 masks (bit reversed) - */ - fdiripv6m = TXGBE_FDIRIP6MSK_DST(info->mask.dst_ipv6_mask) | - TXGBE_FDIRIP6MSK_SRC(info->mask.src_ipv6_mask); - - wr32(hw, TXGBE_FDIRIP6MSK, ~fdiripv6m); - } + /* + * Store source and destination IPv6 masks (bit reversed) + */ + fdiripv6m = TXGBE_FDIRIP6MSK_DST(info->mask.dst_ipv6_mask) | + TXGBE_FDIRIP6MSK_SRC(info->mask.src_ipv6_mask); + wr32(hw, TXGBE_FDIRIP6MSK, ~fdiripv6m); return 0; } @@ -642,6 +639,8 @@ fdir_write_perfect_filter(struct txgbe_hw *hw, fdircmd |= TXGBE_FDIRPICMD_QP(queue); fdircmd |= TXGBE_FDIRPICMD_POOL(input->vm_pool); + if (input->flow_type & TXGBE_ATR_L3TYPE_IPV6) + fdircmd |= TXGBE_FDIRPICMD_IP6; wr32(hw, TXGBE_FDIRPICMD, fdircmd); PMD_DRV_LOG(DEBUG, "Rx Queue=%x hash=%x", queue, fdirhash); @@ -810,11 +809,6 @@ txgbe_fdir_filter_program(struct rte_eth_dev *dev, is_perfect = TRUE; if (is_perfect) { - if (rule->input.flow_type & TXGBE_ATR_L3TYPE_IPV6) { - PMD_DRV_LOG(ERR, "IPv6 is not supported in" - " perfect mode!"); - return -ENOTSUP; - } fdirhash = atr_compute_perfect_hash(&rule->input, TXGBE_DEV_FDIR_CONF(dev)->pballoc); fdirhash |= TXGBE_FDIRPIHASH_IDX(rule->soft_id); diff --git a/drivers/net/txgbe/txgbe_flow.c b/drivers/net/txgbe/txgbe_flow.c index 922603fc50..f2417d0051 100644 --- a/drivers/net/txgbe/txgbe_flow.c +++ b/drivers/net/txgbe/txgbe_flow.c @@ -1812,12 +1812,7 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused, rule->input.flow_type = TXGBE_ATR_FLOW_TYPE_IPV6; rule->mask.pkt_type_mask &= ~TXGBE_ATR_TYPE_MASK_L3P; - /** - * 1. must signature match - * 2. not support last - */ - if (rule->mode != RTE_FDIR_MODE_SIGNATURE || - item->last) { + if (item->last) { memset(rule, 0, sizeof(struct txgbe_fdir_rule)); rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-14 16:09:40.909004568 +0100 +++ 0005-net-txgbe-fix-FDIR-perfect-mode-for-IPv6.patch 2025-07-14 16:09:40.688448457 +0100 @@ -1 +1 @@ -From db4878838ad0e978352cad411f4a72d0cead81fe Mon Sep 17 00:00:00 2001 +From f10daba2b278c89a823e25387fd9529bed4b0947 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit db4878838ad0e978352cad411f4a72d0cead81fe ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -66 +67 @@ -index c7cbf96a46..145ee8a452 100644 +index 922603fc50..f2417d0051 100644