Commit 886441fb authored by Bob Pearson's avatar Bob Pearson Committed by Jason Gunthorpe

RDMA/rxe: Replace WR_REG_MASK by WR_LOCAL_OP_MASK

Rxe has two mask bits WR_LOCAL_MASK and WR_REG_MASK with WR_REG_MASK used
to indicate any local operation and WR_LOCAL_MASK unused. This patch
replaces both of these with one mask bit WR_LOCAL_OP_MASK which is
clearer.

Link: https://lore.kernel.org/r/20210608042552.33275-6-rpearsonhpe@gmail.comSigned-off-by: default avatarBob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent beec0239
...@@ -87,13 +87,13 @@ struct rxe_wr_opcode_info rxe_wr_opcode_info[] = { ...@@ -87,13 +87,13 @@ struct rxe_wr_opcode_info rxe_wr_opcode_info[] = {
[IB_WR_LOCAL_INV] = { [IB_WR_LOCAL_INV] = {
.name = "IB_WR_LOCAL_INV", .name = "IB_WR_LOCAL_INV",
.mask = { .mask = {
[IB_QPT_RC] = WR_REG_MASK, [IB_QPT_RC] = WR_LOCAL_OP_MASK,
}, },
}, },
[IB_WR_REG_MR] = { [IB_WR_REG_MR] = {
.name = "IB_WR_REG_MR", .name = "IB_WR_REG_MR",
.mask = { .mask = {
[IB_QPT_RC] = WR_REG_MASK, [IB_QPT_RC] = WR_LOCAL_OP_MASK,
}, },
}, },
}; };
......
...@@ -19,8 +19,7 @@ enum rxe_wr_mask { ...@@ -19,8 +19,7 @@ enum rxe_wr_mask {
WR_SEND_MASK = BIT(2), WR_SEND_MASK = BIT(2),
WR_READ_MASK = BIT(3), WR_READ_MASK = BIT(3),
WR_WRITE_MASK = BIT(4), WR_WRITE_MASK = BIT(4),
WR_LOCAL_MASK = BIT(5), WR_LOCAL_OP_MASK = BIT(5),
WR_REG_MASK = BIT(6),
WR_READ_OR_WRITE_MASK = WR_READ_MASK | WR_WRITE_MASK, WR_READ_OR_WRITE_MASK = WR_READ_MASK | WR_WRITE_MASK,
WR_READ_WRITE_OR_SEND_MASK = WR_READ_OR_WRITE_MASK | WR_SEND_MASK, WR_READ_WRITE_OR_SEND_MASK = WR_READ_OR_WRITE_MASK | WR_SEND_MASK,
......
...@@ -617,7 +617,7 @@ int rxe_requester(void *arg) ...@@ -617,7 +617,7 @@ int rxe_requester(void *arg)
if (unlikely(!wqe)) if (unlikely(!wqe))
goto exit; goto exit;
if (wqe->mask & WR_REG_MASK) { if (wqe->mask & WR_LOCAL_OP_MASK) {
if (wqe->wr.opcode == IB_WR_LOCAL_INV) { if (wqe->wr.opcode == IB_WR_LOCAL_INV) {
struct rxe_dev *rxe = to_rdev(qp->ibqp.device); struct rxe_dev *rxe = to_rdev(qp->ibqp.device);
struct rxe_mr *rmr; struct rxe_mr *rmr;
......
...@@ -596,7 +596,7 @@ static void init_send_wqe(struct rxe_qp *qp, const struct ib_send_wr *ibwr, ...@@ -596,7 +596,7 @@ static void init_send_wqe(struct rxe_qp *qp, const struct ib_send_wr *ibwr,
init_send_wr(qp, &wqe->wr, ibwr); init_send_wr(qp, &wqe->wr, ibwr);
/* local operation */ /* local operation */
if (unlikely(mask & WR_REG_MASK)) { if (unlikely(mask & WR_LOCAL_OP_MASK)) {
wqe->mask = mask; wqe->mask = mask;
wqe->state = wqe_state_posted; wqe->state = wqe_state_posted;
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment