From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B49F5757FC; Tue, 30 Jul 2024 16:40:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722357621; cv=none; b=lFtpqImuFLN90Y1Ga7d2xSz481Wc0ntHtIkVstIqc4EN9vMo/lBExLz7REQ1/YegQjIEAR9WPwdF8TTq3Jwr5InnO0Vp7zKIcN8oMmxYMNK2TIV5+QdtoqjxB1hBvxpE7HBUKsZl4d9yy9Tl+EBRhAsezRmSszK0ZYai7ZOXi8k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722357621; c=relaxed/simple; bh=IPukiD+J9QE//2ceDIfhAI/yNC2PzjMSEop79wYWISw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KXa/Uulgsk/R5nmCNISpx2gsja1yHKyx557JmGlJ2IllTYVLfOzJ+cvVOpuwQyCoJRY8KfLB9GVsbkX0VlInHW+Y5+H3OSX1P063UrSGhj97EqwhzlqoHsK/KBN2bhzR7TZQFvRR2ab09+sRaUgjkadQQ9pzkf8G8obQli8jhc8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xJkaFQfh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xJkaFQfh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9598BC4AF0C; Tue, 30 Jul 2024 16:40:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722357621; bh=IPukiD+J9QE//2ceDIfhAI/yNC2PzjMSEop79wYWISw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xJkaFQfhhJAciyBxFB0w7AsblY6lhfOFUuCr8YJqTnTD/8hCwji9kG3Zj/QL8YgNN rswMrReOmnAnjjD/EB0MJZE7LTmG/SIgMwVv8QTI+UaprW1u0vuTJ+M+ceyYKEkHaY jy8LYnkPmLkJINMQWpz4RooM3I7Wv+DAwE/e+ljA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Honggang LI , Zhu Yanjun , Leon Romanovsky , Jason Gunthorpe , Sasha Levin Subject: [PATCH 6.6 275/568] RDMA/rxe: Dont set BTH_ACK_MASK for UC or UD QPs Date: Tue, 30 Jul 2024 17:46:22 +0200 Message-ID: <20240730151650.629015709@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151639.792277039@linuxfoundation.org> References: <20240730151639.792277039@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Honggang LI [ Upstream commit 4adcaf969d77d3d3aa3871bbadc196258a38aec6 ] BTH_ACK_MASK bit is used to indicate that an acknowledge (for this packet) should be scheduled by the responder. Both UC and UD QPs are unacknowledged, so don't set BTH_ACK_MASK for UC or UD QPs. Fixes: 8700e3e7c485 ("Soft RoCE driver") Signed-off-by: Honggang LI Link: https://lore.kernel.org/r/20240624020348.494338-1-honggangli@163.com Reviewed-by: Zhu Yanjun Signed-off-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/sw/rxe/rxe_req.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rxe/rxe_req.c index d8c41fd626a94..7a36080d2baef 100644 --- a/drivers/infiniband/sw/rxe/rxe_req.c +++ b/drivers/infiniband/sw/rxe/rxe_req.c @@ -424,7 +424,7 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp, int paylen; int solicited; u32 qp_num; - int ack_req; + int ack_req = 0; /* length from start of bth to end of icrc */ paylen = rxe_opcode[opcode].length + payload + pad + RXE_ICRC_SIZE; @@ -445,8 +445,9 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp, qp_num = (pkt->mask & RXE_DETH_MASK) ? ibwr->wr.ud.remote_qpn : qp->attr.dest_qp_num; - ack_req = ((pkt->mask & RXE_END_MASK) || - (qp->req.noack_pkts++ > RXE_MAX_PKT_PER_ACK)); + if (qp_type(qp) != IB_QPT_UD && qp_type(qp) != IB_QPT_UC) + ack_req = ((pkt->mask & RXE_END_MASK) || + (qp->req.noack_pkts++ > RXE_MAX_PKT_PER_ACK)); if (ack_req) qp->req.noack_pkts = 0; -- 2.43.0