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

Commit 83bb4442 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/uverbs: Remove UA_FLAGS 



This bit of boilerplate isn't really necessary, we can use bitfields
instead of a flags enum and the macros can then individually initialize
them through the __VA_ARGS__ like everything else.

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

drivers/infiniband/core/uverbs_ioctl.c

+4 −6
Original line number Diff line number Diff line
@@ -98,14 +98,14 @@ static int uverbs_process_attr(struct ib_uverbs_file *ufile, 
		 * non-zero content, making ABI compat/discovery simpler.

		 */

		if (uattr->len > val_spec->u.ptr.len &&

		    val_spec->flags & UVERBS_ATTR_SPEC_F_MIN_SZ_OR_ZERO &&

		    val_spec->min_sz_or_zero &&

		    !uverbs_is_attr_cleared(uattr, val_spec->u.ptr.len))

			return -EOPNOTSUPP;



	/* fall through */

	case UVERBS_ATTR_TYPE_PTR_OUT:

		if (uattr->len < val_spec->u.ptr.min_len ||

		    (!(val_spec->flags & UVERBS_ATTR_SPEC_F_MIN_SZ_OR_ZERO) &&

		    (!val_spec->min_sz_or_zero &&

		     uattr->len > val_spec->u.ptr.len))

			return -EINVAL;
@@ -116,8 +116,7 @@ static int uverbs_process_attr(struct ib_uverbs_file *ufile, 
		e->ptr_attr.len = uattr->len;

		e->ptr_attr.flags = uattr->flags;



		if (val_spec->flags & UVERBS_ATTR_SPEC_F_ALLOC_AND_COPY &&

		    !uverbs_attr_ptr_is_inline(e)) {

		if (val_spec->alloc_and_copy && !uverbs_attr_ptr_is_inline(e)) {

			void *p;



			p = kvmalloc(uattr->len, GFP_KERNEL);
@@ -220,8 +219,7 @@ static int uverbs_finalize_attrs(struct uverbs_attr_bundle *attrs_bundle, 
				if (!ret)

					ret = current_ret;

			} else if (spec->type == UVERBS_ATTR_TYPE_PTR_IN &&

				   spec->flags &

					   UVERBS_ATTR_SPEC_F_ALLOC_AND_COPY &&

				   spec->alloc_and_copy &&

				   !uverbs_attr_ptr_is_inline(attr)) {

				kvfree(attr->ptr_attr.ptr);

			}

drivers/infiniband/core/uverbs_ioctl_merge.c

+3 −3
Original line number Diff line number Diff line
@@ -374,18 +374,18 @@ static struct uverbs_method_spec *build_method_with_attrs(const struct uverbs_me 
				 "ib_uverbs: Method contains more than one object attr (%d) with new/destroy access\n",

				 min_id) ||

			    WARN(attr_obj_with_special_access &&

				 !(attr->flags & UVERBS_ATTR_SPEC_F_MANDATORY),

				 !attr->mandatory,

				 "ib_uverbs: Tried to merge attr (%d) but it's an object with new/destroy access but isn't mandatory\n",

				 min_id) ||

			    WARN(IS_ATTR_OBJECT(attr) &&

				 attr->flags & UVERBS_ATTR_SPEC_F_MIN_SZ_OR_ZERO,

				 attr->min_sz_or_zero,

				 "ib_uverbs: Tried to merge attr (%d) but it's an object with min_sz flag\n",

				 min_id)) {

				res = -EINVAL;

				goto free;

			}



			if (attr->flags & UVERBS_ATTR_SPEC_F_MANDATORY)

			if (attr->mandatory)

				set_bit(min_id, hash->mandatory_attrs_bitmask);

			min_id++;

drivers/infiniband/core/uverbs_std_types_counters.c

+5 −5
Original line number Diff line number Diff line
@@ -129,14 +129,14 @@ DECLARE_UVERBS_NAMED_METHOD( 
	UVERBS_ATTR_IDR(UVERBS_ATTR_CREATE_COUNTERS_HANDLE,

			UVERBS_OBJECT_COUNTERS,

			UVERBS_ACCESS_NEW,

			UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));

			UA_MANDATORY));



DECLARE_UVERBS_NAMED_METHOD_DESTROY(

	UVERBS_METHOD_COUNTERS_DESTROY,

	UVERBS_ATTR_IDR(UVERBS_ATTR_DESTROY_COUNTERS_HANDLE,

			UVERBS_OBJECT_COUNTERS,

			UVERBS_ACCESS_DESTROY,

			UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));

			UA_MANDATORY));



#define MAX_COUNTERS_BUFF_SIZE USHRT_MAX

DECLARE_UVERBS_NAMED_METHOD(
@@ -144,13 +144,13 @@ DECLARE_UVERBS_NAMED_METHOD( 
	UVERBS_ATTR_IDR(UVERBS_ATTR_READ_COUNTERS_HANDLE,

			UVERBS_OBJECT_COUNTERS,

			UVERBS_ACCESS_READ,

			UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

			UA_MANDATORY),

	UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_READ_COUNTERS_BUFF,

			    UVERBS_ATTR_SIZE(0, MAX_COUNTERS_BUFF_SIZE),

			    UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

			    UA_MANDATORY),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_READ_COUNTERS_FLAGS,

			   UVERBS_ATTR_TYPE(__u32),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));

			   UA_MANDATORY));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_COUNTERS,

			    UVERBS_TYPE_ALLOC_IDR(uverbs_free_counters),

drivers/infiniband/core/uverbs_std_types_cq.c

+9 −8
Original line number Diff line number Diff line
@@ -152,23 +152,24 @@ DECLARE_UVERBS_NAMED_METHOD( 
	UVERBS_ATTR_IDR(UVERBS_ATTR_CREATE_CQ_HANDLE,

			UVERBS_OBJECT_CQ,

			UVERBS_ACCESS_NEW,

			UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

			UA_MANDATORY),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_CQE,

			   UVERBS_ATTR_TYPE(u32),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

			   UA_MANDATORY),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_USER_HANDLE,

			   UVERBS_ATTR_TYPE(u64),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

			   UA_MANDATORY),

	UVERBS_ATTR_FD(UVERBS_ATTR_CREATE_CQ_COMP_CHANNEL,

		       UVERBS_OBJECT_COMP_CHANNEL,

		       UVERBS_ACCESS_READ),

		       UVERBS_ACCESS_READ,

		       UA_OPTIONAL),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_COMP_VECTOR,

			   UVERBS_ATTR_TYPE(u32),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

			   UA_MANDATORY),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_FLAGS, UVERBS_ATTR_TYPE(u32)),

	UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_CREATE_CQ_RESP_CQE,

			    UVERBS_ATTR_TYPE(u32),

			    UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

			    UA_MANDATORY),

	UVERBS_ATTR_UHW());



static int UVERBS_HANDLER(UVERBS_METHOD_CQ_DESTROY)(struct ib_device *ib_dev,
@@ -205,10 +206,10 @@ DECLARE_UVERBS_NAMED_METHOD( 
	UVERBS_ATTR_IDR(UVERBS_ATTR_DESTROY_CQ_HANDLE,

			UVERBS_OBJECT_CQ,

			UVERBS_ACCESS_DESTROY,

			UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

			UA_MANDATORY),

	UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_DESTROY_CQ_RESP,

			    UVERBS_ATTR_TYPE(struct ib_uverbs_destroy_cq_resp),

			    UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));

			    UA_MANDATORY));



DECLARE_UVERBS_NAMED_OBJECT(

	UVERBS_OBJECT_CQ,

drivers/infiniband/core/uverbs_std_types_dm.c

+4 −4
Original line number Diff line number Diff line
@@ -90,20 +90,20 @@ DECLARE_UVERBS_NAMED_METHOD( 
	UVERBS_ATTR_IDR(UVERBS_ATTR_ALLOC_DM_HANDLE,

			UVERBS_OBJECT_DM,

			UVERBS_ACCESS_NEW,

			UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

			UA_MANDATORY),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_ALLOC_DM_LENGTH,

			   UVERBS_ATTR_TYPE(u64),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

			   UA_MANDATORY),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_ALLOC_DM_ALIGNMENT,

			   UVERBS_ATTR_TYPE(u32),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));

			   UA_MANDATORY));



DECLARE_UVERBS_NAMED_METHOD_DESTROY(

	UVERBS_METHOD_DM_FREE,

	UVERBS_ATTR_IDR(UVERBS_ATTR_FREE_DM_HANDLE,

			UVERBS_OBJECT_DM,

			UVERBS_ACCESS_DESTROY,

			UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));

			UA_MANDATORY));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_DM,

			    UVERBS_TYPE_ALLOC_IDR(uverbs_free_dm),