From patchwork Thu Sep 20 21:43:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hefty, Sean" X-Patchwork-Id: 1488081 X-Patchwork-Delegate: roland@digitalvampire.org Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 79E0F3FE65 for ; Thu, 20 Sep 2012 21:43:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755979Ab2ITVnT (ORCPT ); Thu, 20 Sep 2012 17:43:19 -0400 Received: from mga01.intel.com ([192.55.52.88]:63966 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755990Ab2ITVnL convert rfc822-to-8bit (ORCPT ); Thu, 20 Sep 2012 17:43:11 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 20 Sep 2012 14:43:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,455,1344236400"; d="scan'208";a="224630756" Received: from orsmsx102.amr.corp.intel.com ([10.22.225.129]) by fmsmga001.fm.intel.com with ESMTP; 20 Sep 2012 14:43:10 -0700 Received: from orsmsx108.amr.corp.intel.com (10.22.225.41) by ORSMSX102.amr.corp.intel.com (10.22.225.129) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 20 Sep 2012 14:43:10 -0700 Received: from orsmsx101.amr.corp.intel.com ([169.254.8.152]) by ORSMSX108.amr.corp.intel.com ([169.254.9.202]) with mapi id 14.01.0355.002; Thu, 20 Sep 2012 14:43:09 -0700 From: "Hefty, Sean" To: "linux-rdma (linux-rdma@vger.kernel.org)" Subject: [PATCH 1/2] libmlx4: Infra-structure changes to support verbs extensions Thread-Topic: [PATCH 1/2] libmlx4: Infra-structure changes to support verbs extensions Thread-Index: Ac2XeOODw/GVBZofRDSdG73YLYhWzQ== Date: Thu, 20 Sep 2012 21:43:08 +0000 Message-ID: <1828884A29C6694DAF28B7E6B8A8237346A8E82A@ORSMSX101.amr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Yishai Hadas Signed-off-by: Yishai Hadas Signed-off-by: Tzahi Oved --- src/mlx4.c | 83 +++++++++++++++++++++++++++++++++++++++--------------------- src/mlx4.h | 16 ++++++++++++ 2 files changed, 70 insertions(+), 29 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/mlx4.c b/src/mlx4.c index 8cf249a..1a4e8b0 100644 --- a/src/mlx4.c +++ b/src/mlx4.c @@ -120,22 +120,34 @@ static struct ibv_context_ops mlx4_ctx_ops = { .detach_mcast = ibv_cmd_detach_mcast }; +/* function is used to indicate to the library of verbs extensions + * provider capable + */ static struct ibv_context *mlx4_alloc_context(struct ibv_device *ibdev, int cmd_fd) { - struct mlx4_context *context; + return (struct ibv_context *)(((uint8_t *)NULL)-1); +} + +static int mlx4_init_context(struct verbs_device *device, + struct ibv_context *ibv_ctx, int cmd_fd) +{ + struct mlx4_context *context; struct ibv_get_context cmd; struct mlx4_alloc_ucontext_resp resp; int i; + /* verbs_context should be used for new verbs + *struct verbs_context *verbs_ctx = verbs_get_ctx(ibv_ctx); + */ - context = calloc(1, sizeof *context); - if (!context) - return NULL; - - context->ibv_ctx.cmd_fd = cmd_fd; + /* memory footprint of mlx4_context and verbs_context share + * struct ibv_context. + */ + context = to_mctx(ibv_ctx); + ibv_ctx->cmd_fd = cmd_fd; - if (ibv_cmd_get_context(&context->ibv_ctx, &cmd, sizeof cmd, + if (ibv_cmd_get_context(ibv_ctx, &cmd, sizeof(cmd), &resp.ibv_resp, sizeof resp)) - goto err_free; + return errno; context->num_qps = resp.qp_tab_size; context->qp_table_shift = ffs(context->num_qps) - 1 - MLX4_QP_TABLE_BITS; @@ -150,15 +162,15 @@ static struct ibv_context *mlx4_alloc_context(struct ibv_device *ibdev, int cmd_ pthread_mutex_init(&context->db_list_mutex, NULL); - context->uar = mmap(NULL, to_mdev(ibdev)->page_size, PROT_WRITE, + context->uar = mmap(NULL, to_mdev_ex(device)->page_size, PROT_WRITE, MAP_SHARED, cmd_fd, 0); if (context->uar == MAP_FAILED) - goto err_free; + return errno; if (resp.bf_reg_size) { - context->bf_page = mmap(NULL, to_mdev(ibdev)->page_size, + context->bf_page = mmap(NULL, to_mdev_ex(device)->page_size, PROT_WRITE, MAP_SHARED, cmd_fd, - to_mdev(ibdev)->page_size); + to_mdev_ex(device)->page_size); if (context->bf_page == MAP_FAILED) { fprintf(stderr, PFX "Warning: BlueFlame available, " "but failed to mmap() BlueFlame page.\n"); @@ -176,23 +188,28 @@ static struct ibv_context *mlx4_alloc_context(struct ibv_device *ibdev, int cmd_ pthread_spin_init(&context->uar_lock, PTHREAD_PROCESS_PRIVATE); - context->ibv_ctx.ops = mlx4_ctx_ops; - - return &context->ibv_ctx; + ibv_ctx->ops = mlx4_ctx_ops; + /* New verbs should be added as below + * verbs_ctx->drv_new_func1 = mlx4_new_func1; + */ + return 0; -err_free: - free(context); - return NULL; } -static void mlx4_free_context(struct ibv_context *ibctx) + +static void mlx4_uninit_context(struct verbs_device *device, + struct ibv_context *ibv_ctx) { - struct mlx4_context *context = to_mctx(ibctx); + struct mlx4_context *context = to_mctx(ibv_ctx); - munmap(context->uar, to_mdev(ibctx->device)->page_size); + munmap(context->uar, to_mdev_ex(device)->page_size); if (context->bf_page) - munmap(context->bf_page, to_mdev(ibctx->device)->page_size); - free(context); + munmap(context->bf_page, to_mdev_ex(device)->page_size); +} + +static void mlx4_free_context(struct ibv_context *ibctx) +{ + return; } static struct ibv_device_ops mlx4_dev_ops = { @@ -204,7 +221,7 @@ static struct ibv_device *mlx4_driver_init(const char *uverbs_sys_path, int abi_version) { char value[8]; - struct mlx4_device *dev; + struct mlx4_device_ex *dev; unsigned vendor, device; int i; @@ -226,7 +243,7 @@ static struct ibv_device *mlx4_driver_init(const char *uverbs_sys_path, return NULL; found: - if (abi_version < MLX4_UVERBS_MIN_ABI_VERSION || + if (abi_version <= MLX4_UVERBS_MIN_ABI_VERSION || abi_version > MLX4_UVERBS_MAX_ABI_VERSION) { fprintf(stderr, PFX "Fatal: ABI version %d of %s is not supported " "(min supported %d, max supported %d)\n", @@ -243,16 +260,24 @@ found: return NULL; } - dev->ibv_dev.ops = mlx4_dev_ops; + dev->verbs_dev.device.ops = mlx4_dev_ops; dev->page_size = sysconf(_SC_PAGESIZE); - - return &dev->ibv_dev; + dev->verbs_dev.sz = sizeof(*dev); + dev->verbs_dev.size_of_context = + sizeof(struct mlx4_context) - sizeof(struct ibv_context); + /* mlx4_init_context will initialize provider calls */ + dev->verbs_dev.init_context = mlx4_init_context; + dev->verbs_dev.uninit_context = mlx4_uninit_context; + + return &dev->verbs_dev.device; } + #ifdef HAVE_IBV_REGISTER_DRIVER static __attribute__((constructor)) void mlx4_register_driver(void) { - ibv_register_driver("mlx4", mlx4_driver_init); + verbs_register_driver("mlx4", mlx4_driver_init); + } #else /* diff --git a/src/mlx4.h b/src/mlx4.h index 13c13d8..c06dbd5 100644 --- a/src/mlx4.h +++ b/src/mlx4.h @@ -135,6 +135,11 @@ struct mlx4_device { int page_size; }; +struct mlx4_device_ex { + struct verbs_device verbs_dev; + int page_size; +}; + struct mlx4_db_page; struct mlx4_context { @@ -261,6 +266,17 @@ static inline struct mlx4_device *to_mdev(struct ibv_device *ibdev) return to_mxxx(dev, device); } +#define to_mxxx_ex(xxx, type) \ + ((struct mlx4_##type##_ex *) \ + ((void *) verbs##xxx - offsetof(struct mlx4_##type##_ex, verbs_##xxx))) + + +static inline struct mlx4_device_ex *to_mdev_ex(const struct verbs_device + *verbsdev) +{ + return to_mxxx_ex(dev, device); +} + static inline struct mlx4_context *to_mctx(struct ibv_context *ibctx) { return to_mxxx(ctx, context);