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 EBBA27DA78; Thu, 15 Aug 2024 13:31:24 +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=1723728685; cv=none; b=iQ5knm9uI9HcJ5sZu73d2WZvy2KAdhruNChcPnQKYh2LVA346mrHfexcrXDxoA0sXYKUpbSyJlU+ezX9r7wlHwt1ds8ZS+e8DT8+RSoM3W7Sx+Ee5sQ8j48YpG5Qpc52jv9eie7ABc4+8pwj2067CxqdUBcNYmC8H1HoUL2u2mA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723728685; c=relaxed/simple; bh=ciK62ypz9rYpcP1rbJimNvkuOZQSJXyUXQ+pqzjcvQE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KSkADesyupCI+PRq8/76x2+vFIER8NvzPhoXPQLoZpGR1mY3QwznKQZDPOSbF6UuYeo+zpmgLyBPA+HcAG5JkC+aDwsnYhzrsgFEBvkJ9CsOI6Y6Va0wXFxvO53zdlFKBbAHFDRGSXKejMweN/HY5ebo4Ig7XhfWpZyKREGruJ0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HT0iGrwo; 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="HT0iGrwo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16B5AC32786; Thu, 15 Aug 2024 13:31:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723728684; bh=ciK62ypz9rYpcP1rbJimNvkuOZQSJXyUXQ+pqzjcvQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HT0iGrwoqBmwLtD3ikA6CQa4oL2RYFPWrtneSJvHZF8KyTMmaTyEQHBlirzf1T0RU dpTte2IaN0TZDMpMH3ptkdbJkJG3BTTZZDnos1yFNAH8szXli02peN4f3/JUBeN7D1 oJTk4KgypGP9e1ZeCX2OpGsbL5o2BUmBbpajJbG0= 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 4.19 046/196] RDMA/rxe: Dont set BTH_ACK_MASK for UC or UD QPs Date: Thu, 15 Aug 2024 15:22:43 +0200 Message-ID: <20240815131853.846902947@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131852.063866671@linuxfoundation.org> References: <20240815131852.063866671@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 4.19-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 4008ab2da0526..aa57a9cb53886 100644 --- a/drivers/infiniband/sw/rxe/rxe_req.c +++ b/drivers/infiniband/sw/rxe/rxe_req.c @@ -390,7 +390,7 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp, int solicited; u16 pkey; 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; @@ -426,8 +426,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