From: Michael Margolin <mrgolin@amazon.com>
To: <jgg@nvidia.com>, <leon@kernel.org>, <linux-rdma@vger.kernel.org>
Cc: <sleybo@amazon.com>, <matua@amazon.com>, <gal.pressman@linux.dev>
Subject: [PATCH for-next] RDMA/efa: Rename alloc_ucontext comp_mask to supported_caps
Date: Mon, 16 Mar 2026 18:08:46 +0000 [thread overview]
Message-ID: <20260316180846.30273-1-mrgolin@amazon.com> (raw)
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: Michael Margolin <mrgolin@amazon.com>
---
drivers/infiniband/hw/efa/efa_verbs.c | 17 +++++++++--------
include/uapi/rdma/efa-abi.h | 6 +++---
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/infiniband/hw/efa/efa_verbs.c b/drivers/infiniband/hw/efa/efa_verbs.c
index fc498663cd37..283c62d9cb3d 100644
--- a/drivers/infiniband/hw/efa/efa_verbs.c
+++ b/drivers/infiniband/hw/efa/efa_verbs.c
@@ -1917,22 +1917,23 @@ static int efa_dealloc_uar(struct efa_dev *dev, u16 uarn)
return efa_com_dealloc_uar(&dev->edev, ¶ms);
}
-#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;
diff --git a/include/uapi/rdma/efa-abi.h b/include/uapi/rdma/efa-abi.h
index 13225b038124..d5c18f8de182 100644
--- a/include/uapi/rdma/efa-abi.h
+++ b/include/uapi/rdma/efa-abi.h
@@ -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];
};
--
2.47.3
next reply other threads:[~2026-03-16 18:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-16 18:08 Michael Margolin [this message]
2026-03-17 11:04 ` [PATCH for-next] RDMA/efa: Rename alloc_ucontext comp_mask to supported_caps Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260316180846.30273-1-mrgolin@amazon.com \
--to=mrgolin@amazon.com \
--cc=gal.pressman@linux.dev \
--cc=jgg@nvidia.com \
--cc=leon@kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=matua@amazon.com \
--cc=sleybo@amazon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox