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 826CDA0C4E for ; Wed, 7 Jul 2021 17:54:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 510084156C; Wed, 7 Jul 2021 17:54:52 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2073.outbound.protection.outlook.com [40.107.96.73]) by mails.dpdk.org (Postfix) with ESMTP id 2DEE741567; Wed, 7 Jul 2021 17:54:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CARoVq99ph2VJGDs2tlX8wAWrFzTQ/8EyqW/sMaZwp5UiLfZdY40eFJ2obCpF5x3rzTJST9Ugx8T5WfYpMVmCBvYJGRNzJB3VwTUsHQ6VtOSM8Qie0IFBpsJT30nMlrZK4Kd1Ow1PcLz1KyylFkIM0l3whO7O8nC80Bl577+9+YW+UZo9J7pppNXQPftPGuyHzQZPGni2InXMrW8FoDerzRI45LV33kySwiujl3XjufpKOG2kCdK9IxGhicBletTNeEYffinCvRVuQHweciQnqwuZ+X8b9fXLcqPJj10uu7HsBwVIrZ+/V5QZe93W0pHF3wiXEUuej5gPJUAC38CFg== 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=1kApFPG0lnTXkaJWIZcoFZJHbb95ymGOlOh0LuMmiaU=; b=gUw3J136pO4Xuk5k5JYnCysexMyMiOkCriPQJEApDToJa+PeEZbmb6dq+fZD9v56uFOp1likBKtGYGxD/H+Nhe860a/9gp22LVoNasRPj2dwKzMABQHzn0svBPpgCWKJ8MiAqWPolSqH/QwtZpSLj63zKJoeTcDXvHy0wOhdD2Dkrj+tig3tvveFLKKn6mFmS+B61di0Fy25ecqDkQ/iGy53zzku1OHOi2O1Ebu2r1YDArJs1SEmVnyYmPncnQyQokHuWnqb4WRtT3rQjcZis4DIJzDTsClPsOZo9JMKkpEgmv0sP0gpVj6MxLQYxOK0wdIvNMun44ML4Cr6ZNLu+A== 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=1kApFPG0lnTXkaJWIZcoFZJHbb95ymGOlOh0LuMmiaU=; b=j0bo3mZL5rG/UHXFXTZof2jd5BLARohjuWNMvuA5b21yO9p9pGnWoSK/jNbpQPkmwbSnfSdAPLlManQXtIWveqpoIyg7miznjam2aQeI1eVp+mo6v76FPDtiQnik4YdnoLMB8TXKFg69ExQyKz/cKujWFLwJi4B7WFlOIeWIRxeCttJ31r3wK107KgMNi3qjcILvCehCKBl9bahUWQ8FSALRNzSHWKYTgp/sX1rj2ZGWsBXukCphXJJ3/55XarbAaWBZbz/hdMQDLVnrv0SJ2yI9ntRi9FnXjkbW73n5g8809x+/bLSiTWeBWFl3Fr92oCvpgwEbWzfoFeqr+90iqg== Received: from MW4PR04CA0230.namprd04.prod.outlook.com (2603:10b6:303:87::25) by CH2PR12MB3894.namprd12.prod.outlook.com (2603:10b6:610:2b::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20; Wed, 7 Jul 2021 15:54:49 +0000 Received: from CO1NAM11FT027.eop-nam11.prod.protection.outlook.com (2603:10b6:303:87:cafe::1e) by MW4PR04CA0230.outlook.office365.com (2603:10b6:303:87::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20 via Frontend Transport; Wed, 7 Jul 2021 15:54:49 +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 CO1NAM11FT027.mail.protection.outlook.com (10.13.174.224) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4308.20 via Frontend Transport; Wed, 7 Jul 2021 15:54:49 +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; Wed, 7 Jul 2021 15:54:47 +0000 From: Viacheslav Ovsiienko To: CC: , , , , Date: Wed, 7 Jul 2021 18:54:28 +0300 Message-ID: <20210707155428.13178-2-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210707155428.13178-1-viacheslavo@nvidia.com> References: <20210707155428.13178-1-viacheslavo@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d87716be-c0c5-4f6c-1139-08d9415f8d23 X-MS-TrafficTypeDiagnostic: CH2PR12MB3894: 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: 97bDrzNP4nV8nfFa5EXwjMcarXW++h9Fuap1T4qDWvmyJszIu5Y0A0gukQWRwAMvjUZqs8H7RJMCoO7I4Hok0/2QytpdAvAh98P2kggtS1s6BxAON/+X17QmBH3XcCPBMAkMfvTHES3ruZitWtv2xLillEiz86LgJf79QxYG0+fMZAZQvv09/FyU8wfiuKzPM3FKdAHvSQZIIf/C0zYD/5B8WuX7xzxA49NAoQAWqqfxn1OPsrRqlRqzL9MvEekrqbF+JTPjmuPA8Sh+HHDxdAoY/e6GgGXQVhsySIW7+IgkscoD9kTweMOYSQBPSFGsrFISQ9LbRvD8fY0oft7YKHLPmy0pcTLF08DgI6AzOE4/O7z1MxxksQgFJHLfS05H0pgjIM5mAJXsfUdhPd+3ku7NOkiBMP37+dy/otku42S+XaWy786+LI6IEzXZiqjktiK6bw257L2FF7ygM0xiCrT+nkWU2zzveSHSygSOquHwtJPzvKtzSsUo4TCdoJ9qvP5pTiOTqZgXaSKSP184keQLLboaV4E8Fhm8Uo5joQc4kw9kgU/pdRfXk3YgksnBbk1V8ORpUthwgk09RcSVPMQA3ee82Ab1x+Ju6KubzgaWjJ80uwhX0bLOe+GvUzGTJ9QlDDDCkZufIWJAAgJQjhkXjO0A523q6J0T1xQtAgQFzqvV69oXBhJN1vTgFtXknblSOTlZOZq7NSp0QwBcBw== 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)(346002)(136003)(396003)(376002)(39860400002)(36840700001)(46966006)(4326008)(55016002)(5660300002)(1076003)(70586007)(70206006)(36906005)(6286002)(54906003)(336012)(316002)(2616005)(2906002)(7696005)(6916009)(8936002)(26005)(186003)(6666004)(8676002)(16526019)(426003)(83380400001)(7636003)(356005)(36756003)(86362001)(82740400003)(36860700001)(82310400003)(47076005)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jul 2021 15:54:49.3351 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d87716be-c0c5-4f6c-1139-08d9415f8d23 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: CO1NAM11FT027.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3894 Subject: [dpdk-stable] [PATCH v4 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" The compilation flag HAVE_MLX5DV_DR_DEVX_PORT depends on presence of mlx5dv_query_devx_port routine in rdma-core library. The mlx5dv_query_devx_port routine exists only in OFED versions of rdma-core library and is being planned to be removed and replaced with Upstream compatible mlx5dv_query_port. As mlx5dv_query_devx_port is being removed all the dependencies on the HAVE_MLX5DV_DR_DEVX_PORT compilation flag are reconsidered. 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 7168edc62c..4ef163e1ef 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