From: Greg Kroah-Hartman Date: Fri, 22 Aug 2025 15:10:39 +0000 (+0200) Subject: drop queue-6.1/smb-client-let-send_done-cleanup-before-calling-smbd_disconnect_rdma_c... X-Git-Tag: v6.16.3~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f1c3f832b801eead5bf5d9484837e80d825950f;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.1/smb-client-let-send_done-cleanup-before-calling-smbd_disconnect_rdma_connection.patch On request of the developer --- diff --git a/queue-6.1/series b/queue-6.1/series index cbe61dd592..e55b43989b 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -355,7 +355,6 @@ fscrypt-don-t-use-problematic-non-inline-crypto-engines.patch block-reject-invalid-operation-in-submit_bio_noacct.patch block-make-req_op_zone_finish-a-write-operation.patch pci-acpi-fix-runtime-pm-ref-imbalance-on-hot-plug-capable-ports.patch -smb-client-let-send_done-cleanup-before-calling-smbd_disconnect_rdma_connection.patch cifs-reset-iface-weights-when-we-cannot-find-a-candidate.patch usb-typec-fusb302-cache-pd-rx-state.patch btrfs-qgroup-fix-race-between-quota-disable-and-quota-rescan-ioctl.patch diff --git a/queue-6.1/smb-client-let-send_done-cleanup-before-calling-smbd_disconnect_rdma_connection.patch b/queue-6.1/smb-client-let-send_done-cleanup-before-calling-smbd_disconnect_rdma_connection.patch deleted file mode 100644 index 4a67afb985..0000000000 --- a/queue-6.1/smb-client-let-send_done-cleanup-before-calling-smbd_disconnect_rdma_connection.patch +++ /dev/null @@ -1,63 +0,0 @@ -From stable+bounces-169889-greg=kroah.com@vger.kernel.org Sun Aug 17 15:51:23 2025 -From: Sasha Levin -Date: Sun, 17 Aug 2025 09:51:13 -0400 -Subject: smb: client: let send_done() cleanup before calling smbd_disconnect_rdma_connection() -To: stable@vger.kernel.org -Cc: Stefan Metzmacher , Steve French , Tom Talpey , Long Li , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, Steve French , Sasha Levin -Message-ID: <20250817135113.1474958-1-sashal@kernel.org> - -From: Stefan Metzmacher - -[ Upstream commit 5349ae5e05fa37409fd48a1eb483b199c32c889b ] - -We should call ib_dma_unmap_single() and mempool_free() before calling -smbd_disconnect_rdma_connection(). - -And smbd_disconnect_rdma_connection() needs to be the last function to -call as all other state might already be gone after it returns. - -Cc: Steve French -Cc: Tom Talpey -Cc: Long Li -Cc: linux-cifs@vger.kernel.org -Cc: samba-technical@lists.samba.org -Fixes: f198186aa9bb ("CIFS: SMBD: Establish SMB Direct connection") -Signed-off-by: Stefan Metzmacher -Signed-off-by: Steve French -[ Replaced `info` with `request->info` ] -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - fs/smb/client/smbdirect.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - ---- a/fs/smb/client/smbdirect.c -+++ b/fs/smb/client/smbdirect.c -@@ -273,18 +273,21 @@ static void send_done(struct ib_cq *cq, - log_rdma_send(INFO, "smbd_request 0x%p completed wc->status=%d\n", - request, wc->status); - -- if (wc->status != IB_WC_SUCCESS || wc->opcode != IB_WC_SEND) { -- log_rdma_send(ERR, "wc->status=%d wc->opcode=%d\n", -- wc->status, wc->opcode); -- smbd_disconnect_rdma_connection(request->info); -- } -- - for (i = 0; i < request->num_sge; i++) - ib_dma_unmap_single(request->info->id->device, - request->sge[i].addr, - request->sge[i].length, - DMA_TO_DEVICE); - -+ if (wc->status != IB_WC_SUCCESS || wc->opcode != IB_WC_SEND) { -+ struct smbd_connection *info = request->info; -+ log_rdma_send(ERR, "wc->status=%d wc->opcode=%d\n", -+ wc->status, wc->opcode); -+ mempool_free(request, info->request_mempool); -+ smbd_disconnect_rdma_connection(info); -+ return; -+ } -+ - if (atomic_dec_and_test(&request->info->send_pending)) - wake_up(&request->info->wait_send_pending); -