From mboxrd@z Thu Jan 1 00:00:00 1970 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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 7A1F5C43461 for ; Sun, 18 Apr 2021 13:50:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 58BCB6052B for ; Sun, 18 Apr 2021 13:50:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231548AbhDRNu2 (ORCPT ); Sun, 18 Apr 2021 09:50:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:44120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231460AbhDRNuW (ORCPT ); Sun, 18 Apr 2021 09:50:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E01D26052B; Sun, 18 Apr 2021 13:49:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618753794; bh=IYDhQViSgL0R8VHANWxTUf0VoI44Roq3uZ442Mv64m4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AknnVTmIHVJLeFEwlScamx151JiwmRBaTdf7UWNqIjDi/yptuhc1AsYy6NROKFfSH uxGLMPvfy+Un8kbIVhuBAN5HCdX8s/tRFxv7nib4L9/ZMQ7uEGKCpL+27RKc+JZ+Y/ 9Nc8tXN/EiAIdxKwOyVfhTkHVfbH/LF2n2xmyL+BVc/g1Fsb9FMOnt/MpLRKQ9nXls drPBSR0ZE+VBt8KdBAQpXCheGs9PMQgQcJUo663Wvl/p1c/K//OfVa1uyUg6+vKqTE 4O/IhbKMVmMkrUUlZ471s/I6Sv1nPYIghvzMZ2Z4lbzpc8kINea5eF+/4/+GjKGEPi YMMn08w07tPgA== From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Maor Gottlieb , linux-rdma@vger.kernel.org Subject: [PATCH rdma-next 2/2] RDMA/mlx5: Fix type assignment for ICM DM Date: Sun, 18 Apr 2021 16:49:40 +0300 Message-Id: <58dedbd5c132660f808e59166d434e2eaa6ecf7a.1618753425.git.leonro@nvidia.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Maor Gottlieb We should hold the UAPI DM type in the base struct and not the internal mlx5 type. Fix it. Fixes: 9905fb65119f ("RDMA/mlx5: Re-organize the DM code") Signed-off-by: Maor Gottlieb Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/mlx5/dm.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/dm.c b/drivers/infiniband/hw/mlx5/dm.c index 235aad6beacb..094bf85589db 100644 --- a/drivers/infiniband/hw/mlx5/dm.c +++ b/drivers/infiniband/hw/mlx5/dm.c @@ -331,12 +331,20 @@ static struct ib_dm *handle_alloc_dm_memic(struct ib_ucontext *ctx, return ERR_PTR(err); } +static enum mlx5_sw_icm_type get_icm_type(int uapi_type) +{ + return uapi_type == MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM ? + MLX5_SW_ICM_TYPE_STEERING : + MLX5_SW_ICM_TYPE_HEADER_MODIFY; +} + static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx, struct ib_dm_alloc_attr *attr, struct uverbs_attr_bundle *attrs, int type) { struct mlx5_core_dev *dev = to_mdev(ctx->device)->mdev; + enum mlx5_sw_icm_type icm_type = get_icm_type(type); struct mlx5_ib_dm_icm *dm; u64 act_size; int err; @@ -368,7 +376,7 @@ static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx, act_size = roundup_pow_of_two(act_size); dm->base.size = act_size; - err = mlx5_dm_sw_icm_alloc(dev, type, act_size, attr->alignment, + err = mlx5_dm_sw_icm_alloc(dev, icm_type, act_size, attr->alignment, to_mucontext(ctx)->devx_uid, &dm->base.dev_addr, &dm->obj_id); if (err) @@ -377,7 +385,7 @@ static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx, err = uverbs_copy_to(attrs, MLX5_IB_ATTR_ALLOC_DM_RESP_START_OFFSET, &dm->base.dev_addr, sizeof(dm->base.dev_addr)); if (err) { - mlx5_dm_sw_icm_dealloc(dev, type, dm->base.size, + mlx5_dm_sw_icm_dealloc(dev, icm_type, dm->base.size, to_mucontext(ctx)->devx_uid, dm->base.dev_addr, dm->obj_id); goto free; @@ -409,11 +417,9 @@ struct ib_dm *mlx5_ib_alloc_dm(struct ib_device *ibdev, case MLX5_IB_UAPI_DM_TYPE_MEMIC: return handle_alloc_dm_memic(context, attr, attrs); case MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM: - return handle_alloc_dm_sw_icm(context, attr, attrs, - MLX5_SW_ICM_TYPE_STEERING); + return handle_alloc_dm_sw_icm(context, attr, attrs, type); case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_SW_ICM: - return handle_alloc_dm_sw_icm(context, attr, attrs, - MLX5_SW_ICM_TYPE_HEADER_MODIFY); + return handle_alloc_dm_sw_icm(context, attr, attrs, type); default: return ERR_PTR(-EOPNOTSUPP); } @@ -441,10 +447,7 @@ static void mlx5_dm_memic_dealloc(struct mlx5_ib_dm_memic *dm) static int mlx5_dm_icm_dealloc(struct mlx5_ib_ucontext *ctx, struct mlx5_ib_dm_icm *dm) { - enum mlx5_sw_icm_type type = - dm->base.type == MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM ? - MLX5_SW_ICM_TYPE_STEERING : - MLX5_SW_ICM_TYPE_HEADER_MODIFY; + enum mlx5_sw_icm_type type = get_icm_type(dm->base.type); struct mlx5_core_dev *dev = to_mdev(dm->base.ibdm.device)->mdev; int err; -- 2.30.2