smb: add kernel internal IPPROTO_SMBDIRECT
Subsystems (8)
Stefan Metzmacher
reviewerPATCH 2/8 smb: smbdirect: fix copyright header of smbdirect.h
In reply to Stefan MetzmacherEverything in smbdirect.h was taken from my out of tree prototype.
--- fs/smb/common/smbdirect/smbdirect.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/smb/common/smbdirect/smbdirect.h +1 -2
@@ -1,7 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ /* -* Copyright (C) 2017, Microsoft Corporation. -* Copyright (C) 2018, LG Electronics. +* Copyright (C) 2025 Stefan Metzmacher */ #ifndef __FS_SMB_COMMON_SMBDIRECT_SMBDIRECT_H__
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 3/8 smb: smbdirect: fix the logic in smbdirect_socket_destroy_sync() without an error
In reply to Stefan MetzmacherIf smbdirect_socket_destroy_sync() and sc->first_error was not set we should set -ESHUTDOWN, that's a better condition doing it only implicitly with thesc->status < SMBDIRECT_SOCKET_DISCONNECTING check.
--- fs/smb/common/smbdirect/smbdirect_socket.c | 28 ++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-)
fs/smb/common/smbdirect/smbdirect_socket.c +21 -7
@@ -600,13 +600,20 @@ void smbdirect_socket_destroy_sync(struct smbdirect_socket *sc)*/ WARN_ON_ONCE (in_interrupt ()); -smbdirect_log_rdma_event (sc,SMBDIRECT_LOG_INFO , -"cancelling and disable disconnect_work\n" ); -disable_work_sync (&sc->disconnect_work); +/* +* First we try to disable the work +* without disable_work_sync() in a +* non blocking way, if it's already +* running it will be handles by +* disable_work_sync() below. +* +* Here we just want to make sure queue_work() in +* smbdirect_socket_schedule_cleanup_lvl() +* is a no-op. +*/ +disable_work (&sc->disconnect_work); -smbdirect_log_rdma_event (sc,SMBDIRECT_LOG_INFO , -"destroying rdma session\n" ); -if (sc->status <SMBDIRECT_SOCKET_DISCONNECTING ) { +if (!sc->first_error)/* * SMBDIRECT_LOG_INFO is enough here * as this is the typical case where
@@ -615,8 +622,15 @@ void smbdirect_socket_destroy_sync(struct smbdirect_socket *sc)smbdirect_socket_schedule_cleanup_lvl (sc,SMBDIRECT_LOG_INFO , -ESHUTDOWN ); + +smbdirect_log_rdma_event (sc,SMBDIRECT_LOG_INFO , +"cancelling and disable disconnect_work\n" ); +disable_work_sync (&sc->disconnect_work); + +smbdirect_log_rdma_event (sc,SMBDIRECT_LOG_INFO , +"destroying rdma session\n" ); +if (sc->status <SMBDIRECT_SOCKET_DISCONNECTING )smbdirect_socket_cleanup_work (&sc->disconnect_work); - }if (sc->status <SMBDIRECT_SOCKET_DISCONNECTED ) {smbdirect_log_rdma_event (sc,SMBDIRECT_LOG_INFO ,"wait for transport being disconnected\n" );
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 4/8 smb: smbdirect: let smbdirect_connection_deregister_mr_io unlock while waiting
In reply to Stefan MetzmacherWe should not hold a mutex locked during wait_for_completion() holding a reference is enough.
--- fs/smb/common/smbdirect/smbdirect_mr.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/smb/common/smbdirect/smbdirect_mr.c +8 -0
@@ -410,6 +410,7 @@ void smbdirect_connection_deregister_mr_io(struct smbdirect_mr_io *mr)struct smbdirect_socket *sc = mr->socket;int ret =0 ; +lock_again:mutex_lock (&mr->mutex);if (mr->state ==SMBDIRECT_MR_DISABLED ) goto put_kref;
@@ -440,8 +441,15 @@ void smbdirect_connection_deregister_mr_io(struct smbdirect_mr_io *mr)smbdirect_socket_schedule_cleanup (sc, ret); goto done; } + +/* +* We still hold the reference to mr +* so we can unlock while waiting. +*/ +mutex_unlock (&mr->mutex);wait_for_completion (&mr->invalidate_done); mr->need_invalidate = false; + goto lock_again; }else /* * For remote invalidation, just set it to SMBDIRECT_MR_INVALIDATED
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 5/8 net: define IPPROTO_SMBDIRECT and SOL_SMBDIRECT constants
In reply to Stefan MetzmacherThis patch adds IPPROTO_SMBDIRECT and SOL_SMBDIRECT constants to the networking subsystem. These definitions are essential for applications to set socket options and protocol identifiers related to the SMBDIRECT protocol, defined in [MS-SMBD] by Microsoft. It is used as wrapper around RDMA in order to provide a transport for SMB3, but Microsoft also uses it as transport for other protocols.
SMBDIRECT works over Infiniband, RoCE and iWarp. RoCEv2 is based on IP/UDP and iWarp is based on IP/TCP, so these use IP addresses natively.
Infiniband and RoCEv1 require IPOIB in order to be used for SMBDIRECT.
So instead of adding a PF_SMBDIRECT, which would only use AF_INET[6], we use IPPROTO_SMBDIRECT instead, this uses a number not allocated from IANA, as it would not appear in an IP header.
This is similar to IPPROTO_SMC, IPPROTO_MPTCP and IPPROTO_QUIC, which are linux specific values for the socket() syscall.
socket(AF_INET, SOCK_STREAM, IPPROTO_SMBDIRECT); socket(AF_INET6, SOCK_STREAM, IPPROTO_SMBDIRECT);
This will allow the existing smbdirect code used by cifs.ko and ksmbd.ko to be moved behind the socket layer, so that there's less special handling. Only sock_sendmsg() sock_recvmsg() are used, so that the main stream handling is done all the same for tcp, smbdirect and later also quic.
The special RDMA read/write handling will be via direct function calls as they are currently done for the in kernel consumers.
As a start __sock_create(kern=0)/sk->sk_kern_sock == 0 will still cause a -EPROTONOSUPPORT. So only in kernel consumers will be supported for now.
Once I have developed a stable interface for the RDMA read/write handling using sendmsg/recvmsg with MSG_OOB and msg_control, it will also exposed to userspace in order to allow Samba to use it.
As the numbers of IPPROTO_QUIC (261) and SOL_QUIC (288) [1] are already used in various (released) userspace applications, I used 289 for SOL_SMBDIRECT instead of 288.
--- include/linux/socket.h | 2 ++ include/uapi/linux/in.h | 2 ++ 2 files changed, 4 insertions(+)
include/linux/socket.h +2 -0
@@ -401,6 +401,8 @@ struct ucred {#define SOL_MCTP 285#define SOL_SMC 286#define SOL_VSOCK 287 +/* 288 reserved for SOL_QUIC */ +#define SOL_SMBDIRECT 289/* IPX options */ #define IPX_TYPE 1
include/uapi/linux/in.h +2 -0
@@ -85,6 +85,8 @@ enum {#define IPPROTO_RAW IPPROTO_RAW IPPROTO_SMC = 256, /* Shared Memory Communications */#define IPPROTO_SMC IPPROTO_SMC + IPPROTO_SMBDIRECT = 257, /* RDMA based transport (mostly used by SMB3) */ +#define IPPROTO_SMBDIRECT IPPROTO_SMBDIRECT IPPROTO_MPTCP = 262, /* Multipath TCP connection */#define IPPROTO_MPTCP IPPROTO_MPTCPIPPROTO_MAX
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 6/8 smb: smbdirect: add in kernel only support for IPPROTO_SMBDIRECT
In reply to Stefan MetzmacherFor userspace callers of socket() still get -EPROTONOSUPPORT, so we are sure we'll only have in kernel callers, cifs.ko and ksmbd.ko, for now. This makes it possible to relax the constrains generic stream socket consumers would otherwise assume.
There's a prototype for userspace sockets on top of this and there's working userspace code for Samba as client and server, so this is just the first step, but a very important one.
The SMBDIRECT protocol is defined in [MS-SMBD] by Microsoft.
It is used as wrapper around RDMA in order to provide a transport for SMB3, but Microsoft also uses it as transport for other protocols.
SMBDIRECT works over Infiniband, RoCE and iWarp. RoCEv2 is based on IP/UDP and iWarp is based on IP/TCP, so these use IP addresses natively.
Infiniband and RoCEv1 require IPOIB in order to be used for SMBDIRECT.
So instead of adding a PF_SMBDIRECT, which would only use AF_INET[6], we use IPPROTO_SMBDIRECT instead, this uses a number not allocated from IANA, as it would not appear in an IP header.
This is similar to IPPROTO_SMC, IPPROTO_MPTCP and IPPROTO_QUIC, which are linux specific values for the socket() syscall.
socket(AF_INET, SOCK_STREAM, IPPROTO_SMBDIRECT); socket(AF_INET6, SOCK_STREAM, IPPROTO_SMBDIRECT);
This will allow the existing smbdirect code used by cifs.ko and ksmbd.ko to be moved behind the socket layer, so that there's less special handling. Only sock_sendmsg() sock_recvmsg() are used, so that the main stream handling is done all the same for tcp, smbdirect and later also quic.
The special RDMA read/write handling will be via direct function calls as they are currently done for the in kernel consumers.
For now the core smbdirect code still supports both modes, direct calls in indirect via the socket layer. The core code uses if (sc->sk.sk_family) as indication for the new socket mode. Once cifs.ko and ksmbd.ko are converted we can remove the old mode slowly, but I'll deferr that to a future patchset.
There's still a way to go in order to make this
as generic as tcp and quic e.g. adding MSG_SPLICE_PAGES support or splice_read/read_sock/read_skb.
But it's a good start, which will make changes
much easier.
--- fs/smb/common/smbdirect/Makefile | 1 + fs/smb/common/smbdirect/smbdirect.h | 62 + fs/smb/common/smbdirect/smbdirect_accept.c | 14 +- .../common/smbdirect/smbdirect_connection.c | 58 + fs/smb/common/smbdirect/smbdirect_devices.c | 2 +- fs/smb/common/smbdirect/smbdirect_internal.h | 59 +- fs/smb/common/smbdirect/smbdirect_listen.c | 49 +- fs/smb/common/smbdirect/smbdirect_main.c | 45 + fs/smb/common/smbdirect/smbdirect_mr.c | 10 + fs/smb/common/smbdirect/smbdirect_proto.c | 1549 +++++++++++++++++ fs/smb/common/smbdirect/smbdirect_public.h | 3 + fs/smb/common/smbdirect/smbdirect_rw.c | 29 +- fs/smb/common/smbdirect/smbdirect_socket.c | 147 ++ fs/smb/common/smbdirect/smbdirect_socket.h | 26 +- 14 files changed, 2039 insertions(+), 15 deletions(-) create mode 100644 fs/smb/common/smbdirect/smbdirect_proto.c
fs/smb/common/smbdirect/Makefile +1 -0
@@ -10,6 +10,7 @@ smbdirect-y := \ smbdirect_connection.o \ smbdirect_mr.o \ smbdirect_rw.o \ + smbdirect_proto.o \ smbdirect_debug.o \ smbdirect_connect.o \ smbdirect_listen.o \
fs/smb/common/smbdirect/smbdirect.h +62 -0
73 lines not on this page · raw message
fs/smb/common/smbdirect/smbdirect_accept.c +13 -1
@@ -6,7 +6,6 @@*/ #include "smbdirect_internal.h" -#include <net/sock.h> #include "../../common/smb2status.h" static int smbdirect_accept_rdma_event_handler(struct rdma_cm_id *id,
@@ -460,6 +459,12 @@ static void smbdirect_accept_negotiate_recv_work(struct work_struct *work)spin_lock_irqsave (&lsc->listen.lock, flags);list_del (&sc->accept.list);list_add_tail (&sc->accept.list, &lsc->listen.ready); +if (lsc->sk.sk_family) { +struct sock *lsk = &lsc->sk; + +if (!sock_flag (lsk,SOCK_DEAD ) && lsk->sk_socket) + lsk->sk_data_ready (lsk); + }wake_up (&lsc->listen.wait_queue);spin_unlock_irqrestore (&lsc->listen.lock, flags);
@@ -774,11 +779,13 @@ static long smbdirect_socket_wait_for_accept(struct smbdirect_socket *lsc, long {long ret; +smbdirect_socket_sk_unlock (lsc); ret =wait_event_interruptible_timeout (lsc->listen.wait_queue, !list_empty_careful (&lsc->listen.ready) || lsc->status !=SMBDIRECT_SOCKET_LISTENING || lsc->first_error, timeo); +smbdirect_socket_sk_lock (lsc);if (lsc->status !=SMBDIRECT_SOCKET_LISTENING )return -EINVAL ;if (lsc->first_error)
@@ -850,6 +857,11 @@ struct smbdirect_socket *smbdirect_socket_accept(struct smbdirect_socket *lsc,* order to grant credits to the peer. */ nsc->status =SMBDIRECT_SOCKET_CONNECTED ; +if (nsc->sk.sk_family) { +struct sock *nsk = &nsc->sk; + +inet_sk_set_state (nsk,TCP_ESTABLISHED ); + }smbdirect_accept_negotiate_finish (nsc,0 );return nsc;
fs/smb/common/smbdirect/smbdirect_connection.c +58 -0
157 lines not on this page · raw message
fs/smb/common/smbdirect/smbdirect_devices.c +1 -1
@@ -257,7 +257,7 @@ __init int smbdirect_devices_init(void)return 0 ; } -__exit void smbdirect_devices_exit(void) +__cold void smbdirect_devices_exit (void ) {struct smbdirect_device *sdev, *tmp;
fs/smb/common/smbdirect/smbdirect_internal.h +56 -3
87 lines not on this page · raw message
fs/smb/common/smbdirect/smbdirect_listen.c +45 -4
73 lines not on this page · raw message
fs/smb/common/smbdirect/smbdirect_main.c +45 -0
67 lines not on this page · raw message
fs/smb/common/smbdirect/smbdirect_mr.c +10 -0
@@ -167,9 +167,11 @@ smbdirect_connection_get_mr_io(struct smbdirect_socket *sc)int ret; again: +smbdirect_socket_sk_unlock (sc); ret =wait_event_interruptible (sc->mr_io.ready.wait_queue,atomic_read (&sc->mr_io.ready.count) || sc->status !=SMBDIRECT_SOCKET_CONNECTED ); +smbdirect_socket_sk_lock (sc);if (ret) { smbdirect_log_rdma_mr(sc, SMBDIRECT_LOG_ERR, "wait_event_interruptible ret=%d (%1pe)\n",
@@ -281,7 +283,9 @@ smbdirect_connection_register_mr_io(struct smbdirect_socket *sc,return NULL ; } +smbdirect_socket_sk_lock (sc); mr =smbdirect_connection_get_mr_io (sc); +smbdirect_socket_sk_unlock (sc);if (!mr) {smbdirect_log_rdma_mr (sc,SMBDIRECT_LOG_ERR ,"smbdirect_connection_get_mr_io returning NULL\n" );
@@ -415,6 +419,12 @@ void smbdirect_connection_deregister_mr_io(struct smbdirect_mr_io *mr)if (mr->state ==SMBDIRECT_MR_DISABLED ) goto put_kref; +/* +* We are protected by mr->mutex +* without lock_sock(). +*/ +smbdirect_socket_sk_not_owned_by_me (sc); +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) {smbdirect_mr_io_disable_locked (mr); goto put_kref;
fs/smb/common/smbdirect/smbdirect_proto.c new file +1549 -0
1,549 lines not on this page · raw message
fs/smb/common/smbdirect/smbdirect_public.h +3 -0
@@ -49,6 +49,7 @@ int smbdirect_socket_set_kernel_settings(struct smbdirect_socket *sc,#define SMBDIRECT_LOG_RDMA_MR 0x100#define SMBDIRECT_LOG_RDMA_RW 0x200#define SMBDIRECT_LOG_NEGOTIATE 0x400 +#define SMBDIRECT_LOG_SK 0x800 void smbdirect_socket_set_logging(struct smbdirect_socket *sc, void *private_ptr, bool (*needed)(struct smbdirect_socket *sc,
@@ -145,4 +146,6 @@ void smbdirect_connection_legacy_debug_proc_show(struct smbdirect_socket *sc,unsigned int rdma_readwrite_threshold, struct seq_file *m); +struct smbdirect_socket *smbdirect_socket_from_sock (const struct socket *sock); +#endif /* __FS_SMB_COMMON_SMBDIRECT_SMBDIRECT_PUBLIC_H__ */
fs/smb/common/smbdirect/smbdirect_rw.c +24 -5
@@ -105,11 +105,11 @@ static void smbdirect_connection_rdma_write_done(struct ib_cq *cq, struct ib_wcsmbdirect_connection_rdma_rw_done (cq, wc,DMA_TO_DEVICE ); } -int smbdirect_connection_rdma_xmit (struct smbdirect_socket *sc, -void *buf,size_t buf_len, -struct smbdirect_buffer_descriptor_v1 *desc, -size_t desc_len, -bool is_read) +static int smbdirect_connection_rdma_xmit_locked (struct smbdirect_socket *sc, +void *buf,size_t buf_len, +struct smbdirect_buffer_descriptor_v1 *desc, +size_t desc_len, +bool is_read) {const struct smbdirect_socket_parameters *sp = &sc->parameters;enum dma_data_direction direction = is_read ?DMA_FROM_DEVICE :DMA_TO_DEVICE ;
@@ -123,6 +123,8 @@ int smbdirect_connection_rdma_xmit(struct smbdirect_socket *sc,int credits_needed;size_t desc_buf_len, desc_num =0 ; +smbdirect_socket_sk_owned_by_me (sc); +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return -ENOTCONN ;
@@ -235,7 +237,9 @@ int smbdirect_connection_rdma_xmit(struct smbdirect_socket *sc, } msg = list_last_entry(&msg_list, struct smbdirect_rw_io, list); +smbdirect_socket_sk_unlock (sc);wait_for_completion (&completion); +smbdirect_socket_sk_lock (sc); ret = msg->error; out:list_for_each_entry_safe (msg, next_msg, &msg_list, list) {
@@ -252,4 +256,19 @@ int smbdirect_connection_rdma_xmit(struct smbdirect_socket *sc,kfree (msg); goto out; } + +int smbdirect_connection_rdma_xmit (struct smbdirect_socket *sc, +void *buf,size_t buf_len, +struct smbdirect_buffer_descriptor_v1 *desc, +size_t desc_len, +bool is_read) +{ +int ret; + +smbdirect_socket_sk_lock (sc); + ret =smbdirect_connection_rdma_xmit_locked (sc, buf, buf_len, desc, desc_len, is_read); +smbdirect_socket_sk_unlock (sc); + +return ret; +}__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_rdma_xmit);
fs/smb/common/smbdirect/smbdirect_socket.c +147 -0
217 lines not on this page · raw message
fs/smb/common/smbdirect/smbdirect_socket.h +25 -1
@@ -104,6 +104,18 @@ enum smbdirect_keepalive_status { };struct smbdirect_socket { +union { +struct sock sk; +struct inet_sock inet; + }; +/* needed by inet6_create() */ +struct ipv6_pinfo inet6; +void (*orig_sk_destruct)(struct sock *sk); + +/* +* This is the first element that is +* initialized in smbdirect_socket_init() +*/ enum smbdirect_socket_status status;wait_queue_head_t status_wait;int first_error;
@@ -548,14 +560,18 @@ static void __smbdirect_log_printf(struct smbdirect_socket *sc, __smbdirect_log_generic(sc, lvl, SMBDIRECT_LOG_RDMA_RW, fmt, ##args) #define smbdirect_log_negotiate(sc, lvl, fmt, args...) \ __smbdirect_log_generic(sc, lvl, SMBDIRECT_LOG_NEGOTIATE, fmt, ##args) +#define smbdirect_log_sk(sc, lvl, fmt, args...) \ + __smbdirect_log_generic(sc, lvl, SMBDIRECT_LOG_SK, fmt, ##args) static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc) { + const size_t status_offset = offsetof(struct smbdirect_socket, status); + /* * This also sets status = SMBDIRECT_SOCKET_CREATED */ BUILD_BUG_ON(SMBDIRECT_SOCKET_CREATED != 0); - memset(sc, 0, sizeof(*sc)); + memset(((u8 *)sc)+status_offset, 0, sizeof(*sc)-status_offset); init_waitqueue_head(&sc->status_wait);
@@ -700,6 +716,14 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)__SMBDIRECT_CHECK_STATUS_WARN (__sc, __expected_status, \ __SMBDIRECT_SOCKET_DISCONNECT(__sc);) +static __always_inline struct smbdirect_socket * +smbdirect_socket_from_sk (const struct sock *sk) +{ +WARN_ON_ONCE (!sk); +BUILD_BUG_ON (offsetof(struct smbdirect_socket , sk) !=0 ); + return container_of(sk, struct smbdirect_socket, sk); +} +struct smbdirect_send_io {struct smbdirect_socket *socket;struct ib_cqe cqe;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 7/8 smb: client: make use of IPPROTO_SMBDIRECT sockets
In reply to Stefan MetzmacherThis reduces the function calls for special smbdirect features to
- smbdirect_socket_from_sock()
- smbdirect_socket_set_logging()
- smbdirect_socket_set_initial_parameters()
- smbdirect_socket_set_kernel_settings()
- smbdirect_socket_get_current_parameters()
- smbdirect_connection_is_connected()
- smbdirect_connection_send_single_iter()
- smbdirect_connection_send_wait_zero_pending()
- smbdirect_connection_register_mr_io()
- smbdirect_mr_io_fill_buffer_descriptor()
- smbdirect_connection_deregister_mr_io()
- smbdirect_connection_legacy_debug_proc_show()
In future with modifications from David Howells we'll also be able to use sock_sendmsg() and avoid direct calls to smbdirect_connection_send_single_iter() and smbdirect_connection_send_wait_zero_pending().
This will also make it easier to implement the QUIC transport Henrique Carvalho is working on.
In the end the core smb handling should just make use of a SOCK_STREAM socket, after the initial setup.
There's still a way to go, but almost all changes
will be done within the smbdirect code, e.g.
adding MSG_SPLICE_PAGES support or
splice_read/read_sock/read_skb.
But it's a good start, which will make changes
much easier.
--- fs/smb/client/cifs_debug.c | 2 +- fs/smb/client/cifsfs.c | 2 +- fs/smb/client/cifsglob.h | 7 +- fs/smb/client/connect.c | 123 +++++++++-------- fs/smb/client/file.c | 8 +- fs/smb/client/sess.c | 4 +- fs/smb/client/smb2ops.c | 8 +- fs/smb/client/smb2pdu.c | 10 +- fs/smb/client/smbdirect.c | 275 +++++++++++-------------------------- fs/smb/client/smbdirect.h | 27 +--- fs/smb/client/transport.c | 2 +- 11 files changed, 170 insertions(+), 298 deletions(-)
fs/smb/client/cifs_debug.c +1 -1
@@ -481,7 +481,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)seq_printf (m,"\nServer capabilities: 0x%x" , server->capabilities); -if (server->rdma) +if (cifs_rdma_enabled (server))seq_printf (m,"\nRDMA " ); seq_printf(m, "\nTCP status: %d Instance: %d" "\nLocal Users To Server: %d SecMode: 0x%x Req On Wire: %d",
fs/smb/client/cifsfs.c +1 -1
@@ -529,7 +529,7 @@ cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server)default :seq_puts (s,"(unknown)" ); } -if (server->rdma) +if (cifs_rdma_enabled (server))seq_puts (s,",rdma" ); }
fs/smb/client/cifsglob.h +3 -4
@@ -35,6 +35,7 @@#define SMB_PATH_MAX 260#define CIFS_PORT 445#define RFC1001_PORT 139 +#define SMBD_IWARP_PORT 5445/* * The sizes of various internal tables and strings
@@ -759,10 +760,8 @@ struct TCP_Server_Info {bool sec_mskerberos;/* supports legacy MS Kerberos */ bool sec_iakerb;/* supports pass-through auth for Kerberos (krb5 proxy) */ bool large_buf;/* is current buffer large? */ -/* use SMBD connection instead of socket */ -bool rdma; -/* point to the SMBD connection if RDMA is used instead of socket */ -struct smbd_connection *smbd_conn; +int ipproto;/* IPPROTO_TCP or IPOROTO_SMBDIRECT */ +#define cifs_rdma_enabled (__server) ((__server)->ipproto == IPPROTO_SMBDIRECT)struct delayed_work echo;/* echo ping workqueue job */ char *smallbuf;/* pointer to current "small" buffer */ char *bigbuf;/* pointer to current "big" buffer */
fs/smb/client/connect.c +66 -57
258 lines not on this page · raw message
fs/smb/client/file.c +4 -4
@@ -97,9 +97,9 @@ static void cifs_prepare_write(struct netfs_io_subrequest *subreq) cifs_trace_rw_credits_write_prepare);#ifdef CONFIG_CIFS_SMB_DIRECT -if (server->smbd_conn) { +if (cifs_rdma_enabled (server)) {const struct smbdirect_socket_parameters *sp = -smbd_get_parameters (server->smbd_conn); +smbd_get_parameters (server); stream->sreq_max_segs = sp->max_frmr_depth; }
@@ -191,9 +191,9 @@ static int cifs_prepare_read(struct netfs_io_subrequest *subreq) cifs_trace_rw_credits_read_submit);#ifdef CONFIG_CIFS_SMB_DIRECT -if (server->smbd_conn) { +if (cifs_rdma_enabled (server)) {const struct smbdirect_socket_parameters *sp = -smbd_get_parameters (server->smbd_conn); +smbd_get_parameters (server); rreq->io_streams[0 ].sreq_max_segs = sp->max_frmr_depth; }
fs/smb/client/sess.c +2 -2
@@ -207,7 +207,7 @@ int cifs_try_adding_channels(struct cifs_ses *ses)list_for_each_entry_safe_from (iface, niface, &ses->iface_list, iface_head) {/* do not mix rdma and non-rdma interfaces */ -if (iface->rdma_capable != ses->server->rdma) +if (iface->rdma_capable !=cifs_rdma_enabled (ses->server))continue ;/* skip ifaces that are unusable */
@@ -395,7 +395,7 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server) }/* do not mix rdma and non-rdma interfaces */ -if (iface->rdma_capable != server->rdma) +if (iface->rdma_capable !=cifs_rdma_enabled (server))continue ; if (!iface->is_active ||
fs/smb/client/smb2ops.c +4 -4
@@ -503,9 +503,9 @@ smb3_negotiate_wsize(struct cifs_tcon *tcon, struct smb3_fs_context *ctx) wsize = ctx->got_wsize ? ctx->vol_wsize :SMB3_DEFAULT_IOSIZE ; wsize = min_t(unsigned int, wsize, server->max_write);#ifdef CONFIG_CIFS_SMB_DIRECT -if (server->rdma) { +if (cifs_rdma_enabled (server)) {const struct smbdirect_socket_parameters *sp = -smbd_get_parameters (server->smbd_conn); +smbd_get_parameters (server);if (server->sign)/*
@@ -554,9 +554,9 @@ smb3_negotiate_rsize(struct cifs_tcon *tcon, struct smb3_fs_context *ctx) rsize = ctx->got_rsize ? ctx->vol_rsize :SMB3_DEFAULT_IOSIZE ; rsize = min_t(unsigned int, rsize, server->max_read);#ifdef CONFIG_CIFS_SMB_DIRECT -if (server->rdma) { +if (cifs_rdma_enabled (server)) {const struct smbdirect_socket_parameters *sp = -smbd_get_parameters (server->smbd_conn); +smbd_get_parameters (server);if (server->sign)/*
fs/smb/client/smb2pdu.c +7 -3
@@ -4472,7 +4472,7 @@ static inline bool smb3_use_rdma_offload(struct cifs_io_parms *io_parms)return false;/* we can only offload on an rdma connection */ -if (!server->rdma || !server->smbd_conn) +if (!cifs_rdma_enabled (server))return false;/* we don't support signed offload yet */
@@ -4483,6 +4483,10 @@ static inline bool smb3_use_rdma_offload(struct cifs_io_parms *io_parms)if (smb3_encryption_required (tcon))return false; +/* this implicitly sets up server->rdma_readwrite_threshold */ +if (!smbd_get_parameters (server)) +return false; +/* offload also has its overhead, so only do it if desired */ if (io_parms->length < server->rdma_readwrite_threshold)return false;
@@ -4540,7 +4544,7 @@ smb2_new_read_req(void **buf, unsigned int *total_len,struct smbdirect_buffer_descriptor_v1 *v1;bool need_invalidate = server->dialect ==SMB30_PROT_ID ; - rdata->mr =smbd_register_mr (server->smbd_conn, &rdata->subreq.io_iter, + rdata->mr =smbd_register_mr (server, &rdata->subreq.io_iter, true, need_invalidate);if (!rdata->mr)return -EAGAIN ;
@@ -5134,7 +5138,7 @@ smb2_async_writev(struct cifs_io_subrequest *wdata)struct smbdirect_buffer_descriptor_v1 *v1;bool need_invalidate = server->dialect ==SMB30_PROT_ID ; - wdata->mr =smbd_register_mr (server->smbd_conn, &wdata->subreq.io_iter, + wdata->mr =smbd_register_mr (server, &wdata->subreq.io_iter, false, need_invalidate);if (!wdata->mr) { rc = -EAGAIN ;
fs/smb/client/smbdirect.c +77 -198
389 lines not on this page · raw message
fs/smb/client/smbdirect.h +4 -23
@@ -8,7 +8,6 @@#define _SMBDIRECT_H#ifdef CONFIG_CIFS_SMB_DIRECT -#define cifs_rdma_enabled (server) ((server)->rdma)#include "cifsglob.h"
@@ -23,29 +22,18 @@ extern int smbd_max_send_size;extern int smbd_send_credit_target;extern int smbd_receive_credit_max; -struct smbd_connection { -struct smbdirect_socket *socket; -}; +/* prepare a SMBDirect session */ +int smbd_prepare_socket (struct TCP_Server_Info *server,int port); -/* Create a SMBDirect session */ -struct smbd_connection *smbd_get_connection ( -struct TCP_Server_Info *server,struct sockaddr *dstaddr); - -const struct smbdirect_socket_parameters *smbd_get_parameters (struct smbd_connection *conn); - -/* Reconnect SMBDirect session */ -int smbd_reconnect (struct TCP_Server_Info *server); -/* Destroy SMBDirect session */ -void smbd_destroy (struct TCP_Server_Info *server); +const struct smbdirect_socket_parameters *smbd_get_parameters (struct TCP_Server_Info *server);/* Interface for carrying upper layer I/O through send/recv */ -int smbd_recv (struct smbd_connection *info,struct msghdr *msg);int smbd_send (struct TCP_Server_Info *server,int num_rqst,struct smb_rqst *rqst);/* Interfaces to register and deregister MR for RDMA read/write */ struct smbdirect_mr_io *smbd_register_mr ( -struct smbd_connection *info,struct iov_iter *iter, +struct TCP_Server_Info *server,struct iov_iter *iter,bool writing,bool need_invalidate);void smbd_mr_fill_buffer_descriptor (struct smbdirect_mr_io *mr,struct smbdirect_buffer_descriptor_v1 *v1);
@@ -54,13 +42,6 @@ void smbd_deregister_mr(struct smbdirect_mr_io *mr);void smbd_debug_proc_show (struct TCP_Server_Info *server,struct seq_file *m);#else -#define cifs_rdma_enabled (server) 0 -struct smbd_connection {}; -static inline void *smbd_get_connection ( -struct TCP_Server_Info *server,struct sockaddr *dstaddr) {return NULL ;} -static inline int smbd_reconnect (struct TCP_Server_Info *server) {return -1 ; } -static inline void smbd_destroy (struct TCP_Server_Info *server) {} -static inline int smbd_recv (struct smbd_connection *info,struct msghdr *msg) {return -1 ; }static inline int smbd_send (struct TCP_Server_Info *server,int num_rqst,struct smb_rqst *rqst) {return -1 ; }#endif
fs/smb/client/transport.c +1 -1
@@ -253,7 +253,7 @@ int __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,if (cifs_rdma_enabled (server)) {/* return -EAGAIN when connecting or reconnecting */ rc = -EAGAIN ; -if (server->smbd_conn) +if (ssocket) rc =smbd_send (server, num_rqst, rqst); goto smbd_done; }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 8/8 smb: server: make use of IPPROTO_SMBDIRECT sockets
In reply to Stefan MetzmacherThis reduces the function calls for special smbdirect features to
- smbdirect_socket_from_sock()
- smbdirect_socket_set_logging()
- smbdirect_socket_set_initial_parameters()
- smbdirect_socket_set_kernel_settings()
- smbdirect_socket_get_current_parameters()
- smbdirect_connection_is_connected()
- smbdirect_connection_rdma_xmit()
This will also make it easier to implement the QUIC transport Henrique Carvalho is working on.
In the end the core smb handling should just make use of a SOCK_STREAM socket, after the initial setup.
There's still a way to go, but almost all changes will be done within the smbdirect code, e.g. adding MSG_SPLICE_PAGES support or splice_read/read_sock/read_skb.
But it's a good start, which will make changes much easier.
--- fs/smb/server/transport_rdma.c | 119 +++++++++++++++++++-------------- 1 file changed, 70 insertions(+), 49 deletions(-)
fs/smb/server/transport_rdma.c +70 -49
@@ -82,13 +82,13 @@ static struct smb_direct_listener {struct task_struct *thread; -struct smbdirect_socket *socket; +struct socket *sock; } smb_direct_ib_listener, smb_direct_iw_listener;struct smb_direct_transport {struct ksmbd_transport transport; -struct smbdirect_socket *socket; +struct socket *sock; }; static bool smb_direct_logging_needed(struct smbdirect_socket *sc,
@@ -165,18 +165,23 @@ void init_smbd_max_io_size(unsigned int sz)unsigned int get_smbd_max_read_write_size (struct ksmbd_transport *kt) {struct smb_direct_transport *t; +struct smbdirect_socket *sc;const struct smbdirect_socket_parameters *sp;if (kt->ops != &ksmbd_smb_direct_transport_ops)return 0 ; t =SMBD_TRANS (kt); - sp =smbdirect_socket_get_current_parameters (t->socket); + sc =smbdirect_socket_from_sock (t->sock); + +if (!smbdirect_connection_is_connected (sc)) +return 0 ; + sp =smbdirect_socket_get_current_parameters (sc);return sp->max_read_write_size; } -static struct smb_direct_transport *alloc_transport (struct smbdirect_socket *sc) +static struct smb_direct_transport *alloc_transport (struct socket *client_sock) {struct smb_direct_transport *t;struct ksmbd_conn *conn;
@@ -184,7 +189,7 @@ static struct smb_direct_transport *alloc_transport(struct smbdirect_socket *sc) t =kzalloc_obj (*t,KSMBD_DEFAULT_GFP );if (!t)return NULL ; - t->socket = sc; + t->sock = client_sock; conn =ksmbd_conn_alloc ();if (!conn)
@@ -209,13 +214,13 @@ static void smb_direct_free_transport(struct ksmbd_transport *kt) {struct smb_direct_transport *t =SMBD_TRANS (kt); -smbdirect_socket_release (t->socket); +sock_release (t->sock);kfree (t); }static void free_transport (struct smb_direct_transport *t) { -smbdirect_socket_shutdown (t->socket); +kernel_sock_shutdown (t->sock,SHUT_RDWR );ksmbd_conn_free (KSMBD_TRANS (t)->conn); }
@@ -223,7 +228,6 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf, unsigned int size, int unused) {struct smb_direct_transport *st =SMBD_TRANS (t); -struct smbdirect_socket *sc = st->socket;struct msghdr msg = { .msg_flags =0 , };struct kvec iov = { .iov_base = buf,
@@ -231,9 +235,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf, };int ret; -iov_iter_kvec (&msg.msg_iter,ITER_DEST , &iov,1 , size); - - ret =smbdirect_connection_recvmsg (sc, &msg,0 ); + ret =kernel_recvmsg (st->sock, &msg, &iov,1 , size,0 );if (ret == -ERESTARTSYS ) ret = -EINTR ;return ret;
@@ -244,13 +246,14 @@ static int smb_direct_writev(struct ksmbd_transport *t, 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; +struct msghdr msg = { .msg_flags =MSG_NOSIGNAL , }; +struct smbdirect_cmsg_buffer cbuffer = { .msg_control = {0 , }, }; +u32 _remote_token = remote_key; +const u32 *remote_token = need_invalidate ? &_remote_token :NULL ; -iov_iter_kvec (&iter,ITER_SOURCE , iov, niovs, buflen); +smbdirect_buffer_remote_invalidate_cmsg_prepare (&msg, &cbuffer, remote_token); -return smbdirect_connection_send_iter (sc, &iter,0 , - need_invalidate, remote_key); +return kernel_sendmsg (st->sock, &msg, iov, niovs, buflen); } static int smb_direct_rdma_write(struct ksmbd_transport *t,
@@ -259,7 +262,10 @@ static int smb_direct_rdma_write(struct ksmbd_transport *t, unsigned int desc_len) {struct smb_direct_transport *st =SMBD_TRANS (t); -struct smbdirect_socket *sc = st->socket; +struct smbdirect_socket *sc =smbdirect_socket_from_sock (st->sock); + +if (!smbdirect_connection_is_connected (sc)) +return -ENOTCONN ;return smbdirect_connection_rdma_xmit (sc, buf, buflen, desc, desc_len, false);
@@ -271,7 +277,10 @@ static int smb_direct_rdma_read(struct ksmbd_transport *t, unsigned int desc_len) {struct smb_direct_transport *st =SMBD_TRANS (t); -struct smbdirect_socket *sc = st->socket; +struct smbdirect_socket *sc =smbdirect_socket_from_sock (st->sock); + +if (!smbdirect_connection_is_connected (sc)) +return -ENOTCONN ;return smbdirect_connection_rdma_xmit (sc, buf, buflen, desc, desc_len, true);
@@ -280,7 +289,7 @@ static int smb_direct_rdma_read(struct ksmbd_transport *t,static void smb_direct_disconnect (struct ksmbd_transport *t) {struct smb_direct_transport *st =SMBD_TRANS (t); -struct smbdirect_socket *sc = st->socket; +struct smbdirect_socket *sc =smbdirect_socket_from_sock (st->sock);ksmbd_debug (RDMA ,"Disconnecting sc=%p\n" , sc);
@@ -290,23 +299,23 @@ static void smb_direct_disconnect(struct ksmbd_transport *t)static void smb_direct_shutdown (struct ksmbd_transport *t) {struct smb_direct_transport *st =SMBD_TRANS (t); -struct smbdirect_socket *sc = st->socket; +struct smbdirect_socket *sc =smbdirect_socket_from_sock (st->sock);ksmbd_debug (RDMA ,"smb-direct shutdown sc=%p\n" , sc); -smbdirect_socket_shutdown (sc); +kernel_sock_shutdown (st->sock,SHUT_RDWR ); }static int smb_direct_new_connection (struct smb_direct_listener *listener, -struct smbdirect_socket *client_sc) +struct socket *client_sock) {struct smb_direct_transport *t;struct task_struct *handler;int ret; - t =alloc_transport (client_sc); + t =alloc_transport (client_sock);if (!t) { -smbdirect_socket_release (client_sc); +sock_release (client_sock);return -ENOMEM ; }
@@ -328,22 +337,21 @@ static int smb_direct_new_connection(struct smb_direct_listener *listener,static int smb_direct_listener_kthread_fn (void *p) {struct smb_direct_listener *listener = (struct smb_direct_listener *)p; -struct smbdirect_socket *client_sc =NULL ; +struct socket *client_sock =NULL ;while (!kthread_should_stop ()) { -struct proto_accept_arg arg = { .err = -EINVAL , }; -long timeo =MAX_SCHEDULE_TIMEOUT ; +int ret; -if (!listener->socket) +if (!listener->sock)break ; - client_sc =smbdirect_socket_accept (listener->socket, timeo, &arg); -if (!client_sc && arg.err == -EINVAL ) + ret =kernel_accept (listener->sock, &client_sock,0 ); +if (ret == -EINVAL )break ; -if (!client_sc) +if (ret)continue ;ksmbd_debug (CONN ,"connect success: accepted new connection\n" ); -smb_direct_new_connection (listener, client_sc); +smb_direct_new_connection (listener, client_sock); }ksmbd_debug (CONN ,"releasing socket\n" );
@@ -354,8 +362,12 @@ static void smb_direct_listener_destroy(struct smb_direct_listener *listener) {int ret; -if (listener->socket) -smbdirect_socket_shutdown (listener->socket); +if (listener->sock) { + ret =kernel_sock_shutdown (listener->sock,SHUT_RDWR ); +if (ret) +pr_err ("Failed to shutdown socket: %d %1pe\n" , + ret,ERR_PTR (ret)); + }if (listener->thread) { ret =kthread_stop (listener->thread);
@@ -364,9 +376,9 @@ static void smb_direct_listener_destroy(struct smb_direct_listener *listener) listener->thread =NULL ; } -if (listener->socket) { -smbdirect_socket_release (listener->socket); - listener->socket =NULL ; +if (listener->sock) { +sock_release (listener->sock); + listener->sock =NULL ; } listener->port =0 ;
@@ -376,6 +388,7 @@ static int smb_direct_listen(struct smb_direct_listener *listener, int port) {struct net *net = current->nsproxy->net_ns; +struct socket *ksmbd_socket;struct task_struct *kthread;struct sockaddr_in sin = { .sin_family =AF_INET ,
@@ -410,13 +423,21 @@ static int smb_direct_listen(struct smb_direct_listener *listener,return -ENODEV ; } - ret =smbdirect_socket_create_kern (net, &sc); + ret =sock_create_kern (net,PF_INET ,SOCK_STREAM ,IPPROTO_SMBDIRECT , + &ksmbd_socket);if (ret) { -pr_err ("smbdirect_socket_create_kern() failed: %d %1pe\n" , +pr_err ("Can't create IPPROTO_SMBDIRECT socket: %d %1pe\n" , ret,ERR_PTR (ret));return ret; } + sc =smbdirect_socket_from_sock (ksmbd_socket); +if (WARN_ON_ONCE (!sc)) { + ret = -EINVAL ; +pr_err ("smbdirect_socket_from_sock returned NULL\n" ); + goto err; + } +/* * Create the initial parameters */
@@ -450,22 +471,22 @@ static int smb_direct_listen(struct smb_direct_listener *listener, goto err; } - ret =smbdirect_socket_bind (sc, (struct sockaddr *)&sin); + ret =kernel_bind (ksmbd_socket, (struct sockaddr_unsized *)&sin,sizeof (sin));if (ret) { -pr_err ("smbdirect_socket_bind() failed: %d %1pe\n" , +pr_err ("Failed to bind IPPROTO_SMBDIRECT socket: %d %1pe\n" , ret,ERR_PTR (ret)); goto err; } - ret =smbdirect_socket_listen (sc,10 ); + ret =kernel_listen (ksmbd_socket,10 );if (ret) { -pr_err ("Port[%d] smbdirect_socket_listen() failed: %d %1pe\n" , +pr_err ("Port[%d] kernel_listen() error: %d %1pe\n" , port, ret,ERR_PTR (ret)); goto err; } listener->port = port; - listener->socket = sc; + listener->sock = ksmbd_socket; kthread = kthread_run(smb_direct_listener_kthread_fn, listener,
@@ -489,7 +510,7 @@ int ksmbd_rdma_init(void)int ret; smb_direct_ib_listener = smb_direct_iw_listener = (struct smb_direct_listener ) { - .socket =NULL , + .sock =NULL , }; ret = smb_direct_listen(&smb_direct_ib_listener,
@@ -499,8 +520,8 @@ int ksmbd_rdma_init(void) goto err; } -ksmbd_debug (RDMA ,"InfiniBand/RoCEv1/RoCEv2 RDMA listener. socket=%p\n" , - smb_direct_ib_listener.socket); +ksmbd_debug (RDMA ,"InfiniBand/RoCEv1/RoCEv2 RDMA listener. sock=%p\n" , + smb_direct_ib_listener.sock); ret =smb_direct_listen (&smb_direct_iw_listener,SMB_DIRECT_PORT_IWARP );
@@ -509,8 +530,8 @@ int ksmbd_rdma_init(void) goto err; } -ksmbd_debug (RDMA ,"iWarp RDMA listener. socket=%p\n" , - smb_direct_iw_listener.socket); +ksmbd_debug (RDMA ,"iWarp RDMA listener. sock=%p\n" , + smb_direct_iw_listener.sock);return 0 ; err:
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewercover smb: add kernel internal IPPROTO_SMBDIRECT
Hi,
as the work to unify the smbdirect code
between cifs.ko and ksmbd.ko into an smbdirect.ko
is in linux-next for a while this is the next
step to also share the code with userspace
e.g. Samba as client and server.
The SMBDIRECT protocol, defined in [MS-SMBD] by Microsoft.
It is used as wrapper around RDMA in order to provide a transport for SMB3, but Microsoft also uses it as transport for other protocols.
SMBDIRECT works over Infiniband, RoCE and iWarp. RoCEv2 is based on IP/UDP and iWarp is based on IP/TCP, so these use IP addresses natively. Infiniband and RoCEv1 require IPOIB in order to be used for SMBDIRECT.
So instead of adding a PF_SMBDIRECT, which would only use AF_INET[6], we use IPPROTO_SMBDIRECT instead, this uses a number not allocated from IANA, as it would not appear in an IP header.
This is similar to IPPROTO_SMC, IPPROTO_MPTCP and IPPROTO_QUIC, which are linux specific values for the socket() syscall.
socket(AF_INET, SOCK_STREAM, IPPROTO_SMBDIRECT); socket(AF_INET6, SOCK_STREAM, IPPROTO_SMBDIRECT);
This will allow the existing smbdirect code used by cifs.ko and ksmbd.ko to be moved behind the socket layer [1], so that there's less special handling. Only sock_sendmsg() sock_recvmsg() are used, so that the main stream handling is done all the same for tcp, smbdirect and later also quic.
The special RDMA read/write handling will be via direct function calls as they are currently done for the in kernel consumers.
As a start __sock_create(kern=0)/sk->sk_kern_sock == 0 will still cause a -EPROTONOSUPPORT. So only in kernel consumers will be supported for now.
For now the core smbdirect code still supports both modes, direct calls in indirect via the socket layer. The core code uses if (sc->sk.sk_family) as indication for the new socket mode. Once cifs.ko and ksmbd.ko are converted we can remove the old mode slowly, but I'll deferr that to a future patchset.
There's still a way to go in order to make this
as generic as tcp and quic e.g. adding MSG_SPLICE_PAGES support or splice_read/read_sock/read_skb.
But it's a good start, which will make changes much easier.
This patchset is based on top of the smbdirect.ko patches in ksmbd-for-next and it's also based on netdev-next because it needs this commit from there:8341c989ac77d712c7d6e2bce29e8a4bcb2eeae4
"net: remove addr_len argument of recvmsg() handlers"
Patches 1-4 are some preparation fixes for the existing smbdirect.ko patchset. We may
squash them into the existing patches before sending them to Linus. But for now I kept them separately. I also don't cc the network and rdma people on these...
Patch 5 defines IPPROTO_SMBDIRECT and SOL_SMBDIRECT constants (and also reserve the number 288 for SOL_QUIC as applications are already using that and we don't want to conflict)
Patch 6 adds basic IPPROTO_SMBDIRECT layering
on top of the existing smbdirect code.
This is just enough in order to let cifs.ko
and ksmbd.ko use it in the following commits,
so userspace still sees -EPROTONOSUPPORT.
Patch 7 converts cifs.ko to use IPPROTO_SMBDIRECT as much as currently possible.
Using sock_sendmsg is not yet possible, because of the tcp_sock_set_cork usage, but that will change in future.
Patch 8 converts ksmbd.ko to use IPPROTO_SMBDIRECT.
Because of the need for netdev-next commit 8341c989ac77d712c7d6e2bce29e8a4bcb2eeae4 "net: remove addr_len argument of recvmsg() handlers" it's a bit tricky to prepare something that would not cause problems in linux-next.
We could merge in netdev-next completely,
but I saw commit 00f03539e3d97af925abf42992d8c46167d54243 in next-20260406, indicates some resolved conflicts with (at least) the rdma tree, which comes
just before netdev-next, while ksmbd-for-next is merged before all of them. So merging netdev-next into ksmbd-for-next changes the order of netdev-next vs. rdma.
Or we add a new branch smbdirect-for-next that's
merged into linux-next after netdev-next.
Or a bit hacky but likely easier, ksmbd-for-next just cherry-picks 8341c989ac77d712c7d6e2bce29e8a4bcb2eeae4 "net: remove addr_len argument of recvmsg() handlers" and that cherry picked commit is reverted as
last commit in ksmbd-for-next, or only in linux-next right before netdev-next is merged.
For now I have the patches in a branch with a
cherry picked version of the needed commit only, see for-7.1/ipproto-smbdirect-20260407-v1 at commit:e1972e6f1fda9842c5724b7daf4a2aa7779901a5
git fetch https://git.samba.org/metze/linux/wip.git for-7.1/ipproto-smbdirect-20260407-v1
https://git.samba.org/?p=metze/linux/wip.git;a=shortlog;h=refs/heads/for-7.1/ipproto-smbdirect-20260407-v1
It would be great to get this somehow into linux-next soon :-)
Stefan Metzmacher (8):
smb: smbdirect: change
smbdirect_socket_parameters.{initiator_depth,responder_resources} to
__u16 smb: smbdirect: fix copyright header of smbdirect.h
smb: smbdirect: fix the logic in smbdirect_socket_destroy_sync()
without an error
smb: smbdirect: let smbdirect_connection_deregister_mr_io unlock while
waiting
net: define IPPROTO_SMBDIRECT and SOL_SMBDIRECT constants
smb: smbdirect: add in kernel only support for IPPROTO_SMBDIRECT
smb: client: make use of IPPROTO_SMBDIRECT sockets
smb: server: make use of IPPROTO_SMBDIRECT sockets
fs/smb/client/cifs_debug.c | 2 +- fs/smb/client/cifsfs.c | 2 +- fs/smb/client/cifsglob.h | 7 +- fs/smb/client/connect.c | 123 +- fs/smb/client/file.c | 8 +- fs/smb/client/sess.c | 4 +- fs/smb/client/smb2ops.c | 8 +- fs/smb/client/smb2pdu.c | 10 +- fs/smb/client/smbdirect.c | 275 +-- fs/smb/client/smbdirect.h | 27 +- fs/smb/client/transport.c | 2 +- fs/smb/common/smbdirect/Makefile | 1 + fs/smb/common/smbdirect/smbdirect.h | 69 +- fs/smb/common/smbdirect/smbdirect_accept.c | 14 +- .../common/smbdirect/smbdirect_connection.c | 58 + fs/smb/common/smbdirect/smbdirect_devices.c | 2 +- fs/smb/common/smbdirect/smbdirect_internal.h | 59 +- fs/smb/common/smbdirect/smbdirect_listen.c | 49 +- fs/smb/common/smbdirect/smbdirect_main.c | 45 + fs/smb/common/smbdirect/smbdirect_mr.c | 18 + fs/smb/common/smbdirect/smbdirect_proto.c | 1549 +++++++++++++++++ fs/smb/common/smbdirect/smbdirect_public.h | 3 + fs/smb/common/smbdirect/smbdirect_rw.c | 29 +- fs/smb/common/smbdirect/smbdirect_socket.c | 180 +- fs/smb/common/smbdirect/smbdirect_socket.h | 26 +- fs/smb/server/transport_rdma.c | 119 +- include/linux/socket.h | 2 + include/uapi/linux/in.h | 2 + 28 files changed, 2320 insertions(+), 373 deletions(-) create mode 100644 fs/smb/common/smbdirect/smbdirect_proto.c
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 1/8 smb: smbdirect: change smbdirect_socket_parameters.{initiator_depth,responder_resources} to __u16
We still limit this to U8_MAX as the rdma api only uses __u8 and that's also the limit for Infiniband and RoCE*, while iWarp would be able to support larger values at the protocol level.
As struct smbdirect_socket_parameters will be part of the uapi for IPPROTO_SMBDIRECT in future, change it now even if userspace sockets won't be supported yet.
--- fs/smb/common/smbdirect/smbdirect.h | 4 ++-- fs/smb/common/smbdirect/smbdirect_socket.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)
fs/smb/common/smbdirect/smbdirect.h +2 -2
@@ -32,8 +32,8 @@ struct smbdirect_socket_parameters {__u32 resolve_route_timeout_msec;__u32 rdma_connect_timeout_msec;__u32 negotiate_timeout_msec; -__u8 initiator_depth; -__u8 responder_resources; +__u16 initiator_depth;/* limited to U8_MAX */ +__u16 responder_resources;/* limited to U8_MAX */ __u16 recv_credit_max;__u16 send_credit_target;__u32 max_send_size;
fs/smb/common/smbdirect/smbdirect_socket.c +5 -0
@@ -166,6 +166,11 @@ int smbdirect_socket_set_initial_parameters(struct smbdirect_socket *sc,if (sp->flags & ~SMBDIRECT_FLAG_PORT_RANGE_MASK )return -EINVAL ; +if (sp->initiator_depth >U8_MAX ) +return -EINVAL ; +if (sp->responder_resources >U8_MAX ) +return -EINVAL ; +if (sp->flags &SMBDIRECT_FLAG_PORT_RANGE_ONLY_IB && sp->flags &SMBDIRECT_FLAG_PORT_RANGE_ONLY_IW )return -EINVAL ;
Signature · 1 line
2.43.0
merged the first 4 into smb3-kernel ksmbd-for-next
Quoted 166 lines · Stefan Metzmacher
Hi,
as the work to unify the smbdirect code
between cifs.ko and ksmbd.ko into an smbdirect.ko
is in linux-next for a while this is the next
step to also share the code with userspace
e.g. Samba as client and server.The SMBDIRECT protocol, defined in [MS-SMBD] by Microsoft.
It is used as wrapper around RDMA in order to provide a transport for SMB3, but Microsoft also uses it as transport for other protocols.SMBDIRECT works over Infiniband, RoCE and iWarp. RoCEv2 is based on IP/UDP and iWarp is based on IP/TCP, so these use IP addresses natively. Infiniband and RoCEv1 require IPOIB in order to be used for SMBDIRECT.
So instead of adding a
PF_SMBDIRECT, which would only use AF_INET[6], we useIPPROTO_SMBDIRECTinstead, this uses a number not allocated from IANA, as it would not appear in an IP header.This is similar to
IPPROTO_SMC,IPPROTO_MPTCPandIPPROTO_QUIC, which are linux specific values for thesocket()syscall.socket(AF_INET, SOCK_STREAM, IPPROTO_SMBDIRECT); socket(AF_INET6, SOCK_STREAM, IPPROTO_SMBDIRECT);This will allow the existing smbdirect code used by cifs.ko and ksmbd.ko to be moved behind the socket layer [1], so that there's less special handling. Only
sock_sendmsg()sock_recvmsg()are used, so that the main stream handling is done all the same for tcp, smbdirect and later also quic.The special RDMA read/write handling will be via direct function calls as they are currently done for the in kernel consumers.
As a start __sock_create(kern=0)/sk->sk_kern_sock == 0 will still cause a
-EPROTONOSUPPORT. So only in kernel consumers will be supported for now.For now the core smbdirect code still supports both modes, direct calls in indirect via the socket layer. The core code uses if (
sc->sk.sk_family) as indication for the new socket mode. Once cifs.ko and ksmbd.ko are converted we can remove the old mode slowly, but I'll deferr that to a future patchset.There's still a way to go in order to make this
as generic as tcp and quic e.g. addingMSG_SPLICE_PAGESsupport or splice_read/read_sock/read_skb.But it's a good start, which will make changes much easier.
This patchset is based on top of the smbdirect.ko patches in ksmbd-for-next and it's also based on netdev-next because it needs this commit from there:
8341c989ac77d712c7d6e2bce29e8a4bcb2eeae4
"net: removeaddr_lenargument ofrecvmsg()handlers"Patches 1-4 are some preparation fixes for the existing smbdirect.ko patchset. We may
squash them into the existing patches before sending them to Linus. But for now I kept them separately. I also don't cc the network and rdma people on these...Patch 5 defines
IPPROTO_SMBDIRECTandSOL_SMBDIRECTconstants (and also reserve the number 288 forSOL_QUICas applications are already using that and we don't want to conflict)Patch 6 adds basic
IPPROTO_SMBDIRECTlayering
on top of the existing smbdirect code.
This is just enough in order to let cifs.ko
and ksmbd.ko use it in the following commits,
so userspace still sees-EPROTONOSUPPORT.Patch 7 converts cifs.ko to use
IPPROTO_SMBDIRECTas much as currently possible.
Usingsock_sendmsgis not yet possible, because of thetcp_sock_set_corkusage, but that will change in future.Patch 8 converts ksmbd.ko to use
IPPROTO_SMBDIRECT.Because of the need for netdev-next commit
8341c989ac77d712c7d6e2bce29e8a4bcb2eeae4"net: removeaddr_lenargument ofrecvmsg()handlers" it's a bit tricky to prepare something that would not cause problems in linux-next.We could merge in netdev-next completely,
but I saw commit00f03539e3d97af925abf42992d8c46167d54243in next-20260406, indicates some resolved conflicts with (at least) the rdma tree, which comes
just before netdev-next, while ksmbd-for-next is merged before all of them. So merging netdev-next into ksmbd-for-next changes the order of netdev-next vs. rdma.Or we add a new branch smbdirect-for-next that's
merged into linux-next after netdev-next.Or a bit hacky but likely easier, ksmbd-for-next just cherry-picks
8341c989ac77d712c7d6e2bce29e8a4bcb2eeae4"net: removeaddr_lenargument ofrecvmsg()handlers" and that cherry picked commit is reverted as
last commit in ksmbd-for-next, or only in linux-next right before netdev-next is merged.For now I have the patches in a branch with a
cherry picked version of the needed commit only, see for-7.1/ipproto-smbdirect-20260407-v1 at commit:e1972e6f1fda9842c5724b7daf4a2aa7779901a5
git fetch https://git.samba.org/metze/linux/wip.git for-7.1/ipproto-smbdirect-20260407-v1
https://git.samba.org/?p=metze/linux/wip.git;a=shortlog;h=refs/heads/for-7.1/ipproto-smbdirect-20260407-v1It would be great to get this somehow into linux-next soon :-)
Stefan Metzmacher (8):
smb: smbdirect: changesmbdirect_socket_parameters.{initiator_depth,responder_resources} to __u16smb: smbdirect: fix copyright header of
smbdirect.h
smb: smbdirect: fix the logic insmbdirect_socket_destroy_sync()
without an error
smb: smbdirect: letsmbdirect_connection_deregister_mr_iounlock while
waiting
net: defineIPPROTO_SMBDIRECTandSOL_SMBDIRECTconstants
smb: smbdirect: add in kernel only support forIPPROTO_SMBDIRECT
smb: client: make use ofIPPROTO_SMBDIRECTsockets
smb: server: make use ofIPPROTO_SMBDIRECTsocketsfs/smb/client/cifs_debug.c | 2 +- fs/smb/client/cifsfs.c | 2 +- fs/smb/client/cifsglob.h | 7 +- fs/smb/client/connect.c | 123 +- fs/smb/client/file.c | 8 +- fs/smb/client/sess.c | 4 +- fs/smb/client/smb2ops.c | 8 +- fs/smb/client/smb2pdu.c | 10 +- fs/smb/client/smbdirect.c | 275 +-- fs/smb/client/smbdirect.h | 27 +- fs/smb/client/transport.c | 2 +- fs/smb/common/smbdirect/Makefile | 1 + fs/smb/common/smbdirect/smbdirect.h | 69 +- fs/smb/common/smbdirect/smbdirect_accept.c | 14 +- .../common/smbdirect/smbdirect_connection.c | 58 + fs/smb/common/smbdirect/smbdirect_devices.c | 2 +- fs/smb/common/smbdirect/smbdirect_internal.h | 59 +- fs/smb/common/smbdirect/smbdirect_listen.c | 49 +- fs/smb/common/smbdirect/smbdirect_main.c | 45 + fs/smb/common/smbdirect/smbdirect_mr.c | 18 + fs/smb/common/smbdirect/smbdirect_proto.c | 1549 +++++++++++++++++ fs/smb/common/smbdirect/smbdirect_public.h | 3 + fs/smb/common/smbdirect/smbdirect_rw.c | 29 +- fs/smb/common/smbdirect/smbdirect_socket.c | 180 +- fs/smb/common/smbdirect/smbdirect_socket.h | 26 +- fs/smb/server/transport_rdma.c | 119 +- include/linux/socket.h | 2 + include/uapi/linux/in.h | 2 + 28 files changed, 2320 insertions(+), 373 deletions(-) create mode 100644 fs/smb/common/smbdirect/smbdirect_proto.c--
2.43.0
Signature · 3 lines
Thanks, Steve
Kuniyuki Iwashima
maintainerRe: [PATCH 6/8] smb: smbdirect: add in kernel only support for IPPROTO_SMBDIRECT
In reply to Stefan MetzmacherQuoted 22 lines · Stefan Metzmacher
For userspace callers of
socket()still get-EPROTONOSUPPORT, so we are sure we'll only have in kernel callers, cifs.ko and ksmbd.ko, for now. This makes it possible to relax the constrains generic stream socket consumers would otherwise assume.There's a prototype for userspace sockets on top of this and there's working userspace code for Samba as client and server, so this is just the first step, but a very important one.
The SMBDIRECT protocol is defined in [MS-SMBD] by Microsoft.
It is used as wrapper around RDMA in order to provide a transport for SMB3, but Microsoft also uses it as transport for other protocols.SMBDIRECT works over Infiniband, RoCE and iWarp. RoCEv2 is based on IP/UDP and iWarp is based on IP/TCP, so these use IP addresses natively.
Infiniband and RoCEv1 require IPOIB in order to be used for SMBDIRECT.
Quoted 3 lines
So instead of adding a
PF_SMBDIRECT, which would only use AF_INET[6], we useIPPROTO_SMBDIRECTinstead, this uses a number not allocated from IANA, as it would not appear in an IP header.
Overall I don't see the upside of reusing AF_INET6? infra. It just adds an unnecessary sk->sk_prot layer, which can be simply implemented as sock->ops.
It seems only inet_getname() is the valid user of inet_sock.
Quoted 3 lines
This is similar to
IPPROTO_SMC,IPPROTO_MPTCPandIPPROTO_QUIC, which are linux specific values for thesocket()syscall.
SMBDIRECT seems more like SMC, rather than MPTCP and QUIC.
SMC was implemented with AF_SMC first, and IPPROT_SMC was added just to hook at userspace and silently convert TCP sockets to AF_SMC sockets easily.
But the is not the case of SMBDIRECT because the socket is only created from kernel space.
Quoted 6 lines
socket(AF_INET, SOCK_STREAM, IPPROTO_SMBDIRECT); socket(AF_INET6, SOCK_STREAM, IPPROTO_SMBDIRECT);This will allow the existing smbdirect code used by cifs.ko and ksmbd.ko to be moved behind the socket layer,
Reusing AF_INET6? is not related to this statement as long as the upper layer uses in-kernel socket API (sock_XXX()/kernel_XXX()) instead of calling sk->sk_prot->XXX() directly.
Quoted 985 lines
so that there's less special handling. Only
sock_sendmsg()sock_recvmsg()are used, so that the main stream handling is done all the same for tcp, smbdirect and later also quic.The special RDMA read/write handling will be via direct function calls as they are currently done for the in kernel consumers.
For now the core smbdirect code still supports both modes, direct calls in indirect via the socket layer. The core code uses if (
sc->sk.sk_family) as indication for the new socket mode. Once cifs.ko and ksmbd.ko are converted we can remove the old mode slowly, but I'll deferr that to a future patchset.There's still a way to go in order to make this
as generic as tcp and quic e.g. addingMSG_SPLICE_PAGESsupport or splice_read/read_sock/read_skb.But it's a good start, which will make changes
much easier.Cc Steve French <[email protected]>Cc Tom Talpey <[email protected]>Cc Long Li <[email protected]>Cc Namjae Jeon <[email protected]>Cc David Howells <[email protected]>Cc Henrique Carvalho <[email protected]>Cc David S. Miller <[email protected]>Cc Eric Dumazet <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Paolo Abeni <[email protected]>Cc Simon Horman <[email protected]>Cc Kuniyuki Iwashima <[email protected]>Cc Willem de Bruijn <[email protected]>Cc Xin Long <[email protected]>Signed-off-by Stefan Metzmacher <[email protected]>--- fs/smb/common/smbdirect/Makefile | 1 + fs/smb/common/smbdirect/smbdirect.h | 62 + fs/smb/common/smbdirect/smbdirect_accept.c | 14 +- .../common/smbdirect/smbdirect_connection.c | 58 + fs/smb/common/smbdirect/smbdirect_devices.c | 2 +- fs/smb/common/smbdirect/smbdirect_internal.h | 59 +- fs/smb/common/smbdirect/smbdirect_listen.c | 49 +- fs/smb/common/smbdirect/smbdirect_main.c | 45 + fs/smb/common/smbdirect/smbdirect_mr.c | 10 + fs/smb/common/smbdirect/smbdirect_proto.c | 1549 +++++++++++++++++ fs/smb/common/smbdirect/smbdirect_public.h | 3 + fs/smb/common/smbdirect/smbdirect_rw.c | 29 +- fs/smb/common/smbdirect/smbdirect_socket.c | 147 ++ fs/smb/common/smbdirect/smbdirect_socket.h | 26 +- 14 files changed, 2039 insertions(+), 15 deletions(-) create mode 100644 fs/smb/common/smbdirect/smbdirect_proto.cfs/smb/common/smbdirect/Makefile +1
-0@@ -10,6 +10,7 @@ smbdirect-y := \ smbdirect_connection.o \ smbdirect_mr.o \ smbdirect_rw.o \ + smbdirect_proto.o \ smbdirect_debug.o \ smbdirect_connect.o \ smbdirect_listen.o \fs/smb/common/smbdirect/smbdirect.h +62
-0@@ -6,7 +6,10 @@#ifndef __FS_SMB_COMMON_SMBDIRECT_SMBDIRECT_H__#define __FS_SMB_COMMON_SMBDIRECT_SMBDIRECT_H__ +#include <linux/stddef.h> #include <linux/types.h> +#include <linux/socket.h> +#include <asm/ioctls.h> /* SMB-DIRECT buffer descriptor V1 structure [MS-SMBD] 2.2.3.1 */ struct smbdirect_buffer_descriptor_v1 {@@ -49,4 +52,63 @@ struct smbdirect_socket_parameters { SMBDIRECT_FLAG_PORT_RANGE_ONLY_IB | \ SMBDIRECT_FLAG_PORT_RANGE_ONLY_IW) +enum { + __SMBDIRECT_BUFFER_REMOTE_INVALIDATE =0x20 , +}; + +struct smbdirect_cmsg_buffer { +uint8_t msg_control[CMSG_SPACE (24 )]; +}; + +static __always_inline +void __smbdirect_cmsg_prepare(struct msghdr *msg, +struct smbdirect_cmsg_buffer *cbuffer, +int cmsg_type, +const void *payload, +size_t payloadlen) +{ +size_t cmsg_space =CMSG_SPACE (payloadlen); +size_t cmsg_len =CMSG_LEN (payloadlen); +struct cmsghdr *cmsg =NULL ; +void *dataptr =NULL ; + +BUILD_BUG_ON (cmsg_space >sizeof (cbuffer->msg_control)); + +memset (cbuffer,0 ,sizeof (*cbuffer)); + + msg->msg_control = cbuffer->msg_control; + msg->msg_controllen = cmsg_space; + + cmsg =CMSG_FIRSTHDR (msg); + cmsg->cmsg_level =SOL_SMBDIRECT ; + cmsg->cmsg_type = cmsg_type; + cmsg->cmsg_len = cmsg_len; + dataptr =CMSG_DATA (cmsg); +memcpy (dataptr, payload, payloadlen); + msg->msg_controllen = cmsg->cmsg_len; +} + +struct smbdirect_buffer_remote_invalidate_args { +__u32 remote_token; +} __packed; +#define SMBDIRECT_BUFFER_REMOTE_INVALIDATE_CMSG_TYPE \ + _IOW('S', __SMBDIRECT_BUFFER_REMOTE_INVALIDATE, \ + struct smbdirect_buffer_remote_invalidate_args) + +static __always_inline +void smbdirect_buffer_remote_invalidate_cmsg_prepare(struct msghdr *msg, +struct smbdirect_cmsg_buffer *cbuffer, +const __u32 *remote_token) +{ +if (remote_token) { +struct smbdirect_buffer_remote_invalidate_args args = { + .remote_token = *remote_token, + }; + +__smbdirect_cmsg_prepare (msg, cbuffer, +SMBDIRECT_BUFFER_REMOTE_INVALIDATE_CMSG_TYPE , + &args,sizeof (args)); + } +} +#endif /* __FS_SMB_COMMON_SMBDIRECT_SMBDIRECT_H__ */ fs/smb/common/smbdirect/smbdirect_accept.c +13
-1@@ -6,7 +6,6 @@*/ #include "smbdirect_internal.h" -#include <net/sock.h> #include "../../common/smb2status.h" static int smbdirect_accept_rdma_event_handler(struct rdma_cm_id *id,@@ -460,6 +459,12 @@ static void smbdirect_accept_negotiate_recv_work(struct work_struct *work)spin_lock_irqsave (&lsc->listen.lock, flags);list_del (&sc->accept.list);list_add_tail (&sc->accept.list, &lsc->listen.ready); +if (lsc->sk.sk_family) { +struct sock *lsk = &lsc->sk; + +if (!sock_flag (lsk,SOCK_DEAD ) && lsk->sk_socket) + lsk->sk_data_ready (lsk); + }wake_up (&lsc->listen.wait_queue);spin_unlock_irqrestore (&lsc->listen.lock, flags);@@ -774,11 +779,13 @@ static long smbdirect_socket_wait_for_accept(struct smbdirect_socket *lsc, long {long ret; +smbdirect_socket_sk_unlock (lsc); ret =wait_event_interruptible_timeout (lsc->listen.wait_queue, !list_empty_careful (&lsc->listen.ready) || lsc->status !=SMBDIRECT_SOCKET_LISTENING || lsc->first_error, timeo); +smbdirect_socket_sk_lock (lsc);if (lsc->status !=SMBDIRECT_SOCKET_LISTENING )return -EINVAL ;if (lsc->first_error)@@ -850,6 +857,11 @@ struct smbdirect_socket *smbdirect_socket_accept(struct smbdirect_socket *lsc,* order to grant credits to the peer. */ nsc->status =SMBDIRECT_SOCKET_CONNECTED ; +if (nsc->sk.sk_family) { +struct sock *nsk = &nsc->sk; + +inet_sk_set_state (nsk,TCP_ESTABLISHED ); + }smbdirect_accept_negotiate_finish (nsc,0 );return nsc;fs/smb/common/smbdirect/smbdirect_connection.c +58
-0@@ -153,6 +153,15 @@ void smbdirect_connection_rdma_established(struct smbdirect_socket *sc) sc->rdma.cm_id->event_handler = smbdirect_connection_rdma_event_handler; sc->rdma.expected_event =RDMA_CM_EVENT_DISCONNECTED ; + +if (sc->sk.sk_family) { +struct sock *sk = &sc->sk; + +smbdirect_socket_sync_saddr_to_sk (sc,NULL ); +smbdirect_socket_sync_daddr_to_sk (sc); + +inet_sk_set_state (sk,TCP_SYN_RECV ); + } }void smbdirect_connection_negotiation_done (struct smbdirect_socket *sc)@@ -189,6 +198,13 @@ void smbdirect_connection_negotiation_done(struct smbdirect_socket *sc)smbdirect_socket_status_string (sc->status), SMBDIRECT_DEBUG_ERR_PTR(sc->first_error)); sc->status =SMBDIRECT_SOCKET_CONNECTED ; +if (sc->sk.sk_family) { +struct sock *sk = &sc->sk; + +inet_sk_set_state (sk,TCP_ESTABLISHED ); +if (!sock_flag (sk,SOCK_DEAD ) && sk->sk_socket) + sk->sk_socket->state =SS_CONNECTED ; + }/* * We need to setup the refill and send immediate work @@ -203,6 +219,13 @@ void smbdirect_connection_negotiation_done(struct smbdirect_socket *sc) &sc->rdma.cm_id->route.addr.src_addr, &sc->rdma.cm_id->route.addr.dst_addr); +if (sc->sk.sk_family) { +struct sock *sk = &sc->sk; + +if (!sock_flag (sk,SOCK_DEAD ) && sk->sk_socket) + sk->sk_state_change (sk); + } +wake_up (&sc->status_wait); }@@ -739,10 +762,12 @@ int smbdirect_connection_wait_for_connected(struct smbdirect_socket *sc)"waiting for connection: device: %.*s local: %pISpsfc remote: %pISpsfc\n" , IB_DEVICE_NAME_MAX, devname, src, dst); +smbdirect_socket_sk_unlock (sc); ret =wait_event_interruptible_timeout (sc->status_wait, sc->status ==SMBDIRECT_SOCKET_CONNECTED || sc->first_error,msecs_to_jiffies (sp->negotiate_timeout_msec)); +smbdirect_socket_sk_lock (sc);if (sc->rdma.cm_id) {/* * Maybe src and dev are updated in the meantime. @@ -954,6 +979,12 @@ int smbdirect_connection_send_batch_flush(struct smbdirect_socket *sc,atomic_add (batch->credit, &sc->send_io.bcredits.count); batch->credit =0 ;wake_up (&sc->send_io.bcredits.wait_queue); +if (sc->sk.sk_family) { +struct sock *sk = &sc->sk; + +if (!sock_flag (sk,SOCK_DEAD ) && sk->sk_socket) + sk->sk_write_space (sk); + } }return ret;@@ -1091,6 +1122,8 @@ int smbdirect_connection_send_single_iter(struct smbdirect_socket *sc,u32 data_length =0 ;int ret; +smbdirect_socket_sk_owned_by_me (sc); +if (WARN_ON_ONCE (flags))return -EINVAL ;/* no flags support for now */ @@ -1150,10 +1183,12 @@ int smbdirect_connection_send_single_iter(struct smbdirect_socket *sc,* wait until either the refill work or the peer * granted new credits */ +smbdirect_socket_sk_unlock (sc); ret =wait_event_interruptible (sc->send_io.credits.wait_queue,atomic_read (&sc->send_io.credits.count) >=1 ||atomic_read (&sc->recv_io.credits.available) >=1 || sc->status !=SMBDIRECT_SOCKET_CONNECTED ); +smbdirect_socket_sk_lock (sc);if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) ret = -ENOTCONN ;if (ret <0 )@@ -1268,9 +1303,11 @@ int smbdirect_connection_send_wait_zero_pending(struct smbdirect_socket *sc)* that means all the I/Os have been out and we are good to return */ +smbdirect_socket_sk_unlock (sc);wait_event (sc->send_io.pending.zero_wait_queue,atomic_read (&sc->send_io.pending.count) ==0 || sc->status !=SMBDIRECT_SOCKET_CONNECTED ); +smbdirect_socket_sk_lock (sc);if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) { smbdirect_log_write(sc, SMBDIRECT_LOG_ERR, "status=%s first_error=%1pe => %1pe\n",@@ -1297,6 +1334,8 @@ int smbdirect_connection_send_iter(struct smbdirect_socket *sc,int error =0 ;__be32 hdr; +smbdirect_socket_sk_owned_by_me (sc); +if (WARN_ONCE (flags,"unexpected flags=0x%x\n" , flags))return -EINVAL ;/* no flags support for now */ @@ -1448,7 +1487,9 @@ static void smbdirect_connection_send_immediate_work(struct work_struct *work)smbdirect_log_keep_alive (sc,SMBDIRECT_LOG_INFO ,"send an empty message\n" ); sc->statistics.send_empty++; +smbdirect_socket_sk_lock (sc); ret =smbdirect_connection_send_single_iter (sc,NULL ,NULL ,0 ,0 ); +smbdirect_socket_sk_unlock (sc);if (ret <0 ) { smbdirect_log_write(sc, SMBDIRECT_LOG_ERR, "smbdirect_connection_send_single_iter ret=%1pe\n",@@ -1632,6 +1673,12 @@ void smbdirect_connection_recv_io_done(struct ib_cq *cq, struct ib_wc *wc)* If any sender is waiting for credits, unblock it */ wake_up (&sc->send_io.credits.wait_queue); +if (sc->sk.sk_family) { +struct sock *sk = &sc->sk; + +if (!sock_flag (sk,SOCK_DEAD ) && sk->sk_socket) + sk->sk_write_space (sk); + } }/* Send an immediate response right away if requested */ @@ -1652,6 +1699,12 @@ void smbdirect_connection_recv_io_done(struct ib_cq *cq, struct ib_wc *wc)smbdirect_connection_reassembly_append_recv_io (sc, recv_io, data_length);wake_up (&sc->recv_io.reassembly.wait_queue); +if (sc->sk.sk_family) { +struct sock *sk = &sc->sk; + +if (!sock_flag (sk,SOCK_DEAD ) && sk->sk_socket) + sk->sk_data_ready (sk); + } }else smbdirect_connection_put_recv_io (recv_io);@@ -1735,6 +1788,9 @@ int smbdirect_connection_recv_io_refill(struct smbdirect_socket *sc)/* * If the last send credit is waiting for credits * it can grant we need to wake it up +* +* This needs to wake up smbdirect_connection_send_single_iter() +* only, so we don't need sk->sk_write_space() here. */ if (atomic_read (&sc->send_io.bcredits.count) ==0 &&atomic_read (&sc->send_io.credits.count) ==0 )@@ -1922,9 +1978,11 @@ int smbdirect_connection_recvmsg(struct smbdirect_socket *sc,smbdirect_log_read (sc,SMBDIRECT_LOG_INFO ,"wait_event on more data\n" ); +smbdirect_socket_sk_unlock (sc); ret =wait_event_interruptible (sc->recv_io.reassembly.wait_queue, sc->recv_io.reassembly.data_length >= size || sc->status !=SMBDIRECT_SOCKET_CONNECTED ); +smbdirect_socket_sk_lock (sc);/* Don't return any data if interrupted */ if (ret)return ret;fs/smb/common/smbdirect/smbdirect_devices.c +1
-1@@ -257,7 +257,7 @@ __init int smbdirect_devices_init(void)return 0 ; } -__exit void smbdirect_devices_exit(void) +__cold void smbdirect_devices_exit (void ) {struct smbdirect_device *sdev, *tmp;fs/smb/common/smbdirect/smbdirect_internal.h +56
-3@@ -12,8 +12,6 @@#include "smbdirect_pdu.h" #include "smbdirect_public.h" -#include <linux/mutex.h> -struct smbdirect_module_state {struct mutex mutex;@@ -30,6 +28,8 @@ struct smbdirect_module_state {rwlock_t lock;struct list_head list; } devices; + +struct smbdirect_socket_parameters default_parameters; };extern struct smbdirect_module_state smbdirect_globals;@@ -46,10 +46,58 @@ struct smbdirect_device {char ib_name[IB_DEVICE_NAME_MAX ]; }; +static __always_inline void smbdirect_socket_sk_owned_by_me(struct smbdirect_socket *sc) +{ +if (sc->sk.sk_family) { +struct sock *sk = &sc->sk; + +/* assert it is already locked */ +sock_owned_by_me (sk); + } +} + +static __always_inline void smbdirect_socket_sk_not_owned_by_me(struct smbdirect_socket *sc) +{ +if (sc->sk.sk_family) { +struct sock *sk = &sc->sk; + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + } +} + +static __always_inline void smbdirect_socket_sk_lock(struct smbdirect_socket *sc) +{ +if (sc->sk.sk_family) { +struct sock *sk = &sc->sk; + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +lock_sock (sk); + } +} + +static __always_inline void smbdirect_socket_sk_unlock(struct smbdirect_socket *sc) +{ +if (sc->sk.sk_family) { +struct sock *sk = &sc->sk; + +/* assert it is already locked */ +sock_owned_by_me (sk); + +release_sock (sk); + } +} +int smbdirect_socket_init_new (struct net *net,struct smbdirect_socket *sc);int smbdirect_socket_init_accepting (struct rdma_cm_id *id,struct smbdirect_socket *sc); +int smbdirect_socket_sync_saddr_to_sk (struct smbdirect_socket *sc,bool *_is_any_addr); + +int smbdirect_socket_sync_daddr_to_sk (struct smbdirect_socket *sc); + void __smbdirect_socket_schedule_cleanup(struct smbdirect_socket *sc, const char *macro_name, unsigned int lvl,@@ -135,7 +183,12 @@ int smbdirect_accept_connect_request(struct smbdirect_socket *sc,void smbdirect_accept_negotiate_finish (struct smbdirect_socket *sc,u32 ntstatus); +void smbdirect_sk_reclassify (struct sock *sk); +__init int smbdirect_devices_init (void ); -__exit void smbdirect_devices_exit(void); +__cold void smbdirect_devices_exit (void ); + +__init int smbdirect_proto_init (void ); +__exit void smbdirect_proto_exit(void);#endif /* __FS_SMB_COMMON_SMBDIRECT_INTERNAL_H__ */ fs/smb/common/smbdirect/smbdirect_listen.c +45
-4@@ -74,6 +74,12 @@ int smbdirect_socket_listen(struct smbdirect_socket *sc, int backlog)*/ sc->listen.backlog = backlog; +if (sc->sk.sk_family) { +struct sock *sk = &sc->sk; + +inet_sk_set_state (sk,TCP_LISTEN ); + } +if (sc->rdma.cm_id->device) smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO, "listening on addr: %pISpsfc dev: %.*s\n",@@ -209,6 +215,7 @@ static int smbdirect_listen_connect_request(struct smbdirect_socket *lsc, const struct rdma_cm_event *event) {const struct smbdirect_socket_parameters *lsp = &lsc->parameters; +struct sock *nsk =NULL ;struct smbdirect_socket *nsc;unsigned long flags;size_t backlog =max_t (size_t,1 , lsc->listen.backlog);@@ -265,9 +272,39 @@ static int smbdirect_listen_connect_request(struct smbdirect_socket *lsc,return -EBUSY ; } - ret =smbdirect_socket_create_accepting (new_id, &nsc); -if (ret) - goto socket_init_failed; +if (lsc->sk.sk_family) { +struct sock *lsk = &lsc->sk; + + ret = -ENOMEM ; + nsk =sk_clone (lsk, lsk->sk_allocation, false); +if (!nsk) + goto sk_clone_failed; +/* sk_clone_lock() increments refcnt to 2; drop the extra. */ +__sock_put (nsk); +/* sk_clone() already called sk_sockets_allocated_inc(sk); */ +sock_prot_inuse_add (sock_net (nsk), nsk->sk_prot,1 ); + +smbdirect_sk_reclassify (nsk); +inet_sk_set_state (nsk,TCP_SYN_RECV ); + nsc =smbdirect_socket_from_sk (nsk); + + ret =smbdirect_socket_init_accepting (new_id, nsc); +if (ret) + goto socket_init_failed; + +/* +* Note that smbdirect_sock_accept() will set +* SOCK_CUSTOM_SOCKOPT once [__]inet_accept() +* called sk_set_socket() via sock_graft(). +*/ +WARN_ON_ONCE (nsc->orig_sk_destruct != lsc->orig_sk_destruct); +WARN_ON_ONCE (nsk->sk_destruct != lsk->sk_destruct); +WARN_ON_ONCE (nsk->sk_ipv6only != lsk->sk_ipv6only); + }else { + ret =smbdirect_socket_create_accepting (new_id, &nsc); +if (ret) + goto socket_init_failed; + } nsc->logging = lsc->logging; ret =smbdirect_socket_set_initial_parameters (nsc, &lsc->parameters);@@ -302,7 +339,11 @@ static int smbdirect_listen_connect_request(struct smbdirect_socket *lsc,*/ nsc->ib.dev =NULL ; nsc->rdma.cm_id =NULL ; -smbdirect_socket_release (nsc); +if (!nsk) +smbdirect_socket_release (nsc); socket_init_failed: +if (nsk) +sk_free (nsk); +sk_clone_failed:return ret; }fs/smb/common/smbdirect/smbdirect_main.c +45
-0@@ -12,6 +12,7 @@ struct smbdirect_module_state smbdirect_globals = {static __init int smbdirect_module_init (void ) { +struct smbdirect_socket_parameters *sp;int ret = -ENOMEM ;pr_notice ("subsystem loading...\n" );@@ -73,10 +74,52 @@ static __init int smbdirect_module_init(void)if (ret) goto devices_init_failed; +/* +* Create the global default parameters +*/ + sp = &smbdirect_globals.default_parameters; + sp->resolve_addr_timeout_msec =5 *1000 ; + sp->resolve_route_timeout_msec =5 *1000 ; + sp->rdma_connect_timeout_msec =5 *1000 ; + sp->negotiate_timeout_msec =120 *1000 ; + sp->initiator_depth =1 ;/* the server should change this */ + sp->responder_resources =1 ;/* the client should change this */ + sp->recv_credit_max =255 ; + sp->send_credit_target =255 ; + sp->max_send_size =1364 ; +/* +* The maximum fragmented upper-layer payload receive size supported +* +* Assume max_payload_per_credit is +* smbd_max_receive_size - 24 = 1340 +* +* The maximum number would be +* smbd_receive_credit_max * max_payload_per_credit +* +* 1340 * 255 = 341700 (0x536C4) +* +* The minimum value from the spec is 131072 (0x20000) +* +* For now we use the logic we used before: +* (1364 * 255) / 2 = 173910 (0x2A756) +*/ + sp->max_fragmented_recv_size = (1364 *255 ) /2 ; + sp->max_recv_size =1364 ; + sp->max_read_write_size =0 ;/* the server should change this */ + sp->max_frmr_depth =0 ;/* the client should change this */ + sp->keepalive_interval_msec =120 *1000 ; + sp->keepalive_timeout_msec =5 *1000 ; + + ret =smbdirect_proto_init (); +if (ret) + goto proto_init_failed; +mutex_unlock (&smbdirect_globals.mutex);pr_notice ("subsystem loaded\n" );return 0 ; +proto_init_failed: +smbdirect_devices_exit (); devices_init_failed:destroy_workqueue (smbdirect_globals.workqueues.cleanup); alloc_cleanup_wq_failed:@@ -101,6 +144,8 @@ static __exit void smbdirect_module_exit(void)pr_notice ("subsystem unloading...\n" );mutex_lock (&smbdirect_globals.mutex); +smbdirect_proto_exit (); +smbdirect_devices_exit ();destroy_workqueue (smbdirect_globals.workqueues.accept);fs/smb/common/smbdirect/smbdirect_mr.c +10
-0@@ -167,9 +167,11 @@ smbdirect_connection_get_mr_io(struct smbdirect_socket *sc)int ret; again: +smbdirect_socket_sk_unlock (sc); ret =wait_event_interruptible (sc->mr_io.ready.wait_queue,atomic_read (&sc->mr_io.ready.count) || sc->status !=SMBDIRECT_SOCKET_CONNECTED ); +smbdirect_socket_sk_lock (sc);if (ret) { smbdirect_log_rdma_mr(sc, SMBDIRECT_LOG_ERR, "wait_event_interruptible ret=%d (%1pe)\n",@@ -281,7 +283,9 @@ smbdirect_connection_register_mr_io(struct smbdirect_socket *sc,return NULL ; } +smbdirect_socket_sk_lock (sc); mr =smbdirect_connection_get_mr_io (sc); +smbdirect_socket_sk_unlock (sc);if (!mr) {smbdirect_log_rdma_mr (sc,SMBDIRECT_LOG_ERR ,"smbdirect_connection_get_mr_io returning NULL\n" );@@ -415,6 +419,12 @@ void smbdirect_connection_deregister_mr_io(struct smbdirect_mr_io *mr)if (mr->state ==SMBDIRECT_MR_DISABLED ) goto put_kref; +/* +* We are protected by mr->mutex +* without lock_sock(). +*/ +smbdirect_socket_sk_not_owned_by_me (sc); +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) {smbdirect_mr_io_disable_locked (mr); goto put_kref;fs/smb/common/smbdirect/smbdirect_proto.c new file +299
-0@@ -0,0 +1,1549 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2025 Stefan Metzmacher +*/ + +#include "smbdirect_internal.h" +#include <net/protocol.h> +#include <net/inet_common.h> +#include <linux/bpf-cgroup.h> +#include <linux/errname.h> + +#define SMBDIRECT_FN_GENERIC(__sk, __fmt, __args...) do { \ + struct smbdirect_socket *__sc = smbdirect_socket_from_sk(__sk); \ + __smbdirect_log_generic(__sc, SMBDIRECT_LOG_INFO, SMBDIRECT_LOG_SK, \ + __fmt " sc=%p %s first_error=%1pe kern=%u locked=%u refs=%u dead=%u mrefs=%u\n", \ + ##__args, __sc, \ + smbdirect_socket_status_string(__sc->status), \ + SMBDIRECT_DEBUG_ERR_PTR(__sc->first_error), \ + (__sk)->sk_kern_sock, \ + sock_owned_by_user_nocheck(__sk), \ + refcount_read(&((__sk)->sk_refcnt)), \ + sock_flag(__sk, SOCK_DEAD), \ + module_refcount(THIS_MODULE)); \ +} while (0) + +#define SMBDIRECT_FN_COMMENT (__sk, __comment) \ + SMBDIRECT_FN_GENERIC(__sk, "%s with", __comment) + +#define SMBDIRECT_FN_CALLED (__sk) \ + SMBDIRECT_FN_GENERIC(__sk, "Called for") + +#define SMBDIRECT_FN_RETURN_VOID (__sk) \ + SMBDIRECT_FN_GENERIC(__sk, "Returning for") + +#define SMBDIRECT_FN_RETURN_POLL (__sk, __mask) \ + SMBDIRECT_FN_GENERIC(__sk, "Returning mask=0x%x for", __mask) + +#define SMBDIRECT_FN_RETURN_INT (__sk, __ret) do { \ + bool __is_err = IS_ERR(SMBDIRECT_DEBUG_ERR_PTR(__ret)); \ + SMBDIRECT_FN_GENERIC(__sk, "Returning ret=%d%s%s%s for", \ + (__ret), \ + __is_err ? " (" : "", \ + __is_err ? errname(__ret) : "", \ + __is_err ? ")" : ""); \ +} while (0) + +static bool smbdirect_sk_logging_needed (struct smbdirect_socket *sc, +void *private_ptr, +unsigned int lvl, +unsigned int cls) +{ +/* +* Only errors by default. +*/ +if (lvl <=SMBDIRECT_LOG_ERR ) +return true; +return false; +} + +static void smbdirect_sk_logging_vaprintf (struct smbdirect_socket *sc, +const char *func, +unsigned int line, +void *private_ptr, +unsigned int lvl, +unsigned int cls, +struct va_format *vaf) +{ +if (lvl <=SMBDIRECT_LOG_ERR ) +pr_err ("%s:%u %pV" , func, line, vaf); +else +pr_info ("%s:%u %pV" , func, line, vaf); +} + +void smbdirect_sk_reclassify (struct sock *sk) +{ +#ifdef CONFIG_DEBUG_LOCK_ALLOC +static struct lock_class_key sk_key[2 ]; +static struct lock_class_key slock_key[2 ]; + +if (WARN_ON_ONCE (!sock_allow_reclassification (sk))) +return ; + +switch (sk->sk_family) { +case AF_INET : +/* +* Before we reset the owner we +* need to drop the reference of the +* existing module, this is only +* really relevant for AF_INET, +* as that is always builtin +* there's no potential leak +* of module references. We do it +* mainly in order to match the +* AF_INET6 case. +*/ +sk_owner_put (sk); +sk_owner_clear (sk); + +sock_lock_init_class_and_name (sk, +"slock-AF_INET-IPPROTO-SMBDIRECT" , + &slock_key[0 ], +"sk_lock-AF_INET-IPPROTO-SMBDIRECT" , + &sk_key[0 ]); + +/* +* Now that we reclassified the socket +* we're also the new sk_owner, but that's +* not needed as there's still a reference +* on sk->sk_prot->owner, which is dropped +* in sk_prot_free(). But in order to +* avoid module reference leaks to our +* own module we need to put and clear +* sk_owner, in order to allow callers +* to do their own reclassification. +*/ +sk_owner_put (sk); +sk_owner_clear (sk); +break ; +case AF_INET6 : +/* +* Before we reset the owner we +* need to drop the reference of the +* existing module. +* +* As we also use inet6_register_protosw() +* and other symbols from a possible +* ipv6.ko, we already have enough +* module references in order to avoid +* unloading of ipv6.ko, while smbdirect.ko +* is loaded. +* +* However when smbdirect.ko is unloaded +* we should not leak references in order +* to allow ipv6.ko to be unloaded as well. +*/ +sk_owner_put (sk); +sk_owner_clear (sk); + +sock_lock_init_class_and_name (sk, +"slock-AF_INET6-IPPROTO-SMBDIRECT" , + &slock_key[1 ], +"sk_lock-AF_INET6-IPPROTO-SMBDIRECT" , + &sk_key[1 ]); + +/* +* Now that we reclassified the socket +* we're also the new sk_owner, but that's +* not needed as there's still a reference +* on sk->sk_prot->owner, which is dropped +* in sk_prot_free(). But in order to +* avoid module reference leaks to our +* own module we need to put and clear +* sk_owner, in order to allow callers +* to do their own reclassification. +*/ +sk_owner_put (sk); +sk_owner_clear (sk); +break ; +default : +WARN_ON_ONCE (1 ); + } +#endif /* CONFIG_DEBUG_LOCK_ALLOC */ +} + +static void smbdirect_sk_destruct (struct sock *sk) +{ +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); + +/* +* Called by sk_free() +*/ + +SMBDIRECT_FN_CALLED (sk); + +if (WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_DESTROYED )) { +pr_err ("Attempt to release SMBDIRECT socket in status %s sc %p\n" , +smbdirect_socket_status_string (sc->status), sc); +SMBDIRECT_FN_RETURN_VOID (sk); +return ; + } + +SMBDIRECT_FN_COMMENT (sk,"calling orig_sk_destruct" ); +smbdirect_log_sk (sc,SMBDIRECT_LOG_INFO , +"sc[%p]->orig_sk_destruct[%ps]\n" , + sc, sc->orig_sk_destruct); + sc->orig_sk_destruct (sk); +SMBDIRECT_FN_RETURN_VOID (sk); +} + +static int smbdirect_sk_init (struct sock *sk) +{ +struct socket *sock = sk->sk_socket; +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); +const struct smbdirect_socket_parameters *sp = &smbdirect_globals.default_parameters; +void (*orig_sk_destruct)(struct sock *sk); +int ret; + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +smbdirect_sk_reclassify (sk); + +smbdirect_socket_init (sc); +smbdirect_socket_set_logging (sc, +NULL , + smbdirect_sk_logging_needed, + smbdirect_sk_logging_vaprintf); + +smbdirect_log_sk (sc,SMBDIRECT_LOG_INFO , +"Called for sk=%p family=%u protocol=%u type=%u\n" , + sk, sk->sk_family, sk->sk_protocol, sk->sk_type); + +sk_sockets_allocated_inc (sk); +sock_prot_inuse_add (sock_net (sk), sk->sk_prot,1 ); + + orig_sk_destruct = sk->sk_destruct; +SMBDIRECT_FN_COMMENT (sk,"remembered orig_sk_destruct" ); +smbdirect_log_sk (sc,SMBDIRECT_LOG_INFO , +"sc[%p]->orig_sk_destruct[%ps]\n" , + sc, orig_sk_destruct); + sc->orig_sk_destruct = orig_sk_destruct; + sk->sk_destruct = smbdirect_sk_destruct; + +/* +* We want to handle all sockopts explicitly +* and only support what we really support. +*/ +set_bit (SOCK_CUSTOM_SOCKOPT , &sock->flags); +/* +* There are no legacy callers, so we are strict +* regarding ipv4 vs. ipv6. +*/ + sk->sk_ipv6only = true; + +/* +* No userspace sockets yet... +*/ +if (!sk->sk_kern_sock) { + sc->first_error = -EPROTONOSUPPORT ; +SMBDIRECT_FN_COMMENT (sk,"No userspace sockets" ); +return -EPROTONOSUPPORT ; + } + + ret =smbdirect_socket_init_new (sock_net (sk), sc); +if (ret) + goto socket_init_failed; +/* +* smbdirect_socket_init_new() called smbdirect_socket_init() again, +* so we need to call smbdirect_socket_set_logging() again! +*/ +smbdirect_socket_set_logging (sc, +NULL , + smbdirect_sk_logging_needed, + smbdirect_sk_logging_vaprintf); + +WARN_ON_ONCE (sc->orig_sk_destruct != orig_sk_destruct); +WARN_ON_ONCE (sk->sk_destruct != smbdirect_sk_destruct); + + ret =smbdirect_socket_set_initial_parameters (sc, sp); +if (ret) + goto set_params_failed; + + ret =smbdirect_socket_set_kernel_settings (sc,IB_POLL_SOFTIRQ , sk->sk_allocation); +if (ret) + goto set_settings_failed; + +SMBDIRECT_FN_RETURN_INT (sk,0 ); +return 0 ; + +set_settings_failed: +set_params_failed: +socket_init_failed: + sc->first_error = ret; +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static void smbdirect_sk_destroy (struct sock *sk) +{ +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is already locked */ +sock_owned_by_me (sk); + +/* +* For now do a sync disconnect/destroy +* +* SMBDIRECT_LOG_INFO is enough here +* as this is the typical case where +* we terminate the connection ourself. +*/ +smbdirect_socket_schedule_cleanup_lvl (sc, +SMBDIRECT_LOG_INFO , + -ESHUTDOWN ); +smbdirect_socket_destroy_sync (sc); + +sock_prot_inuse_add (sock_net (sk), sk->sk_prot,-1 );
fs/smb/common/smbdirect/smbdirect_proto.c line 309
Quoted 10 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +10
-0+sk_sockets_allocated_dec (sk); + +SMBDIRECT_FN_RETURN_VOID (sk); +} + +static int smbdirect_sk_hash (struct sock *sk) +{ +SMBDIRECT_FN_CALLED (sk); +return 0 ; +}
It seems this was implemented just to fill all function pointers of sk->sk_prot but looks unnecessary.
Same for other NOP functions, unhash(), release_cb(), etc.
Quoted 36 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +36
-0+ +static void smbdirect_sk_unhash (struct sock *sk) +{ +SMBDIRECT_FN_CALLED (sk); +} + +static void smbdirect_sk_release_cb (struct sock *sk) +{ +/* +* Called from release_sock() +*/ +SMBDIRECT_FN_CALLED (sk); +} + +static int smbdirect_sk_pre_bind (struct sock *sk, +struct sockaddr_unsized *uaddr, +int *addr_len, +u32 *flags, +u16 *port) +{ +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +if (*addr_len <sizeof (uaddr->sa_family)) +return -EINVAL ; + +/* AF_UNSPEC is not allowed */ +if (sk->sk_family != uaddr->sa_family) +return -EAFNOSUPPORT ; + +/* +* BPF prog is run before any checks are done so that if the prog +* changes context in a wrong way it will be caught. +*/
fs/smb/common/smbdirect/smbdirect_proto.c line 355
Quoted 10 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +10
-0+switch (sk->sk_family) { +case AF_INET : +if (*addr_len <sizeof (struct sockaddr_in )) +return -EINVAL ; + + *port =ntohs (((struct sockaddr_in *)uaddr)->sin_port); + +return BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, addr_len, +CGROUP_INET4_BIND , + flags);
Do you really need these bpf hooks ?
It seems the smb sockets can be created from kthread and tied to the root cgroup.
Quoted 63 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +63
-0+case AF_INET6 : +/* +* We require a full struct sockaddr_in6 (28 bytes) instead of a +* minimal size of SIN6_LEN_RFC2133 (24 bytes), as we don't +* have any legacy callers in userspace and the +* rdma layer also expects that. +*/ +if (*addr_len <sizeof (struct sockaddr_in6 )) +return -EINVAL ; + + *port =ntohs (((struct sockaddr_in6 *)uaddr)->sin6_port); + +return BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, addr_len, +CGROUP_INET6_BIND , + flags); + } + +return -EAFNOSUPPORT ; +} + +static int smbdirect_sk_do_bind (struct sock *sk, +struct sockaddr_unsized *uaddr, +const u32 flags, +const u16 port) +{ +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); +bool is_any_addr = true; +int ret; + +SMBDIRECT_FN_CALLED (sk); + +if (flags &BIND_WITH_LOCK ) +sock_owned_by_me (sk); +else +sock_not_owned_by_me (sk); + + ret =smbdirect_socket_bind (sc, (struct sockaddr *)uaddr); +if (ret) { +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + + ret =smbdirect_socket_sync_saddr_to_sk (sc, &is_any_addr); +if (ret) { +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + +/* Make sure we are allowed to bind here. */ +if (sk->sk_num && !(flags &BIND_FROM_BPF )) { +switch (sk->sk_family) { +case AF_INET : + ret =BPF_CGROUP_RUN_PROG_INET4_POST_BIND (sk); +if (ret) { +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } +break ; + +case AF_INET6 : + ret =BPF_CGROUP_RUN_PROG_INET6_POST_BIND (sk); +if (ret) { +SMBDIRECT_FN_RETURN_INT (sk, ret);
fs/smb/common/smbdirect/smbdirect_proto.c line 428
Quoted 10 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +10
-0+return ret; + } +break ; + } + } + +if (!is_any_addr) + sk->sk_userlocks |=SOCK_BINDADDR_LOCK ; +if (port) + sk->sk_userlocks |=SOCK_BINDPORT_LOCK ;
Can this socket be passed to SOCK_BINDPORT_LOCK user, inet_bhash2_reset_saddr(), inet_sk_rebuild_header() ?
Quoted 36 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +36
-0+ + ret =0 ; +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sk_bind (struct sock *sk,struct sockaddr_unsized *addr,int addr_len) +{ +struct net *net =sock_net (sk); +u32 flags =BIND_WITH_LOCK ; +u16 port =0 ; +u16 check_port =0 ; +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + + ret =smbdirect_sk_pre_bind (sk, addr, &addr_len, &flags, &port); +if (ret) { +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + +/* +* treat the iwarp tcp port for +* smb (5445) as the main smb port (445) +* and only allow the bind if 445 +* would be allowed. +*/ +if (port ==5445 ) + check_port =445 ; +else + check_port = port; +
fs/smb/common/smbdirect/smbdirect_proto.c line 474
Quoted 10 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +10
-0+if (!(flags &BIND_NO_CAP_NET_BIND_SERVICE ) && + check_port &&inet_port_requires_bind_service (net, check_port) && + !ns_capable (net->user_ns,CAP_NET_BIND_SERVICE )) { + ret = -EACCES ; +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + +if (flags &BIND_WITH_LOCK ) +lock_sock (sk);
Is connect() called without bind() and could a bpf prog calls bpf_bind() for this socket ?
Quoted 23 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +23
-0+ + ret =smbdirect_sk_do_bind (sk, addr, flags, port); + +if (flags &BIND_WITH_LOCK ) +release_sock (sk); + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static struct sock *smbdirect_sk_accept (struct sock *lsk,struct proto_accept_arg *arg) +{ +struct smbdirect_socket *lsc =smbdirect_socket_from_sk (lsk); +long timeo =sock_rcvtimeo (lsk, arg->flags &O_NONBLOCK ); +struct smbdirect_socket *nsc; +struct sock *nsk; + +SMBDIRECT_FN_CALLED (lsk); + +/* assert it is not already locked */ +sock_not_owned_by_me (lsk); + +lock_sock (lsk);
fs/smb/common/smbdirect/smbdirect_proto.c line 507
Quoted 10 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +10
-0+ nsc =smbdirect_socket_accept (lsc, timeo, arg); +release_sock (lsk); +if (!nsc) { +SMBDIRECT_FN_RETURN_INT (lsk, arg->err); +return NULL ; + } + nsk = &nsc->sk; + +/* assert it is not already locked */ +sock_not_owned_by_me (nsk);
Looks redundant.
Quoted 41 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +41
-0+ +SMBDIRECT_FN_RETURN_INT (lsk,0 ); +return nsk; +} + +static int smbdirect_sk_pre_connect (struct sock *sk,struct sockaddr_unsized *uaddr,int addr_len) +{ +SMBDIRECT_FN_CALLED (sk); + +/* assert it is already locked */ +sock_owned_by_me (sk); + +if (addr_len <sizeof (uaddr->sa_family)) +return -EINVAL ; + +if (sk->sk_family != uaddr->sa_family) +return -EAFNOSUPPORT ; + +switch (sk->sk_family) { +case AF_INET : +if (addr_len <sizeof (struct sockaddr_in )) +return -EINVAL ; + +return BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr, &addr_len); +case AF_INET6 : +/* +* We require a full struct sockaddr_in6 (28 bytes) instead of a +* minimal size of SIN6_LEN_RFC2133 (24 bytes), as we don't +* have any legacy callers in userspace and the +* rdma layer also expects that. +*/ +if (addr_len <sizeof (struct sockaddr_in6 )) +return -EINVAL ; + +return BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr, &addr_len); + } + +return -EAFNOSUPPORT ; +} + +static int smbdirect_sk_connect (struct sock *sk,struct sockaddr_unsized *addr,int addr_len)
fs/smb/common/smbdirect/smbdirect_proto.c line 558
Quoted 10 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +10
-0+{ +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is already locked */ +sock_owned_by_me (sk); + + ret =smbdirect_connect (sc, (struct sockaddr *)addr);
Why is this called via sk->sk_prot instead of being called directly from sock->ops->connect() ?
Same for other sk->sk_prot functions.
Quoted 46 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +46
-0+ +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sk_setsockopt (struct sock *sk,int level,int optname, +sockptr_t optval,unsigned int optlen) +{ +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +switch (level) { +default : +SMBDIRECT_FN_COMMENT (sk,"default" ); +smbdirect_log_sk (sc,SMBDIRECT_LOG_INFO , +"level=%d optname=%d for sk=%p\n" , + level, optname, sk); + ret = -EOPNOTSUPP ; +break ; + } + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sk_getsockopt (struct sock *sk,int level,int optname, +char __user *optval,int __user *optlen) +{ +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +switch (level) { +default : +SMBDIRECT_FN_COMMENT (sk,"default" ); + smbdirect_log_sk(sc, SMBDIRECT_LOG_INFO, + "level=%d optname=%d for sk=%p\n",
fs/smb/common/smbdirect/smbdirect_proto.c line 614
Quoted 10 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +10
-0+ level, optname, sk); + ret = -EOPNOTSUPP ; +break ; + } + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sk_ioctl (struct sock *sk,int cmd,int *karg)
Is there any in-kernel ioctl() user for this socket ?
Quoted 359 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +359
-0+{ +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +switch (cmd) { +default : +SMBDIRECT_FN_COMMENT (sk,"default" ); +smbdirect_log_sk (sc,SMBDIRECT_LOG_INFO , +"cmd=%d (0x%x) for sk=%p\n" , + cmd, cmd, sk); + ret = -ENOIOCTLCMD ; +break ; + } + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static inline size_t smbdirect_cmsg_count (const struct msghdr *_msg, +int *first_sol_smbdirect_type) +{ +struct msghdr *msg = (struct msghdr *)(uintptr_t )(const void *)_msg; +struct cmsghdr *cmsg =NULL ; +size_t count =0 ; + +if (first_sol_smbdirect_type !=NULL ) + *first_sol_smbdirect_type =-1 ; + +for (cmsg =CMSG_FIRSTHDR (msg); + cmsg !=NULL ; + cmsg =CMSG_NXTHDR (msg, cmsg)) { + count++; +if (cmsg->cmsg_level !=SOL_SMBDIRECT ) +continue ; +if (first_sol_smbdirect_type !=NULL ) { + *first_sol_smbdirect_type = cmsg->cmsg_type; + first_sol_smbdirect_type =NULL ; + } + } + +return count; +} + +static __always_inline +ssize_t __smbdirect_cmsg_extract(const struct msghdr *_msg, +int cmsg_type, +void *_payload, +size_t payloadmin, +size_t payloadmax) +{ +struct msghdr *msg = (struct msghdr *)(uintptr_t )(const void *)_msg; +size_t cmsg_len_min =CMSG_LEN (payloadmin); +size_t cmsg_len_max =CMSG_LEN (payloadmax); +const size_t cmsg_len_hdr =CMSG_LEN (0 ); +uint8_t *payload = (uint8_t *)_payload; +struct cmsghdr *cmsg =NULL ; +size_t payloadlen; + +BUILD_BUG_ON (cmsg_len_min > cmsg_len_max); +if (WARN_ON_ONCE (cmsg_len_min > cmsg_len_max)) +return -EBADMSG ; + +for (cmsg =CMSG_FIRSTHDR (msg); + cmsg !=NULL ; + cmsg =CMSG_NXTHDR (msg, cmsg)) { +if (cmsg->cmsg_level !=SOL_SMBDIRECT ) +continue ; + +if (cmsg->cmsg_type != cmsg_type) +continue ; + +if (cmsg->cmsg_len < cmsg_len_min) +return -EBADMSG ; + +if (cmsg->cmsg_len > cmsg_len_max) +return -EMSGSIZE ; + + payloadlen = cmsg->cmsg_len - cmsg_len_hdr; +if (payloadlen >0 ) +memcpy (payload,CMSG_DATA (cmsg), payloadlen); +if (payloadlen < payloadmax) +memset (payload + payloadlen,0 , payloadmax - payloadlen); +return payloadlen; + } + +return -ENOMSG ; +} + +static __always_inline +int smbdirect_buffer_remote_invalidate_cmsg_extract(const struct msghdr *msg, +u32 *remote_token) +{ +struct smbdirect_buffer_remote_invalidate_args args = { + .remote_token =0 , + }; +ssize_t ret; + + ret =__smbdirect_cmsg_extract (msg, +SMBDIRECT_BUFFER_REMOTE_INVALIDATE_CMSG_TYPE , + &args,sizeof (args),sizeof (args)); +if (ret <0 ) +return ret; + + *remote_token = args.remote_token; +return 0 ; +} + +static int smbdirect_sk_sendmsg_locked (struct sock *sk,struct msghdr *msg,size_t msg_len) +{ +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); +struct iov_iter *iter = &msg->msg_iter; +unsigned int flags = msg->msg_flags; +size_t cmsg_count =0 ; +int cmsg_type =-1 ; +bool need_invalidate = false; +u32 remote_key =0 ; +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is already locked */ +sock_owned_by_me (sk); + + cmsg_count =smbdirect_cmsg_count (msg, &cmsg_type); +if (cmsg_count >1 ) { + ret = -EINVAL ; +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + +if (flags & ~(MSG_DONTWAIT |MSG_WAITALL |MSG_NOSIGNAL )) { + ret = -EINVAL ; +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + +if (cmsg_type ==SMBDIRECT_BUFFER_REMOTE_INVALIDATE_CMSG_TYPE ) { + ret =smbdirect_buffer_remote_invalidate_cmsg_extract (msg, &remote_key); +if (!ret) + need_invalidate = true;/* remote_key is valid */ +else if (ret != -ENOMSG ) { +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + }else if (cmsg_count) { + ret = -EINVAL ; +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + +if (WARN_ON_ONCE (iov_iter_rw (iter) !=ITER_SOURCE )) { + ret = -EINVAL ; +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + +if (WARN_ON_ONCE (iov_iter_count (iter) != msg_len)) { + ret = -EINVAL ; +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + +if (flags &MSG_DONTWAIT ) { +if (!sc->first_error && msg_len &&atomic_read (&sc->send_io.credits.count) ==0 ) { + ret = -EAGAIN ; +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + } + flags &= ~(MSG_DONTWAIT |MSG_WAITALL |MSG_NOSIGNAL ); + + ret =smbdirect_connection_send_iter (sc, + iter, + flags, + need_invalidate, + remote_key); +if (ret <0 ) +/* Handle error and possibly send SIGPIPE. */ + ret =sk_stream_error (sk, msg->msg_flags, ret); +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sk_sendmsg (struct sock *sk,struct msghdr *msg,size_t msg_len) +{ +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +lock_sock (sk); + ret =smbdirect_sk_sendmsg_locked (sk, msg, msg_len); +release_sock (sk); + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sk_recvmsg (struct sock *sk,struct msghdr *msg,size_t len,int flags) +{ +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); +struct iov_iter *iter = &msg->msg_iter; +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +if (flags & ~(MSG_DONTWAIT |MSG_WAITALL |MSG_NOSIGNAL )) { + ret = -EINVAL ; +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + +if (WARN_ON_ONCE (iov_iter_rw (iter) !=ITER_DEST )) { + ret = -EINVAL ; +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + +/* +* For now smbdirect_connection_recvmsg() relies +* on this assertion and the current in kernel +* users are working that way. +*/ +if (WARN_ON_ONCE (iov_iter_count (iter) != len)) { + ret = -EINVAL ; +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + +lock_sock (sk); +if (flags &MSG_DONTWAIT ) { +if (!sc->first_error && len && sc->recv_io.reassembly.data_length ==0 ) { + ret = -EAGAIN ; +release_sock (sk); +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; + } + } + flags &= ~(MSG_DONTWAIT |MSG_WAITALL |MSG_NOSIGNAL ); + ret =smbdirect_connection_recvmsg (sc, msg, flags); +if (msg->msg_get_inq && ret >=0 ) + msg->msg_inq = sc->recv_io.reassembly.data_length; +release_sock (sk); + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static void smbdirect_sk_shutdown (struct sock *sk,int how) +{ +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is already locked */ +sock_owned_by_me (sk); + +smbdirect_socket_schedule_cleanup (sc, -ESHUTDOWN ); + +SMBDIRECT_FN_RETURN_VOID (sk); +} + +static int smbdirect_sk_disconnect (struct sock *sk,int flags) +{ +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is already locked */ +sock_owned_by_me (sk); + +smbdirect_socket_schedule_cleanup (sc, -ESHUTDOWN ); + +if (flags &O_NONBLOCK ) { +if (sc->status >=SMBDIRECT_SOCKET_DISCONNECTED ) { +SMBDIRECT_FN_RETURN_INT (sk,0 ); +return 0 ; + } + +/* +* This will cause SS_DISCONNECTING in +* smbdirect_sock_connect_locked(). +*/ +SMBDIRECT_FN_RETURN_INT (sk, sc->first_error); +return sc->first_error; + } + +smbdirect_socket_destroy_sync (sc); + +SMBDIRECT_FN_RETURN_INT (sk,0 ); +return 0 ; +} + +static void smbdirect_sk_close (struct sock *sk,long timeout) +{ +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +/* +* We hold an additional reference so +* that the sock_put() in sk_common_release() +* doesn't call sk_free(), that is potentially +* deferred to our sock_put() after release_sock(). +* +* Note that sk_common_release() calls +* smbdirect_sk_destroy() as the first thing. +*/ +sock_hold (sk); +lock_sock (sk); +sk_common_release (sk); +release_sock (sk); +SMBDIRECT_FN_COMMENT (sk,"before sock_put()" ); +sock_put (sk); +} + +static struct percpu_counter smbdirect_sockets_allocated; + +static struct proto smbdirect_prot = { + .name ="smbdirect" , + .owner =THIS_MODULE , + .obj_size =sizeof (struct smbdirect_socket ), + .ipv6_pinfo_offset = offsetof(struct smbdirect_socket , inet6), + .init = smbdirect_sk_init, + .destroy = smbdirect_sk_destroy, + .hash = smbdirect_sk_hash, + .unhash = smbdirect_sk_unhash, + .release_cb = smbdirect_sk_release_cb, + .bind = smbdirect_sk_bind, + .accept = smbdirect_sk_accept, + .pre_connect = smbdirect_sk_pre_connect, + .connect = smbdirect_sk_connect, + .setsockopt = smbdirect_sk_setsockopt, + .getsockopt = smbdirect_sk_getsockopt, + .ioctl = smbdirect_sk_ioctl, + .sendmsg = smbdirect_sk_sendmsg, + .recvmsg = smbdirect_sk_recvmsg, + .shutdown = smbdirect_sk_shutdown, + .disconnect = smbdirect_sk_disconnect, + .close = smbdirect_sk_close, + .sockets_allocated = &smbdirect_sockets_allocated, +}; + +static int smbdirect_sock_release (struct socket *sock) +{ +struct sock *sk = sock->sk; +int ret; +
fs/smb/common/smbdirect/smbdirect_proto.c line 983
Quoted 10 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +10
-0+SMBDIRECT_FN_CALLED (sk); + +/* assert it is not locked */ +sock_not_owned_by_me (sk); +WARN_ON_ONCE (sock_owned_by_user_nocheck (sk)); + +switch (sk->sk_family) { +case AF_INET : +SMBDIRECT_FN_COMMENT (sk,"calling inet_release()" ); + ret =inet_release (sock);
Given setsockopt() is banned, smbdirect_sk_close() can be inlined here.
Quoted 20 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +20
-0+break ; +case AF_INET6 : +#if IS_ENABLED (CONFIG_IPV6 ) +SMBDIRECT_FN_COMMENT (sk,"calling inet6_release()" ); + ret =inet6_release (sock); +#else + ret = -EAFNOSUPPORT ; +#endif +break ; +default : + ret = -EAFNOSUPPORT ; +break ; + } + +return ret; +} + +static int smbdirect_sock_bind (struct socket *sock,struct sockaddr_unsized *saddr,int len) +{ +struct sock *sk = sock->sk;
fs/smb/common/smbdirect/smbdirect_proto.c line 1013
Quoted 10 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +10
-0+int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +switch (sk->sk_family) { +case AF_INET : + ret =inet_bind (sock, saddr, len);
inet_bind() just calls sk->sk_prot->bind() if set. So, the same question applies; why not inline sk->sk_prot->bind() here.
Quoted 143 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +143
-0+break ; +case AF_INET6 : +#if IS_ENABLED (CONFIG_IPV6 ) + ret =inet6_bind (sock, saddr, len); +#else + ret = -EAFNOSUPPORT ; +#endif +break ; +default : + ret = -EAFNOSUPPORT ; +break ; + } + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sock_connect_locked (struct socket *sock, +struct sockaddr_unsized *uaddr, +int addr_len,int flags) +{ +struct sock *sk = sock->sk; +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is already locked */ +sock_owned_by_me (sk); + +if (addr_len <sizeof (uaddr->sa_family)) +return -EINVAL ; + +if (sk->sk_family != uaddr->sa_family) +return -EAFNOSUPPORT ; + +switch (sk->sk_family) { +case AF_INET : +if (addr_len <sizeof (struct sockaddr_in )) +return -EINVAL ; +break ; +case AF_INET6 : +/* +* We require a full struct sockaddr_in6 (28 bytes) instead of a +* minimal size of SIN6_LEN_RFC2133 (24 bytes), as we don't +* have any legacy callers in userspace and the +* rdma layer also expects that. +*/ +if (addr_len <sizeof (struct sockaddr_in6 )) +return -EINVAL ; +break ; +default : +return -EAFNOSUPPORT ; + } + +switch (sock->state) { +case SS_CONNECTED : +return -EISCONN ; +case SS_CONNECTING : +return -EALREADY ; +case SS_UNCONNECTED : +break ; +default : +return -EINVAL ; + } + +if (sc->status ==SMBDIRECT_SOCKET_CONNECTED ) +return -EISCONN ; + +if (sc->status !=SMBDIRECT_SOCKET_CREATED ) +return -EINVAL ; + +if (BPF_CGROUP_PRE_CONNECT_ENABLED (sk)) { + ret = sk->sk_prot->pre_connect (sk, uaddr, addr_len); +if (ret) +return ret; + } + + ret = sk->sk_prot->connect (sk, uaddr, addr_len); +if (ret <0 ) +return ret; + +inet_sk_set_state (sk,TCP_SYN_SENT ); + sock->state =SS_CONNECTING ; + +if (flags &O_NONBLOCK ) +return -EINPROGRESS ; + + ret =smbdirect_connection_wait_for_connected (sc); +if (ret) + goto sock_error; + +return 0 ; + +sock_error: + sock->state =SS_UNCONNECTED ; + sk->sk_disconnects++; +if (sk->sk_prot->disconnect (sk, flags)) + sock->state =SS_DISCONNECTING ; +return ret; +} + +static int smbdirect_sock_connect (struct socket *sock, +struct sockaddr_unsized *uaddr, +int addr_len,int flags) +{ +struct sock *sk = sock->sk; +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +lock_sock (sk); + ret =smbdirect_sock_connect_locked (sock, uaddr, addr_len, flags); +release_sock (sk); + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sock_listen (struct socket *sock,int backlog) +{ +struct sock *sk = sock->sk; +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +lock_sock (sk); + ret =smbdirect_socket_listen (sc, backlog); +release_sock (sk); + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sock_accept (struct socket *lsock,struct socket *nsock, +struct proto_accept_arg *arg)
fs/smb/common/smbdirect/smbdirect_proto.c line 1166
Quoted 10 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +10
-0+{ +struct sock *lsk = lsock->sk; +int ret; + +SMBDIRECT_FN_CALLED (lsk); + +/* assert it is not already locked */ +sock_not_owned_by_me (lsk); + + ret =inet_accept (lsock, nsock, arg);
Could this account socket memory to memcg twice ?
see 4a997d49d92a and 16942cf4d3e3
Quoted 758 lines
fs/smb/common/smbdirect/smbdirect_proto.c new file +383
-0+if (!ret) +/* +* We want to handle all sockopts explicitly +* and only support what we really support. +*/ +set_bit (SOCK_CUSTOM_SOCKOPT , &nsock->flags); + +SMBDIRECT_FN_RETURN_INT (lsk, ret); +return ret; +} + +static int smbdirect_sock_getname (struct socket *sock,struct sockaddr *uaddr,int peer) +{ +struct sock *sk = sock->sk; +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +switch (sk->sk_family) { +case AF_INET : + ret =inet_getname (sock, uaddr, peer); +break ; +case AF_INET6 : +#if IS_ENABLED (CONFIG_IPV6 ) + ret =inet6_getname (sock, uaddr, peer); +#else + ret = -EAFNOSUPPORT ; +#endif +break ; +default : + ret = -EAFNOSUPPORT ; +break ; + } + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static __poll_t smbdirect_sock_poll (struct file *file,struct socket *sock,poll_table *wait) +{ +struct sock *sk = sock->sk; +struct smbdirect_socket *sc =smbdirect_socket_from_sk (sk); +__poll_t mask =0 ; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +sock_poll_wait (file, sock, wait); + +if (sc->status ==SMBDIRECT_SOCKET_LISTENING ) { +if (!list_empty_careful (&sc->listen.ready)) + mask |=EPOLLIN |EPOLLRDNORM ; +SMBDIRECT_FN_RETURN_POLL (sk, mask); +return mask; + } + +if (sc->first_error) { +/* +* A broken connection should report almost everything in order to let +* applications to detect it reliable. +*/ + mask |=EPOLLHUP ; + mask |=EPOLLERR ; + mask |=EPOLLIN |EPOLLRDNORM |EPOLLRDHUP ; + mask |=EPOLLOUT |EPOLLWRNORM ; +SMBDIRECT_FN_RETURN_POLL (sk, mask); +return mask; + } + +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) { +/* +* A just created socket. +*/ +SMBDIRECT_FN_RETURN_POLL (sk, mask); +return mask; + } + +if (sc->recv_io.reassembly.data_length >0 ) + mask |=EPOLLIN |EPOLLRDNORM ; + +if (atomic_read (&sc->send_io.bcredits.count) >0 && +atomic_read (&sc->send_io.lcredits.count) >0 && +atomic_read (&sc->send_io.credits.count) >0 ) + mask |=EPOLLOUT |EPOLLWRNORM ; +else { +sk_set_bit (SOCKWQ_ASYNC_NOSPACE , sk); +set_bit (SOCK_NOSPACE , &sk->sk_socket->flags); + +/* +* Race breaker. If space is freed after +* wspace test but before the flags are set, +* IO signal will be lost. Memory barrier +* pairs with the input side. +*/ +smp_mb__after_atomic (); +if (atomic_read (&sc->send_io.bcredits.count) >0 && +atomic_read (&sc->send_io.lcredits.count) >0 && +atomic_read (&sc->send_io.credits.count) >0 ) + mask |=EPOLLOUT |EPOLLWRNORM ; + } + +SMBDIRECT_FN_RETURN_POLL (sk, mask); +return mask; +} + +static int smbdirect_sock_ioctl (struct socket *sock,unsigned int cmd,unsigned long arg) +{ +struct sock *sk = sock->sk; +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +/* +* We may need to handle some here as +* smbirect_sk_ioctl() only gets a kernel +* int pointer as arg, but we may +* need to the whole struct +*/ +switch (cmd) { +default : +/* +* Note this has some special handling for +* sk->sk_type == SOCK_RAW, in case we ever +* implement SOCK_RAW... +* +* It calls smbdirect_sk_ioctl()... +*/ + ret =sk_ioctl (sk, cmd, (void __user *)arg); +break ; + } + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sock_shutdown (struct socket *sock,int how) +{ +struct sock *sk = sock->sk; +int ret =0 ; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + +/* +* We have these from userspace: +* SHUT_RD = 0, SHUT_WR = 1 and SHUT_RDWR = 2 +* +* And we map them to SHUTDOWN_MASK = 3 +* RCV_SHUTDOWN = 1, SEND_SHUTDOWN = 2, BOTH = 3 +*/ + how++; +if ((how & ~SHUTDOWN_MASK ) || !how)/* MAXINT->0 */ +return -EINVAL ; + +lock_sock (sk); + +switch (sk->sk_state) { +case TCP_CLOSE : + ret = -ENOTCONN ; + fallthrough; +default : +WRITE_ONCE (sk->sk_shutdown, sk->sk_shutdown | how); + sk->sk_prot->shutdown (sk, how); +break ; + +case TCP_SYN_SENT : +case TCP_SYN_RECV : + ret = sk->sk_prot->disconnect (sk,O_NONBLOCK ); +break ; + } + +/* Wake up anyone sleeping in poll. */ + sk->sk_state_change (sk); +release_sock (sk); +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sock_setsockopt (struct socket *sock,int level,int optname, +sockptr_t optval,unsigned int optlen) +{ +struct sock *sk = sock->sk; +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + + ret =sock_common_setsockopt (sock, level, optname, optval, optlen); + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sock_getsockopt (struct socket *sock,int level,int optname, +char __user *optval,int __user *optlen) +{ +struct sock *sk = sock->sk; +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + + ret =sock_common_getsockopt (sock, level, optname, optval, optlen); + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sock_sendmsg (struct socket *sock,struct msghdr *msg,size_t len) +{ +struct sock *sk = sock->sk; +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + + ret = sk->sk_prot->sendmsg (sk, msg, len); + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static int smbdirect_sock_recvmsg (struct socket *sock,struct msghdr *msg,size_t size, +int flags) +{ +struct sock *sk = sock->sk; +int ret; + +SMBDIRECT_FN_CALLED (sk); + +/* assert it is not already locked */ +sock_not_owned_by_me (sk); + + ret =sock_common_recvmsg (sock, msg, size, flags); + +SMBDIRECT_FN_RETURN_INT (sk, ret); +return ret; +} + +static const struct proto_ops smbdirect_inet_proto_ops = { + .family =PF_INET , + .owner =THIS_MODULE , + .release = smbdirect_sock_release, + .bind = smbdirect_sock_bind, + .connect = smbdirect_sock_connect, + .socketpair = sock_no_socketpair, + .listen = smbdirect_sock_listen, + .accept = smbdirect_sock_accept, + .getname = smbdirect_sock_getname, + .poll = smbdirect_sock_poll, + .ioctl = smbdirect_sock_ioctl, + .shutdown = smbdirect_sock_shutdown, + .setsockopt = smbdirect_sock_setsockopt, + .getsockopt = smbdirect_sock_getsockopt, + .sendmsg = smbdirect_sock_sendmsg, + .sendmsg_locked = smbdirect_sk_sendmsg_locked, + .recvmsg = smbdirect_sock_recvmsg, + .mmap = sock_no_mmap, +}; + +#if IS_ENABLED (CONFIG_IPV6 ) +static const struct proto_ops smbdirect_inet6_proto_ops = { + .family =PF_INET6 , + .owner =THIS_MODULE , + .release = smbdirect_sock_release, + .bind = smbdirect_sock_bind, + .connect = smbdirect_sock_connect, + .socketpair = sock_no_socketpair, + .listen = smbdirect_sock_listen, + .accept = smbdirect_sock_accept, + .getname = smbdirect_sock_getname, + .poll = smbdirect_sock_poll, + .ioctl = smbdirect_sock_ioctl, + .shutdown = smbdirect_sock_shutdown, + .setsockopt = smbdirect_sock_setsockopt, + .getsockopt = smbdirect_sock_getsockopt, + .sendmsg = smbdirect_sock_sendmsg, + .sendmsg_locked = smbdirect_sk_sendmsg_locked, + .recvmsg = smbdirect_sock_recvmsg, + .mmap = sock_no_mmap, +}; +#endif + +static struct inet_protosw smbdirect_inet_stream_protosw = { + .type =SOCK_STREAM , + .protocol =IPPROTO_SMBDIRECT , + .prot = &smbdirect_prot, + .ops = &smbdirect_inet_proto_ops, +}; + +#if IS_ENABLED (CONFIG_IPV6 ) +static struct inet_protosw smbdirect_inet6_stream_protosw = { + .type =SOCK_STREAM , + .protocol =IPPROTO_SMBDIRECT , + .prot = &smbdirect_prot, + .ops = &smbdirect_inet6_proto_ops, +}; +#endif + +struct smbdirect_socket *smbdirect_socket_from_sock (const struct socket *sock) +{ +if (!sock || + !sock->sk || + sock->sk->sk_protocol !=IPPROTO_SMBDIRECT ) +return NULL ; + +if (WARN_ON_ONCE (sock->sk->sk_destruct != smbdirect_sk_destruct)) +return NULL ; + +return smbdirect_socket_from_sk (sock->sk); +} +__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_from_sock); + +static __init int smbdirect_protosw_init (void ) +{ +int err; + + err =proto_register (&smbdirect_prot,1 ); +if (err) +return err; + +inet_register_protosw (&smbdirect_inet_stream_protosw); +#if IS_ENABLED (CONFIG_IPV6 ) +inet6_register_protosw (&smbdirect_inet6_stream_protosw); +#endif + +return 0 ; +} + +static __exit void smbdirect_protosw_exit(void) +{ +#if IS_ENABLED (CONFIG_IPV6 ) +inet6_unregister_protosw (&smbdirect_inet6_stream_protosw); +#endif +inet_unregister_protosw (&smbdirect_inet_stream_protosw); + +proto_unregister (&smbdirect_prot); +} + +__init int smbdirect_proto_init (void ) +{ +int err; + + err =percpu_counter_init (&smbdirect_sockets_allocated,0 ,GFP_KERNEL ); +if (err) + goto err_percpu_counter; + + err =smbdirect_protosw_init (); +if (err) + goto err_protosw; + +return 0 ; + +err_protosw: +percpu_counter_destroy (&smbdirect_sockets_allocated); +err_percpu_counter: +return err; +} + +__exit void smbdirect_proto_exit(void) +{ +smbdirect_protosw_exit (); +percpu_counter_destroy (&smbdirect_sockets_allocated); +} + +MODULE_ALIAS_NET_PF_PROTO_TYPE (PF_INET ,257 /* IPPROTO_SMBDIRECT */ ,SOCK_STREAM ); +MODULE_ALIAS_NET_PF_PROTO_TYPE (PF_INET6 ,257 /* IPPROTO_SMBDIRECT */ ,SOCK_STREAM );fs/smb/common/smbdirect/smbdirect_public.h +3
-0@@ -49,6 +49,7 @@ int smbdirect_socket_set_kernel_settings(struct smbdirect_socket *sc,#define SMBDIRECT_LOG_RDMA_MR 0x100#define SMBDIRECT_LOG_RDMA_RW 0x200#define SMBDIRECT_LOG_NEGOTIATE 0x400 +#define SMBDIRECT_LOG_SK 0x800 void smbdirect_socket_set_logging(struct smbdirect_socket *sc, void *private_ptr, bool (*needed)(struct smbdirect_socket *sc,@@ -145,4 +146,6 @@ void smbdirect_connection_legacy_debug_proc_show(struct smbdirect_socket *sc,unsigned int rdma_readwrite_threshold, struct seq_file *m); +struct smbdirect_socket *smbdirect_socket_from_sock (const struct socket *sock); +#endif /* __FS_SMB_COMMON_SMBDIRECT_SMBDIRECT_PUBLIC_H__ */ fs/smb/common/smbdirect/smbdirect_rw.c +24
-5@@ -105,11 +105,11 @@ static void smbdirect_connection_rdma_write_done(struct ib_cq *cq, struct ib_wcsmbdirect_connection_rdma_rw_done (cq, wc,DMA_TO_DEVICE ); } -int smbdirect_connection_rdma_xmit (struct smbdirect_socket *sc, -void *buf,size_t buf_len, -struct smbdirect_buffer_descriptor_v1 *desc, -size_t desc_len, -bool is_read) +static int smbdirect_connection_rdma_xmit_locked (struct smbdirect_socket *sc, +void *buf,size_t buf_len, +struct smbdirect_buffer_descriptor_v1 *desc, +size_t desc_len, +bool is_read) {const struct smbdirect_socket_parameters *sp = &sc->parameters;enum dma_data_direction direction = is_read ?DMA_FROM_DEVICE :DMA_TO_DEVICE ;@@ -123,6 +123,8 @@ int smbdirect_connection_rdma_xmit(struct smbdirect_socket *sc,int credits_needed;size_t desc_buf_len, desc_num =0 ; +smbdirect_socket_sk_owned_by_me (sc); +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return -ENOTCONN ;@@ -235,7 +237,9 @@ int smbdirect_connection_rdma_xmit(struct smbdirect_socket *sc, } msg = list_last_entry(&msg_list, struct smbdirect_rw_io, list); +smbdirect_socket_sk_unlock (sc);wait_for_completion (&completion); +smbdirect_socket_sk_lock (sc); ret = msg->error; out:list_for_each_entry_safe (msg, next_msg, &msg_list, list) {@@ -252,4 +256,19 @@ int smbdirect_connection_rdma_xmit(struct smbdirect_socket *sc,kfree (msg); goto out; } + +int smbdirect_connection_rdma_xmit (struct smbdirect_socket *sc, +void *buf,size_t buf_len, +struct smbdirect_buffer_descriptor_v1 *desc, +size_t desc_len, +bool is_read) +{ +int ret; + +smbdirect_socket_sk_lock (sc); + ret =smbdirect_connection_rdma_xmit_locked (sc, buf, buf_len, desc, desc_len, is_read); +smbdirect_socket_sk_unlock (sc); + +return ret; +}__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_rdma_xmit);fs/smb/common/smbdirect/smbdirect_socket.c +147
-0@@ -5,6 +5,7 @@*/ #include "smbdirect_internal.h" +#include <net/transp_v6.h> bool smbdirect_frwr_is_supported (const struct ib_device_attr *attrs) {@@ -217,6 +218,7 @@ int smbdirect_socket_set_kernel_settings(struct smbdirect_socket *sc, sc->send_io.mem.gfp_mask = gfp_mask; sc->recv_io.mem.gfp_mask = gfp_mask; sc->rw_io.mem.gfp_mask = gfp_mask; + sc->sk.sk_allocation = gfp_mask;return 0 ; }@@ -242,6 +244,106 @@ void smbdirect_socket_set_logging(struct smbdirect_socket *sc, }__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_set_logging); +int smbdirect_socket_sync_saddr_to_sk (struct smbdirect_socket *sc,bool *_is_any_addr) +{ +struct sock *sk = &sc->sk; +const struct sockaddr_storage *saddr; +const struct sockaddr_in *sin; +const struct sockaddr_in6 *sin6; +struct in_addr sin_addr = { .s_addr =htonl (INADDR_ANY ), }; +struct in6_addr sin6_addr = in6addr_any; +__be32 sin6_flowinfo =0 ; +bool is_any_addr = true; +u16 sport =0 ; +int ret; + + saddr = &sc->rdma.cm_id->route.addr.src_addr; + +if (WARN_ON_ONCE (saddr->ss_family != sk->sk_family)) { + ret = -EINVAL ; +return ret; + } + +switch (saddr->ss_family) { +case AF_INET : + sin = (struct sockaddr_in *)saddr; + sport =ntohs (sin->sin_port); + sin_addr = sin->sin_addr; + is_any_addr = (sin_addr.s_addr ==htonl (INADDR_ANY )); +break ; + +case AF_INET6 : + sin6 = (struct sockaddr_in6 *)saddr; + sport =ntohs (sin6->sin6_port); + sin_addr.s_addr =LOOPBACK4_IPV6 ; + sin6_addr = sin6->sin6_addr; + is_any_addr =ipv6_addr_any (&sin6_addr); + sin6_flowinfo = sin6->sin6_flowinfo; +break ; + } + + sk->sk_bound_dev_if = sc->rdma.cm_id->route.addr.dev_addr.bound_dev_if; + sk->sk_rcv_saddr = sc->inet.inet_saddr = sin_addr.s_addr; +#if IS_ENABLED (CONFIG_IPV6 ) + sk->sk_v6_rcv_saddr = sc->inet6.saddr = sin6_addr; +#else + sc->inet6.saddr = sin6_addr; +#endif + sc->inet6.flow_label = sin6_flowinfo; + sk->sk_num = sport; + sc->inet.inet_sport =htons (sport); + +if (_is_any_addr) + *_is_any_addr = is_any_addr; +return 0 ; +} + +int smbdirect_socket_sync_daddr_to_sk (struct smbdirect_socket *sc) +{ +struct sock *sk = &sc->sk; +const struct sockaddr_storage *daddr; +const struct sockaddr_in *sin; +const struct sockaddr_in6 *sin6; +struct in_addr sin_addr = { .s_addr =htonl (INADDR_ANY ), }; +#if IS_ENABLED (CONFIG_IPV6 ) +struct in6_addr sin6_addr = in6addr_any; +#endif +u16 dport =0 ; +int ret; + + daddr = &sc->rdma.cm_id->route.addr.dst_addr; + +if (WARN_ON_ONCE (daddr->ss_family != sk->sk_family)) { + ret = -EINVAL ; +return ret; + } + +switch (daddr->ss_family) { +case AF_INET : + sin = (struct sockaddr_in *)daddr; + dport =ntohs (sin->sin_port); + sin_addr = sin->sin_addr; +break ; + +case AF_INET6 : + sin6 = (struct sockaddr_in6 *)daddr; + dport =ntohs (sin6->sin6_port); + sin_addr.s_addr =LOOPBACK4_IPV6 ; +#if IS_ENABLED (CONFIG_IPV6 ) + sin6_addr = sin6->sin6_addr; +#endif +break ; + } + + sk->sk_daddr = sc->inet.inet_daddr = sin_addr.s_addr; +#if IS_ENABLED (CONFIG_IPV6 ) + sk->sk_v6_daddr = sin6_addr; +#endif + sk->sk_dport = sc->inet.inet_dport =htons (dport); + +return 0 ; +} +static void smbdirect_socket_wake_up_all (struct smbdirect_socket *sc) {/* @@ -257,6 +359,38 @@ static void smbdirect_socket_wake_up_all(struct smbdirect_socket *sc)wake_up_all (&sc->recv_io.reassembly.wait_queue);wake_up_all (&sc->rw_io.credits.wait_queue);wake_up_all (&sc->mr_io.ready.wait_queue); + +if (sc->sk.sk_family) { +struct sock *sk = &sc->sk; + +WRITE_ONCE (sk->sk_shutdown,SHUTDOWN_MASK ); + +WARN_ON_ONCE (sc->first_error ==0 ); +if (sc->first_error <0 ) +WRITE_ONCE (sk->sk_err, -sc->first_error); +else +WRITE_ONCE (sk->sk_err, sc->first_error); + +if (sc->status >=SMBDIRECT_SOCKET_DISCONNECTED ) { +inet_sk_set_state (sk,TCP_CLOSE ); +if (!sock_flag (sk,SOCK_DEAD ) && sk->sk_socket) + sk->sk_socket->state =SS_UNCONNECTED ; + }else { +inet_sk_set_state (sk,TCP_CLOSING ); +if (!sock_flag (sk,SOCK_DEAD ) && sk->sk_socket) + sk->sk_socket->state =SS_DISCONNECTING ; + } + +/* +* Note tcp_done_with_error() also calls both +* sk->sk_state_change(sk) via tcp_done() +* and sk_error_report() directly. +*/ +if (!sock_flag (sk,SOCK_DEAD ) && sk->sk_socket) + sk->sk_state_change (sk); +if (!sock_flag (sk,SOCK_DEAD ) && sk->sk_socket) +sk_error_report (sk); + } } void __smbdirect_socket_schedule_cleanup(struct smbdirect_socket *sc,@@ -510,11 +644,13 @@ static void smbdirect_socket_destroy(struct smbdirect_socket *sc)*/ smbdirect_socket_wake_up_all (sc); +smbdirect_socket_sk_unlock (sc);disable_work_sync (&sc->disconnect_work);disable_work_sync (&sc->connect.work);disable_work_sync (&sc->recv_io.posted.refill_work);disable_work_sync (&sc->idle.immediate_work);disable_delayed_work_sync (&sc->idle.timer_work); +smbdirect_socket_sk_lock (sc);if (sc->rdma.cm_id)rdma_lock_handler (sc->rdma.cm_id);@@ -600,6 +736,8 @@ void smbdirect_socket_destroy_sync(struct smbdirect_socket *sc)*/ WARN_ON_ONCE (in_interrupt ()); +smbdirect_socket_sk_owned_by_me (sc); +/* * First we try to disable the work * without disable_work_sync() in a @@ -625,7 +763,9 @@ void smbdirect_socket_destroy_sync(struct smbdirect_socket *sc)smbdirect_log_rdma_event (sc,SMBDIRECT_LOG_INFO ,"cancelling and disable disconnect_work\n" ); +smbdirect_socket_sk_unlock (sc);disable_work_sync (&sc->disconnect_work); +smbdirect_socket_sk_lock (sc);smbdirect_log_rdma_event (sc,SMBDIRECT_LOG_INFO ,"destroying rdma session\n" );@@ -634,7 +774,9 @@ void smbdirect_socket_destroy_sync(struct smbdirect_socket *sc)if (sc->status <SMBDIRECT_SOCKET_DISCONNECTED ) {smbdirect_log_rdma_event (sc,SMBDIRECT_LOG_INFO ,"wait for transport being disconnected\n" ); +smbdirect_socket_sk_unlock (sc);wait_event (sc->status_wait, sc->status ==SMBDIRECT_SOCKET_DISCONNECTED ); +smbdirect_socket_sk_lock (sc);smbdirect_log_rdma_event (sc,SMBDIRECT_LOG_INFO ,"waited for transport being disconnected\n" ); }@@ -723,6 +865,8 @@ int smbdirect_socket_wait_for_credits(struct smbdirect_socket *sc, {int ret; +smbdirect_socket_sk_owned_by_me (sc); +if (WARN_ON_ONCE (needed <0 ))return -EINVAL ;@@ -731,9 +875,12 @@ int smbdirect_socket_wait_for_credits(struct smbdirect_socket *sc,return 0 ;atomic_add (needed, total_credits); + +smbdirect_socket_sk_unlock (sc); ret =wait_event_interruptible (*waitq,atomic_read (total_credits) >= needed || sc->status != expected_status); +smbdirect_socket_sk_lock (sc);if (sc->status != expected_status)return unexpected_errno;fs/smb/common/smbdirect/smbdirect_socket.h +25
-2@@ -104,6 +104,18 @@ enum smbdirect_keepalive_status { };struct smbdirect_socket { +union { +struct sock sk; +struct inet_sock inet; + }; +/* needed by inet6_create() */ +struct ipv6_pinfo inet6; +void (*orig_sk_destruct)(struct sock *sk); + +/* +* This is the first element that is +* initialized in smbdirect_socket_init() +*/ enum smbdirect_socket_status status;wait_queue_head_t status_wait;int first_error;@@ -548,14 +560,18 @@ static void __smbdirect_log_printf(struct smbdirect_socket *sc, __smbdirect_log_generic(sc, lvl, SMBDIRECT_LOG_RDMA_RW, fmt, ##args) #define smbdirect_log_negotiate(sc, lvl, fmt, args...) \ __smbdirect_log_generic(sc, lvl, SMBDIRECT_LOG_NEGOTIATE, fmt, ##args) +#define smbdirect_log_sk(sc, lvl, fmt, args...) \ + __smbdirect_log_generic(sc, lvl, SMBDIRECT_LOG_SK, fmt, ##args) static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc) { + const size_t status_offset = offsetof(struct smbdirect_socket, status); + /* * This also sets status = SMBDIRECT_SOCKET_CREATED */ BUILD_BUG_ON(SMBDIRECT_SOCKET_CREATED != 0); - memset(sc, 0, sizeof(*sc)); + memset(((u8 *)sc)+status_offset, 0, sizeof(*sc)-status_offset); init_waitqueue_head(&sc->status_wait);@@ -700,6 +716,14 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)__SMBDIRECT_CHECK_STATUS_WARN (__sc, __expected_status, \ __SMBDIRECT_SOCKET_DISCONNECT(__sc);) +static __always_inline struct smbdirect_socket * +smbdirect_socket_from_sk (const struct sock *sk) +{ +WARN_ON_ONCE (!sk); +BUILD_BUG_ON (offsetof(struct smbdirect_socket , sk) !=0 ); + return container_of(sk, struct smbdirect_socket, sk); +} +struct smbdirect_send_io {struct smbdirect_socket *socket;struct ib_cqe cqe; --2.43.0
Re: [PATCH 1/8] smb: smbdirect: change smbdirect_socket_parameters.{initiator_depth,responder_resources} to __u16
In reply to Stefan MetzmacherQuoted 57 lines · Stefan Metzmacher
We still limit this to
U8_MAXas the rdma api only uses__u8and that's also the limit for Infiniband and RoCE*, while iWarp would be able to support larger values at the protocol level.As struct
smbdirect_socket_parameterswill be part of the uapi forIPPROTO_SMBDIRECTin future, change it now even if userspace sockets won't be supported yet.Cc Steve French <[email protected]>Cc Tom Talpey <[email protected]>Cc Long Li <[email protected]>Cc Namjae Jeon <[email protected]>Cc David Howells <[email protected]>Cc Henrique Carvalho <[email protected]>Signed-off-by Stefan Metzmacher <[email protected]>--- fs/smb/common/smbdirect/smbdirect.h | 4 ++-- fs/smb/common/smbdirect/smbdirect_socket.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)fs/smb/common/smbdirect/smbdirect.h +2
-2@@ -32,8 +32,8 @@ struct smbdirect_socket_parameters {__u32 resolve_route_timeout_msec;__u32 rdma_connect_timeout_msec;__u32 negotiate_timeout_msec; -__u8 initiator_depth; -__u8 responder_resources; +__u16 initiator_depth;/* limited to U8_MAX */ +__u16 responder_resources;/* limited to U8_MAX */ __u16 recv_credit_max;__u16 send_credit_target;__u32 max_send_size;fs/smb/common/smbdirect/smbdirect_socket.c +5
-0@@ -166,6 +166,11 @@ int smbdirect_socket_set_initial_parameters(struct smbdirect_socket *sc,if (sp->flags & ~SMBDIRECT_FLAG_PORT_RANGE_MASK )return -EINVAL ; +if (sp->initiator_depth >U8_MAX ) +return -EINVAL ; +if (sp->responder_resources >U8_MAX ) +return -EINVAL ; +if (sp->flags &SMBDIRECT_FLAG_PORT_RANGE_ONLY_IB && sp->flags &SMBDIRECT_FLAG_PORT_RANGE_ONLY_IW )return -EINVAL ;Signature · 1 line
2.43.0