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 6D136A0548 for ; Mon, 16 Aug 2021 18:30:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5DAE340143; Mon, 16 Aug 2021 18:30:17 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08on2045.outbound.protection.outlook.com [40.107.101.45]) by mails.dpdk.org (Postfix) with ESMTP id 2F93F4114C for ; Mon, 16 Aug 2021 18:30:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N4yHCpmfO6ip5vJfxKUuL+7+REUSxNCjJbWX2O7sTqD0GuuN76k8vxeHg2WUbb4SN6+1hcdI57Sp+YSIWkyE66bEcA465Np8HBHlbWQmmpDFKdNku38mcLY5HWu+PfZdy3fkF/alZcS0URQ2zKEgHSX3mLyO4kVX1wbj+qhW2tf5tLS0on7VsAc7BTTDZVwbls3+L35ltfX04oYjL693qQsmT9yHA6ncmREBGEYcCxLZM70G2PAVJjFonhFPIsu+wxWQBrK8C2yDcS8Dv71F25fu+ysQ8dAsIYUBS/lEhR4evafFB06g+dD558rsRyuWxxaSN0PcmxJfK88T6l+dcQ== 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=ShWbT/WnSE5Nwn9X5jEI4jsXVwG1W9me+2muqoEVSZQ=; b=XSdWd6I4ONSXv8jvDRx0b/8S+wNEPRKWeDgF7WAUoGRVulEGqpxw1iVCSKPctdQOtsED2mBXDVdvoKSCU2VJSj+F9JmKKa56mFgH9PHz8tp9N7GCvw5nqDNOtqVzfZbdrgdAbo67BE/tiOqZ6b7670uGlrNJlJHO7FzLDdD+gmSsa71pZld7jRdPBcn6Zl+Tj8WmlZF3j3kPnb5dnPLo5X4lmw6gHNe/MPUk9sI/Q9IPf7rKWhMPvJMfEq3YjsTpPE+Czy+9ePnJ5zNeIK+rB9OtYb6VtCdsdC9YlP4RXHDf6UMiFb4k/RcLC6s+v+HQ+zgN/4BHPPQPQ7ILI/73Fg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.32) smtp.rcpttodomain=canonical.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine 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=ShWbT/WnSE5Nwn9X5jEI4jsXVwG1W9me+2muqoEVSZQ=; b=jfDB/fNv/69UzX3oCbmucSlIX/D8QyplwRKiGZAQ0+Fes5xFidCVG5XRBLAx3HAiHVMQgfg6m1DLziguw9V1Zsv1PO0OwOv776XXW1GLuEpLCGhA4e7HHe5RKqEGEMsH2oju86z7dKWQ2GiCfr/AFkw8Mjm6XPNgzBPOYfx/hEdHXBOtT3BMR0SUL1/0S11Lz+lXlnLPPzB+eU7/GfF+w1l6J+noFevLrG/Xd7EqDxHcpTH15P8fwmKymZO+0AfxbW+bRXDyj/g/6CzMDcy1OUEXFnDR9Qp1nY9Elunmu9+oS+8Ukp4V1jF6jnAoqG481cNSprYjNqWlCsWsKwi2eg== Received: from BN0PR04CA0052.namprd04.prod.outlook.com (2603:10b6:408:e8::27) by MN2PR12MB4127.namprd12.prod.outlook.com (2603:10b6:208:1d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16; Mon, 16 Aug 2021 16:30:14 +0000 Received: from BN8NAM11FT006.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e8:cafe::c7) by BN0PR04CA0052.outlook.office365.com (2603:10b6:408:e8::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Mon, 16 Aug 2021 16:30:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.32) smtp.mailfrom=nvidia.com; canonical.com; dkim=none (message not signed) header.d=none;canonical.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.32 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.32; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.32) by BN8NAM11FT006.mail.protection.outlook.com (10.13.177.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.16 via Frontend Transport; Mon, 16 Aug 2021 16:30:14 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 16 Aug 2021 09:30:13 -0700 Received: from nvidia.com (172.20.187.6) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 16 Aug 2021 16:30:12 +0000 From: Bing Zhao To: , CC: , Date: Mon, 16 Aug 2021 19:29:48 +0300 Message-ID: <20210816162952.1931473-3-bingz@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210816162952.1931473-1-bingz@nvidia.com> References: <20210816162952.1931473-1-bingz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ffac37a7-89b5-4a33-6d06-08d960d3200e X-MS-TrafficTypeDiagnostic: MN2PR12MB4127: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3383; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 67lZ8/d8NgWgtEGy4z6LhjHDNPGj3tObo0TmbOr1rUJw8t9JLThPb9+fJFRAWgsVm1uStdRpYgxXhsxwdj/Xu0/Tx5WWrTUajC73I6LifG56DIC1vqMj6A1KxKVqT8cuEdgjReSe3nNL3YGbVwsgGsC16WNMosZGxdaSKXce1cNfo73fyktzS2PI2lSHcr4BxLgye3fFtsEoaSO3MXRnoJROVrhpt75xk9P77aHn5khBT/ZmzTzJfyxV7vvNdbBDb6oN53Ef5WoTqMr6E5+/ePgkfTIc0ILECWqLA6OuLDZqYoEzrw2SgWcXNWNfGjSQA2VgAg7CtDYxohuGzLQT34Z/gEB79UCPpzfK8GhuCRn44KelvZzC0uRYhJ87lse2xrkMIvwq2nwsdL038lYyWWC0JOyRhRrJE/U6boVWjf5ZPt4cxpYm9l6jxvRtwXpMaHsiqZbvk3HdwTKlFkjN8mVDsmBSbAMvWNZDOsDjzWMXl468D66v1/SgOIEnp6APeQW1RrZbDxD+q+Jd1a/nA31ituFmwSwrs4Al1+00/sK8fOgR+NsoLXZhzlzYkJ2DsoU9xJ/YO++ukJOVmnvhTJDARIDH3866+A+/YR9Cu9zValTgqDok/1y8pnVvqgf5K+DMfYPLWvvfd+n610+gEIehIPbmWAa0VMlKEJzNZDuBYqFqPoRBQvsGF+vMfXSeuuR4T5GXq7JvtfgON0/QrA== X-Forefront-Antispam-Report: CIP:216.228.112.32; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid01.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(346002)(376002)(39860400002)(396003)(46966006)(36840700001)(426003)(336012)(356005)(55016002)(478600001)(2616005)(107886003)(36756003)(6286002)(47076005)(8676002)(70206006)(70586007)(186003)(16526019)(54906003)(8936002)(7696005)(110136005)(7636003)(6666004)(26005)(82740400003)(86362001)(83380400001)(316002)(4326008)(1076003)(82310400003)(5660300002)(36860700001)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2021 16:30:14.0029 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ffac37a7-89b5-4a33-6d06-08d960d3200e 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.32]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT006.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4127 Subject: [dpdk-stable] [PATCH 19.11 2/6] common/mlx5: fix compatibility with OFED 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" From: Viacheslav Ovsiienko [ upstream commit 0fd928bbbae5e6f89376f9996d5340a861fc14e3 ] 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. The new compilation flag HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT is for backward compatibility with older OFED versions. Fixes: 6cfe84fbe7b1 ("net/mlx5: fix port action for LAG") Cc: stable@dpdk.org Signed-off-by: Viacheslav Ovsiienko Acked-by: Matan Azrad Signed-off-by: Matan Azrad Signed-off-by: Bing Zhao --- drivers/net/mlx5/Makefile | 5 +++++ drivers/net/mlx5/meson.build | 2 ++ drivers/net/mlx5/mlx5_flow_dv.c | 2 +- drivers/net/mlx5/mlx5_glue.c | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 605975c245..3719f0f11e 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -178,6 +178,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh infiniband/mlx5dv.h \ func mlx5dv_query_devx_port \ $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT \ + infiniband/mlx5dv.h \ + func mlx5dv_dr_action_create_dest_ib_port \ + $(AUTOCONF_OUTPUT) $Q sh -- '$<' '$@' \ HAVE_IBV_DEVX_OBJ \ infiniband/mlx5dv.h \ diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index 139056cbe8..3336c58ce5 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -138,6 +138,8 @@ if build 'IBV_WQ_FLAG_RX_END_PADDING' ], [ 'HAVE_MLX5DV_DR_DEVX_PORT', 'infiniband/mlx5dv.h', 'mlx5dv_query_devx_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/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 42ae1bbe2c..44c47ce8e4 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7117,7 +7117,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(). diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c index 65b63bd607..1553a9b41c 100644 --- a/drivers/net/mlx5/mlx5_glue.c +++ b/drivers/net/mlx5/mlx5_glue.c @@ -393,7 +393,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 -- 2.21.0