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 15B23A0A0E for ; Mon, 10 May 2021 18:13:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0D54D410FF; Mon, 10 May 2021 18:13:28 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2083.outbound.protection.outlook.com [40.107.94.83]) by mails.dpdk.org (Postfix) with ESMTP id B227540140 for ; Mon, 10 May 2021 18:13:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f+TkvGOeEJTqGcTgGvCZPT7oNVGK5jYCqYmjKwwP3TgWV9kylASPyVE0bigf9kCjrAD3Xh1U/mS5o6HjcPwbSXWsk86hnJ/fu51JlxGSg/x4QlQ5OLGg1uSt7h9UJqOCKqlaTYyqcy031TIXRU4awbPLNW5YllBEqNm4A7TPMmkFEeQAVsrqZ/FmO9nZZ/jDcCIBai1Hkk08iO3wkWIhRXsMIvmVOk2MuYBpCT8v4Q2kPkasK+f2srrwzjis3dpVpc512xNRPlsVf0HFgcgvQgm98Qo5xNIx/NkEqSXKmtUkbDiZGKeAfqON52Xe90EzX+COYzkJNMFD2VR3iACsxw== 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-SenderADCheck; bh=T1gBxje7kFFVSEyvasphs/2RhOXlkVerN9FSxgoO28U=; b=h/CBrz5n4rwCdMBZZ9wtMm53KoF3DPJa/l7gWBK5KKY0iiF5aqq6uWbqW79XLh+JmOcl192OhZo4Bcpp6rYpo39Dln8Ed/B91kREVVif+U/6y/QKwSUSOa5CkooPo4JDWVwc80yeKq82qCsbrf6IGgz4sj13Xmu0pL4FZ5Tv0xy/29PmL/lzBWP6eec/3IZuQ0sLvWb1iS0WCke9t3lP74Yn0bh/v+lUdbnQ6S8OwAPscgfEoP9+wXuvslw9wrWv8IFIteMtV8TTzFR9V1bAWoDqVpwRy0cVFxVH4jzFjtYtq9S/mADEW6UM5vcf67NMkRGoqgCfH17Jgo1by3YMSQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=T1gBxje7kFFVSEyvasphs/2RhOXlkVerN9FSxgoO28U=; b=cAYiuouQpeB94ndkCEjPPIbLTU0A0zhanKPIL6XyB5TJi2Su39ybAusy/MvjOmBkLx3K0GXnniL7ovK0oKdfsq10/9knNw9o6n9ysR1JH6tgqvXKcewejsL9fz7UKyXqci5zpaQRGZwRRdwV3Tc3L7kN8twx6QUjvPjxHQm4ZYgacs0ypkloWITmfF1Zhy2KgwPESij6ZdIoaZmqKB46EfVCJuQ1EcJcR2bBkOXRpCIhRkzN0n3lAcnBWxp67a2DE11YW0rjlX23Z04ZZkX0yIPQdHQwXnXuBvhpl6Cg36zwW/LRpTM/rRiAV39CfAwbugm8+PVFVWUmQe2/xPDIlg== Received: from MW4PR03CA0204.namprd03.prod.outlook.com (2603:10b6:303:b8::29) by BN9PR12MB5147.namprd12.prod.outlook.com (2603:10b6:408:118::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.27; Mon, 10 May 2021 16:13:23 +0000 Received: from CO1NAM11FT053.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b8:cafe::52) by MW4PR03CA0204.outlook.office365.com (2603:10b6:303:b8::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:13:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT053.mail.protection.outlook.com (10.13.175.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:13:23 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:13:20 +0000 From: Xueming Li To: Li Zhang CC: Luca Boccassi , Viacheslav Ovsiienko , dpdk stable Date: Tue, 11 May 2021 00:00:51 +0800 Message-ID: <20210510160258.30982-102-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ec025b2c-a473-4d9c-4960-08d913ce8930 X-MS-TrafficTypeDiagnostic: BN9PR12MB5147: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tOLeFs8ac8aZHcVNAHEfheMuy8Gc1PuoNSMwxD1Dz2MG2LYCku5Xhxe8ZdhYmjnn8yZ0BK67s7B/Zgi2FIqhf8Jraob/1yuPvGBrBFwmXJigYqZqRFFG4Qr2dzDXNQ2kDLnDg2NdOfTy018IKfb2GyRgtzMYvOSv0o19ur+w9u8PddggzQBehWo2u3J9E8gsB5otU1HNV7/S1fLZyNOK18PHn5U1Aouh1Bhbaf5KYHTUfcPfAEzVPj9Ht582BnlvqklI5pzsnxPYy7uN7Vv8s2ep3HNuR+Dc2XbZIVwFjYRuMYfTKffB75H9igdEjRvfBPgMXPHMlz3+ZbnhnLYtgE+zuvGsykioAgOLFHX8muQ3ouzekJnO3fLdRI3jZFi6REcIVAG6Tx1DjmEJ/nrsl4BIHxXuM++7H7wV3KXrxi+SBtsf6VeQeY9+Afa5ZI9flwwHcMsJvm+9WXL5DqYDChHw3PXNvvDRp950RWbYiaycT57WE1M6M1v5cKwYLbFHy5M2GyXg7JAnuAl3z77zLceVbb0ZgPMXMFwCbFb1mjkKFaj4FoUDBAKVewnzHCnpTND3vJeYyLRYGZy1r4jnsHDyWCZaM7svRSJTtLSNC+9CrUjdJHsXa5+ntH3bEPmBmVNGVyk7sFkKcFlk5mE03TTCWnjIZxFUquWtd6+fnfw3uWkZUQAL89m1IjFOOK603zY0FIP7WvduiuKZ/Lc38SidG3nKXchS87Ry1RdDBDEyUw6EHhcNEmkyGLiiKKuB3uUV+vZ+jKrairUW8ziuHg== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(396003)(376002)(346002)(39860400002)(46966006)(36840700001)(54906003)(966005)(83380400001)(316002)(4326008)(426003)(6666004)(336012)(6862004)(47076005)(478600001)(356005)(186003)(36906005)(5660300002)(2616005)(7636003)(82740400003)(82310400003)(7696005)(36860700001)(8676002)(1076003)(86362001)(55016002)(2906002)(36756003)(70586007)(70206006)(6636002)(8936002)(6286002)(26005)(53546011)(37006003)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:13:23.4460 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ec025b2c-a473-4d9c-4960-08d913ce8930 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT053.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5147 Subject: [dpdk-stable] patch 'net/mlx5: fix flow actions index in cache' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 05/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/229101313919b163516238b0d858dba9ff12a654 Thanks. Xueming Li --- >From 229101313919b163516238b0d858dba9ff12a654 Mon Sep 17 00:00:00 2001 From: Li Zhang Date: Tue, 16 Mar 2021 14:05:17 +0200 Subject: [PATCH] net/mlx5: fix flow actions index in cache Cc: Luca Boccassi [ upstream commit d406aba8f1e8568c1bf0b1aad1d5756cead5df21 ] When using port id or push VLAN action index to find the action in cache, it will fail to find actions. The root cause is the index is not saved in cache when creating the port id action or push vlan action. To fix these issues, update the index in cache when creating. Fixes: 0fd5f82aaa07 ("net/mlx5: make port ID action cache thread safe") Fixes: 3422af2af2e4 ("net/mlx5: make push VLAN action cache thread safe") Signed-off-by: Li Zhang Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 353a8df24c..347c3a1c13 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -3039,6 +3039,7 @@ flow_dv_port_id_create_cb(struct mlx5_cache_list *list, "cannot create action"); return NULL; } + cache->idx = idx; return &cache->entry; } @@ -3130,6 +3131,7 @@ flow_dv_push_vlan_create_cb(struct mlx5_cache_list *list, "cannot create push vlan action"); return NULL; } + cache->idx = idx; return &cache->entry; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:29.260567300 +0800 +++ 0103-net-mlx5-fix-flow-actions-index-in-cache.patch 2021-05-10 23:59:26.480000000 +0800 @@ -1 +1 @@ -From d406aba8f1e8568c1bf0b1aad1d5756cead5df21 Mon Sep 17 00:00:00 2001 +From 229101313919b163516238b0d858dba9ff12a654 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit d406aba8f1e8568c1bf0b1aad1d5756cead5df21 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 1a74d5ac2b..23e5849783 100644 +index 353a8df24c..347c3a1c13 100644 @@ -26 +28 @@ -@@ -3612,6 +3612,7 @@ flow_dv_port_id_create_cb(struct mlx5_cache_list *list, +@@ -3039,6 +3039,7 @@ flow_dv_port_id_create_cb(struct mlx5_cache_list *list, @@ -34 +36 @@ -@@ -3703,6 +3704,7 @@ flow_dv_push_vlan_create_cb(struct mlx5_cache_list *list, +@@ -3130,6 +3131,7 @@ flow_dv_push_vlan_create_cb(struct mlx5_cache_list *list,