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 1AAF9428F8 for ; Sun, 9 Apr 2023 17:29:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 11244427F2; Sun, 9 Apr 2023 17:29:53 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2078.outbound.protection.outlook.com [40.107.223.78]) by mails.dpdk.org (Postfix) with ESMTP id A7946410EF for ; Sun, 9 Apr 2023 17:29:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RPeUNAO5/SiA6QdTq8dHA2UXt6iXRkujjOVxi/bMkgchSw4fc4Nx2WTy06hejD3Xm8RaXL+xKD7ZWJVDuXeRbB92rSwOxsezvwpC+51THA5fT8GwXCeY3eDknMOjIQGfOjyEzH8ZM1EcC8nH5ZIit1WdK3MSut9EfMBTxbO1If2Sdr5LRqnbYoKTlyELsbQUywzG8/g+J7wRjTh6eki59eq/V9v3ZYdueNMztBnQ38nEsaCG+IFQ5AnZ9BRUjAoAhxUrFJYegbqBv+86M3SjuBPJdP4FlXYVUJTEDdeZQmFbeaCGKhEYav9MiHmv6QR/rlOvaqHFRz3u5nKdKlLNjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lrUkCjHAcAEV4W4ohMJz4gELzzP2Or6lkslr74eHVTM=; b=lE6D3Ppor+b+kadG//4rJBo6zPpWW3ur0HhPOMzTZVVdtIwR65fV3yRxce2uXwp7zdarxQ1XnfAkgQ4snToej7iycrTopw6Vi7j1i4zwUvkBtjF83ZBjJ/EVnTepV3hv7Z2fsiJOc2Joikppu54MHzEdh6sSedRyTeQsRlwAMdw4LKWklw2D0iVRliQrwYgDgXWysPJBO67oGorA6wjsicD+q7K5V12rZZwpGdJFNVfL9PnmaqEKNT8mIi9g+ZIQLT54jOnOTiP5doW+D2+5VJbbjWx8ds420yxtdne+lhpsWPsyGOUnHIhd8ZAQEGuRG1zncOyaadJMq5egJJhyVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lrUkCjHAcAEV4W4ohMJz4gELzzP2Or6lkslr74eHVTM=; b=S/YJDFjsx5TdgE9h6lsOuDjW7YYkPHeSmtmsZcueXrBFjFVS768ITAWPxH+0acbKyiiYjxezlrzp6jZZ7nBQhqjX7uwsNxVdk+5yTGmyQCc7N7FMtR3U7XUh9xWu3pvMsLULV0a5qeI9N3+H3T8P5T/+iTSdtbs3zqVh9LiqcTjL8eb/ywwvXBt/T4lxccMFk/LtoljaRDxuqpKs/6e1cN3JUnROXLlKH+uEDlsX4aKUqH6YRCFEVy71KJ6sl7hwcA/CRV8qLnOCmjCK7KCf73pcG+Du7OcXIBCzlJv/IYkw0Z0xjVY25HXcZIERzV2WJi3y2kay4+Tg53zNH3DvcQ== Received: from BN9PR03CA0710.namprd03.prod.outlook.com (2603:10b6:408:ef::25) by BY5PR12MB4968.namprd12.prod.outlook.com (2603:10b6:a03:1d2::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Sun, 9 Apr 2023 15:29:49 +0000 Received: from BN8NAM11FT065.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ef:cafe::ad) by BN9PR03CA0710.outlook.office365.com (2603:10b6:408:ef::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:29:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT065.mail.protection.outlook.com (10.13.177.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:29:48 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:29:39 -0700 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 9 Apr 2023 08:29:37 -0700 From: Xueming Li To: Kaiwen Deng CC: Song Jiale , dpdk stable Subject: patch 'net/ixgbe: fix IPv6 mask in flow director' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:55 +0800 Message-ID: <20230409152529.5308-48-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT065:EE_|BY5PR12MB4968:EE_ X-MS-Office365-Filtering-Correlation-Id: 762b63df-d641-4cd7-3df6-08db390f417e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /NxtNbxzfq8BpJLPlur4be4cUK6uU8wMWhpfeIa6rkBvPNQL+9FuN5c4oZV7j0CAYcLQMdOy0mvEEGI+Vn8FD8Totp+aatPupKhnsqFH+Q554zYypuGv8BrYQzzIi+vMrYFLTjUdBOl4OEyGx7mpPGcIYhEk5LMNOgIAXRgcFrwU33bDbKufS8KT2vVbnEBcAPj8l7JnwUjWBmDdtkTiI4gJmSMUGd5aOJV4hxwpLIt8v3nJe7+mddoA028kmv4rQnumqDG1TpMW3COmg/YgYNOu28C4TYYvpzijvIisKnsB97AAMdNQFptq9dHmUgf/ySx3NRJ8tKrI2xP2XJ2TH2dzYnd2D1iSUyozoBcnlE8yEwZAA4WMCm54HQ9zSaIe/LUHooX4pXOGkfG0NISTi9W4eopnbcSzInILIbS1TXYYD+ma3kxbUtX61BnqbKhBxUiG7p4stQtaT6SDpfU7GuIUQQCbX/iRpITgEPQJVBjcxj6V4FncF6kNGBBLsdjcPM95rxShv+Nw3tSyysQGWmkErWUP8TLGa6ip5QEXR17AhxbqrB25yRg4TjD45+PanVxGOCEr8pg+xUXxBriy4A/bI8VuV+3iDqePvXoyUWzSdZlnAeXMq3LjKiJdhEWvlu4goxA4KakDqMgdUveN1rAXYGOBUcg5Krp7PURLsBq7cvdJUQjKVgElmLrdF0Rdjd7NxI7cDe7uCBfzZYhAoteNCaWOUf6GzyK/+X82SZWZnJuMYJRkeo60jM/GKFENG4MNybiH7cDMLq+tm5igXx3dcaC9dQ+K8t+TGxFs1Gc= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(396003)(39850400004)(376002)(451199021)(36840700001)(46966006)(478600001)(7696005)(54906003)(316002)(53546011)(1076003)(26005)(16526019)(6286002)(186003)(6666004)(966005)(2906002)(4326008)(70586007)(70206006)(5660300002)(8676002)(6916009)(41300700001)(8936002)(82310400005)(7636003)(356005)(82740400003)(55016003)(86362001)(40480700001)(36756003)(47076005)(83380400001)(2616005)(426003)(336012)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:29:48.7111 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 762b63df-d641-4cd7-3df6-08db390f417e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT065.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4968 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/dc67b490e8485bc61fdc6d07352dd5242a5e9722 Thanks. Xueming Li --- >From dc67b490e8485bc61fdc6d07352dd5242a5e9722 Mon Sep 17 00:00:00 2001 From: Kaiwen Deng Date: Fri, 3 Mar 2023 12:52:26 +0800 Subject: [PATCH] net/ixgbe: fix IPv6 mask in flow director Cc: Xueming Li [ upstream commit 444505f933f197bd064c7f801fa86e88d5edfce5 ] Rules without addr mask cannot be created together in ixgbe when setting IPv6 addr mask to default value as 0. This commit is to change the default value of IPv6 addr mask as '0xFF'. Fixes: cba954b7beda ("net/ixgbe: enable IPv6 mask in flow rules") Fixes: 7d629cacedee ("net/ixgbe: enable IPv6 for consistent API") Signed-off-by: Kaiwen Deng Tested-by: Song Jiale --- .mailmap | 1 + drivers/net/ixgbe/ixgbe_flow.c | 16 ++++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.mailmap b/.mailmap index ea09ef90cb..e9ecebafc1 100644 --- a/.mailmap +++ b/.mailmap @@ -1247,6 +1247,7 @@ Smadar Fuks Solal Pirelli Solganik Alexander Somnath Kotur +Song Jiale Song Zhu Sony Chacko Sotiris Salloumis diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c index d2ba87df27..7cccbfddb3 100644 --- a/drivers/net/ixgbe/ixgbe_flow.c +++ b/drivers/net/ixgbe/ixgbe_flow.c @@ -1645,10 +1645,6 @@ ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev, memset(&rule->mask, 0xFF, sizeof(struct ixgbe_hw_fdir_mask)); rule->mask.vlan_tci_mask = 0; rule->mask.flex_bytes_mask = 0; - rule->mask.dst_port_mask = 0; - rule->mask.src_port_mask = 0; - rule->mask.src_ipv6_mask = 0; - rule->mask.dst_ipv6_mask = 0; /** * The first not void item should be @@ -1922,9 +1918,9 @@ ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev, /* check src addr mask */ for (j = 0; j < 16; j++) { - if (ipv6_mask->hdr.src_addr[j] == UINT8_MAX) { - rule->mask.src_ipv6_mask |= 1 << j; - } else if (ipv6_mask->hdr.src_addr[j] != 0) { + if (ipv6_mask->hdr.src_addr[j] == 0) { + rule->mask.src_ipv6_mask &= ~(1 << j); + } else if (ipv6_mask->hdr.src_addr[j] != UINT8_MAX) { memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, @@ -1935,9 +1931,9 @@ ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev, /* check dst addr mask */ for (j = 0; j < 16; j++) { - if (ipv6_mask->hdr.dst_addr[j] == UINT8_MAX) { - rule->mask.dst_ipv6_mask |= 1 << j; - } else if (ipv6_mask->hdr.dst_addr[j] != 0) { + if (ipv6_mask->hdr.dst_addr[j] == 0) { + rule->mask.dst_ipv6_mask &= ~(1 << j); + } else if (ipv6_mask->hdr.dst_addr[j] != UINT8_MAX) { memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:39.986689900 +0800 +++ 0047-net-ixgbe-fix-IPv6-mask-in-flow-director.patch 2023-04-09 21:45:38.649042200 +0800 @@ -1 +1 @@ -From 444505f933f197bd064c7f801fa86e88d5edfce5 Mon Sep 17 00:00:00 2001 +From dc67b490e8485bc61fdc6d07352dd5242a5e9722 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 444505f933f197bd064c7f801fa86e88d5edfce5 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 69b6f4de1d..5b42f87d1e 100644 +index ea09ef90cb..e9ecebafc1 100644 @@ -26 +28 @@ -@@ -1253,6 +1253,7 @@ Smadar Fuks +@@ -1247,6 +1247,7 @@ Smadar Fuks @@ -35 +37 @@ -index 79c84044af..eac81ee489 100644 +index d2ba87df27..7cccbfddb3 100644