Commit 45216d63 authored by Xiao Yang's avatar Xiao Yang Committed by Jason Gunthorpe
Browse files

RDMA/rxe: Add MASK suffix for RXE_READ_OR_ATOMIC and RXE_WRITE_OR_SEND 

To reflect the intention, since it is not just a single bit.

Link: https://lore.kernel.org/r/20210914080253.1145353-3-yangx.jy@fujitsu.com


Signed-off-by: default avatarXiao Yang <yangx.jy@fujitsu.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 373efe0f

drivers/infiniband/sw/rxe/rxe_opcode.h

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ enum rxe_hdr_mask { 


	RXE_LOOPBACK_MASK	= BIT(NUM_HDR_TYPES + 12),



	RXE_READ_OR_ATOMIC	= (RXE_READ_MASK | RXE_ATOMIC_MASK),

	RXE_WRITE_OR_SEND	= (RXE_WRITE_MASK | RXE_SEND_MASK),

	RXE_READ_OR_ATOMIC_MASK	= (RXE_READ_MASK | RXE_ATOMIC_MASK),

	RXE_WRITE_OR_SEND_MASK	= (RXE_WRITE_MASK | RXE_SEND_MASK),

	RXE_READ_OR_WRITE_MASK	= (RXE_READ_MASK | RXE_WRITE_MASK),

};

drivers/infiniband/sw/rxe/rxe_req.c

+3 −3
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static int finish_packet(struct rxe_qp *qp, struct rxe_send_wqe *wqe, 
	if (err)

		return err;



	if (pkt->mask & RXE_WRITE_OR_SEND) {

	if (pkt->mask & RXE_WRITE_OR_SEND_MASK) {

		if (wqe->wr.send_flags & IB_SEND_INLINE) {

			u8 *tmp = &wqe->dma.inline_data[wqe->dma.sge_offset];
@@ -678,13 +678,13 @@ int rxe_requester(void *arg) 
	}



	mask = rxe_opcode[opcode].mask;

	if (unlikely(mask & RXE_READ_OR_ATOMIC)) {

	if (unlikely(mask & RXE_READ_OR_ATOMIC_MASK)) {

		if (check_init_depth(qp, wqe))

			goto exit;

	}



	mtu = get_mtu(qp);

	payload = (mask & RXE_WRITE_OR_SEND) ? wqe->dma.resid : 0;

	payload = (mask & RXE_WRITE_OR_SEND_MASK) ? wqe->dma.resid : 0;

	if (payload > mtu) {

		if (qp_type(qp) == IB_QPT_UD) {

			/* C10-93.1.1: If the total sum of all the buffer lengths specified for a

drivers/infiniband/sw/rxe/rxe_resp.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static enum resp_states check_resource(struct rxe_qp *qp, 
		}

	}



	if (pkt->mask & RXE_READ_OR_ATOMIC) {

	if (pkt->mask & RXE_READ_OR_ATOMIC_MASK) {

		/* it is the requesters job to not send

		 * too many read/atomic ops, we just

		 * recycle the responder resource queue