Commit 373efe0f authored by Xiao Yang's avatar Xiao Yang Committed by Jason Gunthorpe

RDMA/rxe: Add new RXE_READ_OR_WRITE_MASK

1) Replace (RXE_READ_MASK | RXE_WRITE_MASK) with RXE_READ_OR_WRITE_MASK.
2) Change (RXE_READ_MASK | RXE_WRITE_OR_SEND) to RXE_READ_OR_WRITE_MASK
   because we don't need to check RETH for RXE_SEND_MASK.

Link: https://lore.kernel.org/r/20210914080253.1145353-2-yangx.jy@fujitsu.comSigned-off-by: default avatarXiao Yang <yangx.jy@fujitsu.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 11333be1
...@@ -84,6 +84,7 @@ enum rxe_hdr_mask { ...@@ -84,6 +84,7 @@ enum rxe_hdr_mask {
RXE_READ_OR_ATOMIC = (RXE_READ_MASK | RXE_ATOMIC_MASK), RXE_READ_OR_ATOMIC = (RXE_READ_MASK | RXE_ATOMIC_MASK),
RXE_WRITE_OR_SEND = (RXE_WRITE_MASK | RXE_SEND_MASK), RXE_WRITE_OR_SEND = (RXE_WRITE_MASK | RXE_SEND_MASK),
RXE_READ_OR_WRITE_MASK = (RXE_READ_MASK | RXE_WRITE_MASK),
}; };
#define OPCODE_NONE (-1) #define OPCODE_NONE (-1)
......
...@@ -413,7 +413,7 @@ static enum resp_states check_rkey(struct rxe_qp *qp, ...@@ -413,7 +413,7 @@ static enum resp_states check_rkey(struct rxe_qp *qp,
enum resp_states state; enum resp_states state;
int access; int access;
if (pkt->mask & (RXE_READ_MASK | RXE_WRITE_MASK)) { if (pkt->mask & RXE_READ_OR_WRITE_MASK) {
if (pkt->mask & RXE_RETH_MASK) { if (pkt->mask & RXE_RETH_MASK) {
qp->resp.va = reth_va(pkt); qp->resp.va = reth_va(pkt);
qp->resp.offset = 0; qp->resp.offset = 0;
...@@ -434,7 +434,7 @@ static enum resp_states check_rkey(struct rxe_qp *qp, ...@@ -434,7 +434,7 @@ static enum resp_states check_rkey(struct rxe_qp *qp,
} }
/* A zero-byte op is not required to set an addr or rkey. */ /* A zero-byte op is not required to set an addr or rkey. */
if ((pkt->mask & (RXE_READ_MASK | RXE_WRITE_OR_SEND)) && if ((pkt->mask & RXE_READ_OR_WRITE_MASK) &&
(pkt->mask & RXE_RETH_MASK) && (pkt->mask & RXE_RETH_MASK) &&
reth_len(pkt) == 0) { reth_len(pkt) == 0) {
return RESPST_EXECUTE; return RESPST_EXECUTE;
......
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