From patchwork Thu Sep 24 14:32:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Cohen X-Patchwork-Id: 260266 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BC2EC2D0E2 for ; Thu, 24 Sep 2020 14:32:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DD68E2311A for ; Thu, 24 Sep 2020 14:32:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="C2+HY/jH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728292AbgIXOci (ORCPT ); Thu, 24 Sep 2020 10:32:38 -0400 Received: from hqnvemgate24.nvidia.com ([216.228.121.143]:5786 "EHLO hqnvemgate24.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728088AbgIXOci (ORCPT ); Thu, 24 Sep 2020 10:32:38 -0400 Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate24.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Thu, 24 Sep 2020 07:31:01 -0700 Received: from mtl-vdi-166.wap.labs.mlnx (10.124.1.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 24 Sep 2020 14:32:35 +0000 Date: Thu, 24 Sep 2020 17:32:31 +0300 From: Eli Cohen To: , , , , CC: Subject: [PATCH V1 vhost-next] vdpa/mlx5: Make vdpa core driver a distinct module Message-ID: <20200924143231.GA186492@mtl-vdi-166.wap.labs.mlnx> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.5 (bf161cf53efb) (2018-04-13) X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1600957862; bh=nc2vNiYTrqyZAVfOBX+/N1PhV107Mq0CuuADPzerkwA=; h=Date:From:To:CC:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:User-Agent:X-Originating-IP:X-ClientProxiedBy; b=C2+HY/jHQmA3V0wnnGb9jUchWPBfllMmy6N4w28X6W/X4u53yjS3eTvLusqH1Tphj NO6umwaCq5eaKwfAkhJT2wJafZGoHglWqOHuCi3emtbp/nrGYsZBj+/TDz44KyQDl1 rKWK+0Zo5aIoHO4Jq5AuzGyxFs1l/epHu2u4hedrmowwxD33+Op2FAHjULur5jTHdj uNch/lgKSpIQlnHtOqz1KBjjUNhPvTQnrfCADL7A0Cak3HkP6TBKeAwR3ZkeItwqce /7qDgFmtLUtvl8ShhfUjS84e8HXydX9vLWpGtnetnXNk2VAj5ghjf0EmNqHcCULw9I 74xNOfwsORXwQ== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Change core vdpa functionality into a loadbale module such that upcoming block implementation will be able to use it. Signed-off-by: Eli Cohen --- V0 --> V1: Removed "default n" for configu options as 'n' is the default drivers/vdpa/Kconfig | 8 +++----- drivers/vdpa/Makefile | 2 +- drivers/vdpa/mlx5/Makefile | 7 +++++-- drivers/vdpa/mlx5/core/core_main.c | 20 ++++++++++++++++++++ drivers/vdpa/mlx5/core/mr.c | 3 +++ drivers/vdpa/mlx5/core/resources.c | 10 ++++++++++ 6 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 drivers/vdpa/mlx5/core/core_main.c diff --git a/drivers/vdpa/Kconfig b/drivers/vdpa/Kconfig index 4271c408103e..57ff6a7f7401 100644 --- a/drivers/vdpa/Kconfig +++ b/drivers/vdpa/Kconfig @@ -29,10 +29,9 @@ config IFCVF To compile this driver as a module, choose M here: the module will be called ifcvf. -config MLX5_VDPA - bool "MLX5 VDPA support library for ConnectX devices" +config MLX5_VDPA_CORE + tristate "MLX5 VDPA support library for ConnectX devices" depends on MLX5_CORE - default n help Support library for Mellanox VDPA drivers. Provides code that is common for all types of VDPA drivers. The following drivers are planned: @@ -40,8 +39,7 @@ config MLX5_VDPA config MLX5_VDPA_NET tristate "vDPA driver for ConnectX devices" - depends on MLX5_VDPA - default n + depends on MLX5_VDPA_CORE help VDPA network driver for ConnectX6 and newer. Provides offloading of virtio net datapath such that descriptors put on the ring will diff --git a/drivers/vdpa/Makefile b/drivers/vdpa/Makefile index d160e9b63a66..07353bbb9f8b 100644 --- a/drivers/vdpa/Makefile +++ b/drivers/vdpa/Makefile @@ -2,4 +2,4 @@ obj-$(CONFIG_VDPA) += vdpa.o obj-$(CONFIG_VDPA_SIM) += vdpa_sim/ obj-$(CONFIG_IFCVF) += ifcvf/ -obj-$(CONFIG_MLX5_VDPA) += mlx5/ +obj-$(CONFIG_MLX5_VDPA_CORE) += mlx5/ diff --git a/drivers/vdpa/mlx5/Makefile b/drivers/vdpa/mlx5/Makefile index 89a5bededc9f..9f50f7e8d889 100644 --- a/drivers/vdpa/mlx5/Makefile +++ b/drivers/vdpa/mlx5/Makefile @@ -1,4 +1,7 @@ subdir-ccflags-y += -I$(srctree)/drivers/vdpa/mlx5/core -obj-$(CONFIG_MLX5_VDPA_NET) += mlx5_vdpa.o -mlx5_vdpa-$(CONFIG_MLX5_VDPA_NET) += net/main.o net/mlx5_vnet.o core/resources.o core/mr.o +obj-$(CONFIG_MLX5_VDPA_CORE) += mlx5_vdpa_core.o +mlx5_vdpa_core-$(CONFIG_MLX5_VDPA_CORE) += core/resources.o core/mr.o core/core_main.o + +obj-$(CONFIG_MLX5_VDPA_NET) += mlx5_vdpa_net.o +mlx5_vdpa_net-$(CONFIG_MLX5_VDPA_NET) += net/main.o net/mlx5_vnet.o diff --git a/drivers/vdpa/mlx5/core/core_main.c b/drivers/vdpa/mlx5/core/core_main.c new file mode 100644 index 000000000000..4b39b55f57ab --- /dev/null +++ b/drivers/vdpa/mlx5/core/core_main.c @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB +/* Copyright (c) 2020 Mellanox Technologies Ltd. */ + +#include + +MODULE_AUTHOR("Eli Cohen "); +MODULE_DESCRIPTION("Mellanox VDPA core driver"); +MODULE_LICENSE("Dual BSD/GPL"); + +static int __init mlx5_vdpa_core_init(void) +{ + return 0; +} + +static void __exit mlx5_vdpa_core_exit(void) +{ +} + +module_init(mlx5_vdpa_core_init); +module_exit(mlx5_vdpa_core_exit); diff --git a/drivers/vdpa/mlx5/core/mr.c b/drivers/vdpa/mlx5/core/mr.c index ef1c550f8266..c093eab6c714 100644 --- a/drivers/vdpa/mlx5/core/mr.c +++ b/drivers/vdpa/mlx5/core/mr.c @@ -434,6 +434,7 @@ int mlx5_vdpa_create_mr(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb *iotlb) mutex_unlock(&mr->mkey_mtx); return err; } +EXPORT_SYMBOL(mlx5_vdpa_create_mr); void mlx5_vdpa_destroy_mr(struct mlx5_vdpa_dev *mvdev) { @@ -456,6 +457,7 @@ void mlx5_vdpa_destroy_mr(struct mlx5_vdpa_dev *mvdev) out: mutex_unlock(&mr->mkey_mtx); } +EXPORT_SYMBOL(mlx5_vdpa_destroy_mr); static bool map_empty(struct vhost_iotlb *iotlb) { @@ -484,3 +486,4 @@ int mlx5_vdpa_handle_set_map(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb *io return err; } +EXPORT_SYMBOL(mlx5_vdpa_handle_set_map); diff --git a/drivers/vdpa/mlx5/core/resources.c b/drivers/vdpa/mlx5/core/resources.c index 96e6421c5d1c..89606a18e286 100644 --- a/drivers/vdpa/mlx5/core/resources.c +++ b/drivers/vdpa/mlx5/core/resources.c @@ -98,6 +98,7 @@ int mlx5_vdpa_create_tis(struct mlx5_vdpa_dev *mvdev, void *in, u32 *tisn) return err; } +EXPORT_SYMBOL(mlx5_vdpa_create_tis); void mlx5_vdpa_destroy_tis(struct mlx5_vdpa_dev *mvdev, u32 tisn) { @@ -108,6 +109,7 @@ void mlx5_vdpa_destroy_tis(struct mlx5_vdpa_dev *mvdev, u32 tisn) MLX5_SET(destroy_tis_in, in, tisn, tisn); mlx5_cmd_exec_in(mvdev->mdev, destroy_tis, in); } +EXPORT_SYMBOL(mlx5_vdpa_destroy_tis); int mlx5_vdpa_create_rqt(struct mlx5_vdpa_dev *mvdev, void *in, int inlen, u32 *rqtn) { @@ -121,6 +123,7 @@ int mlx5_vdpa_create_rqt(struct mlx5_vdpa_dev *mvdev, void *in, int inlen, u32 * return err; } +EXPORT_SYMBOL(mlx5_vdpa_create_rqt); void mlx5_vdpa_destroy_rqt(struct mlx5_vdpa_dev *mvdev, u32 rqtn) { @@ -131,6 +134,7 @@ void mlx5_vdpa_destroy_rqt(struct mlx5_vdpa_dev *mvdev, u32 rqtn) MLX5_SET(destroy_rqt_in, in, rqtn, rqtn); mlx5_cmd_exec_in(mvdev->mdev, destroy_rqt, in); } +EXPORT_SYMBOL(mlx5_vdpa_destroy_rqt); int mlx5_vdpa_create_tir(struct mlx5_vdpa_dev *mvdev, void *in, u32 *tirn) { @@ -144,6 +148,7 @@ int mlx5_vdpa_create_tir(struct mlx5_vdpa_dev *mvdev, void *in, u32 *tirn) return err; } +EXPORT_SYMBOL(mlx5_vdpa_create_tir); void mlx5_vdpa_destroy_tir(struct mlx5_vdpa_dev *mvdev, u32 tirn) { @@ -154,6 +159,7 @@ void mlx5_vdpa_destroy_tir(struct mlx5_vdpa_dev *mvdev, u32 tirn) MLX5_SET(destroy_tir_in, in, tirn, tirn); mlx5_cmd_exec_in(mvdev->mdev, destroy_tir, in); } +EXPORT_SYMBOL(mlx5_vdpa_destroy_tir); int mlx5_vdpa_alloc_transport_domain(struct mlx5_vdpa_dev *mvdev, u32 *tdn) { @@ -170,6 +176,7 @@ int mlx5_vdpa_alloc_transport_domain(struct mlx5_vdpa_dev *mvdev, u32 *tdn) return err; } +EXPORT_SYMBOL(mlx5_vdpa_alloc_transport_domain); void mlx5_vdpa_dealloc_transport_domain(struct mlx5_vdpa_dev *mvdev, u32 tdn) { @@ -180,6 +187,7 @@ void mlx5_vdpa_dealloc_transport_domain(struct mlx5_vdpa_dev *mvdev, u32 tdn) MLX5_SET(dealloc_transport_domain_in, in, transport_domain, tdn); mlx5_cmd_exec_in(mvdev->mdev, dealloc_transport_domain, in); } +EXPORT_SYMBOL(mlx5_vdpa_dealloc_transport_domain); int mlx5_vdpa_create_mkey(struct mlx5_vdpa_dev *mvdev, struct mlx5_core_mkey *mkey, u32 *in, int inlen) @@ -266,6 +274,7 @@ int mlx5_vdpa_alloc_resources(struct mlx5_vdpa_dev *mvdev) mutex_destroy(&mvdev->mr.mkey_mtx); return err; } +EXPORT_SYMBOL(mlx5_vdpa_alloc_resources); void mlx5_vdpa_free_resources(struct mlx5_vdpa_dev *mvdev) { @@ -282,3 +291,4 @@ void mlx5_vdpa_free_resources(struct mlx5_vdpa_dev *mvdev) mutex_destroy(&mvdev->mr.mkey_mtx); res->valid = false; } +EXPORT_SYMBOL(mlx5_vdpa_free_resources);