Commit b572ebe6 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/mlx5: Separate restrack callbacks initialization from main.c 

The restrack code has separate .c, so move callbacks initialization to
that file to improve code locality.

Link: https://lore.kernel.org/r/20200702081809.423482-3-leon@kernel.org


Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent ac47bf5e

drivers/infiniband/hw/mlx5/main.c

+9 −34
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

/*

 * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 * Copyright (c) 2013-2020, Mellanox Technologies inc. All rights reserved.

 */



#include <linux/debugfs.h>
@@ -62,6 +35,7 @@ 
#include "srq.h"

#include "qp.h"

#include "wr.h"

#include "restrack.h"

#include <linux/mlx5/fs_helpers.h>

#include <linux/mlx5/accel.h>

#include <rdma/uverbs_std_types.h>
@@ -6615,11 +6589,6 @@ static const struct ib_device_ops mlx5_ib_dev_ops = { 
	.drain_rq = mlx5_ib_drain_rq,

	.drain_sq = mlx5_ib_drain_sq,

	.enable_driver = mlx5_ib_enable_driver,

	.fill_res_cq_entry_raw = mlx5_ib_fill_res_cq_entry_raw,

	.fill_res_mr_entry = mlx5_ib_fill_res_mr_entry,

	.fill_res_mr_entry_raw = mlx5_ib_fill_res_mr_entry_raw,

	.fill_res_qp_entry_raw = mlx5_ib_fill_res_qp_entry_raw,

	.fill_stat_mr_entry = mlx5_ib_fill_stat_mr_entry,

	.get_dev_fw_str = get_dev_fw_str,

	.get_dma_mr = mlx5_ib_get_dma_mr,

	.get_link_layer = mlx5_ib_port_link_layer,
@@ -7205,6 +7174,9 @@ static const struct mlx5_ib_profile pf_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_DELAY_DROP,

		     mlx5_ib_stage_delay_drop_init,

		     mlx5_ib_stage_delay_drop_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_RESTRACK,

		     mlx5_ib_restrack_init,

		     NULL),

};



const struct mlx5_ib_profile raw_eth_profile = {
@@ -7259,6 +7231,9 @@ const struct mlx5_ib_profile raw_eth_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_POST_IB_REG_UMR,

		     mlx5_ib_stage_post_ib_reg_umr_init,

		     NULL),

	STAGE_CREATE(MLX5_IB_STAGE_RESTRACK,

		     mlx5_ib_restrack_init,

		     NULL),

};



static void *mlx5_ib_add_slave_port(struct mlx5_core_dev *mdev)

drivers/infiniband/hw/mlx5/mlx5_ib.h

+3 −35
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */

/*

 * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 * Copyright (c) 2013-2020, Mellanox Technologies inc. All rights reserved.

 */



#ifndef MLX5_IB_H
@@ -850,7 +823,7 @@ enum mlx5_ib_stages { 
	MLX5_IB_STAGE_IB_REG,

	MLX5_IB_STAGE_POST_IB_REG_UMR,

	MLX5_IB_STAGE_DELAY_DROP,

	MLX5_IB_STAGE_CLASS_ATTR,

	MLX5_IB_STAGE_RESTRACK,

	MLX5_IB_STAGE_MAX,

};
@@ -1374,11 +1347,6 @@ struct mlx5_core_dev *mlx5_ib_get_native_port_mdev(struct mlx5_ib_dev *dev, 
						   u8 *native_port_num);

void mlx5_ib_put_native_port_mdev(struct mlx5_ib_dev *dev,

				  u8 port_num);

int mlx5_ib_fill_res_mr_entry(struct sk_buff *msg, struct ib_mr *ib_mr);

int mlx5_ib_fill_res_mr_entry_raw(struct sk_buff *msg, struct ib_mr *ib_mr);

int mlx5_ib_fill_res_qp_entry_raw(struct sk_buff *msg, struct ib_qp *ibqp);

int mlx5_ib_fill_res_cq_entry_raw(struct sk_buff *msg, struct ib_cq *ibcq);

int mlx5_ib_fill_stat_mr_entry(struct sk_buff *msg, struct ib_mr *ib_mr);



extern const struct uapi_definition mlx5_ib_devx_defs[];

extern const struct uapi_definition mlx5_ib_flow_defs[];

drivers/infiniband/hw/mlx5/restrack.c

+21 −8
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

/*

 * Copyright (c) 2019, Mellanox Technologies inc.  All rights reserved.

 * Copyright (c) 2019-2020, Mellanox Technologies Ltd. All rights reserved.

 */



#include <uapi/rdma/rdma_netlink.h>
@@ -8,6 +8,7 @@ 
#include <rdma/ib_umem_odp.h>

#include <rdma/restrack.h>

#include "mlx5_ib.h"

#include "restrack.h"



#define MAX_DUMP_SIZE 1024
@@ -77,8 +78,7 @@ out: 
	return err;

}



int mlx5_ib_fill_stat_mr_entry(struct sk_buff *msg,

			       struct ib_mr *ibmr)

static int fill_stat_mr_entry(struct sk_buff *msg, struct ib_mr *ibmr)

{

	struct mlx5_ib_mr *mr = to_mmr(ibmr);

	struct nlattr *table_attr;
@@ -112,7 +112,7 @@ err: 
	return -EMSGSIZE;

}



int mlx5_ib_fill_res_mr_entry_raw(struct sk_buff *msg, struct ib_mr *ibmr)

static int fill_res_mr_entry_raw(struct sk_buff *msg, struct ib_mr *ibmr)

{

	struct mlx5_ib_mr *mr = to_mmr(ibmr);
@@ -120,8 +120,7 @@ int mlx5_ib_fill_res_mr_entry_raw(struct sk_buff *msg, struct ib_mr *ibmr) 
			    mlx5_mkey_to_idx(mr->mmkey.key));

}



int mlx5_ib_fill_res_mr_entry(struct sk_buff *msg,

			      struct ib_mr *ibmr)

static int fill_res_mr_entry(struct sk_buff *msg, struct ib_mr *ibmr)

{

	struct mlx5_ib_mr *mr = to_mmr(ibmr);

	struct nlattr *table_attr;
@@ -149,7 +148,7 @@ err: 
	return -EMSGSIZE;

}



int mlx5_ib_fill_res_cq_entry_raw(struct sk_buff *msg, struct ib_cq *ibcq)

static int fill_res_cq_entry_raw(struct sk_buff *msg, struct ib_cq *ibcq)

{

	struct mlx5_ib_dev *dev = to_mdev(ibcq->device);

	struct mlx5_ib_cq *cq = to_mcq(ibcq);
@@ -157,10 +156,24 @@ int mlx5_ib_fill_res_cq_entry_raw(struct sk_buff *msg, struct ib_cq *ibcq) 
	return fill_res_raw(msg, dev, MLX5_SGMT_TYPE_PRM_QUERY_CQ, cq->mcq.cqn);

}



int mlx5_ib_fill_res_qp_entry_raw(struct sk_buff *msg, struct ib_qp *ibqp)

static int fill_res_qp_entry_raw(struct sk_buff *msg, struct ib_qp *ibqp)

{

	struct mlx5_ib_dev *dev = to_mdev(ibqp->device);



	return fill_res_raw(msg, dev, MLX5_SGMT_TYPE_PRM_QUERY_QP,

			    ibqp->qp_num);

}



static const struct ib_device_ops restrack_ops = {

	.fill_res_cq_entry_raw = fill_res_cq_entry_raw,

	.fill_res_mr_entry = fill_res_mr_entry,

	.fill_res_mr_entry_raw = fill_res_mr_entry_raw,

	.fill_res_qp_entry_raw = fill_res_qp_entry_raw,

	.fill_stat_mr_entry = fill_stat_mr_entry,

};



int mlx5_ib_restrack_init(struct mlx5_ib_dev *dev)

{

	ib_set_device_ops(&dev->ib_dev, &restrack_ops);

	return 0;

}

drivers/infiniband/hw/mlx5/restrack.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */

/*

 * Copyright (c) 2013-2020, Mellanox Technologies Ltd. All rights reserved.

 */



#ifndef _MLX5_IB_RESTRACK_H

#define _MLX5_IB_RESTRACK_H



#include "mlx5_ib.h"



int mlx5_ib_restrack_init(struct mlx5_ib_dev *dev);



#endif /* _MLX5_IB_RESTRACK_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE