From patchwork Tue Sep 14 05:38:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Shnaiderman X-Patchwork-Id: 98827 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C1BE3A0C47; Tue, 14 Sep 2021 07:40:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0882F410F7; Tue, 14 Sep 2021 07:40:04 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2061.outbound.protection.outlook.com [40.107.244.61]) by mails.dpdk.org (Postfix) with ESMTP id 4081D410EB for ; Tue, 14 Sep 2021 07:40:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OuFH6ivhboH/J0dgVbfOhYlgNyihdGwRz5OIW6WNPupojzrSJ3AgJ4JMzBdcshqperVZnyb3BYk4CuTib9llsxSdqAeVQvH6SZ12JHVfeR7+yKzZNiF4yJTOv1g3uqsaVYpc5J5dtY9DT9Pp71cypXs1tux7r0E+sRM3Gvgk98cFDtVYUTf8LSCn6sTvAZO3r1/+VyjwG8lVH6t3S7yMe6OHy1/gPQToZLIRsZ6cVS5nJqR3fEmYL1GZeFMIW/fO0cNJ/nk2AvUrT+FTCx3x7isrdJAOwmnPILNZ4Qh2LDoxMK5RbRUtt9lU/bJML1LbQOCqDVTA8QfLHvBGAbSP2w== 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; bh=IhMw0dVoeWxn6IWKHs4/hkBRq5AA+iLvOWg9twajpdo=; b=VLDA1tt1E8940Y2u46/zfhEGydYPF8dfQ3GembazeLqxELZ1ANSaUFiv39cpHMjGSHEKMc0C1MwCMpaWqSKxsIBHPV1mdap5/i8jg09NC8E/M88ozgigUXa5QaeFEeGdHbFlQf/1VN23/FPFM8zYgG+KjUCVn4P7vOpkFLPTS1FQwFemcUppE0lLPYbxMVj2fIFJhxBfoImzlK7zXF0bIsXvkea0Pf6u2LrbhHKVWsNIMFvDAR0Dr5a/6EERz9n6IqdJLSLtP1rzOnrayDdbHj+ET6khKRQG01z67elm3E7SLSGBYm5oO1kULkWVyTUnjfPxi9qEO7RCbniN6OI0mA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.35) smtp.rcpttodomain=monjalon.net 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=IhMw0dVoeWxn6IWKHs4/hkBRq5AA+iLvOWg9twajpdo=; b=erck76nTwRJu2/3OtgF+EuGxXRKaOyA3X1KiSpeA4hwIaR9YXdx/Z+lSWuw6UkXDeWrp4/cFeSw9hIcCYunOn/4kO8Bw1wB7yPYDot3KnzboUxrfeamvJRXPZC9lycjHHIA74wBgbapwh2fJ7KKjw6/W6aqjH/rbkNJuhbWmqUC5hVVEDTSg9o7JO3rbE60htalnk99P6O6OeJ0pEBmw4Jz6UOZLZi8XKuYnDzAm8tD0m8ymUhYpOHV72zct/0AKnmh6g9slhgYXUOMGNdwyBiFXK8HAsTCsu741dGTgtCQvDrzUai6d2AUXZfkFSBylURCExl5gWcdL9Tdo2NYKEg== Received: from MWHPR08CA0040.namprd08.prod.outlook.com (2603:10b6:300:c0::14) by DM5PR12MB1754.namprd12.prod.outlook.com (2603:10b6:3:10f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Tue, 14 Sep 2021 05:40:00 +0000 Received: from CO1NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:300:c0:cafe::da) by MWHPR08CA0040.outlook.office365.com (2603:10b6:300:c0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Tue, 14 Sep 2021 05:40:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.35) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.35 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.35; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.35) by CO1NAM11FT013.mail.protection.outlook.com (10.13.174.227) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4500.14 via Frontend Transport; Tue, 14 Sep 2021 05:40:00 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 14 Sep 2021 05:40:00 +0000 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.18; Tue, 14 Sep 2021 05:39:57 +0000 From: Tal Shnaiderman To: CC: , , , , , , , Date: Tue, 14 Sep 2021 08:38:26 +0300 Message-ID: <20210914053833.7760-4-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20210914053833.7760-1-talshn@nvidia.com> References: <20210914053833.7760-1-talshn@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b1e229d7-49bb-4e06-445c-08d977421816 X-MS-TrafficTypeDiagnostic: DM5PR12MB1754: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j3TvnV8cYyrtDQtTUnpZCXu33F5Sg0AI2rGKLU15BATY1y9UC+snkvojlT84Zpspd/cjuyKMfIx+4Kpqzz7HPqNhwwzQemL7CQI5CSHWOzSEWp2C60XVagsBZPjejoC28oJXRpCHJJz3qw+VRkh7hKa6W4gfMxRApdurV4txlPShJHFKNq5PAtDrFN3ZayZAv5e42kpHJpF8GojX6NYKtrGmh7M+JeBBrhQqdpHVyBEOc8ZTHECDUX+JD/oRjTurDP4xRubJKQS1TsqatyVM+vmgwTqYces2YjuRw30gzy8IgItsBBTB2oTs9h06rNKv6Kuogr850BS0EHo29gAOE/jMws5znHDh2hnX+EOO+w3c26AMBR1zW9SlMX+wzuVzsyo6HLEdU4DQpaephPmNad9IfX4zC31kitKosHM7y0xc0TWKIUUQz5sXyNTT2iYQwTj7GQXLvkgypDZwAHcGDn54uJk/wiKBrc7AZ16o/KRhxuG5g7M13SOtylc67FEnATfYzjl6v4r50n/fTJfGVVeVVxUwmBOplQdKDCBtPxin0ZDIRVLTaweKqPBeaaKMIJZxfsxYa8XS2+PQ5S9EC3vv80K/I7lWu3QnPuhP5L98sjHuQXYAFNXI+4xsnbXgZmooJYeROHnyQZVKAlbaiG90VR8jLSP2e7CIJJTwnqBA7VMH7r6b+DAm5yuIkw104LioRpDiQytQX+apR3mjug== X-Forefront-Antispam-Report: CIP:216.228.112.35; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid02.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(376002)(396003)(346002)(39860400002)(36840700001)(46966006)(82310400003)(6666004)(36906005)(8676002)(83380400001)(426003)(2616005)(107886003)(356005)(186003)(6286002)(54906003)(16526019)(316002)(82740400003)(2906002)(336012)(7636003)(1076003)(8936002)(478600001)(26005)(4326008)(6916009)(55016002)(7696005)(5660300002)(70206006)(70586007)(36860700001)(86362001)(47076005)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 05:40:00.4125 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b1e229d7-49bb-4e06-445c-08d977421816 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.35]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1754 Subject: [dpdk-dev] [RFC PATCH 03/10] common/mlx5: move pdn getter to common driver X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Move to common and export the function mlx5_os_get_pdn. Signed-off-by: Tal Shnaiderman --- drivers/common/mlx5/linux/mlx5_common_os.c | 35 ++++++++++++++++++++++++++++ drivers/common/mlx5/mlx5_common.h | 4 ++++ drivers/common/mlx5/version.map | 1 + drivers/common/mlx5/windows/mlx5_common_os.c | 21 +++++++++++++++++ drivers/net/mlx5/linux/mlx5_os.c | 35 ---------------------------- drivers/net/mlx5/mlx5.h | 1 - drivers/net/mlx5/windows/mlx5_os.c | 21 ----------------- 7 files changed, 61 insertions(+), 57 deletions(-) diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c b/drivers/common/mlx5/linux/mlx5_common_os.c index 3ef507944f..4aada82669 100644 --- a/drivers/common/mlx5/linux/mlx5_common_os.c +++ b/drivers/common/mlx5/linux/mlx5_common_os.c @@ -456,3 +456,38 @@ mlx5_os_open_device_context(struct rte_device *dev) } return ctx; } + +/** + * Extract pdn of PD object using DV API. + * + * @param[in] pd + * Pointer to the verbs PD object. + * @param[out] pdn + * Pointer to the PD object number variable. + * + * @return + * 0 on success, error value otherwise. + */ +int +mlx5_os_get_pdn(void *pd, uint32_t *pdn) +{ +#ifdef HAVE_IBV_FLOW_DV_SUPPORT + struct mlx5dv_obj obj; + struct mlx5dv_pd pd_info; + int ret = 0; + + obj.pd.in = pd; + obj.pd.out = &pd_info; + ret = mlx5_glue->dv_init_obj(&obj, MLX5DV_OBJ_PD); + if (ret) { + DRV_LOG(DEBUG, "Fail to get PD object info"); + return ret; + } + *pdn = pd_info.pdn; + return 0; +#else + (void)pd; + (void)pdn; + return -ENOTSUP; +#endif /* HAVE_IBV_FLOW_DV_SUPPORT */ +} diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h index 249804b00c..fcdf376193 100644 --- a/drivers/common/mlx5/mlx5_common.h +++ b/drivers/common/mlx5/mlx5_common.h @@ -423,4 +423,8 @@ __rte_internal void * mlx5_os_open_device_context(struct rte_device *dev); +__rte_internal +int +mlx5_os_get_pdn(void *pd, uint32_t *pdn); + #endif /* RTE_PMD_MLX5_COMMON_H_ */ diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map index 6d4258dd25..c6de706fdb 100644 --- a/drivers/common/mlx5/version.map +++ b/drivers/common/mlx5/version.map @@ -144,6 +144,7 @@ INTERNAL { mlx5_os_match_devx_devices_to_addr; mlx5_os_open_device_context; mlx5_os_get_ibv_dev; # WINDOWS_NO_EXPORT + mlx5_os_get_pdn; mlx5_os_reg_mr; mlx5_os_umem_dereg; mlx5_os_umem_reg; diff --git a/drivers/common/mlx5/windows/mlx5_common_os.c b/drivers/common/mlx5/windows/mlx5_common_os.c index 3b59e57e57..5c9cccd3e9 100644 --- a/drivers/common/mlx5/windows/mlx5_common_os.c +++ b/drivers/common/mlx5/windows/mlx5_common_os.c @@ -323,3 +323,24 @@ mlx5_os_open_device_context(struct rte_device *dev) mlx5_glue->free_device_list(orig_devx_bdf_devs); return devx_ctx_match; } + +/** + * Extract pdn of PD object using DevX + * + * @param[in] pd + * Pointer to the DevX PD object. + * @param[out] pdn + * Pointer to the PD object number variable. + * + * @return + * 0 on success, error value otherwise. + */ +int +mlx5_os_get_pdn(void *pd, uint32_t *pdn) +{ + if (!pd) + return -EINVAL; + + *pdn = ((struct mlx5_pd *)pd)->pdn; + return 0; +} diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 470b16cb9a..a7df1ddb2e 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -2811,41 +2811,6 @@ mlx5_restore_doorbell_mapping_env(int value) setenv(MLX5_SHUT_UP_BF, value ? "1" : "0", 1); } -/** - * Extract pdn of PD object using DV API. - * - * @param[in] pd - * Pointer to the verbs PD object. - * @param[out] pdn - * Pointer to the PD object number variable. - * - * @return - * 0 on success, error value otherwise. - */ -int -mlx5_os_get_pdn(void *pd, uint32_t *pdn) -{ -#ifdef HAVE_IBV_FLOW_DV_SUPPORT - struct mlx5dv_obj obj; - struct mlx5dv_pd pd_info; - int ret = 0; - - obj.pd.in = pd; - obj.pd.out = &pd_info; - ret = mlx5_glue->dv_init_obj(&obj, MLX5DV_OBJ_PD); - if (ret) { - DRV_LOG(DEBUG, "Fail to get PD object info"); - return ret; - } - *pdn = pd_info.pdn; - return 0; -#else - (void)pd; - (void)pdn; - return -ENOTSUP; -#endif /* HAVE_IBV_FLOW_DV_SUPPORT */ -} - /** * Function API to open IB device. * diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index e02714e231..cb05929efe 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1770,7 +1770,6 @@ void mlx5_os_free_shared_dr(struct mlx5_priv *priv); int mlx5_os_open_device(const struct mlx5_dev_spawn_data *spawn, const struct mlx5_dev_config *config, struct mlx5_dev_ctx_shared *sh); -int mlx5_os_get_pdn(void *pd, uint32_t *pdn); int mlx5_os_net_probe(struct rte_device *dev); void mlx5_os_dev_shared_handler_install(struct mlx5_dev_ctx_shared *sh); void mlx5_os_dev_shared_handler_uninstall(struct mlx5_dev_ctx_shared *sh); diff --git a/drivers/net/mlx5/windows/mlx5_os.c b/drivers/net/mlx5/windows/mlx5_os.c index 9dea6d639e..336b41d33b 100644 --- a/drivers/net/mlx5/windows/mlx5_os.c +++ b/drivers/net/mlx5/windows/mlx5_os.c @@ -1102,25 +1102,4 @@ mlx5_os_set_reg_mr_cb(mlx5_reg_mr_t *reg_mr_cb, *dereg_mr_cb = mlx5_os_dereg_mr; } -/** - * Extract pdn of PD object using DevX - * - * @param[in] pd - * Pointer to the DevX PD object. - * @param[out] pdn - * Pointer to the PD object number variable. - * - * @return - * 0 on success, error value otherwise. - */ -int -mlx5_os_get_pdn(void *pd, uint32_t *pdn) -{ - if (!pd) - return -EINVAL; - - *pdn = ((struct mlx5_pd *)pd)->pdn; - return 0; -} - const struct mlx5_flow_driver_ops mlx5_flow_verbs_drv_ops = {0};