From patchwork Tue Jun 16 10:39:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 217712 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 CC3D8C433DF for ; Tue, 16 Jun 2020 10:46:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A42FF20776 for ; Tue, 16 Jun 2020 10:46:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592304363; bh=uA22cCRWBVpECohJIFO4hkg/gezZbNw8GwbDDBUNfx0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mZcESfCR97ph1HlFKbZcmVEQQiAVg9X68hqcxkyjebVYRv5tCEQ0Tftmq7TLJrZwT tqg0LiVS6qKdFm92XfvOjqIevzDWnDZSw9LLZxq9nkJpaSM1yxm9AFCVSR5ObxHSA9 DKzF2jGKey5enhVwnyk6tjdkmhTKGp9uk46kmft4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728415AbgFPKqC (ORCPT ); Tue, 16 Jun 2020 06:46:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:59572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725775AbgFPKqA (ORCPT ); Tue, 16 Jun 2020 06:46:00 -0400 Received: from localhost (unknown [213.57.247.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 97F5D20767; Tue, 16 Jun 2020 10:45:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592304359; bh=uA22cCRWBVpECohJIFO4hkg/gezZbNw8GwbDDBUNfx0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jpYgOd0S/MR1Db502//F4N0+G69AsvdufTagSt7u6yEtO9nAmtqUHQGx9JVwur3Mc wX7uM6Cq+w/HaLZAXpt0L9gSa38otZjue75atLgIeBWUy4k2tpYpqTm9oORySo7iik u6dmBFvJP2o46rKomg5trfPpu/g9S5WACurV8w3s= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Maor Gottlieb , Jakub Kicinski , linux-rdma@vger.kernel.org, netdev@vger.kernel.org, Saeed Mahameed Subject: [PATCH mlx5-next v2 01/11] net/mlx5: Export resource dump interface Date: Tue, 16 Jun 2020 13:39:56 +0300 Message-Id: <20200616104006.2425549-2-leon@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200616104006.2425549-1-leon@kernel.org> References: <20200616104006.2425549-1-leon@kernel.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Maor Gottlieb Export some of the resource dump API. mlx5_ib driver will use it in downstream patches. Signed-off-by: Maor Gottlieb Signed-off-by: Leon Romanovsky --- .../mellanox/mlx5/core/diag/rsc_dump.c | 3 ++ .../mellanox/mlx5/core/diag/rsc_dump.h | 33 +------------------ .../diag => include/linux/mlx5}/rsc_dump.h | 22 ++++--------- 3 files changed, 10 insertions(+), 48 deletions(-) copy {drivers/net/ethernet/mellanox/mlx5/core/diag => include/linux/mlx5}/rsc_dump.h (68%) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c b/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c index 17ab7efe693d..10218c2324cc 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c @@ -130,11 +130,13 @@ struct mlx5_rsc_dump_cmd *mlx5_rsc_dump_cmd_create(struct mlx5_core_dev *dev, cmd->mem_size = key->size; return cmd; } +EXPORT_SYMBOL(mlx5_rsc_dump_cmd_create); void mlx5_rsc_dump_cmd_destroy(struct mlx5_rsc_dump_cmd *cmd) { kfree(cmd); } +EXPORT_SYMBOL(mlx5_rsc_dump_cmd_destroy); int mlx5_rsc_dump_next(struct mlx5_core_dev *dev, struct mlx5_rsc_dump_cmd *cmd, struct page *page, int *size) @@ -155,6 +157,7 @@ int mlx5_rsc_dump_next(struct mlx5_core_dev *dev, struct mlx5_rsc_dump_cmd *cmd, return more_dump; } +EXPORT_SYMBOL(mlx5_rsc_dump_next); #define MLX5_RSC_DUMP_MENU_SEGMENT 0xffff static int mlx5_rsc_dump_menu(struct mlx5_core_dev *dev) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h b/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h index 148270073e71..64c4956db6d2 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h @@ -4,41 +4,10 @@ #ifndef __MLX5_RSC_DUMP_H #define __MLX5_RSC_DUMP_H +#include #include #include "mlx5_core.h" -enum mlx5_sgmt_type { - MLX5_SGMT_TYPE_HW_CQPC, - MLX5_SGMT_TYPE_HW_SQPC, - MLX5_SGMT_TYPE_HW_RQPC, - MLX5_SGMT_TYPE_FULL_SRQC, - MLX5_SGMT_TYPE_FULL_CQC, - MLX5_SGMT_TYPE_FULL_EQC, - MLX5_SGMT_TYPE_FULL_QPC, - MLX5_SGMT_TYPE_SND_BUFF, - MLX5_SGMT_TYPE_RCV_BUFF, - MLX5_SGMT_TYPE_SRQ_BUFF, - MLX5_SGMT_TYPE_CQ_BUFF, - MLX5_SGMT_TYPE_EQ_BUFF, - MLX5_SGMT_TYPE_SX_SLICE, - MLX5_SGMT_TYPE_SX_SLICE_ALL, - MLX5_SGMT_TYPE_RDB, - MLX5_SGMT_TYPE_RX_SLICE_ALL, - MLX5_SGMT_TYPE_MENU, - MLX5_SGMT_TYPE_TERMINATE, - - MLX5_SGMT_TYPE_NUM, /* Keep last */ -}; - -struct mlx5_rsc_key { - enum mlx5_sgmt_type rsc; - int index1; - int index2; - int num_of_obj1; - int num_of_obj2; - int size; -}; - #define MLX5_RSC_DUMP_ALL 0xFFFF struct mlx5_rsc_dump_cmd; struct mlx5_rsc_dump; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h b/include/linux/mlx5/rsc_dump.h similarity index 68% copy from drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h copy to include/linux/mlx5/rsc_dump.h index 148270073e71..87415fa754fe 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h +++ b/include/linux/mlx5/rsc_dump.h @@ -1,11 +1,10 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (c) 2019 Mellanox Technologies. */ - -#ifndef __MLX5_RSC_DUMP_H -#define __MLX5_RSC_DUMP_H +/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */ +/* Copyright (c) 2020 Mellanox Technologies inc. */ #include -#include "mlx5_core.h" + +#ifndef __MLX5_RSC_DUMP +#define __MLX5_RSC_DUMP enum mlx5_sgmt_type { MLX5_SGMT_TYPE_HW_CQPC, @@ -39,20 +38,11 @@ struct mlx5_rsc_key { int size; }; -#define MLX5_RSC_DUMP_ALL 0xFFFF struct mlx5_rsc_dump_cmd; -struct mlx5_rsc_dump; - -struct mlx5_rsc_dump *mlx5_rsc_dump_create(struct mlx5_core_dev *dev); -void mlx5_rsc_dump_destroy(struct mlx5_core_dev *dev); - -int mlx5_rsc_dump_init(struct mlx5_core_dev *dev); -void mlx5_rsc_dump_cleanup(struct mlx5_core_dev *dev); struct mlx5_rsc_dump_cmd *mlx5_rsc_dump_cmd_create(struct mlx5_core_dev *dev, struct mlx5_rsc_key *key); void mlx5_rsc_dump_cmd_destroy(struct mlx5_rsc_dump_cmd *cmd); - int mlx5_rsc_dump_next(struct mlx5_core_dev *dev, struct mlx5_rsc_dump_cmd *cmd, struct page *page, int *size); -#endif +#endif /* __MLX5_RSC_DUMP */