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 35B662DA76C; Sun, 1 Mar 2026 01:46:19 +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=1772329579; cv=none; b=iqZFF6auofaW/WHXNxzZEx82UglFaE8kaN/c+WpoiPe08FAMhdiWo9vN4ZzYhBcaHP/Mt3RTKBS6oT1Kfamiap5puhepuI6C1Q3qXy+i6hSXZUkI+6Uss291HWUGVYamFrO/cuOnouH51/9f8w2J6LijHcR1qMA6GOiXETG2OpM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772329579; c=relaxed/simple; bh=1Q1MvAuhTlTBjRlrLmmX9KN0YpUZ/AZ01slXa/fPEtQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=rA9JdTAihPmQuGn9/g+A29KE4OM79fdzzLY1AAf/Z0af6RQjrZRq7A8M7DCwiduJjiq5L1uA2HosZNa7OhoJpTSr0Q+liwvrMFxzBwYmdKDo3ch9b6ehQ/hICD6bb7trESdR/V7JiVfTlqtjKiSVI3VLtN9GLM4xbT3YrqEoong= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TSSRC62G; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TSSRC62G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23325C19421; Sun, 1 Mar 2026 01:46:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772329579; bh=1Q1MvAuhTlTBjRlrLmmX9KN0YpUZ/AZ01slXa/fPEtQ=; h=From:To:Cc:Subject:Date:From; b=TSSRC62GcFvIplc6nw4+Tu/NvJXxPXU+OAQyuWlyY2NQlSXww2qeH70OhRFh4Uqpc V5PjwOGhudDjFhEp609/VQtsREqZVefHFEbrXNADLxYshg6HOZDF0Ia/JBizO3oIof dYM6IFNmA1gCXyXCIbfqLAacbOyVeqWxnU9w0/+gFLj6DNxQ+0vpB+rFvh8H080kRb xYWkPNAr93RVrJ6eCtYyVqhPDJ5TKW6/7+AiS5eKqvjGsBRJjjwnRPmJWJmA79TRq+ 030EAj4pxIIHT9dRipgw+uDmfas88aMjsxJ3diWRrQ5lpkRd931UMn0NghxBeu4biG u/L7AD0yarBVg== From: Sasha Levin To: stable@vger.kernel.org, metze@samba.org Cc: Steve French , Tom Talpey , Long Li , Namjae Jeon , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, Steve French Subject: FAILED: Patch "smb: client: split out smbd_ib_post_send()" failed to apply to 6.1-stable tree Date: Sat, 28 Feb 2026 20:46:16 -0500 Message-ID: <20260301014616.1709142-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From bf30515caec590316e0d08208e4252eed4c160df Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 22 Jan 2026 18:16:54 +0100 Subject: [PATCH] smb: client: split out smbd_ib_post_send() This is like smb_direct_post_send() in the server and will simplify porting the smbdirect_send_batch and credit related logic from the server. Cc: # 6.18.x Cc: Steve French Cc: Tom Talpey Cc: Long Li Cc: Namjae Jeon Cc: linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org Signed-off-by: Stefan Metzmacher Signed-off-by: Steve French --- fs/smb/client/smbdirect.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c index 405931ce3978f..75c0ac9cc65c7 100644 --- a/fs/smb/client/smbdirect.c +++ b/fs/smb/client/smbdirect.c @@ -1101,11 +1101,26 @@ static int manage_keep_alive_before_sending(struct smbdirect_socket *sc) return 0; } +static int smbd_ib_post_send(struct smbdirect_socket *sc, + struct ib_send_wr *wr) +{ + int ret; + + atomic_inc(&sc->send_io.pending.count); + ret = ib_post_send(sc->ib.qp, wr, NULL); + if (ret) { + pr_err("failed to post send: %d\n", ret); + smbd_disconnect_rdma_connection(sc); + ret = -EAGAIN; + } + return ret; +} + /* Post the send request */ static int smbd_post_send(struct smbdirect_socket *sc, struct smbdirect_send_io *request) { - int rc, i; + int i; for (i = 0; i < request->num_sge; i++) { log_rdma_send(INFO, @@ -1126,15 +1141,7 @@ static int smbd_post_send(struct smbdirect_socket *sc, request->wr.num_sge = request->num_sge; request->wr.opcode = IB_WR_SEND; request->wr.send_flags = IB_SEND_SIGNALED; - - rc = ib_post_send(sc->ib.qp, &request->wr, NULL); - if (rc) { - log_rdma_send(ERR, "ib_post_send failed rc=%d\n", rc); - smbd_disconnect_rdma_connection(sc); - rc = -EAGAIN; - } - - return rc; + return smbd_ib_post_send(sc, &request->wr); } static int wait_for_credits(struct smbdirect_socket *sc, @@ -1280,12 +1287,6 @@ static int smbd_post_send_iter(struct smbdirect_socket *sc, le32_to_cpu(packet->data_length), le32_to_cpu(packet->remaining_data_length)); - /* - * Now that we got a local and a remote credit - * we add us as pending - */ - atomic_inc(&sc->send_io.pending.count); - rc = smbd_post_send(sc, request); if (!rc) return 0; -- 2.51.0