Commit 886441fb authored Jun 07, 2021 by Bob Pearson Committed by Jason Gunthorpe Jun 16, 2021

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.com


Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

parent beec0239

drivers/infiniband/sw/rxe/rxe_opcode.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -87,13 +87,13 @@ struct rxe_wr_opcode_info rxe_wr_opcode_info[] = {
		[IB_WR_LOCAL_INV] = {
		.name = "IB_WR_LOCAL_INV",
		.mask = {
		[IB_QPT_RC] = WR_REG_MASK,
		[IB_QPT_RC] = WR_LOCAL_OP_MASK,
		},
		},
		[IB_WR_REG_MR] = {
		.name = "IB_WR_REG_MR",
		.mask = {
		[IB_QPT_RC] = WR_REG_MASK,
		[IB_QPT_RC] = WR_LOCAL_OP_MASK,
		},
		},
		};

drivers/infiniband/sw/rxe/rxe_opcode.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,7 @@ enum rxe_wr_mask {
		WR_SEND_MASK = BIT(2),
		WR_READ_MASK = BIT(3),
		WR_WRITE_MASK = BIT(4),
		WR_LOCAL_MASK = BIT(5),
		WR_REG_MASK = BIT(6),
		WR_LOCAL_OP_MASK = BIT(5),

		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,

drivers/infiniband/sw/rxe/rxe_req.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -617,7 +617,7 @@ int rxe_requester(void *arg)
		if (unlikely(!wqe))
		goto exit;

		if (wqe->mask & WR_REG_MASK) {
		if (wqe->mask & WR_LOCAL_OP_MASK) {
		if (wqe->wr.opcode == IB_WR_LOCAL_INV) {
		struct rxe_dev *rxe = to_rdev(qp->ibqp.device);
		struct rxe_mr *rmr;

drivers/infiniband/sw/rxe/rxe_verbs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

		/* local operation */
		if (unlikely(mask & WR_REG_MASK)) {
		if (unlikely(mask & WR_LOCAL_OP_MASK)) {
		wqe->mask = mask;
		wqe->state = wqe_state_posted;
		return;