RDMA/rxe: Simplify cq->notify code
Subsystems (2)
PATCH 1/1 RDMA/rxe: Simplify cq->notify code
The flags parameter to the request notify verb is a bitmask. But, rxe driver treats cq->notify as an int. If someone ever set both the IB_CQ_SOLICITED and the IB_CQ_NEXT_COMP bits rxe_cq_post could fail to generate a completion event. This patch treats the notify flags as a bit mask consistently and can handle the above case correctly.
--- drivers/infiniband/sw/rxe/rxe_cq.c | 5 ++--- drivers/infiniband/sw/rxe/rxe_verbs.c | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-)
drivers/infiniband/sw/rxe/rxe_cq.c +2 -3
@@ -113,10 +113,9 @@ int rxe_cq_post(struct rxe_cq *cq, struct rxe_cqe *cqe, int solicited)queue_advance_producer (cq->queue,QUEUE_TYPE_TO_CLIENT ); -if ((cq->notify ==IB_CQ_NEXT_COMP ) || - (cq->notify ==IB_CQ_SOLICITED && solicited)) { +if ((cq->notify &IB_CQ_NEXT_COMP ) || + (cq->notify &IB_CQ_SOLICITED && solicited)) { cq->notify =0 ; - cq->ibcq.comp_handler (&cq->ibcq, cq->ibcq.cq_context); }
drivers/infiniband/sw/rxe/rxe_verbs.c +1 -4
@@ -1181,14 +1181,11 @@ static int rxe_req_notify_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags)unsigned long irq_flags;spin_lock_irqsave (&cq->cq_lock, irq_flags); -if (cq->notify !=IB_CQ_NEXT_COMP ) - cq->notify = flags &IB_CQ_SOLICITED_MASK ; - + cq->notify |= flags &IB_CQ_SOLICITED_MASK ; empty =queue_empty (cq->queue,QUEUE_TYPE_TO_ULP );if ((flags &IB_CQ_REPORT_MISSED_EVENTS ) && !empty) ret =1 ; -spin_unlock_irqrestore (&cq->cq_lock, irq_flags);return ret;
Signature · 1 line
2.39.2
Quoted 7 lines · Bob Pearson
The flags parameter to the request notify verb is a bitmask. But, rxe driver treats
cq->notifyas an int. If someone ever set both theIB_CQ_SOLICITEDand theIB_CQ_NEXT_COMPbitsrxe_cq_postcould fail to generate a completion event. This patch treats the notify flags as a bit mask consistently and can handle the above case correctly.
Quoted 5 lines
Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_cq.c | 5 ++--- drivers/infiniband/sw/rxe/rxe_verbs.c | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-)
Applied to for-next, thanks
Jason