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 924C942D46 for ; Sun, 25 Jun 2023 08:43:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8E06641143; Sun, 25 Jun 2023 08:43:45 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2075.outbound.protection.outlook.com [40.107.102.75]) by mails.dpdk.org (Postfix) with ESMTP id 637EE40A7F for ; Sun, 25 Jun 2023 08:43:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WyFDUA62wW0KrHLwb3KgE7mfr2ysQo1034JHH4/f7ZaLr5LFDX3biqNCKkgUTEG/2PYaF3/L2TN5B0IN5WXqxGM0UbULTsk9Hpqnbs8NfKTkJzaY1DR/ZJZpBp9xVjEbFT2C0wEFokw5WXCsL46mrAHclHvWqA9hqsQWA6oyt2tuvHyUwA6O5VcNorw516ScE5tgHOCdATmIrn4fzWiJJvCrsw1Vw4Tll1bi7kadNqZkHT6IQKwpENx83vAu3x9VTuw70XK4TXqDZLIi6H1195FjqSMjlW5kf5vLbLFPP7/uHiiNA4VqWOiNfSmUURZcBHEiTrziRF8cPsG+JFvmSA== 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=WMqE9PsIbaTmbwPBxsAeNU8iHBLMehqk/fwUfW0immQ=; b=dZusP4ZarGaKCd1Oh/+ex/tNc3GigR9zmCyDAMoq4Js9Q+2xzerQ6EeZn5y/7J9Kg0lp/hAizwIQ8NlKHh5yQ6Y/xXV+QTDkM1P4nejPt3yaj729e2rJv0AR1SI28yL5EvmGigltji9s+ireKgcABBzhrICi/d8iVO+8VHGudI8B48HfA2VQ0MVtRgH9vmEH76U62nyaV3x+Vwyaz32pM2OK8K12AJna5cEts5QOiI0MK4qzjb4rRqelN4TA6RqWkstyKjZKan67eEHH9ZWgzF3BhUhoJFPHRTTqBWS+gtEQKlzlyFQ+izQsGzbl6LKsgKzvXBCYZmswXA3JPWsYFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org 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=WMqE9PsIbaTmbwPBxsAeNU8iHBLMehqk/fwUfW0immQ=; b=AKQxosCDtxmMqSDGDvvlicST9PatyKAMaWmNE3W+W8pf438s9kUyiHDjqgrLOOYsmUfjmadq9P6xmSC/NfeK6KdooBer3ibuI+K6otYA1/bSDVdd20eQOMlkmo3OL39AYfqPQnFwC0n7fuov8FGDe1Sha9KJ5bWmHBhREo1HSSQl0/uGtgVHWyf+j1n+n85KBOU5FaNakTBlWVWeagXuHzkdeNaCDSH5SmvMzyocU16RCxArO5RZ1gH3wJjmXR6QDGr/D343aqIIzf3iIu8RW+/sIZnBRAGEaP8sm98qijyCiAKMXvwnPYoIfD73/xgQja82pim34ReeB/sfZGOtTQ== Received: from BN9PR03CA0361.namprd03.prod.outlook.com (2603:10b6:408:f7::6) by BL1PR12MB5304.namprd12.prod.outlook.com (2603:10b6:208:314::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Sun, 25 Jun 2023 06:43:41 +0000 Received: from BN8NAM11FT066.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f7:cafe::b5) by BN9PR03CA0361.outlook.office365.com (2603:10b6:408:f7::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:43:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT066.mail.protection.outlook.com (10.13.177.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:43:41 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:43:29 -0700 Received: from nvidia.com (10.126.230.35) 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; Sat, 24 Jun 2023 23:43:27 -0700 From: Xueming Li To: Rongwei Liu CC: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix VXLAN matching with zero value' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:07 +0800 Message-ID: <20230625063544.11183-90-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT066:EE_|BL1PR12MB5304:EE_ X-MS-Office365-Filtering-Correlation-Id: 2356219c-4f5e-4bd1-c5ec-08db754783c4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AxOpy82uGnIzjj76uF9f2FQzZ26xtgSMRB0UbfUeZCoWpeIkSpVJRVgML0U2BcdH9qJuWcmi9ddfJOF7BNfzYyrk+RDwYfNtH5NyTiFjZy41Sk4gmXHKqAlk39ick0DvzPrkOptDNYEh/VzXL2NCxtrqRh33QEsvqDZ/z+ngCEB5xFJmOv7GEBz28VdX0EYfakYk27Ffylg8hx0MNF3Hji9JrZWVZK3hoZBOvQfHvPCokKehZ8mbcrm2+lVBPHFvs1Jqyoh18Q5Lf09F9IZ7l1D5UeyaToYPQ6fY/kTNTYykYkbI56RkpxgG958mS0dwu/M8PqjM3zEUxy0Ng5tM2KnknRf1ltnnPqv0+BGWy7TlCaDHerzRKO9Hw7/sMZwYTAyQg6HgGhxvoDkwrC2LR7BeUQ1LIHe52ee1uuMWeZcYWl2twbo5yfibYUNPgjk5IYupJgxuDrRBelAIA3/q+2eQ05OIxlUQncidIVMMydY/f34U3HNlKR1CoHx+u+AZfG4DMCsTPVit8pZA/O3/DJd9lFBdrMmThdAjwcXn6PRaWNz71vnrQaubscbpVdqYIIo8im8Te1mItg5YtS0DUpJkskfRppRVUFoNvJiIRA400ETL9IYh5sgjWVcjzSi2LEUzEhnYARBe95zMykkCUYyZn3krdAHZolCqXIfRVFLLMR32K+06FtkghdaCVlmsmTOCCzhaXcw/yePK4DMNHQv/7ZQwqReSAorR0pZmHn27n5qwscs/sh107MInGhHWfg9ZaMZcLdDRDU5hS/gBGA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(376002)(39860400002)(451199021)(46966006)(36840700001)(40470700004)(40460700003)(2906002)(82310400005)(82740400003)(336012)(7636003)(6666004)(2616005)(356005)(186003)(83380400001)(53546011)(426003)(1076003)(16526019)(6286002)(47076005)(26005)(966005)(36860700001)(37006003)(40480700001)(55016003)(41300700001)(7696005)(86362001)(54906003)(478600001)(316002)(70586007)(70206006)(36756003)(4326008)(6636002)(5660300002)(8936002)(6862004)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:43:41.4864 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2356219c-4f5e-4bd1-c5ec-08db754783c4 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT066.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5304 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.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 06/27/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/commit/?h=22.11-staging&id=eb02902423e140d7a9627bb377026ded42628fe1 Thanks. Xueming Li --- >From eb02902423e140d7a9627bb377026ded42628fe1 Mon Sep 17 00:00:00 2001 From: Rongwei Liu Date: Tue, 16 May 2023 08:40:53 +0300 Subject: [PATCH] net/mlx5: fix VXLAN matching with zero value Cc: Xueming Li [ upstream commit 40c78a1f76cdbf9d0e1002d603b5d381d2e0a6b4 ] When an application wants to match VxLAN last_rsvd value zero, PMD sets the matching mask field to zero by mistake and it causes traffic with any last_rsvd value hits. The matching mask should be taken from application input directly, no need to perform the bit reset operation. Fixes: cd4ab742064a ("net/mlx5: split flow item matcher and value translation") Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 12db56f173..485afdf5ca 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9223,12 +9223,10 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev, { const struct rte_flow_item_vxlan *vxlan_m; const struct rte_flow_item_vxlan *vxlan_v; - const struct rte_flow_item_vxlan *vxlan_vv = item->spec; void *headers_v; void *misc_v; void *misc5_v; uint32_t tunnel_v; - uint32_t *tunnel_header_v; char *vni_v; uint16_t dport; int size; @@ -9280,24 +9278,11 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev, vni_v[i] = vxlan_m->vni[i] & vxlan_v->vni[i]; return; } - tunnel_header_v = (uint32_t *)MLX5_ADDR_OF(fte_match_set_misc5, - misc5_v, - tunnel_header_1); tunnel_v = (vxlan_v->vni[0] & vxlan_m->vni[0]) | (vxlan_v->vni[1] & vxlan_m->vni[1]) << 8 | (vxlan_v->vni[2] & vxlan_m->vni[2]) << 16; - *tunnel_header_v = tunnel_v; - if (key_type == MLX5_SET_MATCHER_SW_M) { - tunnel_v = (vxlan_vv->vni[0] & vxlan_m->vni[0]) | - (vxlan_vv->vni[1] & vxlan_m->vni[1]) << 8 | - (vxlan_vv->vni[2] & vxlan_m->vni[2]) << 16; - if (!tunnel_v) - *tunnel_header_v = 0x0; - if (vxlan_vv->rsvd1 & vxlan_m->rsvd1) - *tunnel_header_v |= vxlan_v->rsvd1 << 24; - } else { - *tunnel_header_v |= (vxlan_v->rsvd1 & vxlan_m->rsvd1) << 24; - } + tunnel_v |= (vxlan_v->rsvd1 & vxlan_m->rsvd1) << 24; + MLX5_SET(fte_match_set_misc5, misc5_v, tunnel_header_1, RTE_BE32(tunnel_v)); } /** -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.890993700 +0800 +++ 0089-net-mlx5-fix-VXLAN-matching-with-zero-value.patch 2023-06-25 14:31:58.495773900 +0800 @@ -1 +1 @@ -From 40c78a1f76cdbf9d0e1002d603b5d381d2e0a6b4 Mon Sep 17 00:00:00 2001 +From eb02902423e140d7a9627bb377026ded42628fe1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 40c78a1f76cdbf9d0e1002d603b5d381d2e0a6b4 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index e7a2ae933c..9ef9f13cbb 100644 +index 12db56f173..485afdf5ca 100644 @@ -25 +27 @@ -@@ -9470,12 +9470,10 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev, +@@ -9223,12 +9223,10 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev, @@ -38,2 +40,2 @@ -@@ -9527,24 +9525,11 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev, - vni_v[i] = vxlan_m->hdr.vni[i] & vxlan_v->hdr.vni[i]; +@@ -9280,24 +9278,11 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev, + vni_v[i] = vxlan_m->vni[i] & vxlan_v->vni[i]; @@ -45,3 +47,3 @@ - tunnel_v = (vxlan_v->hdr.vni[0] & vxlan_m->hdr.vni[0]) | - (vxlan_v->hdr.vni[1] & vxlan_m->hdr.vni[1]) << 8 | - (vxlan_v->hdr.vni[2] & vxlan_m->hdr.vni[2]) << 16; + tunnel_v = (vxlan_v->vni[0] & vxlan_m->vni[0]) | + (vxlan_v->vni[1] & vxlan_m->vni[1]) << 8 | + (vxlan_v->vni[2] & vxlan_m->vni[2]) << 16; @@ -50,3 +52,3 @@ -- tunnel_v = (vxlan_vv->hdr.vni[0] & vxlan_m->hdr.vni[0]) | -- (vxlan_vv->hdr.vni[1] & vxlan_m->hdr.vni[1]) << 8 | -- (vxlan_vv->hdr.vni[2] & vxlan_m->hdr.vni[2]) << 16; +- tunnel_v = (vxlan_vv->vni[0] & vxlan_m->vni[0]) | +- (vxlan_vv->vni[1] & vxlan_m->vni[1]) << 8 | +- (vxlan_vv->vni[2] & vxlan_m->vni[2]) << 16; @@ -55,2 +57,2 @@ -- if (vxlan_vv->hdr.rsvd1 & vxlan_m->hdr.rsvd1) -- *tunnel_header_v |= vxlan_v->hdr.rsvd1 << 24; +- if (vxlan_vv->rsvd1 & vxlan_m->rsvd1) +- *tunnel_header_v |= vxlan_v->rsvd1 << 24; @@ -58 +60 @@ -- *tunnel_header_v |= (vxlan_v->hdr.rsvd1 & vxlan_m->hdr.rsvd1) << 24; +- *tunnel_header_v |= (vxlan_v->rsvd1 & vxlan_m->rsvd1) << 24; @@ -60 +62 @@ -+ tunnel_v |= (vxlan_v->hdr.rsvd1 & vxlan_m->hdr.rsvd1) << 24; ++ tunnel_v |= (vxlan_v->rsvd1 & vxlan_m->rsvd1) << 24;