Skip to content

Commit 08ffdf0

Browse files
metze-sambasmfrench
authored andcommitted
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>
1 parent da20536 commit 08ffdf0

1 file changed

Lines changed: 32 additions & 15 deletions

File tree

fs/smb/server/transport_rdma.c

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -959,43 +959,47 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc,
959959
return ret;
960960
}
961961

962-
static int smb_direct_writev(struct ksmbd_transport *t,
963-
struct kvec *iov, int niovs, int buflen,
964-
bool need_invalidate, unsigned int remote_key)
962+
static int smb_direct_send_iter(struct smbdirect_socket *sc,
963+
struct iov_iter *iter,
964+
bool need_invalidate,
965+
unsigned int remote_key)
965966
{
966-
struct smb_direct_transport *st = SMBD_TRANS(t);
967-
struct smbdirect_socket *sc = &st->socket;
968967
struct smbdirect_socket_parameters *sp = &sc->parameters;
969968
int ret;
970969
struct smbdirect_send_batch send_ctx;
971-
struct iov_iter iter;
972970
int error = 0;
971+
__be32 hdr;
973972

974973
if (sc->status != SMBDIRECT_SOCKET_CONNECTED)
975974
return -ENOTCONN;
976975

977-
//FIXME: skip RFC1002 header..
978-
if (WARN_ON_ONCE(niovs <= 1 || iov[0].iov_len != 4))
976+
/*
977+
* For now we expect the iter to have the full
978+
* message, including a 4 byte length header.
979+
*/
980+
if (iov_iter_count(iter) <= 4)
981+
return -EINVAL;
982+
if (!copy_from_iter_full(&hdr, sizeof(hdr), iter))
983+
return -EFAULT;
984+
if (iov_iter_count(iter) != be32_to_cpu(hdr))
979985
return -EINVAL;
980-
iov_iter_kvec(&iter, ITER_SOURCE, iov, niovs, buflen);
981-
iov_iter_advance(&iter, 4);
982986

983987
/*
984988
* The size must fit into the negotiated
985989
* fragmented send size.
986990
*/
987-
if (iov_iter_count(&iter) > sp->max_fragmented_send_size)
991+
if (iov_iter_count(iter) > sp->max_fragmented_send_size)
988992
return -EMSGSIZE;
989993

990994
ksmbd_debug(RDMA, "Sending smb (RDMA): smb_len=%zu\n",
991-
iov_iter_count(&iter));
995+
iov_iter_count(iter));
992996

993997
smb_direct_send_ctx_init(&send_ctx, need_invalidate, remote_key);
994-
while (iov_iter_count(&iter)) {
998+
while (iov_iter_count(iter)) {
995999
ret = smb_direct_post_send_data(sc,
9961000
&send_ctx,
997-
&iter,
998-
iov_iter_count(&iter));
1001+
iter,
1002+
iov_iter_count(iter));
9991003
if (unlikely(ret)) {
10001004
error = ret;
10011005
break;
@@ -1022,6 +1026,19 @@ static int smb_direct_writev(struct ksmbd_transport *t,
10221026
return ret;
10231027
}
10241028

1029+
static int smb_direct_writev(struct ksmbd_transport *t,
1030+
struct kvec *iov, int niovs, int buflen,
1031+
bool need_invalidate, unsigned int remote_key)
1032+
{
1033+
struct smb_direct_transport *st = SMBD_TRANS(t);
1034+
struct smbdirect_socket *sc = &st->socket;
1035+
struct iov_iter iter;
1036+
1037+
iov_iter_kvec(&iter, ITER_SOURCE, iov, niovs, buflen);
1038+
1039+
return smb_direct_send_iter(sc, &iter, need_invalidate, remote_key);
1040+
}
1041+
10251042
static int smb_direct_rdma_write(struct ksmbd_transport *t,
10261043
void *buf, unsigned int buflen,
10271044
struct smbdirect_buffer_descriptor_v1 *desc,

0 commit comments

Comments
 (0)