Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9a5a644 authored by Raed Salem's avatar Raed Salem Committed by Leon Romanovsky
Browse files

IB/uverbs: Add create/destroy counters support 



User space application which uses counters functionality, is expected to
allocate/release the counters resources by calling create/destroy verbs
and in turn get a unique handle that can be used to attach the counters to
its counted type.

Reviewed-by: default avatarYishai Hadas <yishaih@mellanox.com>
Signed-off-by: default avatarRaed Salem <raeds@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent fa9b1802

drivers/infiniband/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -36,4 +36,4 @@ ib_uverbs-y := uverbs_main.o uverbs_cmd.o uverbs_marshall.o \ 
				rdma_core.o uverbs_std_types.o uverbs_ioctl.o \

				uverbs_ioctl_merge.o uverbs_std_types_cq.o \

				uverbs_std_types_flow_action.o uverbs_std_types_dm.o \

				uverbs_std_types_mr.o
 
				uverbs_std_types_mr.o uverbs_std_types_counters.o

drivers/infiniband/core/uverbs.h

+1 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_RWQ_IND_TBL); 
extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_XRCD);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_FLOW_ACTION);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_DM);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_COUNTERS);



#define IB_UVERBS_DECLARE_CMD(name)					\

	ssize_t ib_uverbs_##name(struct ib_uverbs_file *file,		\

drivers/infiniband/core/uverbs_std_types.c

+2 −1
Original line number Diff line number Diff line
@@ -302,7 +302,8 @@ static DECLARE_UVERBS_OBJECT_TREE(uverbs_default_objects, 
				  &UVERBS_OBJECT(UVERBS_OBJECT_RWQ_IND_TBL),

				  &UVERBS_OBJECT(UVERBS_OBJECT_XRCD),

				  &UVERBS_OBJECT(UVERBS_OBJECT_FLOW_ACTION),

				  &UVERBS_OBJECT(UVERBS_OBJECT_DM));

				  &UVERBS_OBJECT(UVERBS_OBJECT_DM),

				  &UVERBS_OBJECT(UVERBS_OBJECT_COUNTERS));



const struct uverbs_object_tree_def *uverbs_default_get_objects(void)

{

drivers/infiniband/core/uverbs_std_types_counters.c

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

/*

 * Copyright (c) 2018, Mellanox Technologies inc.  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.

 */



#include "uverbs.h"

#include <rdma/uverbs_std_types.h>



static int uverbs_free_counters(struct ib_uobject *uobject,

				enum rdma_remove_reason why)

{

	struct ib_counters *counters = uobject->object;



	if (why == RDMA_REMOVE_DESTROY &&

	    atomic_read(&counters->usecnt))

		return -EBUSY;



	return counters->device->destroy_counters(counters);

}



static int UVERBS_HANDLER(UVERBS_METHOD_COUNTERS_CREATE)(struct ib_device *ib_dev,

							 struct ib_uverbs_file *file,

							 struct uverbs_attr_bundle *attrs)

{

	struct ib_counters *counters;

	struct ib_uobject *uobj;

	int ret;



	/*

	 * This check should be removed once the infrastructure

	 * have the ability to remove methods from parse tree once

	 * such condition is met.

	 */

	if (!ib_dev->create_counters)

		return -EOPNOTSUPP;



	uobj = uverbs_attr_get_uobject(attrs, UVERBS_ATTR_CREATE_COUNTERS_HANDLE);

	counters = ib_dev->create_counters(ib_dev, attrs);

	if (IS_ERR(counters)) {

		ret = PTR_ERR(counters);

		goto err_create_counters;

	}



	counters->device = ib_dev;

	counters->uobject = uobj;

	uobj->object = counters;

	atomic_set(&counters->usecnt, 0);



	return 0;



err_create_counters:

	return ret;

}



static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_COUNTERS_CREATE,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_CREATE_COUNTERS_HANDLE,

			 UVERBS_OBJECT_COUNTERS,

			 UVERBS_ACCESS_NEW,

			 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));



static DECLARE_UVERBS_NAMED_METHOD_WITH_HANDLER(UVERBS_METHOD_COUNTERS_DESTROY,

	uverbs_destroy_def_handler,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_DESTROY_COUNTERS_HANDLE,

			 UVERBS_OBJECT_COUNTERS,

			 UVERBS_ACCESS_DESTROY,

			 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_COUNTERS,

			    &UVERBS_TYPE_ALLOC_IDR(0, uverbs_free_counters),

			    &UVERBS_METHOD(UVERBS_METHOD_COUNTERS_CREATE),

			    &UVERBS_METHOD(UVERBS_METHOD_COUNTERS_DESTROY));

include/uapi/rdma/ib_user_ioctl_cmds.h

+14 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ enum uverbs_default_objects { 
	UVERBS_OBJECT_WQ,

	UVERBS_OBJECT_FLOW_ACTION,

	UVERBS_OBJECT_DM,

	UVERBS_OBJECT_COUNTERS,

};



enum {
@@ -131,4 +132,17 @@ enum uverbs_methods_mr { 
	UVERBS_METHOD_DM_MR_REG,

};



enum uverbs_attrs_create_counters_cmd_attr_ids {

	UVERBS_ATTR_CREATE_COUNTERS_HANDLE,

};



enum uverbs_attrs_destroy_counters_cmd_attr_ids {

	UVERBS_ATTR_DESTROY_COUNTERS_HANDLE,

};



enum uverbs_methods_actions_counters_ops {

	UVERBS_METHOD_COUNTERS_CREATE,

	UVERBS_METHOD_COUNTERS_DESTROY,

};



#endif