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 B2A0343B7D for ; Tue, 5 Mar 2024 11:00:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ADF2B42E67; Tue, 5 Mar 2024 11:00:01 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2077.outbound.protection.outlook.com [40.107.93.77]) by mails.dpdk.org (Postfix) with ESMTP id 0F5714014F for ; Tue, 5 Mar 2024 11:00:01 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b5LvqQPmeKGFgL7RTSvOZFZZd9g9cFdygDtKwkHorDAAlW+FeG6EDXu4WTc0NSSkAOQlBey4mJUg2XWG/2VZJpSf2/0r2xat/8gYlViUnEdclFRDXWVvJNTEcSaS3rRG4bnscKrEGl3nbPpMil8eslb2ZjDrmiYRhcWzo8KkhyqpZCqM4jsO4O14GphM+NMcAMvmTdxf5Jhwd4aTS4DcccfFA+gYgDAz45/vj5SFffbaN2YzFjOI63JvcCWw3FFcKotSGllTtyuM+7Sl/yrUSbQsYJzeG+SRfX72gHdT4Rl/DIqlDWZtNh4DKYWclcoEiRaisaxLVh2h5OTt+tLgNA== 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=f/rDq0WP5NCr01VPDAGJZDgs+7UNThtHrAi0vO3LWFM=; b=WiOzclGET9d8KHlZvrutcbX7+u1OvM/kIvpWIeRF5FrvwxdN2edpBgdAf0Oqs1e6zopgyAvWNhOpquXR8S8+f/9pBp0CPNRvp7OGcecYJTttZYGVCdPfaNyVUG8D2R4UN8WzKcsHyvp/cS6568u9KmS/fhFBP7LMzClOvTdCCY1/Y8P0T0n/AqNNcKYP18lDjtn9Jo2DiwxoiAI9+YS9typbkbdWpDEliOxYMXt1+YzV3rO7BgAxCzba4Aaz+5/kjBfMwUOAnsWmyzS3dmMYfaq4UYcW7YEXChlGaJAQJUsbEgTokb6jO8575IRSZGfEdJWT7XNHsVgRHSjnXPK6lg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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 (0) 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=f/rDq0WP5NCr01VPDAGJZDgs+7UNThtHrAi0vO3LWFM=; b=MA85JvB+P7/kcm8qlmf5tEZYox9aMOj0/KKdq+eeDOCOJwKgm0cdFdh9AsDOXeV6RMZwj9lvfjHgY13V4LRrP4D3abDomzywClZaXKjSQ1L/oVinT/wpsdzlbOXD64xsPH5Kf8xdo0KBXvC2vn6WJvDk3K8SO/2+nNDi3Eosn+RZ4ZeNlpWdWRLkpkzB6IIP77m6cPZCXAAPIVLWOXFbjQj4siT/LR1vQg27z5y95VhxA2YUHpKTpQYY5uA97cT/ddCvHB6C9chL4Vucp7nNFx/gBO7LGzj8LchOz1vnLYZ/3AvPXuntzWPl23/kbMB4rPvUDujfol0ZfJTfrRSCLg== Received: from SN7PR04CA0014.namprd04.prod.outlook.com (2603:10b6:806:f2::19) by CH3PR12MB7521.namprd12.prod.outlook.com (2603:10b6:610:143::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:59:58 +0000 Received: from SA2PEPF00001508.namprd04.prod.outlook.com (2603:10b6:806:f2:cafe::c9) by SN7PR04CA0014.outlook.office365.com (2603:10b6:806:f2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38 via Frontend Transport; Tue, 5 Mar 2024 09:59:58 +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 SA2PEPF00001508.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:59:58 +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.41; Tue, 5 Mar 2024 01:59:43 -0800 Received: from nvidia.com (10.126.231.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.1258.12; Tue, 5 Mar 2024 01:59:41 -0800 From: Xueming Li To: Michael Baum CC: Suanming Mou , dpdk stable Subject: patch 'common/mlx5: fix query sample info capability' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:51 +0800 Message-ID: <20240305094757.439387-131-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: SA2PEPF00001508:EE_|CH3PR12MB7521:EE_ X-MS-Office365-Filtering-Correlation-Id: 288f2e42-6166-493d-cc13-08dc3cfb0462 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sP5rSUTL1j1Pt9M7n46RiFBNDpvZrtVhnh/2W+lj0+JC9peXgGAA/4maLFfjb8udDqiADBww8NlmX7nE2cmFOUPs7RzKyOJ5QYnGI7EUzn4n/taqVgQfK0ePHnnF35IxUO+E75CeGlCDI5ed8vCm3kRNyYz27PScZKpQOA7/5r1t7SNnHNQud/pa8Ap8+sXuFBbVTbtGOBw0HFRy8vUmicChjH5wqRNWy3DVvDHuXB2ii0bkiLMshnSJmHxEhcxtbnykzsfqVMAJ2445gF4CgNsfOpaKJlVEdEQThFbiTx8O9pHn2norEUzBHcjqdDMESUp4ZcgihKqSU4OP9mMx0AWYsImLCUdWceOL90Ed+UI/QbumNKDtmKJPLtC29kWSeE2bwRNBBU+jkm443iDDcBj5nQMLXzVTQ2YOBTdvzwACe5PhloO1HFTbNY/USyiOpShFroG4JRkUvP/atWSaSHmgy2gHqbSC+cGhZXWgGgN+MtgbS8oIKd1Oo1jYo+kQ7BYaA9uIm+r8f2TzutYjYVbOsT6sfZYYsdcXtglyZgc2ji0pO+gLtlmMNE2lVFv1wwXC54dAOri7xwe5JSp1rrlFyZM4KIBjFGDku3TynPaZatmXd3YI6YQ7SW1DF64slxTOmSgauy7GD1nd16zHTLKzmFGPQ04yoDVm2cNKDpNPNd69Hhj7BkWSacxxsDEqzfzveJRNuYzx2CyBOsM9oXQff6BU5ZVDqRN+xKy5halA9wPpDN8g4SxPekbv0unY 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:(13230031)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:59:58.6559 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 288f2e42-6166-493d-cc13-08dc3cfb0462 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: SA2PEPF00001508.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7521 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 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=06c494555fd6840d4de23b5fac2bd9c316c43a26 Thanks. Xueming Li --- >From 06c494555fd6840d4de23b5fac2bd9c316c43a26 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Thu, 25 Jan 2024 15:30:22 +0200 Subject: [PATCH] common/mlx5: fix query sample info capability Cc: Xueming Li [ upstream commit e9b1de285341732fde15a621bf01e2372ec88911 ] Query sample info operation might be used by either Geneve TLV option or parse graph. Each operations can be supported regardless to another according the configured profile. In current implementation, the query sample info capability is turn on only when parse graph operation is supported adding unnecessary requirement for Geneve TLV option. This patch adds different cap for Geneve TLV option. Fixes: bc0a9303ed6a ("net/mlx5: adopt new sample ID") Signed-off-by: Michael Baum Acked-by: Suanming Mou --- drivers/common/mlx5/mlx5_devx_cmds.c | 6 ++++-- drivers/common/mlx5/mlx5_devx_cmds.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c index 41f6e0a727..3eeb27fc3f 100644 --- a/drivers/common/mlx5/mlx5_devx_cmds.c +++ b/drivers/common/mlx5/mlx5_devx_cmds.c @@ -965,6 +965,8 @@ mlx5_devx_cmd_query_hca_attr(void *ctx, max_geneve_tlv_options); attr->max_geneve_tlv_option_data_len = MLX5_GET(cmd_hca_cap, hcattr, max_geneve_tlv_option_data_len); + attr->query_match_sample_info = MLX5_GET(cmd_hca_cap, hcattr, + query_match_sample_info); attr->qos.sup = MLX5_GET(cmd_hca_cap, hcattr, qos); attr->wqe_index_ignore = MLX5_GET(cmd_hca_cap, hcattr, wqe_index_ignore_cap); @@ -1094,8 +1096,8 @@ mlx5_devx_cmd_query_hca_attr(void *ctx, (ctx, &attr->flex); if (rc) return -1; - attr->flex.query_match_sample_info = MLX5_GET(cmd_hca_cap, hcattr, - query_match_sample_info); + attr->flex.query_match_sample_info = + attr->query_match_sample_info; } if (attr->crypto) { attr->aes_xts = MLX5_GET(cmd_hca_cap, hcattr, aes_xts) || diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h b/drivers/common/mlx5/mlx5_devx_cmds.h index 7f23e925a5..b814c8becc 100644 --- a/drivers/common/mlx5/mlx5_devx_cmds.h +++ b/drivers/common/mlx5/mlx5_devx_cmds.h @@ -315,6 +315,7 @@ struct mlx5_hca_attr { uint32_t flow_counter_bulk_log_granularity:5; uint32_t alloc_flow_counter_pd:1; uint32_t flow_counter_access_aso:1; + uint32_t query_match_sample_info:1; uint32_t flow_access_aso_opc_mod:8; uint32_t cross_vhca:1; uint32_t lag_rx_port_affinity:1; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:34.876616929 +0800 +++ 0130-common-mlx5-fix-query-sample-info-capability.patch 2024-03-05 17:39:31.053566502 +0800 @@ -1 +1 @@ -From e9b1de285341732fde15a621bf01e2372ec88911 Mon Sep 17 00:00:00 2001 +From 06c494555fd6840d4de23b5fac2bd9c316c43a26 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e9b1de285341732fde15a621bf01e2372ec88911 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index faa38a9f95..9b1cfcc135 100644 +index 41f6e0a727..3eeb27fc3f 100644 @@ -51 +53 @@ -index 4a6008dc1a..0c5727b669 100644 +index 7f23e925a5..b814c8becc 100644 @@ -54 +56 @@ -@@ -316,6 +316,7 @@ struct mlx5_hca_attr { +@@ -315,6 +315,7 @@ struct mlx5_hca_attr {