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 A27142C21F1; Wed, 25 Feb 2026 06:56:33 +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=1772002593; cv=none; b=DAj3MEnMkx8l+mxzdw9pWJLMG9/5jJPClit6KAu90/vk4A+6poF7Fb3HfYQChbE0kPjIw09y4cZsrLwZ0DWl6v6bNS+QKgkSb5BvucBx5BOMcRKI7jMbNJKGCocLLgftCG5f+8erfaPHn+s8d8bdaCIlJ/2NMVQIXDw0HKt7wx4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772002593; c=relaxed/simple; bh=XV3F0g0ZgUsbdPlzBU5ZzkPNKNiNZCookWPYvQ5FX5w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZKjb+AT4W5wlmNE2dxx6FgUqm+EYRBKplY2JIGka9NNLsh6UaJfN6nZqjpkDF6mnKkz/HixQLiSpvQru68nn79uLYN4572R0WYuTA5TL9DB1pulwY/mNDFqLBgnE0F0/c5rdmI0bbOahABzk+hcgG7rAiqBqwwXYlfzCYO0NHuc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RNSNZHt+; 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="RNSNZHt+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 797FCC116D0; Wed, 25 Feb 2026 06:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1772002593; bh=XV3F0g0ZgUsbdPlzBU5ZzkPNKNiNZCookWPYvQ5FX5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RNSNZHt+v9w64umsXkppk5RRPFXGDlrgbVbPtniDbPCmbYWznKJ6kl1GiXNE9/QcB xvNFrrnStCzjEkjrlT/N2UCkPDvKqRVlBFozTNSPFApLrPjvIIYwqL/jnlx/s83Rfs wPCl5rNBXKr6miAajlSjYThU/fOxky7ZTxJIvNPQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Honggang LI , Leon Romanovsky , Sasha Levin Subject: [PATCH 6.18 337/641] RDMA/rtrs: server: remove dead code Date: Tue, 24 Feb 2026 17:21:03 -0800 Message-ID: <20260225012356.839926444@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260225012348.915798704@linuxfoundation.org> References: <20260225012348.915798704@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Honggang LI [ Upstream commit a3572bdc3a028ca47f77d7166ac95b719cf77d50 ] As rkey had been initialized to zero, the WARN_ON_ONCE should never been triggered. Remove it. Fixes: 9cb837480424 ("RDMA/rtrs: server: main functionality") Signed-off-by: Honggang LI Link: https://patch.msgid.link/20251224023819.138846-1-honggangli@163.com Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c index 9ecc6343455d6..7a402eb8e0bf0 100644 --- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c +++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c @@ -208,7 +208,6 @@ static int rdma_write_sg(struct rtrs_srv_op *id) size_t sg_cnt; int err, offset; bool need_inval; - u32 rkey = 0; struct ib_reg_wr rwr; struct ib_sge *plist; struct ib_sge list; @@ -240,11 +239,6 @@ static int rdma_write_sg(struct rtrs_srv_op *id) wr->wr.num_sge = 1; wr->remote_addr = le64_to_cpu(id->rd_msg->desc[0].addr); wr->rkey = le32_to_cpu(id->rd_msg->desc[0].key); - if (rkey == 0) - rkey = wr->rkey; - else - /* Only one key is actually used */ - WARN_ON_ONCE(rkey != wr->rkey); wr->wr.opcode = IB_WR_RDMA_WRITE; wr->wr.wr_cqe = &io_comp_cqe; @@ -277,7 +271,7 @@ static int rdma_write_sg(struct rtrs_srv_op *id) inv_wr.opcode = IB_WR_SEND_WITH_INV; inv_wr.wr_cqe = &io_comp_cqe; inv_wr.send_flags = 0; - inv_wr.ex.invalidate_rkey = rkey; + inv_wr.ex.invalidate_rkey = wr->rkey; } imm_wr.wr.next = NULL; -- 2.51.0