Commit 5aeb6e03 authored by Michael Margolin's avatar Michael Margolin Committed by Leon Romanovsky
Browse files

RDMA/efa: Rename alloc_ucontext comp_mask to supported_caps 

Following discussion [1], rename the comp_mask field in
efa_ibv_alloc_ucontext_cmd to supported_caps to reflect its actual
usage as a capabilities handshake mechanism rather than a standard
comp_mask. Rename related constants and align function and macro names.

[1] https://lore.kernel.org/linux-rdma/20260312120858.GH1448102@nvidia.com/



Signed-off-by: default avatarMichael Margolin <mrgolin@amazon.com>
Link: https://patch.msgid.link/20260316180846.30273-1-mrgolin@amazon.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 6be4ca0a

drivers/infiniband/hw/efa/efa_verbs.c

+9 −8
Original line number Diff line number Diff line
@@ -1917,22 +1917,23 @@ static int efa_dealloc_uar(struct efa_dev *dev, u16 uarn) 
	return efa_com_dealloc_uar(&dev->edev, &params);

}



#define EFA_CHECK_USER_COMP(_dev, _comp_mask, _attr, _mask, _attr_str) \

	(_attr_str = (!(_dev)->dev_attr._attr || ((_comp_mask) & (_mask))) ? \

#define EFA_CHECK_USER_SUPP(_dev, _supported_caps, _attr, _mask, _attr_str) \

	(_attr_str = (!(_dev)->dev_attr._attr || ((_supported_caps) & (_mask))) ? \

		     NULL : #_attr)



static int efa_user_comp_handshake(const struct ib_ucontext *ibucontext,

static int efa_user_supp_handshake(const struct ib_ucontext *ibucontext,

				   const struct efa_ibv_alloc_ucontext_cmd *cmd)

{

	struct efa_dev *dev = to_edev(ibucontext->device);

	char *attr_str;



	if (EFA_CHECK_USER_COMP(dev, cmd->comp_mask, max_tx_batch,

				EFA_ALLOC_UCONTEXT_CMD_COMP_TX_BATCH, attr_str))

	if (EFA_CHECK_USER_SUPP(dev, cmd->supported_caps, max_tx_batch,

				EFA_ALLOC_UCONTEXT_CMD_SUPP_CAPS_TX_BATCH,

				attr_str))

		goto err;



	if (EFA_CHECK_USER_COMP(dev, cmd->comp_mask, min_sq_depth,

				EFA_ALLOC_UCONTEXT_CMD_COMP_MIN_SQ_WR,

	if (EFA_CHECK_USER_SUPP(dev, cmd->supported_caps, min_sq_depth,

				EFA_ALLOC_UCONTEXT_CMD_SUPP_CAPS_MIN_SQ_WR,

				attr_str))

		goto err;
@@ -1966,7 +1967,7 @@ int efa_alloc_ucontext(struct ib_ucontext *ibucontext, struct ib_udata *udata) 
		goto err_out;

	}



	err = efa_user_comp_handshake(ibucontext, &cmd);

	err = efa_user_supp_handshake(ibucontext, &cmd);

	if (err)

		goto err_out;

include/uapi/rdma/efa-abi.h

+3 −3
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ 
 */



enum {

	EFA_ALLOC_UCONTEXT_CMD_COMP_TX_BATCH  = 1 << 0,

	EFA_ALLOC_UCONTEXT_CMD_COMP_MIN_SQ_WR = 1 << 1,

	EFA_ALLOC_UCONTEXT_CMD_SUPP_CAPS_TX_BATCH  = 1 << 0,

	EFA_ALLOC_UCONTEXT_CMD_SUPP_CAPS_MIN_SQ_WR = 1 << 1,

};



struct efa_ibv_alloc_ucontext_cmd {

	__u32 comp_mask;

	__u32 supported_caps;

	__u8 reserved_20[4];

};