From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from hr2.samba.org (hr2.samba.org [144.76.82.148]) (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 9C5F232C33D for ; Tue, 25 Nov 2025 18:29:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=144.76.82.148 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764095360; cv=none; b=eHDeybPxqV/GovEOAM/SCi4oyIDlj5CDYHPGax9eoAziaFQsHwUZYJxE5PhPuYCc0jVYq9/d4I++PbZiI6ha85F5UQenpsNS9B5uZvymjigHy573wKRLWG29XPSaqSo4MrVDk+XEnB3nsrT2gq0gbKyyx783OO3a4tQEsgnJjyE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764095360; c=relaxed/simple; bh=m5Ay7/0UFKlCgUdEmrV0mv7yU4DfSD1e+xnuAezYkWc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=grXRr7Law42Lh4CdLGW7YJkX/YT1FsY+kY3Ut0J2WYfW3VGyMlHY4aWa/pgIeqFhzVC1h51+jMkOhpfb0j6dvyK8u5tqnefCecbkpyaQkSPzjeeW92hvgtz/CNjJ2sJyRS6oxQNCbR824DddNXb1FlV5SIT1Fk8yqWSIWa7Hx78= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=samba.org; spf=pass smtp.mailfrom=samba.org; dkim=pass (3072-bit key) header.d=samba.org header.i=@samba.org header.b=BZ1ZqOhr; arc=none smtp.client-ip=144.76.82.148 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=samba.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=samba.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (3072-bit key) header.d=samba.org header.i=@samba.org header.b="BZ1ZqOhr" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=samba.org; s=42; h=Message-ID:Date:Cc:To:From; bh=Pr6uFoEmMB9T+tkJ3IxLkRvCsBMSjEQVa0Z7Myvcimo=; b=BZ1ZqOhrSwU4cNWKqxekEFOacD x9sfe3k3ZY1+8bHUCxKuuA5kLYXlAuuI+EHXi/NwE5Wfx9a7CTBtqbkDQBhicPoTjyk1vQhDIHpcF xNXbKTAcgayWVJ0MQY40OrKW/lVGam+zD/NUHAx4ku51eyaJj24ms3gi9CSxcTrtWc+NSdkWroPnr uqmaLcYFJ9R8X+uZNZQkpAwi2+dHdk0wbD+v2M/6VmWVARWbfud3aEQ7f7Rrf6fwsLvgYRJg9gynl m11r+LXZ5ex3/64Tjosrv62WuQ38/1TQHcMhLwC42jSdLEGbAOJXGTgkI0eIQ/c6zskqHlL9B7a6R j8dHQuAPQ7w/wLLNbzLbLyy2bbLIw3rlXfOEnnVfWHllJKkSZJd+MLmv/O6Nz3xk1e/AFEtV4kJTB aCh428HNt5VxuHN2ChAAQviHoe9+2NOWUYRCgs2lHSRfdpUW5gZx8gSVuCOEA7JCBFmH8UcSL3pqW VA16mmiYE5l1TMn751Wrr4Cc; Received: from [127.0.0.2] (localhost [127.0.0.1]) by hr2.samba.org with esmtpsa (TLS1.3:ECDHE_SECP256R1__ECDSA_SECP256R1_SHA256__CHACHA20_POLY1305:256) (Exim) id 1vNxh7-00FfgO-1G; Tue, 25 Nov 2025 18:23:18 +0000 From: Stefan Metzmacher To: linux-cifs@vger.kernel.org, samba-technical@lists.samba.org Cc: metze@samba.org, Namjae Jeon , Steve French , Tom Talpey , Steve French Subject: [PATCH v4 127/145] smb: server: split out smb_direct_send_iter() out of smb_direct_writev() Date: Tue, 25 Nov 2025 18:56:13 +0100 Message-ID: <6d7dde779fc3ec602e16ebcc85a6b0d13ae9d42e.1764091285.git.metze@samba.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This will help to move to common code in future. Cc: Namjae Jeon Cc: Steve French Cc: Tom Talpey Cc: linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org Signed-off-by: Stefan Metzmacher Signed-off-by: Steve French --- fs/smb/server/transport_rdma.c | 47 +++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/fs/smb/server/transport_rdma.c b/fs/smb/server/transport_rdma.c index b153a47be237..f9913321389b 100644 --- a/fs/smb/server/transport_rdma.c +++ b/fs/smb/server/transport_rdma.c @@ -772,43 +772,47 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc, return ret; } -static int smb_direct_writev(struct ksmbd_transport *t, - struct kvec *iov, int niovs, int buflen, - bool need_invalidate, unsigned int remote_key) +static int smb_direct_send_iter(struct smbdirect_socket *sc, + struct iov_iter *iter, + bool need_invalidate, + unsigned int remote_key) { - struct smb_direct_transport *st = SMBD_TRANS(t); - struct smbdirect_socket *sc = &st->socket; struct smbdirect_socket_parameters *sp = &sc->parameters; int ret; struct smbdirect_send_batch send_ctx; - struct iov_iter iter; int error = 0; + __be32 hdr; if (sc->status != SMBDIRECT_SOCKET_CONNECTED) return -ENOTCONN; - //FIXME: skip RFC1002 header.. - if (WARN_ON_ONCE(niovs <= 1 || iov[0].iov_len != 4)) + /* + * For now we expect the iter to have the full + * message, including a 4 byte length header. + */ + if (iov_iter_count(iter) <= 4) + return -EINVAL; + if (!copy_from_iter_full(&hdr, sizeof(hdr), iter)) + return -EFAULT; + if (iov_iter_count(iter) != be32_to_cpu(hdr)) return -EINVAL; - iov_iter_kvec(&iter, ITER_SOURCE, iov, niovs, buflen); - iov_iter_advance(&iter, 4); /* * The size must fit into the negotiated * fragmented send size. */ - if (iov_iter_count(&iter) > sp->max_fragmented_send_size) + if (iov_iter_count(iter) > sp->max_fragmented_send_size) return -EMSGSIZE; ksmbd_debug(RDMA, "Sending smb (RDMA): smb_len=%zu\n", - iov_iter_count(&iter)); + iov_iter_count(iter)); smb_direct_send_ctx_init(&send_ctx, need_invalidate, remote_key); - while (iov_iter_count(&iter)) { + while (iov_iter_count(iter)) { ret = smb_direct_post_send_data(sc, &send_ctx, - &iter, - iov_iter_count(&iter)); + iter, + iov_iter_count(iter)); if (unlikely(ret)) { error = ret; break; @@ -835,6 +839,19 @@ static int smb_direct_writev(struct ksmbd_transport *t, return ret; } +static int smb_direct_writev(struct ksmbd_transport *t, + struct kvec *iov, int niovs, int buflen, + bool need_invalidate, unsigned int remote_key) +{ + struct smb_direct_transport *st = SMBD_TRANS(t); + struct smbdirect_socket *sc = &st->socket; + struct iov_iter iter; + + iov_iter_kvec(&iter, ITER_SOURCE, iov, niovs, buflen); + + return smb_direct_send_iter(sc, &iter, need_invalidate, remote_key); +} + static int smb_direct_rdma_write(struct ksmbd_transport *t, void *buf, unsigned int buflen, struct smbdirect_buffer_descriptor_v1 *desc, -- 2.43.0