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 EA0E5A0A0C for ; Thu, 1 Jul 2021 09:16:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82660412B2; Thu, 1 Jul 2021 09:16:23 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2078.outbound.protection.outlook.com [40.107.100.78]) by mails.dpdk.org (Postfix) with ESMTP id 7DABA412AB; Thu, 1 Jul 2021 09:16:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fZA7ou7z079yInH7WKR6TfLipQq280lPln76UzMaO3sAeu8DybJf3qohm14OoUQh5fzVoasXuQ00DPCxX0gCys3Q23Yym5ZNVhQ20GbZEpmQ1TcR2TwwgqihnZE7k7hHSCChP18hJk0g31QZDJ7KtdCZ640xTf0+POzKRqzn8oohQZBlO7PcjOhGq6tqEniygfcQSjQph3fFIxmi1hpt50P2t6fIwecqg7/Zvor0D8uGg8xpuqvtihDCgj8QfqNdbUyzKD31imy/a/ORLbOS8FrQqGbWNliar8+aBFVBH7s4JTcghbznKGkW/fBqV1UrIyBYh4zSF55+MVFlYtGYAg== 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=plZ0/pKXaz1eKGJ6ThbdBI9W/zPsCE36d83n5rB9i2E=; b=nbOmk+PTkcalt7DhB/1W2DObvO4YfWRT+9DQ3Jy5rXsi7GbA5IsRjq0NmpPcUK70M9ODnxtS6Cqtb1tWaykq2viqSkpGVskTwlZIOuFp5OrJDvjs4lN0pO5H83ebR/nAcTHSTpsSTepTZ4wGwO1Ci/bXddgsVnfVj6Nx5mw6kqPXLsbeJpQQZdA6Yt1eZd5mtwyEIuAS91eehML8k6PDNK+r2xzFNBPk481cLDaeTVKgVlUwVNA9PjNEDX42IGEDfPh6xGZlEx92KsViD9ooIsYCd09G4mY3ZOSAX2/Z5Rg/twIjyT7641zu16TbKz6umZhGHfQYVho7LDsH3/MlTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=redhat.com 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=plZ0/pKXaz1eKGJ6ThbdBI9W/zPsCE36d83n5rB9i2E=; b=XQNx+MEsB93KviCqgnLYr8J2rs+sYWJZ8bLgs0dgnVhj1wPI1zFdLmGzN86rjJvE9MG8z+P/NC188EBgpKa1imLkenN1kGXBWR7UnoUOYCz7rxwkebG4Z3wkKDbIu4nFjV3BrCdS4Kev4Sfqn91yk0w5iYFNgceNDAMSvg0xYMrbQBbYuFShWoeb+FXUSvD/3qlBMfn/rFGmSf70kXOFJjQB4iqxyJfirUwTtBAlJx4IZeknitCJMSe6FGVUbV5cR2m/Z5G2cLrE14+tBobyM0cnI8Acv1JpOakPKU/7PxDHmJfOnrEymkQXrmcWIpHD0dW0eag0FP4tD84Iz7R5tQ== Received: from BN6PR1401CA0021.namprd14.prod.outlook.com (2603:10b6:405:4b::31) by BL1PR12MB5377.namprd12.prod.outlook.com (2603:10b6:208:31f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.20; Thu, 1 Jul 2021 07:16:19 +0000 Received: from BN8NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:405:4b:cafe::27) by BN6PR1401CA0021.outlook.office365.com (2603:10b6:405:4b::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.21 via Frontend Transport; Thu, 1 Jul 2021 07:16:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; 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 BN8NAM11FT034.mail.protection.outlook.com (10.13.176.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4287.22 via Frontend Transport; Thu, 1 Jul 2021 07:16:19 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 1 Jul 2021 07:16:13 +0000 From: Viacheslav Ovsiienko To: CC: , , , , Date: Thu, 1 Jul 2021 10:15:52 +0300 Message-ID: <20210701071552.3339-2-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210701071552.3339-1-viacheslavo@nvidia.com> References: <20210701071552.3339-1-viacheslavo@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bc045eee-9f65-4aa1-5387-08d93c601f8d X-MS-TrafficTypeDiagnostic: BL1PR12MB5377: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4oI1KTyLgDI8s7Z0ajf+lGfcT/Tw3Aq0wKM6RIIuRZG9pKY718hxLbFN58iwVfTLDci8Bm48DdXb0XtYjypvpmhb9k4OuvW6H0llYVIpr4fftuw3pPkxpw0YptnEisiepZpMdlBP0EHL9VPKtaxNPAmZoPIuM6jd7oJL7kfspxLQQw20OqRu+857usiH8TsaxMm7Y8t69yz8J1TqZgYCfhFiqXqG1u9ipR0PxkBblZe4WpemHKKxRR3HycHZsEKqa8HRmk0EXZs2DqcrfCSjkkVhmjyFbHwEuQVoh7zwfTVPPRPBbhUljFfW+O1IcqyXfHeFd5zKsuIaBV1n8EooP2gHNJr5FCvF3a2Ocb8ZNRo+wlU5I1ZxNlZdmuaglUbnxIiAfTNHH3cI7z1qpMOsCAKoTZiqcftzydjxJ9RTLezLEqFfmLw5yL7NdJIDeSxQPkiPgudr7Bkcyol7jxbWTwNw2IBooQOV0Tl+W/ukqBlmUZ/jPok+55K8emEHh3yTbjqv23jJbVTlM5zsFw0ohjfRmhFLTHRsjB3/ed/x5HfXfVOkocY2eUKJLPe8fD3jZCUsiTUPc2jOVF18Pj7Xnt50G79I/5nsE4qw+0cgaemUgVMN9R/NYNjWfWwA5mKLcTBG1r9yAT8W23Gjg9reInkVQ1vym7KG/t3xuh6tox/nYtmgM92Cl3pQdPUS/9rGHuYBqlj8YHjJbiMxcSZOow== 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)(39860400002)(376002)(346002)(46966006)(36840700001)(26005)(86362001)(7636003)(316002)(1076003)(83380400001)(8936002)(2616005)(36906005)(6666004)(4326008)(70206006)(54906003)(70586007)(478600001)(6286002)(55016002)(36860700001)(47076005)(7696005)(6916009)(336012)(2906002)(82310400003)(82740400003)(16526019)(5660300002)(356005)(426003)(186003)(8676002)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2021 07:16:19.1169 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bc045eee-9f65-4aa1-5387-08d93c601f8d 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: BN8NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5377 Subject: [dpdk-stable] [PATCH v3 2/2] common/mlx5: fix compilation flag on port query API 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" There is the compilation flag HAVE_MLX5DV_DR_DEVX_PORT that depends on presence of mlx5dv_query_devx_port routine in rdma-core library. The mlx5dv_query_devx_port routine is vendor specific, exists only in OFED version of rdma-core library and there are the plans to remove the routine and replace one with Upstream compatible mlx5dv_query_port version. As mlx5dv_query_devx_port is being removed we should reconsider all the dependencies on the HAVE_MLX5DV_DR_DEVX_PORT compilation flag and introduce the new dedicated compilation flags as needed. Fixes: 6cfe84fbe7b1 ("net/mlx5: fix port action for LAG") Cc: stable@dpdk.org Signed-off-by: Viacheslav Ovsiienko Acked-by: Matan Azrad --- drivers/common/mlx5/linux/meson.build | 2 ++ drivers/common/mlx5/linux/mlx5_glue.c | 2 +- drivers/net/mlx5/mlx5_flow_dv.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build index 5a0ee51b37..5cea1b44d7 100644 --- a/drivers/common/mlx5/linux/meson.build +++ b/drivers/common/mlx5/linux/meson.build @@ -95,6 +95,8 @@ has_sym_args = [ 'mlx5dv_query_devx_port' ], [ 'HAVE_MLX5DV_DR_DEVX_PORT_V35', 'infiniband/mlx5dv.h', 'mlx5dv_query_port' ], + [ 'HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT', 'infiniband/mlx5dv.h', + 'mlx5dv_dr_action_create_dest_ib_port' ], [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h', 'mlx5dv_devx_obj_create' ], [ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h', diff --git a/drivers/common/mlx5/linux/mlx5_glue.c b/drivers/common/mlx5/linux/mlx5_glue.c index 38b174aa31..00be8114be 100644 --- a/drivers/common/mlx5/linux/mlx5_glue.c +++ b/drivers/common/mlx5/linux/mlx5_glue.c @@ -391,7 +391,7 @@ mlx5_glue_dr_create_flow_action_dest_flow_tbl(void *tbl) static void * mlx5_glue_dr_create_flow_action_dest_port(void *domain, uint32_t port) { -#ifdef HAVE_MLX5DV_DR_DEVX_PORT +#ifdef HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT return mlx5dv_dr_action_create_dest_ib_port(domain, port); #else #ifdef HAVE_MLX5DV_DR_ESWITCH diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 62edc4fa85..c5d4b01e57 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -10342,7 +10342,7 @@ flow_dv_translate_action_port_id(struct rte_eth_dev *dev, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "No eswitch info was found for port"); -#ifdef HAVE_MLX5DV_DR_DEVX_PORT +#ifdef HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT /* * This parameter is transferred to * mlx5dv_dr_action_create_dest_ib_port(). -- 2.18.1