diff options
| author | Stefan Metzmacher <metze@samba.org> | 2025-10-17 20:25:12 +0300 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2026-04-16 05:58:23 +0300 |
| commit | 08ffdf0c416849615e8bc935839557429ec24194 (patch) | |
| tree | d8ae34b46821db3c85a8f77f3914f2b5aa91e72b | |
| parent | da20536c508c0f511cf20ceef6757ea4861bf547 (diff) | |
| download | linux-08ffdf0c416849615e8bc935839557429ec24194.tar.xz | |
smb: server: split out smb_direct_send_iter() out of smb_direct_writev()
This will help to move to common code in future.
Cc: Namjae Jeon <linkinjeon@kernel.org>
Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
| -rw-r--r-- | fs/smb/server/transport_rdma.c | 47 |
1 files changed, 32 insertions, 15 deletions
diff --git a/fs/smb/server/transport_rdma.c b/fs/smb/server/transport_rdma.c index adec517e91b5..29281005a30e 100644 --- a/fs/smb/server/transport_rdma.c +++ b/fs/smb/server/transport_rdma.c @@ -959,43 +959,47 @@ bcredit_failed: 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; @@ -1022,6 +1026,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, |