SVC Transport Switch
Subsystems (3)
cover SVC Transport Switch
The following series implements a pluggable transport switch for RPC servers. This patchset is a rollup of the original plus incremental patches.
In addition to the incremental change rollup:
- The address management logic in svc_xprt was cleaned up a based on feedback from Chuck Lever,
- A race was fixed whereby UDP RPC from different clients in parallel could corrupt each other's addresses.
- Changes were made to the sysctl implementation to comply with the new 2.6.24 requirements regarding sysctl ids.
The following testing was done:
- Connectathon on V3 and V4 on TCP, UDP and RDMA mounts
- Kernel build on V3 RDMA mount.
This patchset is against the 2.6.24-rc3 kernel tree.
Signature · 1 line
Signed-off-by: Tom Tucker <[email protected]>
A message that is not in the archive (sent off-list or not yet received): 20071129223917.14563.77633.stgit-gUwIgmpLGaKNDNWfRnPdfg@public.gmane.org
RFC PATCH 1/38 svc: Add an svc transport class
The transport class (svc_xprt_class) represents a type of transport, e.g. udp, tcp, rdma. A transport class has a unique name and a set of transport operations kept in the svc_xprt_ops structure.
A transport class can be dynamically registered and unregisterd. The svc_xprt_class represents the module that implements the transport type and keeps reference counts on the module to avoid unloading while there are active users.
The endpoint (svc_xprt) is a generic, transport independent endpoint that can be used to send and receive data for an RPC service. It inherits it's operations from the transport class.
A transport driver module registers and unregisters itself with svc sunrpc by calling svc_reg_xprt_class, and svc_unreg_xprt_class respectively.
---
include/linux/sunrpc/debug.h | 1 include/linux/sunrpc/svc_xprt.h | 31 +++++++++++++ net/sunrpc/Makefile | 3 + net/sunrpc/svc_xprt.c | 95 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 129 insertions(+), 1 deletions(-)
include/linux/sunrpc/debug.h +1 -0
@@ -21,6 +21,7 @@#define RPCDBG_SCHED 0x0040#define RPCDBG_TRANS 0x0080#define RPCDBG_SVCSOCK 0x0100 +#define RPCDBG_SVCXPRT 0x0100#define RPCDBG_SVCDSP 0x0200#define RPCDBG_MISC 0x0400#define RPCDBG_CACHE 0x0800
include/linux/sunrpc/svc_xprt.h new file +31 -0
@@ -0,0 +1,31 @@ +/* +* linux/include/linux/sunrpc/svc_xprt.h +* +* RPC server transport I/O +*/ + +#ifndef SUNRPC_SVC_XPRT_H +#define SUNRPC_SVC_XPRT_H + +#include <linux/sunrpc/svc.h> + +struct svc_xprt_ops { +}; + +struct svc_xprt_class { +const char *xcl_name; +struct module *xcl_owner; +struct svc_xprt_ops *xcl_ops; +struct list_head xcl_list; +}; + +struct svc_xprt { +struct svc_xprt_class *xpt_class; +struct svc_xprt_ops *xpt_ops; +}; + +int svc_reg_xprt_class (struct svc_xprt_class *); +int svc_unreg_xprt_class (struct svc_xprt_class *); +void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *); + +#endif /* SUNRPC_SVC_XPRT_H */
net/sunrpc/Makefile +2 -1
@@ -11,6 +11,7 @@ sunrpc-y := clnt.o xprt.o socklib.o xprtsock.o sched.o \ auth.o auth_null.o auth_unix.o \ svc.o svcsock.o svcauth.o svcauth_unix.o \ rpcb_clnt.o timer.o xdr.o \ - sunrpc_syms.o cache.o rpc_pipe.o + sunrpc_syms.o cache.o rpc_pipe.o \ + svc_xprt.o sunrpc-$(CONFIG_PROC_FS) += stats.o sunrpc-$(CONFIG_SYSCTL) += sysctl.o
net/sunrpc/svc_xprt.c new file +95 -0
95 lines not on this page · raw message
RFC PATCH 2/38 svc: Make svc_sock the tcp/udp transport
In reply to a message not in the archiveMake TCP and UDP svc_sock transports, and register them with the svc transport core.
A transport type (svc_sock) has an svc_xprt as its first member, and calls svc_xprt_init to initialize this field.
---
include/linux/sunrpc/debug.h | 1 - include/linux/sunrpc/svcsock.h | 4 ++++ net/sunrpc/sunrpc_syms.c | 4 +++- net/sunrpc/svcsock.c | 33 ++++++++++++++++++++++++++++++++- 4 files changed, 39 insertions(+), 3 deletions(-)
include/linux/sunrpc/debug.h +0 -1
@@ -20,7 +20,6 @@#define RPCDBG_BIND 0x0020#define RPCDBG_SCHED 0x0040#define RPCDBG_TRANS 0x0080 -#define RPCDBG_SVCSOCK 0x0100#define RPCDBG_SVCXPRT 0x0100#define RPCDBG_SVCDSP 0x0200#define RPCDBG_MISC 0x0400
include/linux/sunrpc/svcsock.h +4 -0
@@ -10,11 +10,13 @@#define SUNRPC_SVCSOCK_H #include <linux/sunrpc/svc.h> +#include <linux/sunrpc/svc_xprt.h> /* * RPC server socket. */ struct svc_sock { +struct svc_xprt sk_xprt;struct list_head sk_ready;/* list of ready sockets */ struct list_head sk_list;/* list of all sockets */ struct socket * sk_sock;/* berkeley socket layer */
@@ -78,6 +80,8 @@ int svc_addsock(struct svc_serv *serv,int fd, char *name_return, int *proto); +void svc_init_xprt_sock (void ); +void svc_cleanup_xprt_sock (void );/* * svc_makesock socket characteristics
net/sunrpc/sunrpc_syms.c +3 -1
@@ -151,7 +151,8 @@ init_sunrpc(void)#endif cache_register (&ip_map_cache);cache_register (&unix_gid_cache); -init_socket_xprt (); +svc_init_xprt_sock ();/* svc sock transport */ +init_socket_xprt ();/* clnt sock transport */ rpcauth_init_module (); out:return err;
@@ -162,6 +163,7 @@ cleanup_sunrpc(void) {rpcauth_remove_module ();cleanup_socket_xprt (); +svc_cleanup_xprt_sock ();unregister_rpc_pipefs ();rpc_destroy_mempool ();if (cache_unregister (&ip_map_cache))
net/sunrpc/svcsock.c +32 -1
@@ -75,7 +75,7 @@* */ -#define RPCDBG_FACILITY RPCDBG_SVCSOCK +#define RPCDBG_FACILITY RPCDBG_SVCXPRT static struct svc_sock *svc_setup_socket(struct svc_serv *, struct socket *,
@@ -900,12 +900,21 @@ svc_udp_sendto(struct svc_rqst *rqstp)return error; } +static struct svc_xprt_ops svc_udp_ops = { +}; + +static struct svc_xprt_class svc_udp_class = { + .xcl_name ="udp" , + .xcl_ops = &svc_udp_ops, +}; +static void svc_udp_init (struct svc_sock *svsk) {int one =1 ;mm_segment_t oldfs; +svc_xprt_init (&svc_udp_class, &svsk->sk_xprt); svsk->sk_sk->sk_data_ready = svc_udp_data_ready; svsk->sk_sk->sk_write_space = svc_write_space; svsk->sk_recvfrom = svc_udp_recvfrom;
@@ -1344,12 +1353,33 @@ svc_tcp_sendto(struct svc_rqst *rqstp)return sent; } +static struct svc_xprt_ops svc_tcp_ops = { +}; + +static struct svc_xprt_class svc_tcp_class = { + .xcl_name ="tcp" , + .xcl_ops = &svc_tcp_ops, +}; + +void svc_init_xprt_sock (void ) +{ +svc_reg_xprt_class (&svc_tcp_class); +svc_reg_xprt_class (&svc_udp_class); +} + +void svc_cleanup_xprt_sock (void ) +{ +svc_unreg_xprt_class (&svc_tcp_class); +svc_unreg_xprt_class (&svc_udp_class); +} +static void svc_tcp_init (struct svc_sock *svsk) {struct sock *sk = svsk->sk_sk;struct tcp_sock *tp =tcp_sk (sk); +svc_xprt_init (&svc_tcp_class, &svsk->sk_xprt); svsk->sk_recvfrom = svc_tcp_recvfrom; svsk->sk_sendto = svc_tcp_sendto;
@@ -1965,3 +1995,4 @@ static struct svc_deferred_req *svc_deferred_dequeue(struct svc_sock *svsk)spin_unlock (&svsk->sk_lock);return dr; } +
RFC PATCH 3/38 svc: Change the svc_sock in the rqstp structure to a transport
In reply to a message not in the archiveThe rqstp structure contains a pointer to the transport for the RPC request. This functionaly trivial patch adds an unamed union with pointers to both svc_sock and svc_xprt. Ultimately the union will be removed and only the rq_xprt field will remain. This allows incrementally extracting transport independent interfaces without one gigundo patch.
---
include/linux/sunrpc/svc.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
include/linux/sunrpc/svc.h +4 -1
@@ -204,7 +204,10 @@ union svc_addr_u {struct svc_rqst {struct list_head rq_list;/* idle list */ struct list_head rq_all;/* all threads list */ -struct svc_sock * rq_sock;/* socket */ +union { +struct svc_xprt * rq_xprt;/* transport ptr */ +struct svc_sock * rq_sock;/* socket ptr */ + };struct sockaddr_storage rq_addr;/* peer address */ size_t rq_addrlen;
RFC PATCH 4/38 svc: Add a max payload value to the transport
In reply to a message not in the archiveThe svc_max_payload function currently looks at the socket type to determine the max payload. Add a max payload value to svc_xprt_class so it can be returned directly.
---
include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svc.c | 4 +--- net/sunrpc/svcsock.c | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -17,6 +17,7 @@ struct svc_xprt_class {struct module *xcl_owner;struct svc_xprt_ops *xcl_ops;struct list_head xcl_list; +u32 xcl_max_payload; };struct svc_xprt {
net/sunrpc/svc.c +1 -3
@@ -1054,10 +1054,8 @@ err_bad:*/ u32 svc_max_payload (const struct svc_rqst *rqstp) { -int max =RPCSVC_MAXPAYLOAD_TCP ; +int max = rqstp->rq_xprt->xpt_class->xcl_max_payload; -if (rqstp->rq_sock->sk_sock->type ==SOCK_DGRAM ) - max =RPCSVC_MAXPAYLOAD_UDP ;if (rqstp->rq_server->sv_max_payload < max) max = rqstp->rq_server->sv_max_payload;return max;
net/sunrpc/svcsock.c +2 -0
@@ -906,6 +906,7 @@ static struct svc_xprt_ops svc_udp_ops = {static struct svc_xprt_class svc_udp_class = { .xcl_name ="udp" , .xcl_ops = &svc_udp_ops, + .xcl_max_payload =RPCSVC_MAXPAYLOAD_UDP , }; static void
@@ -1359,6 +1360,7 @@ static struct svc_xprt_ops svc_tcp_ops = {static struct svc_xprt_class svc_tcp_class = { .xcl_name ="tcp" , .xcl_ops = &svc_tcp_ops, + .xcl_max_payload =RPCSVC_MAXPAYLOAD_TCP , };void svc_init_xprt_sock (void )
A message that is not in the archive (sent off-list or not yet received): 20071129224002.14563.96227.stgit-gUwIgmpLGaKNDNWfRnPdfg@public.gmane.org
Re: [RFC,PATCH 04/38] svc: Add a max payload value to the transport
Quoted 29 lines · Tom Tucker
The
svc_max_payloadfunction currently looks at the socket type to determine the max payload. Add a max payload value tosvc_xprt_classso it can be returned directly.Signed-off-by Tom Tucker <[email protected]>---
include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svc.c | 4 +--- net/sunrpc/svcsock.c | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-)include/linux/sunrpc/svc_xprt.h +1
-0@@ -17,6 +17,7 @@ struct svc_xprt_class {struct module *xcl_owner;struct svc_xprt_ops *xcl_ops;struct list_head xcl_list; +u32 xcl_max_payload; };struct svc_xprt {net/sunrpc/svc.c +0
-0
net/sunrpc/svc.c err_bad: · line 1057
Quoted 5 lines
net/sunrpc/svc.c +1
-1@@ -1054,10 +1054,8 @@ err_bad:*/ u32 svc_max_payload (const struct svc_rqst *rqstp) { -int max =RPCSVC_MAXPAYLOAD_TCP ; +int max = rqstp->rq_xprt->xpt_class->xcl_max_payload;
Nit: xcl_max_payload is unsigned, as is sv_max_payload, and so is the return type of the svc_max_payload() function, so the automatic variable "max" should also be an unsigned integral type. (Implicit type conversion in the comparison below prevents this from being an actual bug).
Quoted 18 lines
net/sunrpc/svc.c +0
-2-if (rqstp->rq_sock->sk_sock->type ==SOCK_DGRAM ) - max =RPCSVC_MAXPAYLOAD_UDP ;if (rqstp->rq_server->sv_max_payload < max) max = rqstp->rq_server->sv_max_payload;return max;net/sunrpc/svcsock.c +1
-0@@ -906,6 +906,7 @@ static struct svc_xprt_ops svc_udp_ops = {static struct svc_xprt_class svc_udp_class = { .xcl_name ="udp" , .xcl_ops = &svc_udp_ops, + .xcl_max_payload =RPCSVC_MAXPAYLOAD_UDP , }; static void
net/sunrpc/svcsock.c static struct svc_xprt_ops svc_tcp_ops = { · line 1366
Quoted 7 lines
net/sunrpc/svcsock.c +1
-0@@ -1359,6 +1360,7 @@ static struct svc_xprt_ops svc_tcp_ops = {static struct svc_xprt_class svc_tcp_class = { .xcl_name ="tcp" , .xcl_ops = &svc_tcp_ops, + .xcl_max_payload =RPCSVC_MAXPAYLOAD_TCP , };void svc_init_xprt_sock (void )
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
Re: [RFC,PATCH 04/38] svc: Add a max payload value to the transport
Thanks Chuck, I'll fix this.
Quoted 73 lines · Chuck Lever
Quoted 31 lines · Tom Tucker
The
svc_max_payloadfunction currently looks at the socket type to determine the max payload. Add a max payload value tosvc_xprt_class
so it can be returned directly.Signed-off-by Tom Tucker <[email protected]>---
include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svc.c | 4 +--- net/sunrpc/svcsock.c | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-)include/linux/sunrpc/ renamed from include/linux/sunrpc/svc_xprt.h +0
-0
svc_xprt.h
index a8b1da8..b4ce054 100644include/linux/sunrpc/svc_xprt.h +1
-0@@ -17,6 +17,7 @@ struct svc_xprt_class {struct module *xcl_owner;struct svc_xprt_ops *xcl_ops;struct list_head xcl_list; +u32 xcl_max_payload; };struct svc_xprt {net/sunrpc/svc.c +0
-0net/sunrpc/svc.c err_bad: · line 1057
Quoted 5 lines
net/sunrpc/svc.c +1
-1@@ -1054,10 +1054,8 @@ err_bad:*/ u32 svc_max_payload (const struct svc_rqst *rqstp) { -int max =RPCSVC_MAXPAYLOAD_TCP ; +int max = rqstp->rq_xprt->xpt_class->xcl_max_payload;Nit:
xcl_max_payloadis unsigned, as issv_max_payload, and so is the return type of thesvc_max_payload()function, so the automatic variable "max" should also be an unsigned integral type. (Implicit type conversion in the comparison below prevents this from being an actual bug).Quoted 18 lines
net/sunrpc/svc.c +0
-2-if (rqstp->rq_sock->sk_sock->type ==SOCK_DGRAM ) - max =RPCSVC_MAXPAYLOAD_UDP ;if (rqstp->rq_server->sv_max_payload < max) max = rqstp->rq_server->sv_max_payload;return max;net/sunrpc/svcsock.c +1
-0@@ -906,6 +906,7 @@ static struct svc_xprt_ops svc_udp_ops = {static struct svc_xprt_class svc_udp_class = { .xcl_name ="udp" , .xcl_ops = &svc_udp_ops, + .xcl_max_payload =RPCSVC_MAXPAYLOAD_UDP , }; static voidnet/sunrpc/svcsock.c static struct svc_xprt_ops svc_tcp_ops = { · line 1366
Quoted 7 lines
net/sunrpc/svcsock.c +1
-0@@ -1359,6 +1360,7 @@ static struct svc_xprt_ops svc_tcp_ops = {static struct svc_xprt_class svc_tcp_class = { .xcl_name ="tcp" , .xcl_ops = &svc_tcp_ops, + .xcl_max_payload =RPCSVC_MAXPAYLOAD_TCP , };void svc_init_xprt_sock (void )--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
RFC PATCH 5/38 svc: Move sk_sendto and sk_recvfrom to svc_xprt_class
In reply to a message not in the archiveThe sk_sendto and sk_recvfrom are function pointers that allow svc_sock to be used for both UDP and TCP. Move these function pointers to the svc_xprt_ops structure.
---
include/linux/sunrpc/svc_xprt.h | 2 ++ include/linux/sunrpc/svcsock.h | 3 --- net/sunrpc/svcsock.c | 12 ++++++------ 3 files changed, 8 insertions(+), 9 deletions(-)
include/linux/sunrpc/svc_xprt.h +2 -0
@@ -10,6 +10,8 @@#include <linux/sunrpc/svc.h> struct svc_xprt_ops { +int (*xpo_recvfrom)(struct svc_rqst *); +int (*xpo_sendto)(struct svc_rqst *); };struct svc_xprt_class {
include/linux/sunrpc/svcsock.h +0 -3
@@ -45,9 +45,6 @@ struct svc_sock {* be revisted */ struct mutex sk_mutex;/* to serialize sending data */ -int (*sk_recvfrom)(struct svc_rqst *rqstp); -int (*sk_sendto)(struct svc_rqst *rqstp); -/* We keep the old state_change and data_ready CB's here */ void (*sk_ostate)(struct sock *);void (*sk_odata)(struct sock *,int bytes);
net/sunrpc/svcsock.c +6 -6
@@ -901,6 +901,8 @@ svc_udp_sendto(struct svc_rqst *rqstp) }static struct svc_xprt_ops svc_udp_ops = { + .xpo_recvfrom = svc_udp_recvfrom, + .xpo_sendto = svc_udp_sendto, };static struct svc_xprt_class svc_udp_class = {
@@ -918,8 +920,6 @@ svc_udp_init(struct svc_sock *svsk)svc_xprt_init (&svc_udp_class, &svsk->sk_xprt); svsk->sk_sk->sk_data_ready = svc_udp_data_ready; svsk->sk_sk->sk_write_space = svc_write_space; - svsk->sk_recvfrom = svc_udp_recvfrom; - svsk->sk_sendto = svc_udp_sendto;/* initialise setting must have enough space to * receive and respond to one request.
@@ -1355,6 +1355,8 @@ svc_tcp_sendto(struct svc_rqst *rqstp) }static struct svc_xprt_ops svc_tcp_ops = { + .xpo_recvfrom = svc_tcp_recvfrom, + .xpo_sendto = svc_tcp_sendto, };static struct svc_xprt_class svc_tcp_class = {
@@ -1382,8 +1384,6 @@ svc_tcp_init(struct svc_sock *svsk)struct tcp_sock *tp =tcp_sk (sk);svc_xprt_init (&svc_tcp_class, &svsk->sk_xprt); - svsk->sk_recvfrom = svc_tcp_recvfrom; - svsk->sk_sendto = svc_tcp_sendto;if (sk->sk_state ==TCP_LISTEN ) {dprintk ("setting up TCP socket for listening\n" );
@@ -1531,7 +1531,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)dprintk ("svc: server %p, pool %u, socket %p, inuse=%d\n" , rqstp, pool->sp_id, svsk,atomic_read (&svsk->sk_inuse)); - len = svsk->sk_recvfrom (rqstp); + len = svsk->sk_xprt.xpt_ops->xpo_recvfrom (rqstp);dprintk ("svc: got len=%d\n" , len);/* No data, incomplete (TCP) read, or accept() */
@@ -1591,7 +1591,7 @@ svc_send(struct svc_rqst *rqstp)if (test_bit (SK_DEAD , &svsk->sk_flags)) len = -ENOTCONN ;else - len = svsk->sk_sendto (rqstp); + len = svsk->sk_xprt.xpt_ops->xpo_sendto (rqstp);mutex_unlock (&svsk->sk_mutex);svc_sock_release (rqstp);
RFC PATCH 6/38 svc: Add transport specific xpo_release function
In reply to a message not in the archiveThe svc_sock_release function releases pages allocated to a thread. For UDP, this also returns the receive skb to the stack. For RDMA it will post a receive WR and bump the client credit count.
---
include/linux/sunrpc/svc.h | 2 +- include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svcsock.c | 17 +++++++++-------- 3 files changed, 11 insertions(+), 9 deletions(-)
include/linux/sunrpc/svc.h +1 -1
@@ -217,7 +217,7 @@ struct svc_rqst {struct auth_ops * rq_authop;/* authentication flavour */ u32 rq_flavor;/* pseudoflavor */ struct svc_cred rq_cred;/* auth info */ -struct sk_buff * rq_skbuff;/* fast recv inet buffer */ +void * rq_xprt_ctxt;/* transport specific context ptr */ struct svc_deferred_req *rq_deferred;/* deferred request we are replaying */ struct xdr_buf rq_arg;
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -12,6 +12,7 @@struct svc_xprt_ops {int (*xpo_recvfrom)(struct svc_rqst *);int (*xpo_sendto)(struct svc_rqst *); +void (*xpo_release_rqst)(struct svc_rqst *); };struct svc_xprt_class {
net/sunrpc/svcsock.c +9 -8
@@ -185,14 +185,13 @@ svc_thread_dequeue(struct svc_pool *pool, struct svc_rqst *rqstp)/* * Release an skbuff after use */ -static inline void -svc_release_skb (struct svc_rqst *rqstp) +static void svc_release_skb (struct svc_rqst *rqstp) { -struct sk_buff *skb = rqstp->rq_skbuff; +struct sk_buff *skb = rqstp->rq_xprt_ctxt;struct svc_deferred_req *dr = rqstp->rq_deferred;if (skb) { - rqstp->rq_skbuff =NULL ; + rqstp->rq_xprt_ctxt =NULL ;dprintk ("svc: service %p, releasing skb %p\n" , rqstp, skb);skb_free_datagram (rqstp->rq_sock->sk_sk, skb);
@@ -395,7 +394,7 @@ svc_sock_release(struct svc_rqst *rqstp) {struct svc_sock *svsk = rqstp->rq_sock; -svc_release_skb (rqstp); + rqstp->rq_xprt->xpt_ops->xpo_release_rqst (rqstp);svc_free_res_pages (rqstp); rqstp->rq_res.page_len =0 ;
@@ -867,7 +866,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)skb_free_datagram (svsk->sk_sk, skb);return 0 ; } - rqstp->rq_skbuff = skb; + rqstp->rq_xprt_ctxt = skb; } rqstp->rq_arg.page_base =0 ;
@@ -903,6 +902,7 @@ svc_udp_sendto(struct svc_rqst *rqstp)static struct svc_xprt_ops svc_udp_ops = { .xpo_recvfrom = svc_udp_recvfrom, .xpo_sendto = svc_udp_sendto, + .xpo_release_rqst = svc_release_skb, };static struct svc_xprt_class svc_udp_class = {
@@ -1291,7 +1291,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) rqstp->rq_arg.page_len = len - rqstp->rq_arg.head[0 ].iov_len; } - rqstp->rq_skbuff =NULL ; + rqstp->rq_xprt_ctxt =NULL ; rqstp->rq_prot =IPPROTO_TCP ;/* Reset TCP read info */
@@ -1357,6 +1357,7 @@ svc_tcp_sendto(struct svc_rqst *rqstp)static struct svc_xprt_ops svc_tcp_ops = { .xpo_recvfrom = svc_tcp_recvfrom, .xpo_sendto = svc_tcp_sendto, + .xpo_release_rqst = svc_release_skb, };static struct svc_xprt_class svc_tcp_class = {
@@ -1578,7 +1579,7 @@ svc_send(struct svc_rqst *rqstp) }/* release the receive skb before sending the reply */ -svc_release_skb (rqstp); + rqstp->rq_xprt->xpt_ops->xpo_release_rqst (rqstp);/* calculate over-all length */ xb = & rqstp->rq_res;
RFC PATCH 7/38 svc: Add per-transport delete functions
In reply to a message not in the archiveAdd transport specific xpo_detach and xpo_free functions. The xpo_detach function causes the transport to stop delivering data-ready events and enqueing the transport for I/O.
The xpo_free function frees all resources associated with the particular transport instance.
---
include/linux/sunrpc/svc_xprt.h | 2 + net/sunrpc/svcsock.c | 56 ++++++++++++++++++++++++++++++--------- 2 files changed, 45 insertions(+), 13 deletions(-)
include/linux/sunrpc/svc_xprt.h +2 -0
@@ -13,6 +13,8 @@ struct svc_xprt_ops {int (*xpo_recvfrom)(struct svc_rqst *);int (*xpo_sendto)(struct svc_rqst *);void (*xpo_release_rqst)(struct svc_rqst *); +void (*xpo_detach)(struct svc_xprt *); +void (*xpo_free)(struct svc_xprt *); };struct svc_xprt_class {
net/sunrpc/svcsock.c +43 -13
92 lines not on this page · raw message
RFC PATCH 8/38 svc: Add xpo_prep_reply_hdr
In reply to a message not in the archiveSome transports add fields to the RPC header for replies, e.g. the TCP record length. This function is called when preparing the reply header to allow each transport to add whatever fields it requires.
---
include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svc.c | 6 +++--- net/sunrpc/svcsock.c | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -11,6 +11,7 @@struct svc_xprt_ops {int (*xpo_recvfrom)(struct svc_rqst *); +void (*xpo_prep_reply_hdr)(struct svc_rqst *);int (*xpo_sendto)(struct svc_rqst *);void (*xpo_release_rqst)(struct svc_rqst *);void (*xpo_detach)(struct svc_xprt *);
net/sunrpc/svc.c +3 -3
@@ -839,9 +839,9 @@ svc_process(struct svc_rqst *rqstp) rqstp->rq_res.tail[0 ].iov_len =0 ;/* Will be turned off only in gss privacy case: */ rqstp->rq_splice_ok =1 ; -/* tcp needs a space for the record length... */ -if (rqstp->rq_prot ==IPPROTO_TCP ) -svc_putnl (resv,0 ); + +/* Setup reply header */ + rqstp->rq_xprt->xpt_ops->xpo_prep_reply_hdr (rqstp); rqstp->rq_xid =svc_getu32 (argv);svc_putu32 (resv, rqstp->rq_xid);
net/sunrpc/svcsock.c +17 -0
@@ -893,12 +893,17 @@ svc_udp_sendto(struct svc_rqst *rqstp)return error; } +static void svc_udp_prep_reply_hdr (struct svc_rqst *rqstp) +{ +} +static struct svc_xprt_ops svc_udp_ops = { .xpo_recvfrom = svc_udp_recvfrom, .xpo_sendto = svc_udp_sendto, .xpo_release_rqst = svc_release_skb, .xpo_detach = svc_sock_detach, .xpo_free = svc_sock_free, + .xpo_prep_reply_hdr = svc_udp_prep_reply_hdr, };static struct svc_xprt_class svc_udp_class = {
@@ -1350,12 +1355,24 @@ svc_tcp_sendto(struct svc_rqst *rqstp)return sent; } +/* +* Setup response header. TCP has a 4B record length field. +*/ +static void svc_tcp_prep_reply_hdr (struct svc_rqst *rqstp) +{ +struct kvec *resv = &rqstp->rq_res.head[0 ]; + +/* tcp needs a space for the record length... */ +svc_putnl (resv,0 ); +} +static struct svc_xprt_ops svc_tcp_ops = { .xpo_recvfrom = svc_tcp_recvfrom, .xpo_sendto = svc_tcp_sendto, .xpo_release_rqst = svc_release_skb, .xpo_detach = svc_sock_detach, .xpo_free = svc_sock_free, + .xpo_prep_reply_hdr = svc_tcp_prep_reply_hdr, };static struct svc_xprt_class svc_tcp_class = {
RFC PATCH 9/38 svc: Add a transport function that checks for write space
In reply to a message not in the archiveIn order to avoid blocking a service thread, the receive side checks to see if there is sufficient write space to reply to the request. Each transport has a different mechanism for determining if there is enough write space to reply.
The code that checked for white space was coupled with code that checked for CLOSE and CONN. These checks have been broken out into separate statements to make the code easier to read.
---
include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svcsock.c | 60 +++++++++++++++++++++++++++++++++------ 2 files changed, 51 insertions(+), 10 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -10,6 +10,7 @@#include <linux/sunrpc/svc.h> struct svc_xprt_ops { +int (*xpo_has_wspace)(struct svc_xprt *);int (*xpo_recvfrom)(struct svc_rqst *);void (*xpo_prep_reply_hdr)(struct svc_rqst *);int (*xpo_sendto)(struct svc_rqst *);
net/sunrpc/svcsock.c +50 -10
96 lines not on this page · raw message
A message that is not in the archive (sent off-list or not yet received): 20071129224012.14563.23130.stgit-gUwIgmpLGaKNDNWfRnPdfg@public.gmane.org
Re: [RFC,PATCH 09/38] svc: Add a transport function that checks for write space
Quoted 6 lines · Tom Tucker
In order to avoid blocking a service thread, the receive side checks to see if there is sufficient write space to reply to the request. Each transport has a different mechanism for determining if there is enough write space to reply.
The code that checked for white space was coupled with code that
s/white space/write space/
Quoted 41 lines
checked for CLOSE and CONN. These checks have been broken out into separate statements to make the code easier to read.
Signed-off-by Tom Tucker <[email protected]>---
include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svcsock.c | 60 ++++++++++++++++++++++++++++ +++++------ 2 files changed, 51 insertions(+), 10 deletions(-)include/linux/sunrpc/svc_xprt.h +1
-0@@ -10,6 +10,7 @@#include <linux/sunrpc/svc.h> struct svc_xprt_ops { +int (*xpo_has_wspace)(struct svc_xprt *);int (*xpo_recvfrom)(struct svc_rqst *);void (*xpo_prep_reply_hdr)(struct svc_rqst *);int (*xpo_sendto)(struct svc_rqst *);net/sunrpc/svcsock.c +5
-5@@ -269,22 +269,24 @@ svc_sock_enqueue(struct svc_sock *svsk)BUG_ON (svsk->sk_pool !=NULL ); svsk->sk_pool = pool; -set_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); -if (((atomic_read (&svsk->sk_reserved) + serv->sv_max_mesg)*2 - >svc_sock_wspace (svsk)) - && !test_bit (SK_CLOSE , &svsk->sk_flags) - && !test_bit (SK_CONN , &svsk->sk_flags)) { +/* Handle pending connection */ +if (test_bit (SK_CONN , &svsk->sk_flags)) + goto process; + +/* Handle close in-progress */
net/sunrpc/svcsock.c svc_sock_enqueue(struct svc_sock *svsk) · line 283
Quoted 10 lines
net/sunrpc/svcsock.c +6
-3+if (test_bit (SK_CLOSE , &svsk->sk_flags)) + goto process; + +/* Check if we have space to reply to a request */ +if (!svsk->sk_xprt.xpt_ops->xpo_has_wspace (&svsk->sk_xprt)) {/* Don't enqueue while not enough space for reply */ -dprintk ("svc: socket %p no space, %d*2 > %ld, not enqueued\n" , - svsk->sk_sk,atomic_read (&svsk->sk_reserved)+serv->sv_max_mesg, -svc_sock_wspace (svsk)); +dprintk ("svc: no write space, socket %p not enqueued\n" , svsk);
Since you remove the only callers of svc_sock_wspace here, you can probably safely delete that function in this patch as well.
Quoted 19 lines
net/sunrpc/svcsock.c +4
-2svsk->sk_pool =NULL ;clear_bit (SK_BUSY , &svsk->sk_flags); goto out_unlock; } -clear_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); - + process:if (!list_empty (&pool->sp_threads)) { rqstp = list_entry(pool->sp_threads.next, struct svc_rqst,@@ -897,6 +899,24 @@ static void svc_udp_prep_reply_hdr(struct svc_rqst *rqstp) { } +static int svc_udp_has_wspace (struct svc_xprt *xprt) +{ + struct svc_sock *svsk = container_of(xprt, struct svc_sock,
net/sunrpc/svcsock.c static void svc_udp_prep_reply_hdr(struct · line 915
Quoted 10 lines
net/sunrpc/svcsock.c +9
-0sk_xprt); +struct svc_serv *serv = svsk->sk_server; +int required; + +/* +* Set the SOCK_NOSPACE flag before checking the available +* sock space. +*/ +set_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); + required =atomic_read (&svsk->sk_reserved) + serv->sv_max_mesg;
The result of the sum is unsigned, but then we stuff it into a signed integer...
net/sunrpc/svcsock.c static void svc_udp_prep_reply_hdr(struct svc_rqst *rqstp) · line 915
Quoted 2 lines
net/sunrpc/svcsock.c +2
-0+if (required*2 >sock_wspace (svsk->sk_sk)) +return 0 ;
...and then this introduces a mixed sign comparison (harmless AFAICT). Perhaps "required" should be an unsigned long.
Also, some may prefer "<< 1" to "* 2". I'm not sure it makes much difference here. Arguably, it might be slightly better documentation to double "required" before the if statement.
Quoted 23 lines
net/sunrpc/svcsock.c +4
-0+clear_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); +return 1 ; +} +static struct svc_xprt_ops svc_udp_ops = {net/sunrpc/svcsock.c +4
-0.xpo_recvfrom = svc_udp_recvfrom, .xpo_sendto = svc_udp_sendto,@@ -904,6 +924,7 @@ static struct svc_xprt_ops svc_udp_ops = { .xpo_detach = svc_sock_detach, .xpo_free = svc_sock_free, .xpo_prep_reply_hdr = svc_udp_prep_reply_hdr, + .xpo_has_wspace = svc_udp_has_wspace, };static struct svc_xprt_class svc_udp_class = {@@ -1366,6 +1387,24 @@ static void svc_tcp_prep_reply_hdr(struct svc_rqst *rqstp) svc_putnl(resv, 0); } +static int svc_tcp_has_wspace (struct svc_xprt *xprt) +{ + struct svc_sock *svsk = container_of(xprt, struct svc_sock,
net/sunrpc/svcsock.c static void svc_tcp_prep_reply_hdr(struct · line 1403
Quoted 10 lines
net/sunrpc/svcsock.c +9
-0sk_xprt); +struct svc_serv *serv = svsk->sk_server; +int required; + +/* +* Set the SOCK_NOSPACE flag before checking the available +* sock space. +*/ +set_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); + required =atomic_read (&svsk->sk_reserved) + serv->sv_max_mesg;
Ibid.
net/sunrpc/svcsock.c static void svc_tcp_prep_reply_hdr(struct svc_rqst *rqstp) · line 1403
Quoted 2 lines
net/sunrpc/svcsock.c +2
-0+if (required*2 >sk_stream_wspace (svsk->sk_sk)) +return 0 ;
Oddly sk_stream_wspace() returns an int, but sock_space() returns an unsigned long. Sigh...
Quoted 8 lines
net/sunrpc/svcsock.c +4
-0+clear_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); +return 1 ; +} +static struct svc_xprt_ops svc_tcp_ops = {net/sunrpc/svcsock.c +0
-0.xpo_recvfrom = svc_tcp_recvfrom, .xpo_sendto = svc_tcp_sendto,
net/sunrpc/svcsock.c static struct svc_xprt_ops svc_tcp_ops = { · line 1418
Quoted 7 lines
net/sunrpc/svcsock.c +1
-0@@ -1373,6 +1412,7 @@ static struct svc_xprt_ops svc_tcp_ops = { .xpo_detach = svc_sock_detach, .xpo_free = svc_sock_free, .xpo_prep_reply_hdr = svc_tcp_prep_reply_hdr, + .xpo_has_wspace = svc_tcp_has_wspace, };static struct svc_xprt_class svc_tcp_class = {
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
Re: [RFC,PATCH 09/38] svc: Add a transport function that checks for write space
Quoted 9 lines · Chuck Lever
Quoted 6 lines · Tom Tucker
In order to avoid blocking a service thread, the receive side checks to see if there is sufficient write space to reply to the request. Each transport has a different mechanism for determining if there is enough write space to reply.
The code that checked for white space was coupled with code that
s/white space/write space/
ok.
Quoted 48 lines
Quoted 48 lines
checked for CLOSE and CONN. These checks have been broken out into separate statements to make the code easier to read.
Signed-off-by Tom Tucker <[email protected]>---
include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svcsock.c | 60 ++++++++++++++++++++++++++++ +++++------ 2 files changed, 51 insertions(+), 10 deletions(-)include/linux/sunrpc/ renamed from include/linux/sunrpc/svc_xprt.h +0
-0
svc_xprt.h
index 8501115..3adc8f3 100644include/linux/sunrpc/svc_xprt.h +1
-0@@ -10,6 +10,7 @@#include <linux/sunrpc/svc.h> struct svc_xprt_ops { +int (*xpo_has_wspace)(struct svc_xprt *);int (*xpo_recvfrom)(struct svc_rqst *);void (*xpo_prep_reply_hdr)(struct svc_rqst *);int (*xpo_sendto)(struct svc_rqst *);net/sunrpc/svcsock.c +10
-5@@ -269,22 +269,24 @@ svc_sock_enqueue(struct svc_sock *svsk)BUG_ON (svsk->sk_pool !=NULL ); svsk->sk_pool = pool; -set_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); -if (((atomic_read (&svsk->sk_reserved) + serv->sv_max_mesg)*2 - >svc_sock_wspace (svsk)) - && !test_bit (SK_CLOSE , &svsk->sk_flags) - && !test_bit (SK_CONN , &svsk->sk_flags)) { +/* Handle pending connection */ +if (test_bit (SK_CONN , &svsk->sk_flags)) + goto process; + +/* Handle close in-progress */ +if (test_bit (SK_CLOSE , &svsk->sk_flags)) + goto process; + +/* Check if we have space to reply to a request */ +if (!svsk->sk_xprt.xpt_ops->xpo_has_wspace (&svsk->sk_xprt)) {
Quoted 9 lines
net/sunrpc/svcsock.c svc_sock_enqueue(struct svc_sock *svsk) · line 283
Quoted 5 lines
net/sunrpc/svcsock.c +1
-3/* Don't enqueue while not enough space for reply */ -dprintk ("svc: socket %p no space, %d*2 > %ld, not enqueued\n" , - svsk->sk_sk,atomic_read (&svsk->sk_reserved)+serv->sv_max_mesg, -svc_sock_wspace (svsk)); +dprintk ("svc: no write space, socket %p not enqueued\n" , svsk);Since you remove the only callers of
svc_sock_wspacehere, you can probably safely delete that function in this patch as well.
ok.
Quoted 33 lines
Quoted 19 lines
net/sunrpc/svcsock.c +4
-2svsk->sk_pool =NULL ;clear_bit (SK_BUSY , &svsk->sk_flags); goto out_unlock; } -clear_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); - + process:if (!list_empty (&pool->sp_threads)) { rqstp = list_entry(pool->sp_threads.next, struct svc_rqst,@@ -897,6 +899,24 @@ static void svc_udp_prep_reply_hdr(struct svc_rqst *rqstp) { } +static int svc_udp_has_wspace (struct svc_xprt *xprt) +{ + struct svc_sock *svsk = container_of(xprt, struct svc_sock,net/sunrpc/svcsock.c static void svc_udp_prep_reply_hdr(struct · line 915
Quoted 10 lines
net/sunrpc/svcsock.c +9
-0sk_xprt); +struct svc_serv *serv = svsk->sk_server; +int required; + +/* +* Set the SOCK_NOSPACE flag before checking the available +* sock space. +*/ +set_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); + required =atomic_read (&svsk->sk_reserved) + serv->sv_max_mesg;The result of the sum is unsigned, but then we stuff it into a signed integer...
Quoted 6 lines
net/sunrpc/svcsock.c static void svc_udp_prep_reply_hdr(struct svc_rqst *rqstp) · line 915
Quoted 2 lines
net/sunrpc/svcsock.c +2
-0+if (required*2 >sock_wspace (svsk->sk_sk)) +return 0 ;...and then this introduces a mixed sign comparison (harmless AFAICT). Perhaps "required" should be an unsigned long.
So for svc_udp_has_wspace, it makes sense for required to be unsigned, and then demote to signed on return. Yes?
Quoted 41 lines
Also, some may prefer "<< 1" to "* 2". I'm not sure it makes much difference here. Arguably, it might be slightly better documentation to double "required" before the if statement.
Quoted 23 lines
net/sunrpc/svcsock.c +4
-0+clear_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); +return 1 ; +} +static struct svc_xprt_ops svc_udp_ops = {net/sunrpc/svcsock.c +4
-0.xpo_recvfrom = svc_udp_recvfrom, .xpo_sendto = svc_udp_sendto,@@ -904,6 +924,7 @@ static struct svc_xprt_ops svc_udp_ops = { .xpo_detach = svc_sock_detach, .xpo_free = svc_sock_free, .xpo_prep_reply_hdr = svc_udp_prep_reply_hdr, + .xpo_has_wspace = svc_udp_has_wspace, };static struct svc_xprt_class svc_udp_class = {@@ -1366,6 +1387,24 @@ static void svc_tcp_prep_reply_hdr(struct svc_rqst *rqstp) svc_putnl(resv, 0); } +static int svc_tcp_has_wspace (struct svc_xprt *xprt) +{ + struct svc_sock *svsk = container_of(xprt, struct svc_sock,net/sunrpc/svcsock.c static void svc_tcp_prep_reply_hdr(struct · line 1403
Quoted 10 lines
net/sunrpc/svcsock.c +9
-0sk_xprt); +struct svc_serv *serv = svsk->sk_server; +int required; + +/* +* Set the SOCK_NOSPACE flag before checking the available +* sock space. +*/ +set_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); + required =atomic_read (&svsk->sk_reserved) + serv->sv_max_mesg;Ibid.
Quoted 5 lines
net/sunrpc/svcsock.c static void svc_tcp_prep_reply_hdr(struct svc_rqst *rqstp) · line 1403
Quoted 2 lines
net/sunrpc/svcsock.c +2
-0+if (required*2 >sk_stream_wspace (svsk->sk_sk)) +return 0 ;Oddly
sk_stream_wspace()returns an int, butsock_space()returns an unsigned long. Sigh...
For this one, let's leave required signed and add an explicit cast to serv->sv_max_mesg. Sound ok?
What a mess...
Quoted 20 lines
Quoted 9 lines
net/sunrpc/svcsock.c +4
-0+clear_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); +return 1 ; +} +static struct svc_xprt_ops svc_tcp_ops = {net/sunrpc/svcsock.c +0
-0.xpo_recvfrom = svc_tcp_recvfrom, .xpo_sendto = svc_tcp_sendto,net/sunrpc/svcsock.c static struct svc_xprt_ops svc_tcp_ops = { · line 1418
Quoted 7 lines
net/sunrpc/svcsock.c +1
-0@@ -1373,6 +1412,7 @@ static struct svc_xprt_ops svc_tcp_ops = { .xpo_detach = svc_sock_detach, .xpo_free = svc_sock_free, .xpo_prep_reply_hdr = svc_tcp_prep_reply_hdr, + .xpo_has_wspace = svc_tcp_has_wspace, };static struct svc_xprt_class svc_tcp_class = {--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [RFC,PATCH 09/38] svc: Add a transport function that checks for write space
Quoted 30 lines · Tom Tucker
Quoted 18 lines · Chuck Lever
net/sunrpc/svcsock.c static void svc_udp_prep_reply_hdr(struct svc_rqst *rqstp) · line 913
Quoted 13 lines · Tom Tucker
net/sunrpc/svcsock.c +3
-0+static int svc_udp_has_wspace (struct svc_xprt *xprt) +{ + struct svc_sock *svsk = container_of(xprt, struct svc_sock,
sk_xprt);net/sunrpc/svcsock.c +9
-0+struct svc_serv *serv = svsk->sk_server; +int required; + +/* +* Set the SOCK_NOSPACE flag before checking the available +* sock space. +*/ +set_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); + required =atomic_read (&svsk->sk_reserved) + serv->sv_max_mesg;The result of the sum is unsigned, but then we stuff it into a signed integer...
Quoted 6 lines
net/sunrpc/svcsock.c static void svc_udp_prep_reply_hdr(struct svc_rqst *rqstp) · line 915
Quoted 2 lines
net/sunrpc/svcsock.c +2
-0+if (required*2 >sock_wspace (svsk->sk_sk)) +return 0 ;...and then this introduces a mixed sign comparison (harmless AFAICT). Perhaps "required" should be an unsigned long.
So for
svc_udp_has_wspace, it makes sense for required to be unsigned, and then demote to signed on return. Yes?Quoted 1 line
Quoted 7 lines
Quoted 7 lines
Also, some may prefer "<< 1" to "* 2". I'm not sure it makes much difference here. Arguably, it might be slightly better documentation to double "required" before the if statement.
net/sunrpc/svcsock.c static void svc_udp_prep_reply_hdr(struct svc_rqst *rqstp) · line 918
Quoted 3 lines
net/sunrpc/svcsock.c +3
-0+clear_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); +return 1 ; +}
As far as I can tell you never return "required." The result of svc_udp_has_wspace() is really a boolean, right? Or did I miss your point?
Quoted 33 lines
Quoted 33 lines
Quoted 20 lines
net/sunrpc/svcsock.c +5
-0+static struct svc_xprt_ops svc_udp_ops = { .xpo_recvfrom = svc_udp_recvfrom, .xpo_sendto = svc_udp_sendto,@@ -904,6 +924,7 @@ static struct svc_xprt_ops svc_udp_ops = { .xpo_detach = svc_sock_detach, .xpo_free = svc_sock_free, .xpo_prep_reply_hdr = svc_udp_prep_reply_hdr, + .xpo_has_wspace = svc_udp_has_wspace, };static struct svc_xprt_class svc_udp_class = {@@ -1366,6 +1387,24 @@ static void svc_tcp_prep_reply_hdr(struct svc_rqst *rqstp) svc_putnl(resv, 0); } +static int svc_tcp_has_wspace (struct svc_xprt *xprt) +{ + struct svc_sock *svsk = container_of(xprt, struct svc_sock,net/sunrpc/svcsock.c static void svc_tcp_prep_reply_hdr(struct · line 1403
Quoted 10 lines
net/sunrpc/svcsock.c +9
-0sk_xprt); +struct svc_serv *serv = svsk->sk_server; +int required; + +/* +* Set the SOCK_NOSPACE flag before checking the available +* sock space. +*/ +set_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); + required =atomic_read (&svsk->sk_reserved) + serv->sv_max_mesg;Ibid.
Quoted 8 lines
Quoted 5 lines
net/sunrpc/svcsock.c static void svc_tcp_prep_reply_hdr(struct svc_rqst *rqstp) · line 1403
Quoted 2 lines
net/sunrpc/svcsock.c +2
-0+if (required*2 >sk_stream_wspace (svsk->sk_sk)) +return 0 ;Oddly
sk_stream_wspace()returns an int, butsock_space()returns an unsigned long. Sigh...For this one, let's leave required signed and add an explicit cast to
serv->sv_max_mesg. Sound ok?
If sk_reserved goes negative, it will be converted to unsigned, and become a very large positive number. The result of the sum will be recast back to an int when it's assigned to "required," and we probably get a reasonable result. I doubt an explicit cast will change things at all.
Instead, perhaps we should add an explicit check to ensure sk_reserved is a reasonable positive value before doing any other checks. (Likewise in the UDP case as well).
I wonder if this is really the correct write space check to use for TCP, though. I remember fixing a similar issue in the RPC client a long time ago -- both UDP and TCP used the same wspace check. It resulted in the sk_write_space callback hammering on the RPC client, and forward progress on TCP socket writes would slow to a crawl.
You probably want something like this instead:
set_bit(SOCK_NOSPACE, &svsk->sk_sock->flags); required = atomic_read(&svsk->sk_reserved) + serv->sv_max_mesg; wspace = sk_stream_wspace(svsk->sk_sk); if (wspace < sk_stream_min_wspace(svsk->sk_sk)) return 0; if (required * 2 > wspace) return 0; clear_bit(SOCK_NOSPACE, &svsk->sk_sock->flags); return 1;
The first test mimics sk_stream_write_space() and xs_tcp_write_space(). I'm still unsure what to do about the possibility of one of these signed integers going negative on us.
Bruce? Neil? What sayest thou?
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
net/sunrpc/svcsock.c +4
-0+clear_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); +return 1 ; +} +static struct svc_xprt_ops svc_tcp_ops = {net/sunrpc/svcsock.c +1
-0.xpo_recvfrom = svc_tcp_recvfrom, .xpo_sendto = svc_tcp_sendto,@@ -1373,6 +1412,7 @@ static struct svc_xprt_ops svc_tcp_ops = { .xpo_detach = svc_sock_detach, .xpo_free = svc_sock_free, .xpo_prep_reply_hdr = svc_tcp_prep_reply_hdr, + .xpo_has_wspace = svc_tcp_has_wspace, };
Quoted 1 line
Quoted 1 line
net/sunrpc/svcsock.c static struct svc_xprt_ops svc_tcp_ops = { · line 1418
Quoted 1 line
net/sunrpc/svcsock.c +0
-0static struct svc_xprt_class svc_tcp_class = {
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
Re: [RFC,PATCH 09/38] svc: Add a transport function that checks for write space
Quoted 1 line · Chuck Lever
On Nov 30, 2007, at 4:39 PM, Tom Tucker wrote:
[...snip...]
Quoted 14 lines
Quoted 3 lines
For this one, let's leave required signed and add an explicit cast to
serv->sv_max_mesg. Sound ok?If
sk_reservedgoes negative, it will be converted to unsigned, and become a very large positive number. The result of the sum will be recast back to an int when it's assigned to "required," and we probably get a reasonable result. I doubt an explicit cast will change things at all.Instead, perhaps we should add an explicit check to ensure
sk_reservedis a reasonable positive value before doing any other checks. (Likewise in the UDP case as well).
Quoted 5 lines
I wonder if this is really the correct write space check to use for TCP, though. I remember fixing a similar issue in the RPC client a long time ago -- both UDP and TCP used the same wspace check. It resulted in the
sk_write_spacecallback hammering on the RPC client, and forward progress on TCP socket writes would slow to a crawl.
For the server, the callback function is svc_write_space. Does the sk_stream_wspace() < sk_stream_min_wspace() check belong in there as well? I think this callback gets invoked whenever productive acks are received for the connection. In other words, I don't see how it avoids "hammering" the callback, rather it avoids fruitlessly waking up (i.e. calling svc_xprt_enqueue) a transport.
I'm going to optimistically add it. Please let me know if there are objections.
Quoted 16 lines
You probably want something like this instead:
set_bit(SOCK_NOSPACE, &svsk->sk_sock->flags); required = atomic_read(&svsk->sk_reserved) + serv->sv_max_mesg; wspace = sk_stream_wspace(svsk->sk_sk); if (wspace < sk_stream_min_wspace(svsk->sk_sk)) return 0; if (required * 2 > wspace) return 0; clear_bit(SOCK_NOSPACE, &svsk->sk_sock->flags); return 1;
I think this is good stuff and will add it unless someone has an objection.
Quoted 29 lines
The first test mimics
sk_stream_write_space()andxs_tcp_write_space(). I'm still unsure what to do about the possibility of one of these signed integers going negative on us.Bruce? Neil? What sayest thou?
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
net/sunrpc/svcsock.c +5
-0+clear_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); +return 1 ; +} +static struct svc_xprt_ops svc_tcp_ops = { .xpo_recvfrom = svc_tcp_recvfrom, .xpo_sendto = svc_tcp_sendto,@@ -1373,6 +1412,7 @@ static struct svc_xprt_ops svc_tcp_ops = { .xpo_detach = svc_sock_detach, .xpo_free = svc_sock_free, .xpo_prep_reply_hdr = svc_tcp_prep_reply_hdr, + .xpo_has_wspace = svc_tcp_has_wspace, };Quoted 1 line
Quoted 1 line
net/sunrpc/svcsock.c static struct svc_xprt_ops svc_tcp_ops = { · line 1418
Quoted 1 line
net/sunrpc/svcsock.c +0
-0static struct svc_xprt_class svc_tcp_class = {--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
-
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
RFC PATCH 10/38 svc: Move close processing to a single place
In reply to a message not in the archiveClose handling was duplicated in the UDP and TCP recvfrom methods. This code has been moved to the transport independent svc_recv function.
---
net/sunrpc/svcsock.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-)
net/sunrpc/svcsock.c +10 -14
@@ -792,11 +792,6 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)return svc_deferred_recv (rqstp); } -if (test_bit (SK_CLOSE , &svsk->sk_flags)) { -svc_delete_socket (svsk); -return 0 ; - } -clear_bit (SK_DATA , &svsk->sk_flags); skb =NULL ; err = kernel_recvmsg(svsk->sk_sock, &msg, NULL,
@@ -1197,11 +1192,6 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)return svc_deferred_recv (rqstp); } -if (test_bit (SK_CLOSE , &svsk->sk_flags)) { -svc_delete_socket (svsk); -return 0 ; - } -if (svsk->sk_sk->sk_state ==TCP_LISTEN ) {svc_tcp_accept (svsk);svc_sock_received (svsk);
@@ -1585,10 +1575,16 @@ svc_recv(struct svc_rqst *rqstp, long timeout) }spin_unlock_bh (&pool->sp_lock); -dprintk ("svc: server %p, pool %u, socket %p, inuse=%d\n" , - rqstp, pool->sp_id, svsk,atomic_read (&svsk->sk_inuse)); - len = svsk->sk_xprt.xpt_ops->xpo_recvfrom (rqstp); -dprintk ("svc: got len=%d\n" , len); + len =0 ; +if (test_bit (SK_CLOSE , &svsk->sk_flags)) { +dprintk ("svc_recv: found SK_CLOSE\n" ); +svc_delete_socket (svsk); + }else { +dprintk ("svc: server %p, pool %u, socket %p, inuse=%d\n" , + rqstp, pool->sp_id, svsk,atomic_read (&svsk->sk_inuse)); + len = svsk->sk_xprt.xpt_ops->xpo_recvfrom (rqstp); +dprintk ("svc: got len=%d\n" , len); + }/* No data, incomplete (TCP) read, or accept() */ if (len ==0 || len == -EAGAIN ) {
RFC PATCH 11/38 svc: Add xpo_accept transport function
In reply to a message not in the archivePreviously, the accept logic looked into the socket state to determine whether to call accept or recv when data-ready was indicated on an endpoint. Since some transports don't use sockets, this logic was changed to use a flag bit (SK_LISTENER) to identify listening endpoints. A transport function (xpo_accept) was added to allow each transport to define its own accept processing. A transport's initialization logic is reponsible for setting the SK_LISTENER bit. I didn't see any way to do this in transport independent logic since the passive side of a UDP connection doesn't listen and always recv's.
In the svc_recv function, if the SK_LISTENER bit is set, the transport xpo_accept function is called to handle accept processing.
Note that all functions are defined even if they don't make sense for a given transport. For example, accept doesn't mean anything for UDP. The fuction is defined anyway and bug checks if called. The UDP transport should never set the SK_LISTENER bit.
The code that poaches connections when the connection limit is hit was moved to a subroutine to make the accept logic path easier to follow. Since this is in the new connection path, it should not be a performance issue.
---
include/linux/sunrpc/svc_xprt.h | 1 include/linux/sunrpc/svcsock.h | 1 net/sunrpc/svcsock.c | 127 +++++++++++++++++++++------------------ 3 files changed, 72 insertions(+), 57 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -10,6 +10,7 @@#include <linux/sunrpc/svc.h> struct svc_xprt_ops { +struct svc_xprt *(*xpo_accept)(struct svc_xprt *);int (*xpo_has_wspace)(struct svc_xprt *);int (*xpo_recvfrom)(struct svc_rqst *);void (*xpo_prep_reply_hdr)(struct svc_rqst *);
include/linux/sunrpc/svcsock.h +1 -0
@@ -36,6 +36,7 @@ struct svc_sock {#define SK_DEFERRED 8/* request on sk_deferred */ #define SK_OLD 9/* used for temp socket aging mark+sweep */ #define SK_DETACHED 10/* detached from tempsocks list */ +#define SK_LISTENER 11/* listening endpoint */ atomic_t sk_reserved;/* space on outq that is reserved */
net/sunrpc/svcsock.c +70 -57
200 lines not on this page · raw message
A message that is not in the archive (sent off-list or not yet received): 20071129224016.14563.67547.stgit-gUwIgmpLGaKNDNWfRnPdfg@public.gmane.org
Re: [RFC,PATCH 11/38] svc: Add xpo_accept transport function
The refactoring here helps clarity. More below.
Quoted 10 lines · Tom Tucker
Previously, the accept logic looked into the socket state to determine whether to call accept or recv when data-ready was indicated on an endpoint. Since some transports don't use sockets, this logic was changed to use a flag bit (
SK_LISTENER) to identify listening endpoints. A transport function (xpo_accept) was added to allow each transport to define its own accept processing. A transport's initialization logic is reponsible for setting theSK_LISTENERbit. I didn't see any way to do this in transport independent logic since the passive side of a UDP connection doesn't listen and always recv's.
Quoted 6 lines
In the
svc_recvfunction, if theSK_LISTENERbit is set, the transportxpo_acceptfunction is called to handle accept processing.Note that all functions are defined even if they don't make sense for a given transport. For example, accept doesn't mean anything for UDP. The fuction is defined anyway and bug checks if called. The
s/fuction/function/
:-O
Quoted 191 lines
UDP transport should never set the
SK_LISTENERbit.The code that poaches connections when the connection limit is hit was moved to a subroutine to make the accept logic path easier to follow. Since this is in the new connection path, it should not be a performance issue.
Signed-off-by Tom Tucker <[email protected]>---
include/linux/sunrpc/svc_xprt.h | 1 include/linux/sunrpc/svcsock.h | 1 net/sunrpc/svcsock.c | 127 ++++++++++++++++++++ +------------------ 3 files changed, 72 insertions(+), 57 deletions(-)include/linux/sunrpc/svc_xprt.h +1
-0@@ -10,6 +10,7 @@#include <linux/sunrpc/svc.h> struct svc_xprt_ops { +struct svc_xprt *(*xpo_accept)(struct svc_xprt *);int (*xpo_has_wspace)(struct svc_xprt *);int (*xpo_recvfrom)(struct svc_rqst *);void (*xpo_prep_reply_hdr)(struct svc_rqst *);include/linux/sunrpc/svcsock.h +1
-0@@ -36,6 +36,7 @@ struct svc_sock {#define SK_DEFERRED 8/* request on sk_deferred */ #define SK_OLD 9/* used for temp socket aging mark+sweep */ #define SK_DETACHED 10/* detached from tempsocks list */ +#define SK_LISTENER 11/* listening endpoint */ atomic_t sk_reserved;/* space on outq that is reserved */ net/sunrpc/svcsock.c +6
-0@@ -912,6 +912,12 @@ static int svc_udp_has_wspace(struct svc_xprt *xprt)return 1 ; } +static struct svc_xprt *svc_udp_accept (struct svc_xprt *xprt) +{ +BUG (); +return NULL ; +} +static struct svc_xprt_ops svc_udp_ops = { .xpo_recvfrom = svc_udp_recvfrom,net/sunrpc/svcsock.c +3
-2.xpo_sendto = svc_udp_sendto,@@ -920,6 +926,7 @@ static struct svc_xprt_ops svc_udp_ops = { .xpo_free = svc_sock_free, .xpo_prep_reply_hdr = svc_udp_prep_reply_hdr, .xpo_has_wspace = svc_udp_has_wspace, + .xpo_accept = svc_udp_accept, };static struct svc_xprt_class svc_udp_class = {@@ -1044,9 +1051,9 @@ static inline int svc_port_is_privileged (struct sockaddr *sin)/* * Accept a TCP connection */ -static void -svc_tcp_accept (struct svc_sock *svsk) +static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt) { + struct svc_sock *svsk = container_of(xprt, struct svc_sock, sk_xprt);struct sockaddr_storage addr;net/sunrpc/svcsock.c +4
-49struct sockaddr *sin = (struct sockaddr *) &addr;struct svc_serv *serv = svsk->sk_server;@@ -1058,7 +1065,7 @@ svc_tcp_accept(struct svc_sock *svsk)dprintk ("svc: tcp_accept %p sock %p\n" , svsk, sock);if (!sock) -return ; +return NULL ;clear_bit (SK_CONN , &svsk->sk_flags); err =kernel_accept (sock, &newsock,O_NONBLOCK );@@ -1069,7 +1076,7 @@ svc_tcp_accept(struct svc_sock *svsk)else if (err != -EAGAIN &&net_ratelimit ())printk (KERN_WARNING "%s: accept failed (err %d)!\n" , serv->sv_name, -err); -return ; +return NULL ; }set_bit (SK_CONN , &svsk->sk_flags);@@ -1115,59 +1122,14 @@ svc_tcp_accept(struct svc_sock *svsk)svc_sock_received (newsvsk); -/* make sure that we don't have too many active connections. -* If we have, something must be dropped. -* -* There's no point in trying to do random drop here for -* DoS prevention. The NFS clients does 1 reconnect in 15 -* seconds. An attacker can easily beat that. -* -* The only somewhat efficient mechanism would be if drop -* old connections from the same IP first. But right now -* we don't even record the client IP in svc_sock. -*/ -if (serv->sv_tmpcnt > (serv->sv_nrthreads+3 )*20 ) { -struct svc_sock *svsk =NULL ; -spin_lock_bh (&serv->sv_lock); -if (!list_empty (&serv->sv_tempsocks)) { -if (net_ratelimit ()) { -/* Try to help the admin */ -printk (KERN_NOTICE "%s: too many open TCP " -"sockets, consider increasing the " -"number of nfsd threads\n" , - serv->sv_name); -printk (KERN_NOTICE -"%s: last TCP connect from %s\n" , - serv->sv_name,__svc_print_addr (sin, - buf,sizeof (buf))); - } -/* -* Always select the oldest socket. It's not fair, -* but so is life -*/ - svsk =list_entry (serv->sv_tempsocks.prev, - struct svc_sock, - sk_list); -set_bit (SK_CLOSE , &svsk->sk_flags); -atomic_inc (&svsk->sk_inuse); - } -spin_unlock_bh (&serv->sv_lock); - -if (svsk) { -svc_sock_enqueue (svsk); -svc_sock_put (svsk); - } - - } -if (serv->sv_stats) serv->sv_stats->nettcpconn++; -return ; +return &newsvsk->sk_xprt; failed:sock_release (newsock); -return ; +return NULL ; }/*
net/sunrpc/svcsock.c +2
-6@@ -1192,12 +1154,6 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)return svc_deferred_recv (rqstp); } -if (svsk->sk_sk->sk_state ==TCP_LISTEN ) { -svc_tcp_accept (svsk); -svc_sock_received (svsk); -return 0 ; - } -if (test_and_clear_bit (SK_CHNGBUF , &svsk->sk_flags))/* sndbuf needs to have room for one request * per thread, otherwise we can stall even when the @@ -1403,6 +1359,7 @@ static struct svc_xprt_ops svc_tcp_ops = { .xpo_free = svc_sock_free, .xpo_prep_reply_hdr = svc_tcp_prep_reply_hdr, .xpo_has_wspace = svc_tcp_has_wspace, + .xpo_accept = svc_tcp_accept, };static struct svc_xprt_class svc_tcp_class = {@@ -1433,6 +1390,7 @@ svc_tcp_init(struct svc_sock *svsk)if (sk->sk_state ==TCP_LISTEN ) {dprintk ("setting up TCP socket for listening\n" ); +set_bit (SK_LISTENER , &svsk->sk_flags); sk->sk_data_ready = svc_tcp_listen_data_ready;set_bit (SK_CONN , &svsk->sk_flags); }else {
net/sunrpc/svcsock.c svc_sock_update_bufs(struct svc_serv *serv) · line 1446
Quoted 5 lines
net/sunrpc/svcsock.c +2
-0@@ -1484,6 +1442,55 @@ svc_sock_update_bufs(struct svc_serv *serv)spin_unlock_bh (&serv->sv_lock); } +static void +svc_check_conn_limits (struct svc_serv *serv)
Style police want the return value type and function declaration on the same line.
Quoted 4 lines
net/sunrpc/svcsock.c +4
-0+{ +char buf[RPC_MAX_ADDRBUFLEN ]; + +/* make sure that we don't have too many active connections.
net/sunrpc/svcsock.c svc_sock_update_bufs(struct svc_serv *serv) · line 1460
Quoted 10 lines
net/sunrpc/svcsock.c +10
-0+* If we have, something must be dropped. +* +* There's no point in trying to do random drop here for +* DoS prevention. The NFS clients does 1 reconnect in 15 +* seconds. An attacker can easily beat that. +* +* The only somewhat efficient mechanism would be if drop +* old connections from the same IP first. But right now +* we don't even record the client IP in svc_sock. +*/
Just a personal preference: I think this would better serve as a block comment placed just before the function declaration above.
net/sunrpc/svcsock.c svc_sock_update_bufs(struct svc_serv *serv) · line 1461
Quoted 1 line
net/sunrpc/svcsock.c +1
-0+if (serv->sv_tmpcnt > (serv->sv_nrthreads+3 )*20 ) {
Would be nice if the naked constants were defined as macros somewhere. Some rationale for these values would be nice (does anyone (ie, Greg!) remember why these values were chosen?).
Quoted 38 lines
net/sunrpc/svcsock.c +32
-0+struct svc_sock *svsk =NULL ; +spin_lock_bh (&serv->sv_lock); +if (!list_empty (&serv->sv_tempsocks)) { +if (net_ratelimit ()) { +/* Try to help the admin */ +printk (KERN_NOTICE "%s: too many open TCP " +"sockets, consider increasing the " +"number of nfsd threads\n" , + serv->sv_name); +printk (KERN_NOTICE +"%s: last TCP connect from %s\n" , + serv->sv_name, buf); + } +/* +* Always select the oldest socket. It's not fair, +* but so is life +*/ + svsk =list_entry (serv->sv_tempsocks.prev, + struct svc_sock, + sk_list); +set_bit (SK_CLOSE , &svsk->sk_flags); +atomic_inc (&svsk->sk_inuse); + } +spin_unlock_bh (&serv->sv_lock); + +if (svsk) { +svc_sock_enqueue (svsk); +svc_sock_put (svsk); + } + } +} +/* * Receive the next request on any socket. This code is carefully * organised not to touch any cachelines in the shared svc_serv @@ -1579,6 +1586,12 @@ svc_recv(struct svc_rqst *rqstp, long timeout)if (test_bit (SK_CLOSE , &svsk->sk_flags)) {dprintk ("svc_recv: found SK_CLOSE\n" );
net/sunrpc/svcsock.c svc_recv(struct svc_rqst *rqstp, long timeout) · line 1597
Quoted 10 lines
net/sunrpc/svcsock.c +6
-0svc_delete_socket (svsk); + }else if (test_bit (SK_LISTENER , &svsk->sk_flags)) { +struct svc_xprt *newxpt; + newxpt = svsk->sk_xprt.xpt_ops->xpo_accept (&svsk->sk_xprt); +if (newxpt) +svc_check_conn_limits (svsk->sk_server); +svc_sock_received (svsk); }else {dprintk ("svc: server %p, pool %u, socket %p, inuse=%d\n" , rqstp, pool->sp_id, svsk,atomic_read (&svsk->sk_inuse));
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
Re: [RFC,PATCH 11/38] svc: Add xpo_accept transport function
Quoted 22 lines · Chuck Lever
The refactoring here helps clarity. More below.
Quoted 19 lines · Tom Tucker
Previously, the accept logic looked into the socket state to determine whether to call accept or recv when data-ready was indicated on an endpoint.
Since some transports don't use sockets, this logic was changed to use a flag
bit (SK_LISTENER) to identify listening endpoints. A transport function
(xpo_accept) was added to allow each transport to define its own accept
processing. A transport's initialization logic is reponsible for setting theSK_LISTENERbit. I didn't see any way to do this in transport independent
logic since the passive side of a UDP connection doesn't listen and always recv's.In the
svc_recvfunction, if theSK_LISTENERbit is set, the transportxpo_acceptfunction is called to handle accept processing.
Quoted 7 lines
Quoted 3 lines
Note that all functions are defined even if they don't make sense for a given transport. For example, accept doesn't mean anything for UDP. The fuction is defined anyway and bug checks if called. The
s/fuction/function/
:-O
ok.
Quoted 197 lines
Quoted 197 lines
UDP transport should never set the
SK_LISTENERbit.The code that poaches connections when the connection limit is hit was moved to a subroutine to make the accept logic path easier to follow. Since this is in the new connection path, it should not be a performance issue.
Signed-off-by Tom Tucker <[email protected]>---
include/linux/sunrpc/svc_xprt.h | 1 include/linux/sunrpc/svcsock.h | 1 net/sunrpc/svcsock.c | 127 ++++++++++++++++++++ +------------------ 3 files changed, 72 insertions(+), 57 deletions(-)include/linux/sunrpc/ renamed from include/linux/sunrpc/svc_xprt.h +0
-0
svc_xprt.h
index 3adc8f3..1527ff1 100644include/linux/sunrpc/svc_xprt.h +1
-0@@ -10,6 +10,7 @@#include <linux/sunrpc/svc.h> struct svc_xprt_ops { +struct svc_xprt *(*xpo_accept)(struct svc_xprt *);int (*xpo_has_wspace)(struct svc_xprt *);int (*xpo_recvfrom)(struct svc_rqst *);void (*xpo_prep_reply_hdr)(struct svc_rqst *);include/linux/sunrpc/ renamed from include/linux/sunrpc/svcsock.h +0
-0
svcsock.h
index 08e78d0..9882ce0 100644include/linux/sunrpc/svcsock.h +1
-0@@ -36,6 +36,7 @@ struct svc_sock {#define SK_DEFERRED 8/* request on sk_deferred */ #define SK_OLD 9/* used for temp socket aging mark+sweep */ #define SK_DETACHED 10/* detached from tempsocks list */ +#define SK_LISTENER 11/* listening endpoint */ atomic_t sk_reserved;/* space on outq that is reserved */ net/sunrpc/svcsock.c +6
-0@@ -912,6 +912,12 @@ static int svc_udp_has_wspace(struct svc_xprt *xprt)return 1 ; } +static struct svc_xprt *svc_udp_accept (struct svc_xprt *xprt) +{ +BUG (); +return NULL ; +} +static struct svc_xprt_ops svc_udp_ops = { .xpo_recvfrom = svc_udp_recvfrom,net/sunrpc/svcsock.c +3
-2.xpo_sendto = svc_udp_sendto,@@ -920,6 +926,7 @@ static struct svc_xprt_ops svc_udp_ops = { .xpo_free = svc_sock_free, .xpo_prep_reply_hdr = svc_udp_prep_reply_hdr, .xpo_has_wspace = svc_udp_has_wspace, + .xpo_accept = svc_udp_accept, };static struct svc_xprt_class svc_udp_class = {@@ -1044,9 +1051,9 @@ static inline int svc_port_is_privileged (struct sockaddr *sin)/* * Accept a TCP connection */ -static void -svc_tcp_accept (struct svc_sock *svsk) +static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt) { + struct svc_sock *svsk = container_of(xprt, struct svc_sock, sk_xprt);struct sockaddr_storage addr;net/sunrpc/svcsock.c +4
-49struct sockaddr *sin = (struct sockaddr *) &addr;struct svc_serv *serv = svsk->sk_server;@@ -1058,7 +1065,7 @@ svc_tcp_accept(struct svc_sock *svsk)dprintk ("svc: tcp_accept %p sock %p\n" , svsk, sock);if (!sock) -return ; +return NULL ;clear_bit (SK_CONN , &svsk->sk_flags); err =kernel_accept (sock, &newsock,O_NONBLOCK );@@ -1069,7 +1076,7 @@ svc_tcp_accept(struct svc_sock *svsk)else if (err != -EAGAIN &&net_ratelimit ())printk (KERN_WARNING "%s: accept failed (err %d)!\n" , serv->sv_name, -err); -return ; +return NULL ; }set_bit (SK_CONN , &svsk->sk_flags);@@ -1115,59 +1122,14 @@ svc_tcp_accept(struct svc_sock *svsk)svc_sock_received (newsvsk); -/* make sure that we don't have too many active connections. -* If we have, something must be dropped. -* -* There's no point in trying to do random drop here for -* DoS prevention. The NFS clients does 1 reconnect in 15 -* seconds. An attacker can easily beat that. -* -* The only somewhat efficient mechanism would be if drop -* old connections from the same IP first. But right now -* we don't even record the client IP in svc_sock. -*/ -if (serv->sv_tmpcnt > (serv->sv_nrthreads+3 )*20 ) { -struct svc_sock *svsk =NULL ; -spin_lock_bh (&serv->sv_lock); -if (!list_empty (&serv->sv_tempsocks)) { -if (net_ratelimit ()) { -/* Try to help the admin */ -printk (KERN_NOTICE "%s: too many open TCP " -"sockets, consider increasing the " -"number of nfsd threads\n" , - serv->sv_name); -printk (KERN_NOTICE -"%s: last TCP connect from %s\n" , - serv->sv_name,__svc_print_addr (sin, - buf,sizeof (buf))); - } -/* -* Always select the oldest socket. It's not fair, -* but so is life -*/ - svsk =list_entry (serv->sv_tempsocks.prev, - struct svc_sock, - sk_list); -set_bit (SK_CLOSE , &svsk->sk_flags); -atomic_inc (&svsk->sk_inuse); - } -spin_unlock_bh (&serv->sv_lock); - -if (svsk) { -svc_sock_enqueue (svsk); -svc_sock_put (svsk); - } - - } -if (serv->sv_stats) serv->sv_stats->nettcpconn++; -return ; +return &newsvsk->sk_xprt; failed:sock_release (newsock); -return ; +return NULL ; }/*
net/sunrpc/svcsock.c +2
-6@@ -1192,12 +1154,6 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)return svc_deferred_recv (rqstp); } -if (svsk->sk_sk->sk_state ==TCP_LISTEN ) { -svc_tcp_accept (svsk); -svc_sock_received (svsk); -return 0 ; - } -if (test_and_clear_bit (SK_CHNGBUF , &svsk->sk_flags))/* sndbuf needs to have room for one request * per thread, otherwise we can stall even when the @@ -1403,6 +1359,7 @@ static struct svc_xprt_ops svc_tcp_ops = { .xpo_free = svc_sock_free, .xpo_prep_reply_hdr = svc_tcp_prep_reply_hdr, .xpo_has_wspace = svc_tcp_has_wspace, + .xpo_accept = svc_tcp_accept, };static struct svc_xprt_class svc_tcp_class = {@@ -1433,6 +1390,7 @@ svc_tcp_init(struct svc_sock *svsk)if (sk->sk_state ==TCP_LISTEN ) {dprintk ("setting up TCP socket for listening\n" ); +set_bit (SK_LISTENER , &svsk->sk_flags); sk->sk_data_ready = svc_tcp_listen_data_ready;set_bit (SK_CONN , &svsk->sk_flags); }else {@@ -1484,6 +1442,55 @@ svc_sock_update_bufs(struct svc_serv *serv)spin_unlock_bh (&serv->sv_lock); }
Quoted 6 lines
net/sunrpc/svcsock.c svc_sock_update_bufs(struct svc_serv *serv) · line 1446
Quoted 2 lines
net/sunrpc/svcsock.c +2
-0+static void +svc_check_conn_limits (struct svc_serv *serv)Style police want the return value type and function declaration on the same line.
yes.
Quoted 9 lines
Quoted 9 lines
net/sunrpc/svcsock.c +9
-0+{ +char buf[RPC_MAX_ADDRBUFLEN ]; + +/* make sure that we don't have too many active connections. +* If we have, something must be dropped. +* +* There's no point in trying to do random drop here for +* DoS prevention. The NFS clients does 1 reconnect in 15 +* seconds. An attacker can easily beat that.
Quoted 9 lines
net/sunrpc/svcsock.c svc_sock_update_bufs(struct svc_serv *serv) · line 1460
Quoted 5 lines
net/sunrpc/svcsock.c +5
-0+* +* The only somewhat efficient mechanism would be if drop +* old connections from the same IP first. But right now +* we don't even record the client IP in svc_sock. +*/ Just a personal preference: I think this would better serve as a block comment placed just before the function declaration above.
agreed.
Quoted 6 lines
net/sunrpc/svcsock.c svc_sock_update_bufs(struct svc_serv *serv) · line 1461
Quoted 1 line
net/sunrpc/svcsock.c +1
-0+if (serv->sv_tmpcnt > (serv->sv_nrthreads+3 )*20 ) {Would be nice if the naked constants were defined as macros somewhere. Some rationale for these values would be nice (does anyone (ie, Greg!) remember why these values were chosen?).
I've noodled on this before and produced nothing but heat. I'm afraid the best I can come up with is #define THREE and #define TWENTY :-)
Quoted 59 lines
Quoted 38 lines
net/sunrpc/svcsock.c +32
-0+struct svc_sock *svsk =NULL ; +spin_lock_bh (&serv->sv_lock); +if (!list_empty (&serv->sv_tempsocks)) { +if (net_ratelimit ()) { +/* Try to help the admin */ +printk (KERN_NOTICE "%s: too many open TCP " +"sockets, consider increasing the " +"number of nfsd threads\n" , + serv->sv_name); +printk (KERN_NOTICE +"%s: last TCP connect from %s\n" , + serv->sv_name, buf); + } +/* +* Always select the oldest socket. It's not fair, +* but so is life +*/ + svsk =list_entry (serv->sv_tempsocks.prev, + struct svc_sock, + sk_list); +set_bit (SK_CLOSE , &svsk->sk_flags); +atomic_inc (&svsk->sk_inuse); + } +spin_unlock_bh (&serv->sv_lock); + +if (svsk) { +svc_sock_enqueue (svsk); +svc_sock_put (svsk); + } + } +} +/* * Receive the next request on any socket. This code is carefully * organised not to touch any cachelines in the shared svc_serv @@ -1579,6 +1586,12 @@ svc_recv(struct svc_rqst *rqstp, long timeout)if (test_bit (SK_CLOSE , &svsk->sk_flags)) {dprintk ("svc_recv: found SK_CLOSE\n" );net/sunrpc/svcsock.c svc_recv(struct svc_rqst *rqstp, long timeout) · line 1597
Quoted 10 lines
net/sunrpc/svcsock.c +6
-0svc_delete_socket (svsk); + }else if (test_bit (SK_LISTENER , &svsk->sk_flags)) { +struct svc_xprt *newxpt; + newxpt = svsk->sk_xprt.xpt_ops->xpo_accept (&svsk->sk_xprt); +if (newxpt) +svc_check_conn_limits (svsk->sk_server); +svc_sock_received (svsk); }else {dprintk ("svc: server %p, pool %u, socket %p, inuse=%d\n" , rqstp, pool->sp_id, svsk,atomic_read (&svsk->sk_inuse));--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com-
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
RFC PATCH 12/38 svc: Add a generic transport svc_create_xprt function
In reply to a message not in the archiveThe svc_create_xprt function is a transport independent version of the svc_makesock function.
Since transport instance creation contains transport dependent and independent components, add an xpo_create transport function. The transport implementation of this function allocates the memory for the endpoint, implements the transport dependent initialization logic, and calls svc_xprt_init to initialize the transport independent field (svc_xprt) in it's data structure.
---
include/linux/sunrpc/svc_xprt.h | 4 +++ net/sunrpc/svc_xprt.c | 37 ++++++++++++++++++++++++++ net/sunrpc/svcsock.c | 56 +++++++++++++++++++++++++++++---------- 3 files changed, 82 insertions(+), 15 deletions(-)
include/linux/sunrpc/svc_xprt.h +4 -0
@@ -10,6 +10,9 @@#include <linux/sunrpc/svc.h> struct svc_xprt_ops { +struct svc_xprt *(*xpo_create)(struct svc_serv *, +struct sockaddr *,int , +int );struct svc_xprt *(*xpo_accept)(struct svc_xprt *);int (*xpo_has_wspace)(struct svc_xprt *);int (*xpo_recvfrom)(struct svc_rqst *);
@@ -36,5 +39,6 @@ struct svc_xprt {int svc_reg_xprt_class (struct svc_xprt_class *);int svc_unreg_xprt_class (struct svc_xprt_class *);void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *); +int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int );#endif /* SUNRPC_SVC_XPRT_H */
net/sunrpc/svc_xprt.c +37 -0
@@ -93,3 +93,40 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt) xprt->xpt_ops = xcl->xcl_ops; }EXPORT_SYMBOL_GPL (svc_xprt_init); + +int svc_create_xprt (struct svc_serv *serv,char *xprt_name,unsigned short port, +int flags) +{ +struct svc_xprt_class *xcl; +int ret = -ENOENT ; +struct sockaddr_in sin = { + .sin_family =AF_INET , + .sin_addr.s_addr =INADDR_ANY , + .sin_port =htons (port), + }; +dprintk ("svc: creating transport %s[%d]\n" , xprt_name, port); +spin_lock (&svc_xprt_class_lock); +list_for_each_entry (xcl, &svc_xprt_class_list, xcl_list) { +if (strcmp (xprt_name, xcl->xcl_name) ==0 ) { +spin_unlock (&svc_xprt_class_lock); +if (try_module_get (xcl->xcl_owner)) { +struct svc_xprt *newxprt; + ret =0 ; + newxprt = xcl->xcl_ops->xpo_create + (serv, + (struct sockaddr *)&sin,sizeof (sin), + flags); +if (IS_ERR (newxprt)) { +module_put (xcl->xcl_owner); + ret =PTR_ERR (newxprt); + } + } + goto out; + } + } +spin_unlock (&svc_xprt_class_lock); +dprintk ("svc: transport %s not found\n" , xprt_name); + out: +return ret; +} +EXPORT_SYMBOL_GPL (svc_create_xprt);
net/sunrpc/svcsock.c +41 -15
136 lines not on this page · raw message
RFC PATCH 13/38 svc: Change services to use new svc_create_xprt service
In reply to a message not in the archiveModify the various kernel RPC svcs to use the svc_create_xprt service.
---
fs/lockd/svc.c | 17 ++++++++--------- fs/nfs/callback.c | 4 ++-- fs/nfsd/nfssvc.c | 4 ++-- include/linux/sunrpc/svcsock.h | 1 - net/sunrpc/sunrpc_syms.c | 1 - net/sunrpc/svcsock.c | 22 ---------------------- 6 files changed, 12 insertions(+), 37 deletions(-)
fs/lockd/svc.c +8 -9
@@ -219,13 +219,12 @@ lockd(struct svc_rqst *rqstp)module_put_and_exit (0 ); } - -static int find_socket (struct svc_serv *serv,int proto) +static int find_xprt (struct svc_serv *serv,char *proto) {struct svc_sock *svsk;int found =0 ;list_for_each_entry (svsk, &serv->sv_permsocks, sk_list) -if (svsk->sk_sk->sk_protocol == proto) { +if (strcmp (svsk->sk_xprt.xpt_class->xcl_name, proto) ==0 ) { found =1 ;break ; }
@@ -243,13 +242,13 @@ static int make_socks(struct svc_serv *serv, int proto)int err =0 ;if (proto ==IPPROTO_UDP || nlm_udpport) -if (!find_socket (serv,IPPROTO_UDP )) - err =svc_makesock (serv,IPPROTO_UDP , nlm_udpport, -SVC_SOCK_DEFAULTS ); +if (!find_xprt (serv,"udp" )) + err =svc_create_xprt (serv,"udp" , nlm_udpport, +SVC_SOCK_DEFAULTS );if (err >=0 && (proto ==IPPROTO_TCP || nlm_tcpport)) -if (!find_socket (serv,IPPROTO_TCP )) - err =svc_makesock (serv,IPPROTO_TCP , nlm_tcpport, -SVC_SOCK_DEFAULTS ); +if (!find_xprt (serv,"tcp" )) + err =svc_create_xprt (serv,"tcp" , nlm_tcpport, +SVC_SOCK_DEFAULTS );if (err >=0 ) { warned =0 ;
fs/nfs/callback.c +2 -2
@@ -123,8 +123,8 @@ int nfs_callback_up(void)if (!serv) goto out_err; - ret =svc_makesock (serv,IPPROTO_TCP , nfs_callback_set_tcpport, -SVC_SOCK_ANONYMOUS ); + ret =svc_create_xprt (serv,"tcp" , nfs_callback_set_tcpport, +SVC_SOCK_ANONYMOUS );if (ret <=0 ) goto out_destroy; nfs_callback_tcpport = ret;
fs/nfsd/nfssvc.c +2 -2
@@ -236,7 +236,7 @@ static int nfsd_init_socks(int port) error =lockd_up (IPPROTO_UDP );if (error >=0 ) { - error =svc_makesock (nfsd_serv,IPPROTO_UDP , port, + error =svc_create_xprt (nfsd_serv,"udp" , port,SVC_SOCK_DEFAULTS );if (error <0 )lockd_down ();
@@ -247,7 +247,7 @@ static int nfsd_init_socks(int port)#ifdef CONFIG_NFSD_TCP error =lockd_up (IPPROTO_TCP );if (error >=0 ) { - error =svc_makesock (nfsd_serv,IPPROTO_TCP , port, + error =svc_create_xprt (nfsd_serv,"tcp" , port,SVC_SOCK_DEFAULTS );if (error <0 )lockd_down ();
include/linux/sunrpc/svcsock.h +0 -1
@@ -67,7 +67,6 @@ struct svc_sock {/* * Function prototypes. */ -int svc_makesock (struct svc_serv *,int ,unsigned short ,int flags);void svc_force_close_socket (struct svc_sock *);int svc_recv (struct svc_rqst *,long );int svc_send (struct svc_rqst *);
net/sunrpc/sunrpc_syms.c +0 -1
@@ -72,7 +72,6 @@ EXPORT_SYMBOL(svc_drop);EXPORT_SYMBOL (svc_process);EXPORT_SYMBOL (svc_recv);EXPORT_SYMBOL (svc_wake_up); -EXPORT_SYMBOL (svc_makesock);EXPORT_SYMBOL (svc_reserve);EXPORT_SYMBOL (svc_auth_register);EXPORT_SYMBOL (auth_domain_lookup);
net/sunrpc/svcsock.c +0 -22
@@ -2001,28 +2001,6 @@ void svc_force_close_socket(struct svc_sock *svsk)svc_close_socket (svsk); } -/** -* svc_makesock - Make a socket for nfsd and lockd -* @serv: RPC server structure -* @protocol: transport protocol to use -* @port: port to use -* @flags: requested socket characteristics -* -*/ -int svc_makesock (struct svc_serv *serv,int protocol,unsigned short port, -int flags) -{ -dprintk ("svc: creating socket proto = %d\n" , protocol); -switch (protocol) { -case IPPROTO_TCP : -return svc_create_xprt (serv,"tcp" , port, flags); -case IPPROTO_UDP : -return svc_create_xprt (serv,"udp" , port, flags); -default : -return -EINVAL ; - } -} -/* * Handle defer and revisit of requests */
RFC PATCH 14/38 svc: Change sk_inuse to a kref
In reply to a message not in the archiveChange the atomic_t reference count to a kref and move it to the transport indepenent svc_xprt structure. Change the reference count wrapper names to be generic.
---
include/linux/sunrpc/svc_xprt.h | 8 ++++++ include/linux/sunrpc/svcsock.h | 1 - net/sunrpc/svc_xprt.c | 17 ++++++++++++ net/sunrpc/svcsock.c | 54 +++++++++++++++------------------------ 4 files changed, 46 insertions(+), 34 deletions(-)
include/linux/sunrpc/svc_xprt.h +8 -0
@@ -8,6 +8,7 @@#define SUNRPC_SVC_XPRT_H #include <linux/sunrpc/svc.h> +#include <linux/module.h> struct svc_xprt_ops { struct svc_xprt *(*xpo_create)(struct svc_serv *,
@@ -34,11 +35,18 @@ struct svc_xprt_class {struct svc_xprt {struct svc_xprt_class *xpt_class;struct svc_xprt_ops *xpt_ops; +struct kref xpt_ref; };int svc_reg_xprt_class (struct svc_xprt_class *);int svc_unreg_xprt_class (struct svc_xprt_class *);void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *);int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int ); +void svc_xprt_put (struct svc_xprt *xprt); + +static inline void svc_xprt_get (struct svc_xprt *xprt) +{ +kref_get (&xprt->xpt_ref); +}#endif /* SUNRPC_SVC_XPRT_H */
include/linux/sunrpc/svcsock.h +0 -1
@@ -24,7 +24,6 @@ struct svc_sock {struct svc_pool * sk_pool;/* current pool iff queued */ struct svc_serv * sk_server;/* service for this socket */ -atomic_t sk_inuse;/* use count */ unsigned long sk_flags;#define SK_BUSY 0/* enqueued/receiving */ #define SK_CONN 1/* conn pending */
net/sunrpc/svc_xprt.c +17 -0
@@ -82,6 +82,22 @@ int svc_unreg_xprt_class(struct svc_xprt_class *xcl) }EXPORT_SYMBOL_GPL (svc_unreg_xprt_class); +static void svc_xprt_free (struct kref *kref) +{ +struct svc_xprt *xprt = + container_of(kref, struct svc_xprt, xpt_ref); +struct module *owner = xprt->xpt_class->xcl_owner; +BUG_ON (atomic_read (&kref->refcount)); + xprt->xpt_ops->xpo_free (xprt); +module_put (owner); +} + +void svc_xprt_put (struct svc_xprt *xprt) +{ +kref_put (&xprt->xpt_ref, svc_xprt_free); +} +EXPORT_SYMBOL_GPL (svc_xprt_put); +/* * Called by transport drivers to initialize the transport independent * portion of the transport instance.
@@ -91,6 +107,7 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt)memset (xprt,0 ,sizeof (*xprt)); xprt->xpt_class = xcl; xprt->xpt_ops = xcl->xcl_ops; +kref_init (&xprt->xpt_ref); }EXPORT_SYMBOL_GPL (svc_xprt_init);
net/sunrpc/svcsock.c +21 -33
158 lines not on this page · raw message
RFC PATCH 15/38 svc: Move sk_flags to the svc_xprt structure
In reply to a message not in the archiveThis functionally trivial change moves the transport independent sk_flags field to the transport independent svc_xprt structure.
---
include/linux/sunrpc/svc_xprt.h | 12 +++ include/linux/sunrpc/svcsock.h | 13 --- net/sunrpc/svcsock.c | 148 ++++++++++++++++++++------------------- 3 files changed, 87 insertions(+), 86 deletions(-)
include/linux/sunrpc/svc_xprt.h +12 -0
@@ -36,6 +36,18 @@ struct svc_xprt {struct svc_xprt_class *xpt_class;struct svc_xprt_ops *xpt_ops;struct kref xpt_ref; +unsigned long xpt_flags; +#define XPT_BUSY 0/* enqueued/receiving */ +#define XPT_CONN 1/* conn pending */ +#define XPT_CLOSE 2/* dead or dying */ +#define XPT_DATA 3/* data pending */ +#define XPT_TEMP 4/* connected transport */ +#define XPT_DEAD 6/* transport closed */ +#define XPT_CHNGBUF 7/* need to change snd/rcv buf sizes */ +#define XPT_DEFERRED 8/* deferred request pending */ +#define XPT_OLD 9/* used for xprt aging mark+sweep */ +#define XPT_DETACHED 10/* detached from tempsocks list */ +#define XPT_LISTENER 11/* listening endpoint */ };int svc_reg_xprt_class (struct svc_xprt_class *);
include/linux/sunrpc/svcsock.h +0 -13
@@ -24,19 +24,6 @@ struct svc_sock {struct svc_pool * sk_pool;/* current pool iff queued */ struct svc_serv * sk_server;/* service for this socket */ -unsigned long sk_flags; -#define SK_BUSY 0/* enqueued/receiving */ -#define SK_CONN 1/* conn pending */ -#define SK_CLOSE 2/* dead or dying */ -#define SK_DATA 3/* data pending */ -#define SK_TEMP 4/* temp (TCP) socket */ -#define SK_DEAD 6/* socket closed */ -#define SK_CHNGBUF 7/* need to change snd/rcv buffer sizes */ -#define SK_DEFERRED 8/* request on sk_deferred */ -#define SK_OLD 9/* used for temp socket aging mark+sweep */ -#define SK_DETACHED 10/* detached from tempsocks list */ -#define SK_LISTENER 11/* listening endpoint */ -atomic_t sk_reserved;/* space on outq that is reserved */ spinlock_t sk_lock;/* protects sk_deferred and
net/sunrpc/svcsock.c +75 -73
456 lines not on this page · raw message
RFC PATCH 16/38 svc: Move sk_server and sk_pool to svc_xprt
In reply to a message not in the archiveThis is another incremental change that moves transport independent fields from svc_sock to the svc_xprt structure. The changes should be functionally null.
---
include/linux/sunrpc/svc_xprt.h | 6 ++++ include/linux/sunrpc/svcsock.h | 2 - net/sunrpc/svc_xprt.c | 4 ++- net/sunrpc/svcsock.c | 55 +++++++++++++++++++-------------------- 4 files changed, 35 insertions(+), 32 deletions(-)
include/linux/sunrpc/svc_xprt.h +5 -1
@@ -48,11 +48,15 @@ struct svc_xprt {#define XPT_OLD 9/* used for xprt aging mark+sweep */ #define XPT_DETACHED 10/* detached from tempsocks list */ #define XPT_LISTENER 11/* listening endpoint */ + +struct svc_pool *xpt_pool;/* current pool iff queued */ +struct svc_serv *xpt_server;/* service for transport */ };int svc_reg_xprt_class (struct svc_xprt_class *);int svc_unreg_xprt_class (struct svc_xprt_class *); -void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *); +void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *, +struct svc_serv *);int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int );void svc_xprt_put (struct svc_xprt *xprt);
include/linux/sunrpc/svcsock.h +0 -2
@@ -22,8 +22,6 @@ struct svc_sock {struct socket * sk_sock;/* berkeley socket layer */ struct sock * sk_sk;/* INET layer */ -struct svc_pool * sk_pool;/* current pool iff queued */ -struct svc_serv * sk_server;/* service for this socket */ atomic_t sk_reserved;/* space on outq that is reserved */ spinlock_t sk_lock;/* protects sk_deferred and
net/sunrpc/svc_xprt.c +3 -1
@@ -102,12 +102,14 @@ EXPORT_SYMBOL_GPL(svc_xprt_put);* Called by transport drivers to initialize the transport independent * portion of the transport instance. */ -void svc_xprt_init (struct svc_xprt_class *xcl,struct svc_xprt *xprt) +void svc_xprt_init (struct svc_xprt_class *xcl,struct svc_xprt *xprt, +struct svc_serv *serv) {memset (xprt,0 ,sizeof (*xprt)); xprt->xpt_class = xcl; xprt->xpt_ops = xcl->xcl_ops;kref_init (&xprt->xpt_ref); + xprt->xpt_server = serv; }EXPORT_SYMBOL_GPL (svc_xprt_init);
net/sunrpc/svcsock.c +27 -28
194 lines not on this page · raw message
RFC PATCH 17/38 svc: Make close transport independent
In reply to a message not in the archiveMove sk_list and sk_ready to svc_xprt. This involves close because these lists are walked by svcs when closing all their transports. So I combined the moving of these lists to svc_xprt with making close transport independent.
The svc_force_sock_close has been changed to svc_close_all and takes a list as an argument. This removes some svc internals knowledge from the svcs.
This code races with module removal and transport addition.
---
fs/lockd/svc.c | 6 +- fs/nfsd/nfssvc.c | 4 + include/linux/sunrpc/svc_xprt.h | 2 + include/linux/sunrpc/svcsock.h | 4 - net/sunrpc/svc.c | 9 +-- net/sunrpc/svc_xprt.c | 2 + net/sunrpc/svcsock.c | 105 +++++++++++++++++++-------------------- 7 files changed, 63 insertions(+), 69 deletions(-)
fs/lockd/svc.c +3 -3
@@ -221,10 +221,10 @@ lockd(struct svc_rqst *rqstp)static int find_xprt (struct svc_serv *serv,char *proto) { -struct svc_sock *svsk; +struct svc_xprt *xprt;int found =0 ; -list_for_each_entry (svsk, &serv->sv_permsocks, sk_list) -if (strcmp (svsk->sk_xprt.xpt_class->xcl_name, proto) ==0 ) { +list_for_each_entry (xprt, &serv->sv_permsocks, xpt_list) +if (strcmp (xprt->xpt_class->xcl_name, proto) ==0 ) { found =1 ;break ; }
fs/nfsd/nfssvc.c +2 -2
@@ -155,8 +155,8 @@ static int killsig; /* signal that was used to kill last nfsd */static void nfsd_last_thread (struct svc_serv *serv) {/* When last nfsd thread exits we need to do some clean-up */ -struct svc_sock *svsk; -list_for_each_entry (svsk, &serv->sv_permsocks, sk_list) +struct svc_xprt *xprt; +list_for_each_entry (xprt, &serv->sv_permsocks, xpt_list)lockd_down (); nfsd_serv =NULL ;nfsd_racache_shutdown ();
include/linux/sunrpc/svc_xprt.h +2 -0
@@ -36,6 +36,8 @@ struct svc_xprt {struct svc_xprt_class *xpt_class;struct svc_xprt_ops *xpt_ops;struct kref xpt_ref; +struct list_head xpt_list; +struct list_head xpt_ready;unsigned long xpt_flags;#define XPT_BUSY 0/* enqueued/receiving */ #define XPT_CONN 1/* conn pending */
include/linux/sunrpc/svcsock.h +1 -3
@@ -17,8 +17,6 @@*/ struct svc_sock {struct svc_xprt sk_xprt; -struct list_head sk_ready;/* list of ready sockets */ -struct list_head sk_list;/* list of all sockets */ struct socket * sk_sock;/* berkeley socket layer */ struct sock * sk_sk;/* INET layer */
@@ -51,7 +49,7 @@ struct svc_sock {/* * Function prototypes. */ -void svc_force_close_socket (struct svc_sock *); +void svc_close_all (struct list_head *);int svc_recv (struct svc_rqst *,long );int svc_send (struct svc_rqst *);void svc_drop (struct svc_rqst *);
net/sunrpc/svc.c +2 -7
@@ -458,9 +458,6 @@ svc_create_pooled(struct svc_program *prog, unsigned int bufsize,void svc_destroy (struct svc_serv *serv) { -struct svc_sock *svsk; -struct svc_sock *tmp; -dprintk ("svc: svc_destroy(%s, %d)\n" , serv->sv_program->pg_name, serv->sv_nrthreads);
@@ -475,14 +472,12 @@ svc_destroy(struct svc_serv *serv)del_timer_sync (&serv->sv_temptimer); -list_for_each_entry_safe (svsk, tmp, &serv->sv_tempsocks, sk_list) -svc_force_close_socket (svsk); +svc_close_all (&serv->sv_tempsocks);if (serv->sv_shutdown) serv->sv_shutdown (serv); -list_for_each_entry_safe (svsk, tmp, &serv->sv_permsocks, sk_list) -svc_force_close_socket (svsk); +svc_close_all (&serv->sv_permsocks);BUG_ON (!list_empty (&serv->sv_permsocks));BUG_ON (!list_empty (&serv->sv_tempsocks));
net/sunrpc/svc_xprt.c +2 -0
@@ -110,6 +110,8 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt, xprt->xpt_ops = xcl->xcl_ops;kref_init (&xprt->xpt_ref); xprt->xpt_server = serv; +INIT_LIST_HEAD (&xprt->xpt_list); +INIT_LIST_HEAD (&xprt->xpt_ready); }EXPORT_SYMBOL_GPL (svc_xprt_init);
net/sunrpc/svcsock.c +51 -54
227 lines not on this page · raw message
RFC PATCH 18/38 svc: Move sk_reserved to svc_xprt
In reply to a message not in the archiveThis functionally trivial patch moves the sk_reserved field to the transport independent svc_xprt structure.
---
include/linux/sunrpc/svc_xprt.h | 1 + include/linux/sunrpc/svcsock.h | 2 -- net/sunrpc/svcsock.c | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -53,6 +53,7 @@ struct svc_xprt {struct svc_pool *xpt_pool;/* current pool iff queued */ struct svc_serv *xpt_server;/* service for transport */ +atomic_t xpt_reserved;/* space on outq that is rsvd */ };int svc_reg_xprt_class (struct svc_xprt_class *);
include/linux/sunrpc/svcsock.h +0 -2
@@ -20,8 +20,6 @@ struct svc_sock {struct socket * sk_sock;/* berkeley socket layer */ struct sock * sk_sk;/* INET layer */ -atomic_t sk_reserved;/* space on outq that is reserved */ -spinlock_t sk_lock;/* protects sk_deferred and * sk_info_authunix */ struct list_head sk_deferred;/* deferred requests that need to
net/sunrpc/svcsock.c +5 -5
@@ -304,7 +304,7 @@ svc_sock_enqueue(struct svc_sock *svsk) rqstp->rq_sock = svsk;svc_xprt_get (&svsk->sk_xprt); rqstp->rq_reserved = serv->sv_max_mesg; -atomic_add (rqstp->rq_reserved, &svsk->sk_reserved); +atomic_add (rqstp->rq_reserved, &svsk->sk_xprt.xpt_reserved);BUG_ON (svsk->sk_xprt.xpt_pool != pool);wake_up (&rqstp->rq_wait); }else {
@@ -369,7 +369,7 @@ void svc_reserve(struct svc_rqst *rqstp, int space)if (space < rqstp->rq_reserved) {struct svc_sock *svsk = rqstp->rq_sock; -atomic_sub ((rqstp->rq_reserved - space), &svsk->sk_reserved); +atomic_sub ((rqstp->rq_reserved - space), &svsk->sk_xprt.xpt_reserved); rqstp->rq_reserved = space;svc_sock_enqueue (svsk);
@@ -897,7 +897,7 @@ static int svc_udp_has_wspace(struct svc_xprt *xprt)* sock space. */ set_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); - required =atomic_read (&svsk->sk_reserved) + serv->sv_max_mesg; + required =atomic_read (&svsk->sk_xprt.xpt_reserved) + serv->sv_max_mesg;if (required*2 >sock_wspace (svsk->sk_sk))return 0 ;clear_bit (SOCK_NOSPACE , &svsk->sk_sock->flags);
@@ -1344,7 +1344,7 @@ static int svc_tcp_has_wspace(struct svc_xprt *xprt)* sock space. */ set_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); - required =atomic_read (&svsk->sk_reserved) + serv->sv_max_mesg; + required =atomic_read (&svsk->sk_xprt.xpt_reserved) + serv->sv_max_mesg;if (required*2 >sk_stream_wspace (svsk->sk_sk))return 0 ;clear_bit (SOCK_NOSPACE , &svsk->sk_sock->flags);
@@ -1561,7 +1561,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout) rqstp->rq_sock = svsk;svc_xprt_get (&svsk->sk_xprt); rqstp->rq_reserved = serv->sv_max_mesg; -atomic_add (rqstp->rq_reserved, &svsk->sk_reserved); +atomic_add (rqstp->rq_reserved, &svsk->sk_xprt.xpt_reserved); }else {/* No data pending. Go to sleep */ svc_thread_enqueue (pool, rqstp);
RFC PATCH 19/38 svc: Make the enqueue service transport neutral and export it.
In reply to a message not in the archiveThe svc_sock_enqueue function is now transport independent since all of the fields it touches have been moved to the transport independent svc_xprt structure. Change the function to use the svc_xprt structure directly instead of the transport specific svc_sock structure.
Transport specific data-ready handlers need to call this function, so export it.
---
net/sunrpc/svcsock.c | 97 ++++++++++++++++++++++++++------------------------ 1 files changed, 50 insertions(+), 47 deletions(-)
net/sunrpc/svcsock.c +50 -47
@@ -5,7 +5,7 @@* * The server scheduling algorithm does not always distribute the load * evenly when servicing a single client. May need to modify the -* svc_sock_enqueue procedure... +* svc_xprt_enqueue procedure... * * TCP support is largely untested and may be a little slow. The problem * is that we currently do two separate recvfrom's, one for the 4-byte
@@ -63,7 +63,7 @@* providing that certain rules are followed: * * XPT_CONN, XPT_DATA, can be set or cleared at any time. -* after a set, svc_sock_enqueue must be called. +* after a set, svc_xprt_enqueue must be called. * after a clear, the socket must be read/accepted * if this succeeds, it must be set again. * XPT_CLOSE can set at any time. It is never cleared.
@@ -228,22 +228,22 @@ svc_sock_wspace(struct svc_sock *svsk)* processes, wake 'em up. * */ -static void -svc_sock_enqueue (struct svc_sock *svsk) +void +svc_xprt_enqueue (struct svc_xprt *xprt) { -struct svc_serv *serv = svsk->sk_xprt.xpt_server; +struct svc_serv *serv = xprt->xpt_server;struct svc_pool *pool;struct svc_rqst *rqstp;int cpu; -if (!(svsk->sk_xprt.xpt_flags & +if (!(xprt->xpt_flags & ((1 <<XPT_CONN )|(1 <<XPT_DATA )|(1 <<XPT_CLOSE )|(1 <<XPT_DEFERRED ))))return ; -if (test_bit (XPT_DEAD , &svsk->sk_xprt.xpt_flags)) +if (test_bit (XPT_DEAD , &xprt->xpt_flags))return ; cpu =get_cpu (); - pool =svc_pool_for_cpu (svsk->sk_xprt.xpt_server, cpu); + pool =svc_pool_for_cpu (xprt->xpt_server, cpu);put_cpu ();spin_lock_bh (&pool->sp_lock);
@@ -251,11 +251,12 @@ svc_sock_enqueue(struct svc_sock *svsk)if (!list_empty (&pool->sp_threads) && !list_empty (&pool->sp_sockets))printk (KERN_ERR -"svc_sock_enqueue: threads and sockets both waiting??\n" ); +"svc_xprt_enqueue: " +"threads and transports both waiting??\n" ); -if (test_bit (XPT_DEAD , &svsk->sk_xprt.xpt_flags)) { +if (test_bit (XPT_DEAD , &xprt->xpt_flags)) {/* Don't enqueue dead sockets */ -dprintk ("svc: socket %p is dead, not enqueued\n" , svsk->sk_sk); +dprintk ("svc: transport %p is dead, not enqueued\n" , xprt); goto out_unlock; }
@@ -264,28 +265,29 @@ svc_sock_enqueue(struct svc_sock *svsk)* on the idle list. We update XPT_BUSY atomically because * it also guards against trying to enqueue the svc_sock twice. */ -if (test_and_set_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags)) { +if (test_and_set_bit (XPT_BUSY , &xprt->xpt_flags)) {/* Don't enqueue socket while already enqueued */ -dprintk ("svc: socket %p busy, not enqueued\n" , svsk->sk_sk); +dprintk ("svc: transport %p busy, not enqueued\n" , xprt); goto out_unlock; } -BUG_ON (svsk->sk_xprt.xpt_pool !=NULL ); - svsk->sk_xprt.xpt_pool = pool; +BUG_ON (xprt->xpt_pool !=NULL ); + xprt->xpt_pool = pool;/* Handle pending connection */ -if (test_bit (XPT_CONN , &svsk->sk_xprt.xpt_flags)) +if (test_bit (XPT_CONN , &xprt->xpt_flags)) goto process;/* Handle close in-progress */ -if (test_bit (XPT_CLOSE , &svsk->sk_xprt.xpt_flags)) +if (test_bit (XPT_CLOSE , &xprt->xpt_flags)) goto process;/* Check if we have space to reply to a request */ -if (!svsk->sk_xprt.xpt_ops->xpo_has_wspace (&svsk->sk_xprt)) { +if (!xprt->xpt_ops->xpo_has_wspace (xprt)) {/* Don't enqueue while not enough space for reply */ -dprintk ("svc: no write space, socket %p not enqueued\n" , svsk); - svsk->sk_xprt.xpt_pool =NULL ; -clear_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags); +dprintk ("svc: no write space, transport %p not enqueued\n" , + xprt); + xprt->xpt_pool =NULL ; +clear_bit (XPT_BUSY , &xprt->xpt_flags); goto out_unlock; }
@@ -294,28 +296,29 @@ svc_sock_enqueue(struct svc_sock *svsk) rqstp =list_entry (pool->sp_threads.next, struct svc_rqst, rq_list); -dprintk ("svc: socket %p served by daemon %p\n" , - svsk->sk_sk, rqstp); +dprintk ("svc: transport %p served by daemon %p\n" , + xprt, rqstp);svc_thread_dequeue (pool, rqstp); -if (rqstp->rq_sock) +if (rqstp->rq_xprt)printk (KERN_ERR -"svc_sock_enqueue: server %p, rq_sock=%p!\n" , - rqstp, rqstp->rq_sock); - rqstp->rq_sock = svsk; -svc_xprt_get (&svsk->sk_xprt); +"svc_xprt_enqueue: server %p, rq_xprt=%p!\n" , + rqstp, rqstp->rq_xprt); + rqstp->rq_xprt = xprt; +svc_xprt_get (xprt); rqstp->rq_reserved = serv->sv_max_mesg; -atomic_add (rqstp->rq_reserved, &svsk->sk_xprt.xpt_reserved); -BUG_ON (svsk->sk_xprt.xpt_pool != pool); +atomic_add (rqstp->rq_reserved, &xprt->xpt_reserved); +BUG_ON (xprt->xpt_pool != pool);wake_up (&rqstp->rq_wait); }else { -dprintk ("svc: socket %p put into queue\n" , svsk->sk_sk); -list_add_tail (&svsk->sk_xprt.xpt_ready, &pool->sp_sockets); -BUG_ON (svsk->sk_xprt.xpt_pool != pool); +dprintk ("svc: transport %p put into queue\n" , xprt); +list_add_tail (&xprt->xpt_ready, &pool->sp_sockets); +BUG_ON (xprt->xpt_pool != pool); } out_unlock:spin_unlock_bh (&pool->sp_lock); } +EXPORT_SYMBOL_GPL (svc_xprt_enqueue);/* * Dequeue the first socket. Must be called with the pool->sp_lock held.
@@ -349,7 +352,7 @@ svc_sock_received(struct svc_sock *svsk) { svsk->sk_xprt.xpt_pool =NULL ;clear_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt); }
@@ -368,11 +371,11 @@ void svc_reserve(struct svc_rqst *rqstp, int space) space += rqstp->rq_res.head[0 ].iov_len;if (space < rqstp->rq_reserved) { -struct svc_sock *svsk = rqstp->rq_sock; -atomic_sub ((rqstp->rq_reserved - space), &svsk->sk_xprt.xpt_reserved); +struct svc_xprt *xprt = rqstp->rq_xprt; +atomic_sub ((rqstp->rq_reserved - space), &xprt->xpt_reserved); rqstp->rq_reserved = space; -svc_sock_enqueue (svsk); +svc_xprt_enqueue (xprt); } }
@@ -700,7 +703,7 @@ svc_udp_data_ready(struct sock *sk, int count) svsk, sk, count, test_bit(XPT_BUSY, &svsk->sk_xprt.xpt_flags));set_bit (XPT_DATA , &svsk->sk_xprt.xpt_flags); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt); }if (sk->sk_sleep &&waitqueue_active (sk->sk_sleep))wake_up_interruptible (sk->sk_sleep);
@@ -717,7 +720,7 @@ svc_write_space(struct sock *sk)if (svsk) {dprintk ("svc: socket %p(inet %p), write_space busy=%d\n" , svsk, sk,test_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags)); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt); }if (sk->sk_sleep &&waitqueue_active (sk->sk_sleep)) {
@@ -989,7 +992,7 @@ svc_tcp_listen_data_ready(struct sock *sk, int count_unused)if (sk->sk_state ==TCP_LISTEN ) {if (svsk) {set_bit (XPT_CONN , &svsk->sk_xprt.xpt_flags); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt); }else printk ("svc: socket %p: no user data\n" , sk); }
@@ -1013,7 +1016,7 @@ svc_tcp_state_change(struct sock *sk)printk ("svc: socket %p: no user data\n" , sk); else {set_bit (XPT_CLOSE , &svsk->sk_xprt.xpt_flags); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt); }if (sk->sk_sleep &&waitqueue_active (sk->sk_sleep))wake_up_interruptible_all (sk->sk_sleep);
@@ -1028,7 +1031,7 @@ svc_tcp_data_ready(struct sock *sk, int count) sk, sk->sk_user_data);if (svsk) {set_bit (XPT_DATA , &svsk->sk_xprt.xpt_flags); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt); }if (sk->sk_sleep &&waitqueue_active (sk->sk_sleep))wake_up_interruptible (sk->sk_sleep);
@@ -1080,7 +1083,7 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt) }set_bit (XPT_CONN , &svsk->sk_xprt.xpt_flags); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt); err =kernel_getpeername (newsock, sin, &slen);if (err <0 ) {
@@ -1316,7 +1319,7 @@ svc_tcp_sendto(struct svc_rqst *rqstp) (sent<0 )?"got error" :"sent only" , sent, xbufp->len);set_bit (XPT_CLOSE , &rqstp->rq_sock->sk_xprt.xpt_flags); -svc_sock_enqueue (rqstp->rq_sock); +svc_xprt_enqueue (rqstp->rq_xprt); sent = -EAGAIN ; }return sent;
@@ -1493,7 +1496,7 @@ svc_check_conn_limits(struct svc_serv *serv)spin_unlock_bh (&serv->sv_lock);if (svsk) { -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt);svc_xprt_put (&svsk->sk_xprt); } }
@@ -1726,7 +1729,7 @@ svc_age_temp_sockets(unsigned long closure) svsk, get_seconds() - svsk->sk_lastrecv);/* a thread will dequeue and close it soon */ -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt);svc_xprt_put (&svsk->sk_xprt); }
@@ -2008,7 +2011,7 @@ static void svc_revisit(struct cache_deferred_req *dreq, int too_many)list_add (&dr->handle.recent, &svsk->sk_deferred);spin_unlock (&svsk->sk_lock);set_bit (XPT_DEFERRED , &svsk->sk_xprt.xpt_flags); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt);svc_xprt_put (&svsk->sk_xprt); }
RFC PATCH 20/38 svc: Make svc_send transport neutral
In reply to a message not in the archiveMove the sk_mutex field to the transport independent svc_xprt structure. Now all the fields that svc_send touches are transport neutral. Change the svc_send function to use the transport independent svc_xprt directly instead of the transport dependent svc_sock structure.
---
include/linux/sunrpc/svc_xprt.h | 1 + include/linux/sunrpc/svcsock.h | 1 - net/sunrpc/svc_xprt.c | 1 + net/sunrpc/svcsock.c | 19 ++++++++----------- 4 files changed, 10 insertions(+), 12 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -54,6 +54,7 @@ struct svc_xprt {struct svc_pool *xpt_pool;/* current pool iff queued */ struct svc_serv *xpt_server;/* service for transport */ atomic_t xpt_reserved;/* space on outq that is rsvd */ +struct mutex xpt_mutex;/* to serialize sending data */ };int svc_reg_xprt_class (struct svc_xprt_class *);
include/linux/sunrpc/svcsock.h +0 -1
@@ -24,7 +24,6 @@ struct svc_sock {* sk_info_authunix */ struct list_head sk_deferred;/* deferred requests that need to * be revisted */ -struct mutex sk_mutex;/* to serialize sending data */ /* We keep the old state_change and data_ready CB's here */ void (*sk_ostate)(struct sock *);
net/sunrpc/svc_xprt.c +1 -0
@@ -112,6 +112,7 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt, xprt->xpt_server = serv;INIT_LIST_HEAD (&xprt->xpt_list);INIT_LIST_HEAD (&xprt->xpt_ready); +mutex_init (&xprt->xpt_mutex); }EXPORT_SYMBOL_GPL (svc_xprt_init);
net/sunrpc/svcsock.c +8 -11
@@ -1650,15 +1650,13 @@ svc_drop(struct svc_rqst *rqstp)int svc_send (struct svc_rqst *rqstp) { -struct svc_sock *svsk; +struct svc_xprt *xprt;int len;struct xdr_buf *xb; -if ((svsk = rqstp->rq_sock) ==NULL ) { -printk (KERN_WARNING "NULL socket pointer in %s:%d\n" , - __FILE__, __LINE__); + xprt = rqstp->rq_xprt; +if (!xprt)return -EFAULT ; - }/* release the receive skb before sending the reply */ rqstp->rq_xprt->xpt_ops->xpo_release_rqst (rqstp);
@@ -1669,13 +1667,13 @@ svc_send(struct svc_rqst *rqstp) xb->page_len + xb->tail[0 ].iov_len; -/* Grab svsk->sk_mutex to serialize outgoing data. */ -mutex_lock (&svsk->sk_mutex); -if (test_bit (XPT_DEAD , &svsk->sk_xprt.xpt_flags)) +/* Grab mutex to serialize outgoing data. */ +mutex_lock (&xprt->xpt_mutex); +if (test_bit (XPT_DEAD , &xprt->xpt_flags)) len = -ENOTCONN ;else - len = svsk->sk_xprt.xpt_ops->xpo_sendto (rqstp); -mutex_unlock (&svsk->sk_mutex); + len = xprt->xpt_ops->xpo_sendto (rqstp); +mutex_unlock (&xprt->xpt_mutex);svc_sock_release (rqstp);if (len == -ECONNREFUSED || len == -ENOTCONN || len == -EAGAIN )
@@ -1777,7 +1775,6 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv, svsk->sk_lastrecv =get_seconds ();spin_lock_init (&svsk->sk_lock);INIT_LIST_HEAD (&svsk->sk_deferred); -mutex_init (&svsk->sk_mutex);/* Initialize the socket */ if (sock->type ==SOCK_DGRAM )
RFC PATCH 21/38 svc: Change svc_sock_received to svc_xprt_received and export it
In reply to a message not in the archiveAll fields touched by svc_sock_received are now transport independent. Change it to use svc_xprt directly. This function is called from transport dependent code, so export it.
---
include/linux/sunrpc/svc_xprt.h | 2 +- net/sunrpc/svcsock.c | 37 ++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 20 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -1
@@ -62,8 +62,8 @@ int svc_unreg_xprt_class(struct svc_xprt_class *);void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *,struct svc_serv *);int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int ); +void svc_xprt_received (struct svc_xprt *);void svc_xprt_put (struct svc_xprt *xprt); -static inline void svc_xprt_get (struct svc_xprt *xprt) {kref_get (&xprt->xpt_ref);
net/sunrpc/svcsock.c +18 -19
@@ -347,14 +347,14 @@ svc_sock_dequeue(struct svc_pool *pool)* Note: XPT_DATA only gets cleared when a read-attempt finds * no (or insufficient) data. */ -static inline void -svc_sock_received (struct svc_sock *svsk) +void +svc_xprt_received (struct svc_xprt *xprt) { - svsk->sk_xprt.xpt_pool =NULL ; -clear_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags); -svc_xprt_enqueue (&svsk->sk_xprt); + xprt->xpt_pool =NULL ; +clear_bit (XPT_BUSY , &xprt->xpt_flags); +svc_xprt_enqueue (xprt); } - +EXPORT_SYMBOL_GPL (svc_xprt_received);/** * svc_reserve - change the space reserved for the reply to a request.
@@ -783,7 +783,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp) (serv->sv_nrthreads+3) * serv->sv_max_mesg);if ((rqstp->rq_deferred =svc_deferred_dequeue (svsk))) { -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return svc_deferred_recv (rqstp); }
@@ -800,7 +800,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)dprintk ("svc: recvfrom returned error %d\n" , -err);set_bit (XPT_DATA , &svsk->sk_xprt.xpt_flags); } -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return -EAGAIN ; } rqstp->rq_addrlen =sizeof (rqstp->rq_addr);
@@ -815,7 +815,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)/* * Maybe more packets - kick another thread ASAP. */ -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt); len = skb->len -sizeof (struct udphdr ); rqstp->rq_arg.len = len;
@@ -1123,8 +1123,6 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt) }memcpy (&newsvsk->sk_local, sin, slen); -svc_sock_received (newsvsk); -if (serv->sv_stats) serv->sv_stats->nettcpconn++;
@@ -1153,7 +1151,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) test_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags));if ((rqstp->rq_deferred =svc_deferred_dequeue (svsk))) { -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return svc_deferred_recv (rqstp); }
@@ -1193,7 +1191,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)if (len < want) {dprintk ("svc: short recvfrom while reading record length (%d of %lu)\n" , len, want); -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return -EAGAIN ;/* record header not complete */ }
@@ -1229,7 +1227,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)if (len < svsk->sk_reclen) {dprintk ("svc: incomplete TCP record (%d of %d)\n" , len, svsk->sk_reclen); -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return -EAGAIN ;/* record not complete */ } len = svsk->sk_reclen;
@@ -1269,7 +1267,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) svsk->sk_reclen =0 ; svsk->sk_tcplen =0 ; -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);if (serv->sv_stats) serv->sv_stats->nettcpcnt++;
@@ -1282,7 +1280,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) error:if (len == -EAGAIN ) {dprintk ("RPC: TCP recvfrom got EAGAIN\n" ); -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt); }else {printk (KERN_NOTICE "%s: recvfrom returned errno %d\n" , svsk->sk_xprt.xpt_server->sv_name, -len);
@@ -1607,8 +1605,9 @@ svc_recv(struct svc_rqst *rqstp, long timeout)*/ __module_get (newxpt->xpt_class->xcl_owner);svc_check_conn_limits (svsk->sk_xprt.xpt_server); +svc_xprt_received (newxpt); } -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt); }else { dprintk("svc: server %p, pool %u, socket %p, inuse=%d\n", rqstp, pool->sp_id, svsk,
@@ -1827,7 +1826,7 @@ int svc_addsock(struct svc_serv *serv,else { svsk =svc_setup_socket (serv, so, &err,SVC_SOCK_DEFAULTS );if (svsk) { -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt); err =0 ; } }
@@ -1882,7 +1881,7 @@ svc_create_socket(struct svc_serv *serv, int protocol, }if ((svsk =svc_setup_socket (serv, sock, &error, flags)) !=NULL ) { -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return (struct svc_xprt *)svsk; }
A message that is not in the archive (sent off-list or not yet received): 20071129224037.14563.69171.stgit-gUwIgmpLGaKNDNWfRnPdfg@public.gmane.org
Re: [RFC,PATCH 21/38] svc: Change svc_sock_received to svc_xprt_received and export it
Quoted 31 lines · Tom Tucker
All fields touched by
svc_sock_receivedare now transport independent. Change it to usesvc_xprtdirectly. This function is called from transport dependent code, so export it.Signed-off-by Tom Tucker <[email protected]>---
include/linux/sunrpc/svc_xprt.h | 2 +- net/sunrpc/svcsock.c | 37 +++++++++++++++++ +------------------- 2 files changed, 19 insertions(+), 20 deletions(-)include/linux/sunrpc/svc_xprt.h +1
-1@@ -62,8 +62,8 @@ int svc_unreg_xprt_class(struct svc_xprt_class *);void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *,struct svc_serv *);int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int ); +void svc_xprt_received (struct svc_xprt *);void svc_xprt_put (struct svc_xprt *xprt); -static inline void svc_xprt_get (struct svc_xprt *xprt) {kref_get (&xprt->xpt_ref);net/sunrpc/svcsock.c +0
-0
net/sunrpc/svcsock.c svc_sock_dequeue(struct svc_pool *pool) · line 351
Quoted 7 lines
net/sunrpc/svcsock.c +2
-2@@ -347,14 +347,14 @@ svc_sock_dequeue(struct svc_pool *pool)* Note: XPT_DATA only gets cleared when a read-attempt finds * no (or insufficient) data. */ -static inline void -svc_sock_received (struct svc_sock *svsk) +void +svc_xprt_received (struct svc_xprt *xprt)
Style police again. I notice several of these patches add new functions with the return value split onto a separate line.
net/sunrpc/svcsock.c svc_sock_dequeue(struct svc_pool *pool) · line 357
Quoted 10 lines
net/sunrpc/svcsock.c +4
-4{ - svsk->sk_xprt.xpt_pool =NULL ; -clear_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags); -svc_xprt_enqueue (&svsk->sk_xprt); + xprt->xpt_pool =NULL ; +clear_bit (XPT_BUSY , &xprt->xpt_flags); +svc_xprt_enqueue (xprt); } - +EXPORT_SYMBOL_GPL (svc_xprt_received);
When I submitted the RPC client-side transport switch, Trond suggested we add the EXPORTs later when it was clear why they are needed. This may be a personal preference of the server maintainer, but I just thought I'd mention the possibility; it seems to make sense here too.
Quoted 31 lines
net/sunrpc/svcsock.c +0
-0/** * svc_reserve - change the space reserved for the reply to a request.
net/sunrpc/svcsock.c +3
-3@@ -783,7 +783,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp) (serv->sv_nrthreads+3) * serv->sv_max_mesg);if ((rqstp->rq_deferred =svc_deferred_dequeue (svsk))) { -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return svc_deferred_recv (rqstp); }@@ -800,7 +800,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)dprintk ("svc: recvfrom returned error %d\n" , -err);set_bit (XPT_DATA , &svsk->sk_xprt.xpt_flags); } -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return -EAGAIN ; } rqstp->rq_addrlen =sizeof (rqstp->rq_addr);@@ -815,7 +815,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)/* * Maybe more packets - kick another thread ASAP. */ -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt); len = skb->len -sizeof (struct udphdr ); rqstp->rq_arg.len = len;
net/sunrpc/svcsock.c static struct svc_xprt *svc_tcp_accept(struct · line 1128
Quoted 6 lines
net/sunrpc/svcsock.c +0
-2@@ -1123,8 +1123,6 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt) }memcpy (&newsvsk->sk_local, sin, slen); -svc_sock_received (newsvsk); -
I assume it's OK to remove svc_sock_received() here (rather than replacing it with svc_xprt_received()) because you are adding a call to xvs_xprt_received() below in svc_recv().
I think this is a non-trivial change amongst a whole bunch of trivial ones in this patch. Thus it would be nicer if we did this in a separate patch so you can document your rationale for this change. (Yeah, I think we went over this in e-mail some time ago, but still...)
Quoted 71 lines
net/sunrpc/svcsock.c +8
-7if (serv->sv_stats) serv->sv_stats->nettcpconn++;@@ -1153,7 +1151,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) test_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags));if ((rqstp->rq_deferred =svc_deferred_dequeue (svsk))) { -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return svc_deferred_recv (rqstp); }@@ -1193,7 +1191,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)if (len < want) { dprintk("svc: short recvfrom while reading record length (%d of %lu)\n", len, want); -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return -EAGAIN ;/* record header not complete */ }@@ -1229,7 +1227,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)if (len < svsk->sk_reclen) {dprintk ("svc: incomplete TCP record (%d of %d)\n" , len, svsk->sk_reclen); -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return -EAGAIN ;/* record not complete */ } len = svsk->sk_reclen;@@ -1269,7 +1267,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) svsk->sk_reclen =0 ; svsk->sk_tcplen =0 ; -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);if (serv->sv_stats) serv->sv_stats->nettcpcnt++;@@ -1282,7 +1280,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) error:if (len == -EAGAIN ) {dprintk ("RPC: TCP recvfrom got EAGAIN\n" ); -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt); }else {printk (KERN_NOTICE "%s: recvfrom returned errno %d\n" , svsk->sk_xprt.xpt_server->sv_name, -len);@@ -1607,8 +1605,9 @@ svc_recv(struct svc_rqst *rqstp, long timeout)*/ __module_get (newxpt->xpt_class->xcl_owner);svc_check_conn_limits (svsk->sk_xprt.xpt_server); +svc_xprt_received (newxpt); } -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt); }else { dprintk("svc: server %p, pool %u, socket %p, inuse=%d\n", rqstp, pool->sp_id, svsk,@@ -1827,7 +1826,7 @@ int svc_addsock(struct svc_serv *serv,else { svsk =svc_setup_socket (serv, so, &err,SVC_SOCK_DEFAULTS );if (svsk) { -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt); err =0 ; } }
net/sunrpc/svcsock.c svc_create_socket(struct svc_serv *serv, int · line 1887
Quoted 8 lines
net/sunrpc/svcsock.c +1
-1@@ -1882,7 +1881,7 @@ svc_create_socket(struct svc_serv *serv, int protocol, }if ((svsk =svc_setup_socket (serv, sock, &error, flags)) !=NULL ) { -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return (struct svc_xprt *)svsk; }
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
Re: [RFC,PATCH 21/38] svc: Change svc_sock_received to svc_xprt_received and export it
Quoted 35 lines · Chuck Lever
Quoted 34 lines · Tom Tucker
All fields touched by
svc_sock_receivedare now transport independent. Change it to usesvc_xprtdirectly. This function is called from transport dependent code, so export it.Signed-off-by Tom Tucker <[email protected]>---
include/linux/sunrpc/svc_xprt.h | 2 +- net/sunrpc/svcsock.c | 37 +++++++++++++++++ +------------------- 2 files changed, 19 insertions(+), 20 deletions(-)include/linux/sunrpc/ renamed from include/linux/sunrpc/svc_xprt.h +0
-0
svc_xprt.h
index d5ef902..c416d05 100644include/linux/sunrpc/svc_xprt.h +1
-1@@ -62,8 +62,8 @@ int svc_unreg_xprt_class(struct svc_xprt_class *);void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *,struct svc_serv *);int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int ); +void svc_xprt_received (struct svc_xprt *);void svc_xprt_put (struct svc_xprt *xprt); -static inline void svc_xprt_get (struct svc_xprt *xprt) {kref_get (&xprt->xpt_ref);net/sunrpc/svcsock.c +0
-0@@ -347,14 +347,14 @@ svc_sock_dequeue(struct svc_pool *pool)* Note: XPT_DATA only gets cleared when a read-attempt finds * no (or insufficient) data.
Quoted 8 lines
net/sunrpc/svcsock.c svc_sock_dequeue(struct svc_pool *pool) · line 351
Quoted 5 lines
net/sunrpc/svcsock.c +2
-2*/ -static inline void -svc_sock_received (struct svc_sock *svsk) +void +svc_xprt_received (struct svc_xprt *xprt)Style police again. I notice several of these patches add new functions with the return value split onto a separate line.
The policy I used was if I didn't change the function signature, I left it like it was. If I copied it to svc_xprt, I fixed the formatting of the signature to conform. I didn't do that for this one. I'll check for others.
Quoted 17 lines
net/sunrpc/svcsock.c svc_sock_dequeue(struct svc_pool *pool) · line 357
Quoted 11 lines
net/sunrpc/svcsock.c +4
-4{ - svsk->sk_xprt.xpt_pool =NULL ; -clear_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags); -svc_xprt_enqueue (&svsk->sk_xprt); + xprt->xpt_pool =NULL ; +clear_bit (XPT_BUSY , &xprt->xpt_flags); +svc_xprt_enqueue (xprt); } - +EXPORT_SYMBOL_GPL (svc_xprt_received);When I submitted the RPC client-side transport switch, Trond suggested we add the EXPORTs later when it was clear why they are needed. This may be a personal preference of the server maintainer, but I just thought I'd mention the possibility; it seems to make sense here too.
Sure, but we already have a server side provider that helps accelerate the proving process. The svcrdma module won't build without this being exported.
Quoted 43 lines
Quoted 32 lines
net/sunrpc/svcsock.c +0
-0/** * svc_reserve - change the space reserved for the reply to a request.
net/sunrpc/svcsock.c +3
-3@@ -783,7 +783,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp) (serv->sv_nrthreads+3) * serv->sv_max_mesg);if ((rqstp->rq_deferred =svc_deferred_dequeue (svsk))) { -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return svc_deferred_recv (rqstp); }@@ -800,7 +800,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)dprintk ("svc: recvfrom returned error %d\n" , -err);set_bit (XPT_DATA , &svsk->sk_xprt.xpt_flags); } -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return -EAGAIN ; } rqstp->rq_addrlen =sizeof (rqstp->rq_addr);@@ -815,7 +815,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)/* * Maybe more packets - kick another thread ASAP. */ -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt); len = skb->len -sizeof (struct udphdr ); rqstp->rq_arg.len = len;net/sunrpc/svcsock.c static struct svc_xprt *svc_tcp_accept(struct · line 1128
Quoted 6 lines
net/sunrpc/svcsock.c +0
-2@@ -1123,8 +1123,6 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt) }memcpy (&newsvsk->sk_local, sin, slen); -svc_sock_received (newsvsk); -I assume it's OK to remove
svc_sock_received()here (rather than replacing it withsvc_xprt_received()) because you are adding a call toxvs_xprt_received()below insvc_recv().
Quoted 5 lines
I think this is a non-trivial change amongst a whole bunch of trivial ones in this patch. Thus it would be nicer if we did this in a separate patch so you can document your rationale for this change. (Yeah, I think we went over this in e-mail some time ago, but still...)
Yeah, this is probably a good idea. I toyed with removing svc_xprt_received from the provider all-together and putting it in the common logic which would remove 10s of calls to svc_xprt_received and avoid potential races caused by calling it without the BUSY bit held. The reason I didn't do it was because it means that the xpo_receive function must complete before queuing the transport back for more I/O, and this is suboptimal from an MP perspective since some transports can release the transport early (e.g. RDMA) while it parses the transport header and does other business.
Quoted 87 lines
Quoted 71 lines
net/sunrpc/svcsock.c +8
-7if (serv->sv_stats) serv->sv_stats->nettcpconn++;@@ -1153,7 +1151,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) test_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags));if ((rqstp->rq_deferred =svc_deferred_dequeue (svsk))) { -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return svc_deferred_recv (rqstp); }@@ -1193,7 +1191,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)if (len < want) { dprintk("svc: short recvfrom while reading record length (%d of %lu)\n", len, want); -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return -EAGAIN ;/* record header not complete */ }@@ -1229,7 +1227,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)if (len < svsk->sk_reclen) {dprintk ("svc: incomplete TCP record (%d of %d)\n" , len, svsk->sk_reclen); -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return -EAGAIN ;/* record not complete */ } len = svsk->sk_reclen;@@ -1269,7 +1267,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) svsk->sk_reclen =0 ; svsk->sk_tcplen =0 ; -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);if (serv->sv_stats) serv->sv_stats->nettcpcnt++;@@ -1282,7 +1280,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) error:if (len == -EAGAIN ) {dprintk ("RPC: TCP recvfrom got EAGAIN\n" ); -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt); }else {printk (KERN_NOTICE "%s: recvfrom returned errno %d\n" , svsk->sk_xprt.xpt_server->sv_name, -len);@@ -1607,8 +1605,9 @@ svc_recv(struct svc_rqst *rqstp, long timeout)*/ __module_get (newxpt->xpt_class->xcl_owner);svc_check_conn_limits (svsk->sk_xprt.xpt_server); +svc_xprt_received (newxpt); } -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt); }else { dprintk("svc: server %p, pool %u, socket %p, inuse=%d\n", rqstp, pool->sp_id, svsk,@@ -1827,7 +1826,7 @@ int svc_addsock(struct svc_serv *serv,else { svsk =svc_setup_socket (serv, so, &err,SVC_SOCK_DEFAULTS );if (svsk) { -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt); err =0 ; } }net/sunrpc/svcsock.c svc_create_socket(struct svc_serv *serv, int · line 1887
Quoted 8 lines
net/sunrpc/svcsock.c +1
-1@@ -1882,7 +1881,7 @@ svc_create_socket(struct svc_serv *serv, int protocol, }if ((svsk =svc_setup_socket (serv, sock, &error, flags)) !=NULL ) { -svc_sock_received (svsk); +svc_xprt_received (&svsk->sk_xprt);return (struct svc_xprt *)svsk; }--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
-
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [RFC,PATCH 21/38] svc: Change svc_sock_received to svc_xprt_received and export it
Quoted 19 lines · Tom Tucker
Quoted 17 lines · Chuck Lever
net/sunrpc/svcsock.c svc_sock_dequeue(struct svc_pool *pool) · line 357
Quoted 10 lines · Tom Tucker
{
net/sunrpc/svcsock.c +4
-4- svsk->sk_xprt.xpt_pool =NULL ; -clear_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags); -svc_xprt_enqueue (&svsk->sk_xprt); + xprt->xpt_pool =NULL ; +clear_bit (XPT_BUSY , &xprt->xpt_flags); +svc_xprt_enqueue (xprt); } - +EXPORT_SYMBOL_GPL (svc_xprt_received);When I submitted the RPC client-side transport switch, Trond suggested we add the EXPORTs later when it was clear why they are needed. This may be a personal preference of the server maintainer, but I just thought I'd mention the possibility; it seems to make sense here too.
Quoted 3 lines
Sure, but we already have a server side provider that helps accelerate the proving process. The svcrdma module won't build without this being exported.
That's fine. You just add the EXPORTs when you introduce the svcrdma module.
No biggie.
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
RFC PATCH 22/38 svc: Remove sk_lastrecv
In reply to a message not in the archiveWith the implementation of the new mark and sweep algorithm for shutting down old connections, the sk_lastrecv field is no longer needed.
---
include/linux/sunrpc/svcsock.h | 1 - net/sunrpc/svcsock.c | 5 +---- 2 files changed, 1 insertions(+), 5 deletions(-)
include/linux/sunrpc/svcsock.h +0 -1
@@ -33,7 +33,6 @@ struct svc_sock {/* private TCP part */ int sk_reclen;/* length of record */ int sk_tcplen;/* current read length */ -time_t sk_lastrecv;/* time of last received request */ /* cache of various info for TCP sockets */ void *sk_info_authunix;
net/sunrpc/svcsock.c +1 -4
@@ -1622,7 +1622,6 @@ svc_recv(struct svc_rqst *rqstp, long timeout)svc_sock_release (rqstp);return -EAGAIN ; } - svsk->sk_lastrecv =get_seconds ();clear_bit (XPT_OLD , &svsk->sk_xprt.xpt_flags); rqstp->rq_secure =svc_port_is_privileged (svc_addr (rqstp));
@@ -1722,8 +1721,7 @@ svc_age_temp_sockets(unsigned long closure)list_del_init (le); svsk = list_entry(le, struct svc_sock, sk_xprt.xpt_list); -dprintk ("queuing svsk %p for closing, %lu seconds old\n" , - svsk,get_seconds () - svsk->sk_lastrecv); +dprintk ("queuing svsk %p for closing\n" , svsk);/* a thread will dequeue and close it soon */ svc_xprt_enqueue (&svsk->sk_xprt);
@@ -1771,7 +1769,6 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv, svsk->sk_ostate = inet->sk_state_change; svsk->sk_odata = inet->sk_data_ready; svsk->sk_owspace = inet->sk_write_space; - svsk->sk_lastrecv =get_seconds ();spin_lock_init (&svsk->sk_lock);INIT_LIST_HEAD (&svsk->sk_deferred);
RFC PATCH 24/38 svc: Make deferral processing xprt independent
In reply to a message not in the archiveThis patch moves the transport independent sk_deferred list to the svc_xprt structure and updates the svc_deferred_req structure to keep pointers to svc_xprt's directly. The deferral processing code is also moved out of the transport dependent recvfrom functions and into the generic svc_recv path.
---
include/linux/sunrpc/svc.h | 2 + include/linux/sunrpc/svc_xprt.h | 2 + include/linux/sunrpc/svcsock.h | 3 -- net/sunrpc/svc_xprt.c | 1 + net/sunrpc/svcsock.c | 58 +++++++++++++++++---------------------- 5 files changed, 29 insertions(+), 37 deletions(-)
include/linux/sunrpc/svc.h +1 -1
@@ -320,7 +320,7 @@ static inline void svc_free_res_pages(struct svc_rqst *rqstp)struct svc_deferred_req {u32 prot;/* protocol (UDP or TCP) */ -struct svc_sock *svsk; +struct svc_xprt *xprt;struct sockaddr_storage addr;/* where reply must go */ size_t addrlen;union svc_addr_u daddr;/* where reply must come from */
include/linux/sunrpc/svc_xprt.h +2 -0
@@ -59,6 +59,8 @@ struct svc_xprt {spinlock_t xpt_lock;/* protects sk_deferred * and xpt_auth_cache */ void *xpt_auth_cache;/* auth cache */ +struct list_head xpt_deferred;/* deferred requests that need +* to be revisted */ };int svc_reg_xprt_class (struct svc_xprt_class *);
include/linux/sunrpc/svcsock.h +0 -3
@@ -20,9 +20,6 @@ struct svc_sock {struct socket * sk_sock;/* berkeley socket layer */ struct sock * sk_sk;/* INET layer */ -struct list_head sk_deferred;/* deferred requests that need to -* be revisted */ -/* We keep the old state_change and data_ready CB's here */ void (*sk_ostate)(struct sock *);void (*sk_odata)(struct sock *,int bytes);
net/sunrpc/svc_xprt.c +1 -0
@@ -115,6 +115,7 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt, xprt->xpt_server = serv;INIT_LIST_HEAD (&xprt->xpt_list);INIT_LIST_HEAD (&xprt->xpt_ready); +INIT_LIST_HEAD (&xprt->xpt_deferred);mutex_init (&xprt->xpt_mutex);spin_lock_init (&xprt->xpt_lock); }
net/sunrpc/svcsock.c +25 -33
119 lines not on this page · raw message
RFC PATCH 25/38 svc: Move the sockaddr information to svc_xprt
In reply to a message not in the archiveThis patch moves the transport sockaddr to the svc_xprt structure. Convenience functions are added to set and get the local and remote addresses of a transport from the transport provider as well as determine the length of a sockaddr.
A transport is responsible for setting the xpt_local and xpt_remote addresses in the svc_xprt structure as part of transport creation and xpo_accept processing. This cannot be done in a generic way and in fact varies between TCP, UDP and RDMA. A set of xpo_ functions (e.g. getlocalname, getremotename) could have been added but this would have resulted in additional caching and copying of the addresses around. Note that the xpt_local address should also be set on listening endpoints; for TCP/RDMA this is done as part of endpoint creation.
For connected transports like TCP and RDMA, the addresses never change and can be set once and copied into the rqstp structure for each request. For UDP, however, the local and remote addresses may change for each request. In this case, the address information is obtained from the UDP recvmsg info and copied into the rqstp structure from there.
A svc_xprt_local_port function was also added that returns the local port given a transport. This is used by svc_create_xprt when returning the port associated with a newly created transport, and later when creating a generic find transport service to check if a service is already listening on a given port.
---
include/linux/sunrpc/svc_xprt.h | 51 ++++++++++++++++++++++++++++++++++++ include/linux/sunrpc/svcsock.h | 4 --- net/sunrpc/svc_xprt.c | 31 ++++++++++++++++++++-- net/sunrpc/svcsock.c | 56 +++++++++++++++++++++------------------ 4 files changed, 110 insertions(+), 32 deletions(-)
include/linux/sunrpc/svc_xprt.h +51 -0
@@ -61,6 +61,10 @@ struct svc_xprt {void *xpt_auth_cache;/* auth cache */ struct list_head xpt_deferred;/* deferred requests that need * to be revisted */ +struct sockaddr_storage xpt_local;/* local address */ +int xpt_locallen;/* length of address */ +struct sockaddr_storage xpt_remote;/* remote peer's address */ +int xpt_remotelen;/* length of address */ };int svc_reg_xprt_class (struct svc_xprt_class *);
@@ -70,9 +74,56 @@ void svc_xprt_init(struct svc_xprt_class *, struct svc_xprt *,int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int );void svc_xprt_received (struct svc_xprt *);void svc_xprt_put (struct svc_xprt *xprt); +void svc_xprt_copy_addrs (struct svc_rqst *rqstp,struct svc_xprt *xprt);static inline void svc_xprt_get (struct svc_xprt *xprt) {kref_get (&xprt->xpt_ref); } +static inline void svc_xprt_set_local (struct svc_xprt *xprt, +struct sockaddr *sa,int salen) +{ +memcpy (&xprt->xpt_local, sa, salen); + xprt->xpt_locallen = salen; +} +static inline void svc_xprt_set_remote (struct svc_xprt *xprt, +struct sockaddr *sa,int salen) +{ +memcpy (&xprt->xpt_remote, sa, salen); + xprt->xpt_remotelen = salen; +} +static inline int svc_addr_port (struct sockaddr *sa) +{ +int ret =-1 ; +switch (sa->sa_family) { +case AF_INET : + ret =ntohs (((struct sockaddr_in *)sa)->sin_port); +break ; +case AF_INET6 : + ret =ntohs (((struct sockaddr_in6 *)sa)->sin6_port); +break ; + } +return ret; +} + +static inline int svc_addr_len (struct sockaddr *sa) +{ +switch (sa->sa_family) { +case AF_INET : +return sizeof (struct sockaddr_in ); +case AF_INET6 : +return sizeof (struct sockaddr_in6 ); + } +return -ENOTSUPP ; +} + +static inline int svc_xprt_local_port (struct svc_xprt *xprt) +{ +return svc_addr_port ((struct sockaddr *)&xprt->xpt_local); +} + +static inline int svc_xprt_remote_port (struct svc_xprt *xprt) +{ +return svc_addr_port ((struct sockaddr *)&xprt->xpt_remote); +}#endif /* SUNRPC_SVC_XPRT_H */
include/linux/sunrpc/svcsock.h +0 -4
@@ -28,10 +28,6 @@ struct svc_sock {/* private TCP part */ int sk_reclen;/* length of record */ int sk_tcplen;/* current read length */ - -struct sockaddr_storage sk_local;/* local address */ -struct sockaddr_storage sk_remote;/* remote peer's address */ -int sk_remotelen;/* length of address */ };/*
net/sunrpc/svc_xprt.c +29 -2
@@ -138,7 +138,6 @@ int svc_create_xprt(struct svc_serv *serv, char *xprt_name, unsigned short port,spin_unlock (&svc_xprt_class_lock);if (try_module_get (xcl->xcl_owner)) {struct svc_xprt *newxprt; - ret =0 ; newxprt = xcl->xcl_ops->xpo_create (serv, (struct sockaddr *)&sin, sizeof(sin),
@@ -146,7 +145,8 @@ int svc_create_xprt(struct svc_serv *serv, char *xprt_name, unsigned short port,if (IS_ERR (newxprt)) {module_put (xcl->xcl_owner); ret =PTR_ERR (newxprt); - } + }else + ret =svc_xprt_local_port (newxprt); } goto out; }
@@ -157,3 +157,30 @@ int svc_create_xprt(struct svc_serv *serv, char *xprt_name, unsigned short port,return ret; }EXPORT_SYMBOL_GPL (svc_create_xprt); + +/* +* Copy the local and remote xprt addresses to the rqstp structure +*/ +void svc_xprt_copy_addrs (struct svc_rqst *rqstp,struct svc_xprt *xprt) +{ +struct sockaddr *sin; + +memcpy (&rqstp->rq_addr, &xprt->xpt_remote, xprt->xpt_remotelen); + rqstp->rq_addrlen = xprt->xpt_remotelen; + +/* +* Destination address in request is needed for binding the +* source address in RPC replies/callbacks later. +*/ + sin = (struct sockaddr *)&xprt->xpt_local; +switch (sin->sa_family) { +case AF_INET : + rqstp->rq_daddr.addr = ((struct sockaddr_in *)sin)->sin_addr; +break ; +case AF_INET6 : + rqstp->rq_daddr.addr6 = ((struct sockaddr_in6 *)sin)->sin6_addr; +break ; + } +} +EXPORT_SYMBOL_GPL (svc_xprt_copy_addrs); +
net/sunrpc/svcsock.c +30 -26
122 lines not on this page · raw message
A message that is not in the archive (sent off-list or not yet received): 20071129224046.14563.59353.stgit-gUwIgmpLGaKNDNWfRnPdfg@public.gmane.org
Re: [RFC,PATCH 25/38] svc: Move the sockaddr information to svc_xprt
A few minor quibbles below.
Quoted 96 lines · Tom Tucker
This patch moves the transport sockaddr to the
svc_xprtstructure. Convenience functions are added to set and get the local and remote addresses of a transport from the transport provider as well as determine the length of a sockaddr.A transport is responsible for setting the
xpt_localandxpt_remoteaddresses in thesvc_xprtstructure as part of transport creation andxpo_acceptprocessing. This cannot be done in a generic way and in fact varies between TCP, UDP and RDMA. A set ofxpo_functions (e.g. getlocalname, getremotename) could have been added but this would have resulted in additional caching and copying of the addresses around. Note that thexpt_localaddress should also be set on listening endpoints; for TCP/RDMA this is done as part of endpoint creation.For connected transports like TCP and RDMA, the addresses never change and can be set once and copied into the rqstp structure for each request. For UDP, however, the local and remote addresses may change for each request. In this case, the address information is obtained from the UDP recvmsg info and copied into the rqstp structure from there.
A
svc_xprt_local_portfunction was also added that returns the local port given a transport. This is used bysvc_create_xprtwhen returning the port associated with a newly created transport, and later when creating a generic find transport service to check if a service is already listening on a given port.Signed-off-by Tom Tucker <[email protected]>---
include/linux/sunrpc/svc_xprt.h | 51 ++++++++++++++++++++++++++++ ++++++++ include/linux/sunrpc/svcsock.h | 4 --- net/sunrpc/svc_xprt.c | 31 ++++++++++++++++++++-- net/sunrpc/svcsock.c | 56 ++++++++++++++++++++ +------------------ 4 files changed, 110 insertions(+), 32 deletions(-)include/linux/sunrpc/svc_xprt.h +31
-0@@ -61,6 +61,10 @@ struct svc_xprt {void *xpt_auth_cache;/* auth cache */ struct list_head xpt_deferred;/* deferred requests that need * to be revisted */ +struct sockaddr_storage xpt_local;/* local address */ +int xpt_locallen;/* length of address */ +struct sockaddr_storage xpt_remote;/* remote peer's address */ +int xpt_remotelen;/* length of address */ };int svc_reg_xprt_class (struct svc_xprt_class *);@@ -70,9 +74,56 @@ void svc_xprt_init(struct svc_xprt_class *, struct svc_xprt *,int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int );void svc_xprt_received (struct svc_xprt *);void svc_xprt_put (struct svc_xprt *xprt); +void svc_xprt_copy_addrs (struct svc_rqst *rqstp,struct svc_xprt *xprt);static inline void svc_xprt_get (struct svc_xprt *xprt) {kref_get (&xprt->xpt_ref); } +static inline void svc_xprt_set_local (struct svc_xprt *xprt, +struct sockaddr *sa,int salen) +{ +memcpy (&xprt->xpt_local, sa, salen); + xprt->xpt_locallen = salen; +} +static inline void svc_xprt_set_remote (struct svc_xprt *xprt, +struct sockaddr *sa,int salen) +{ +memcpy (&xprt->xpt_remote, sa, salen); + xprt->xpt_remotelen = salen; +} +static inline int svc_addr_port (struct sockaddr *sa) +{ +int ret =-1 ; +switch (sa->sa_family) { +case AF_INET : + ret =ntohs (((struct sockaddr_in *)sa)->sin_port); +break ; +case AF_INET6 : + ret =ntohs (((struct sockaddr_in6 *)sa)->sin6_port); +break ; + } +return ret; +} +
include/linux/sunrpc/svc_xprt.h void svc_xprt_init(struct svc_xprt_class *, · line 119
Quoted 10 lines
include/linux/sunrpc/svc_xprt.h +10
-0+static inline int svc_addr_len (struct sockaddr *sa) +{ +switch (sa->sa_family) { +case AF_INET : +return sizeof (struct sockaddr_in ); +case AF_INET6 : +return sizeof (struct sockaddr_in6 ); + } +return -ENOTSUPP ; +}
Address lengths should be size_t. I shouldn't have used "int".
For unrecognized address families, you could return zero here instead of a negative number.
Quoted 11 lines
include/linux/sunrpc/svc_xprt.h +10
-0+ +static inline int svc_xprt_local_port (struct svc_xprt *xprt) +{ +return svc_addr_port ((struct sockaddr *)&xprt->xpt_local); +} + +static inline int svc_xprt_remote_port (struct svc_xprt *xprt) +{ +return svc_addr_port ((struct sockaddr *)&xprt->xpt_remote); +}
Quoted 1 line
#endif /*
SUNRPC_SVC_XPRT_H*/
Ports in native endianness should be "unsigned short."
Quoted 210 lines
include/linux/sunrpc/svcsock.h +0
-4@@ -28,10 +28,6 @@ struct svc_sock {/* private TCP part */ int sk_reclen;/* length of record */ int sk_tcplen;/* current read length */ - -struct sockaddr_storage sk_local;/* local address */ -struct sockaddr_storage sk_remote;/* remote peer's address */ -int sk_remotelen;/* length of address */ };/* net/sunrpc/svc_xprt.c +0
-1@@ -138,7 +138,6 @@ int svc_create_xprt(struct svc_serv *serv, char *xprt_name, unsigned short port,spin_unlock (&svc_xprt_class_lock);if (try_module_get (xcl->xcl_owner)) {struct svc_xprt *newxprt; - ret =0 ; newxprt = xcl->xcl_ops->xpo_create (serv,net/sunrpc/svc_xprt.c +2
-1(struct sockaddr *)&sin, sizeof(sin),@@ -146,7 +145,8 @@ int svc_create_xprt(struct svc_serv *serv, char *xprt_name, unsigned short port, if (IS_ERR(newxprt)) {module_put (xcl->xcl_owner); ret =PTR_ERR (newxprt); - } + } else + ret =svc_xprt_local_port (newxprt); } goto out;net/sunrpc/svc_xprt.c +5
-0}@@ -157,3 +157,30 @@ int svc_create_xprt(struct svc_serv *serv, char *xprt_name, unsigned short port, return ret; }EXPORT_SYMBOL_GPL (svc_create_xprt); + +/* +* Copy the local and remote xprt addresses to the rqstp structure +*/ +void svc_xprt_copy_addrs(struct svc_rqst *rqstp, struct svc_xprt*xprt)
net/sunrpc/svc_xprt.c +22
-0+{ +struct sockaddr *sin; + +memcpy (&rqstp->rq_addr, &xprt->xpt_remote, xprt->xpt_remotelen); + rqstp->rq_addrlen = xprt->xpt_remotelen; + +/* +* Destination address in request is needed for binding the +* source address in RPC replies/callbacks later. +*/ + sin = (struct sockaddr *)&xprt->xpt_local; +switch (sin->sa_family) { +case AF_INET : + rqstp->rq_daddr.addr = ((struct sockaddr_in *)sin)->sin_addr; +break ; +case AF_INET6 : + rqstp->rq_daddr.addr6 = ((struct sockaddr_in6 *)sin)->sin6_addr; +break ; + } +} +EXPORT_SYMBOL_GPL (svc_xprt_copy_addrs); +net/sunrpc/svcsock.c +2
-22@@ -638,33 +638,13 @@ svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr, int buflen) struct msghdr msg = { .msg_flags =MSG_DONTWAIT , }; -struct sockaddr *sin;int len; len =kernel_recvmsg (svsk->sk_sock, &msg, iov, nr, buflen, msg.msg_flags); -/* sock_recvmsg doesn't fill in the name/namelen, so we must.. -*/ -memcpy (&rqstp->rq_addr, &svsk->sk_remote, svsk->sk_remotelen); - rqstp->rq_addrlen = svsk->sk_remotelen; - -/* Destination address in request is needed for binding the -* source address in RPC callbacks later. -*/ - sin = (struct sockaddr *)&svsk->sk_local; -switch (sin->sa_family) { -case AF_INET : - rqstp->rq_daddr.addr = ((struct sockaddr_in *)sin)->sin_addr; -break ; -case AF_INET6 : - rqstp->rq_daddr.addr6 = ((struct sockaddr_in6 *)sin)->sin6_addr; -break ; - } -dprintk ("svc: socket %p recvfrom(%p, %Zu) = %d\n" , svsk, iov[0 ].iov_base, iov[0 ].iov_len, len); -return len; }@@ -734,8 +714,15 @@ svc_write_space(struct sock *sk) } } -static inline void svc_udp_get_dest_address (struct svc_rqst *rqstp, -struct cmsghdr *cmh) +/* +* Copy the UDP datagram's destination address to the rqstp structure.
+ * The 'destination' address in this case is the address to which the
+ * peer sent the datagram, i.e. our local address. For multihomed
+ * hosts, this can change from msg to msg. Note that only the IP
+ * address changes, the port number should remain the same.
+ */net/sunrpc/svcsock.c +8
-4+static void svc_udp_get_dest_address (struct svc_rqst *rqstp, +struct cmsghdr *cmh) {switch (rqstp->rq_sock->sk_sk->sk_family) {case AF_INET : {@@ -802,7 +789,10 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)svc_xprt_received (&svsk->sk_xprt);return -EAGAIN ; } - rqstp->rq_addrlen =sizeof (rqstp->rq_addr); + len =svc_addr_len (svc_addr (rqstp)); +if (len <0 ) +return len; + rqstp->rq_addrlen = len;if (skb->tstamp.tv64 ==0 ) { skb->tstamp =ktime_get_real ();/* Don't enable netstamp, sunrpc doesn't @@ -1114,14 +1104,13 @@ static struct svc_xprt *svc_tcp_accept (struct svc_xprt *xprt) if (!(newsvsk = svc_setup_socket(serv, newsock, &err, (SVC_SOCK_ANONYMOUS | SVC_SOCK_TEMPORARY)))) goto failed; -memcpy (&newsvsk->sk_remote, sin, slen); - newsvsk->sk_remotelen = slen; +svc_xprt_set_remote (&newsvsk->sk_xprt, sin, slen); err =kernel_getsockname (newsock, sin, &slen);if (unlikely (err <0 )) {dprintk ("svc_tcp_accept: kernel_getsockname error %d\n" , -err); slen = offsetof(struct sockaddr , sa_data); } -memcpy (&newsvsk->sk_local, sin, slen); +svc_xprt_set_local (&newsvsk->sk_xprt, sin, slen);if (serv->sv_stats)net/sunrpc/svcsock.c +9
-0serv->sv_stats->nettcpconn++;@@ -1262,6 +1251,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) svsk->sk_reclen =0 ; svsk->sk_tcplen =0 ; +svc_xprt_copy_addrs (rqstp, &svsk->sk_xprt);svc_xprt_received (&svsk->sk_xprt);if (serv->sv_stats) serv->sv_stats->nettcpcnt++;@@ -1821,6 +1811,11 @@ int svc_addsock(struct svc_serv *serv,else { svsk =svc_setup_socket (serv, so, &err,SVC_SOCK_DEFAULTS );if (svsk) { +struct sockaddr_storage addr; +struct sockaddr *sin = (struct sockaddr *)&addr; +int salen; +if (kernel_getsockname (svsk->sk_sock, sin, &salen) ==0 ) +svc_xprt_set_local (&svsk->sk_xprt, sin, salen);svc_xprt_received (&svsk->sk_xprt); err =0 ; }@@ -1846,6 +1841,9 @@ svc_create_socket(struct svc_serv *serv, int protocol, int error;int type;char buf[RPC_MAX_ADDRBUFLEN ]; +struct sockaddr_storage addr; +struct sockaddr *newsin = (struct sockaddr *)&addr; +int newlen; dprintk("svc: svc_create_socket(%s, %d, %s)\n",net/sunrpc/svcsock.c +6
-0serv->sv_program->pg_name, protocol,@@ -1870,12 +1868,18 @@ svc_create_socket(struct svc_serv *serv,int protocol, if (error < 0) goto bummer; + newlen = len; + error =kernel_getsockname (sock, newsin, &newlen); +if (error <0 ) + goto bummer; +if (protocol ==IPPROTO_TCP ) {if ((error =kernel_listen (sock,64 )) <0 ) goto bummer; }if ((svsk =svc_setup_socket (serv, sock, &error, flags)) !=NULL ) { +svc_xprt_set_local (&svsk->sk_xprt, newsin, newlen);svc_xprt_received (&svsk->sk_xprt);return (struct svc_xprt *)svsk;
Quoted 1 line
}
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
RFC PATCH 26/38 svc: Make svc_sock_release svc_xprt_release
In reply to a message not in the archiveThe svc_sock_release function only touches transport independent fields. Change the function to manipulate svc_xprt directly instead of the transport dependent svc_sock structure.
---
net/sunrpc/svcsock.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-)
net/sunrpc/svcsock.c +7 -9
@@ -383,10 +383,9 @@ void svc_reserve(struct svc_rqst *rqstp, int space) } } -static void -svc_sock_release (struct svc_rqst *rqstp) +static void svc_xprt_release (struct svc_rqst *rqstp) { -struct svc_sock *svsk = rqstp->rq_sock; +struct svc_xprt *xprt = rqstp->rq_xprt; rqstp->rq_xprt->xpt_ops->xpo_release_rqst (rqstp);
@@ -394,7 +393,6 @@ svc_sock_release(struct svc_rqst *rqstp) rqstp->rq_res.page_len =0 ; rqstp->rq_res.page_base =0 ; -/* Reset response buffer and release * the reservation. * But first, check that enough space was reserved
@@ -407,9 +405,9 @@ svc_sock_release(struct svc_rqst *rqstp) rqstp->rq_res.head[0 ].iov_len =0 ;svc_reserve (rqstp,0 ); - rqstp->rq_sock =NULL ; + rqstp->rq_xprt =NULL ; -svc_xprt_put (&svsk->sk_xprt); +svc_xprt_put (xprt); }/*
@@ -1609,7 +1607,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)/* No data, incomplete (TCP) read, or accept() */ if (len ==0 || len == -EAGAIN ) { rqstp->rq_res.len =0 ; -svc_sock_release (rqstp); +svc_xprt_release (rqstp);return -EAGAIN ; }clear_bit (XPT_OLD , &svsk->sk_xprt.xpt_flags);
@@ -1629,7 +1627,7 @@ void svc_drop(struct svc_rqst *rqstp) {dprintk ("svc: socket %p dropped request\n" , rqstp->rq_sock); -svc_sock_release (rqstp); +svc_xprt_release (rqstp); }/*
@@ -1662,7 +1660,7 @@ svc_send(struct svc_rqst *rqstp)else len = xprt->xpt_ops->xpo_sendto (rqstp);mutex_unlock (&xprt->xpt_mutex); -svc_sock_release (rqstp); +svc_xprt_release (rqstp);if (len == -ECONNREFUSED || len == -ENOTCONN || len == -EAGAIN )return 0 ;
RFC PATCH 27/38 svc: Make svc_recv transport neutral
In reply to a message not in the archiveAll of the transport field and functions used by svc_recv are now transport independent. Change the svc_recv function to use the svc_xprt structure directly instead of the transport specific svc_sock structure.
---
net/sunrpc/svcsock.c | 61 +++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 30 deletions(-)
net/sunrpc/svcsock.c +31 -30
@@ -327,22 +327,21 @@ EXPORT_SYMBOL_GPL(svc_xprt_enqueue);/* * Dequeue the first socket. Must be called with the pool->sp_lock held. */ -static inline struct svc_sock * -svc_sock_dequeue (struct svc_pool *pool) +static struct svc_xprt *svc_xprt_dequeue (struct svc_pool *pool) { -struct svc_sock *svsk; +struct svc_xprt *xprt;if (list_empty (&pool->sp_sockets))return NULL ; - svsk =list_entry (pool->sp_sockets.next, - struct svc_sock, sk_xprt.xpt_ready); -list_del_init (&svsk->sk_xprt.xpt_ready); + xprt =list_entry (pool->sp_sockets.next, + struct svc_xprt, xpt_ready); +list_del_init (&xprt->xpt_ready); -dprintk ("svc: socket %p dequeued, inuse=%d\n" , - svsk->sk_sk,atomic_read (&svsk->sk_xprt.xpt_ref.refcount)); +dprintk ("svc: transport %p dequeued, inuse=%d\n" , + xprt,atomic_read (&xprt->xpt_ref.refcount)); -return svsk; +return xprt; }/*
@@ -1491,20 +1490,20 @@ svc_check_conn_limits(struct svc_serv *serv)int svc_recv (struct svc_rqst *rqstp,long timeout) { -struct svc_sock *svsk =NULL ; +struct svc_xprt *xprt =NULL ;struct svc_serv *serv = rqstp->rq_server;struct svc_pool *pool = rqstp->rq_pool;int len, i; -int pages; +int pages;struct xdr_buf *arg;DECLARE_WAITQUEUE (wait, current);dprintk ("svc: server %p waiting for data (to = %ld)\n" , rqstp, timeout); -if (rqstp->rq_sock) +if (rqstp->rq_xprt)printk (KERN_ERR -"svc_recv: service %p, socket not NULL!\n" , +"svc_recv: service %p, transport not NULL!\n" , rqstp);if (waitqueue_active (&rqstp->rq_wait)) printk(KERN_ERR
@@ -1541,11 +1540,12 @@ svc_recv(struct svc_rqst *rqstp, long timeout)return -EINTR ;spin_lock_bh (&pool->sp_lock); -if ((svsk =svc_sock_dequeue (pool)) !=NULL ) { - rqstp->rq_sock = svsk; -svc_xprt_get (&svsk->sk_xprt); + xprt =svc_xprt_dequeue (pool); +if (xprt) { + rqstp->rq_xprt = xprt; +svc_xprt_get (xprt); rqstp->rq_reserved = serv->sv_max_mesg; -atomic_add (rqstp->rq_reserved, &svsk->sk_xprt.xpt_reserved); +atomic_add (rqstp->rq_reserved, &xprt->xpt_reserved); }else {/* No data pending. Go to sleep */ svc_thread_enqueue (pool, rqstp);
@@ -1565,7 +1565,8 @@ svc_recv(struct svc_rqst *rqstp, long timeout)spin_lock_bh (&pool->sp_lock);remove_wait_queue (&rqstp->rq_wait, &wait); -if (!(svsk = rqstp->rq_sock)) { + xprt = rqstp->rq_xprt; +if (!xprt) {svc_thread_dequeue (pool, rqstp);spin_unlock_bh (&pool->sp_lock);dprintk ("svc: server %p, no data yet\n" , rqstp);
@@ -1575,12 +1576,12 @@ svc_recv(struct svc_rqst *rqstp, long timeout)spin_unlock_bh (&pool->sp_lock); len =0 ; -if (test_bit (XPT_CLOSE , &svsk->sk_xprt.xpt_flags)) { +if (test_bit (XPT_CLOSE , &xprt->xpt_flags)) {dprintk ("svc_recv: found XPT_CLOSE\n" ); -svc_delete_xprt (&svsk->sk_xprt); - }else if (test_bit (XPT_LISTENER , &svsk->sk_xprt.xpt_flags)) { +svc_delete_xprt (xprt); + }else if (test_bit (XPT_LISTENER , &xprt->xpt_flags)) {struct svc_xprt *newxpt; - newxpt = svsk->sk_xprt.xpt_ops->xpo_accept (&svsk->sk_xprt); + newxpt = xprt->xpt_ops->xpo_accept (xprt);if (newxpt) {/* * We know this module_get will succeed because the
@@ -1590,17 +1591,17 @@ svc_recv(struct svc_rqst *rqstp, long timeout)svc_check_conn_limits (svsk->sk_xprt.xpt_server);svc_xprt_received (newxpt); } -svc_xprt_received (&svsk->sk_xprt); +svc_xprt_received (xprt); }else { -dprintk ("svc: server %p, pool %u, socket %p, inuse=%d\n" , - rqstp, pool->sp_id, svsk, -atomic_read (&svsk->sk_xprt.xpt_ref.refcount)); - rqstp->rq_deferred =svc_deferred_dequeue (&svsk->sk_xprt); +dprintk ("svc: server %p, pool %u, transport %p, inuse=%d\n" , + rqstp, pool->sp_id, xprt, +atomic_read (&xprt->xpt_ref.refcount)); + rqstp->rq_deferred =svc_deferred_dequeue (xprt);if (rqstp->rq_deferred) { -svc_xprt_received (&svsk->sk_xprt); +svc_xprt_received (xprt); len =svc_deferred_recv (rqstp); }else - len = svsk->sk_xprt.xpt_ops->xpo_recvfrom (rqstp); + len = xprt->xpt_ops->xpo_recvfrom (rqstp);dprintk ("svc: got len=%d\n" , len); }
@@ -1610,7 +1611,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)svc_xprt_release (rqstp);return -EAGAIN ; } -clear_bit (XPT_OLD , &svsk->sk_xprt.xpt_flags); +clear_bit (XPT_OLD , &xprt->xpt_flags); rqstp->rq_secure =svc_port_is_privileged (svc_addr (rqstp)); rqstp->rq_chandle.defer = svc_defer;
RFC PATCH 28/38 svc: Make svc_age_temp_sockets svc_age_temp_transports
In reply to a message not in the archiveThis function is transport independent. Change it to use svc_xprt directly and change it's name to reflect this.
---
net/sunrpc/svcsock.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-)
net/sunrpc/svcsock.c +19 -17
@@ -1673,48 +1673,50 @@ svc_send(struct svc_rqst *rqstp)* a mark-and-sweep algorithm. */ static void -svc_age_temp_sockets (unsigned long closure) +svc_age_temp_xprts (unsigned long closure) {struct svc_serv *serv = (struct svc_serv *)closure; -struct svc_sock *svsk; +struct svc_xprt *xprt;struct list_head *le, *next;LIST_HEAD (to_be_aged); -dprintk ("svc_age_temp_sockets\n" ); +dprintk ("svc_age_temp_xprts\n" );if (!spin_trylock_bh (&serv->sv_lock)) {/* busy, try again 1 sec later */ -dprintk ("svc_age_temp_sockets: busy\n" ); +dprintk ("svc_age_temp_xprts: busy\n" );mod_timer (&serv->sv_temptimer, jiffies +HZ );return ; }list_for_each_safe (le, next, &serv->sv_tempsocks) { - svsk = list_entry(le, struct svc_sock, sk_xprt.xpt_list); + xprt = list_entry(le, struct svc_xprt, xpt_list); -if (!test_and_set_bit (XPT_OLD , &svsk->sk_xprt.xpt_flags)) +/* First time through, just mark it OLD. Second time +* through, close it. */ +if (!test_and_set_bit (XPT_OLD , &xprt->xpt_flags))continue ; -if (atomic_read (&svsk->sk_xprt.xpt_ref.refcount) >1 - ||test_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags)) +if (atomic_read (&xprt->xpt_ref.refcount) >1 + ||test_bit (XPT_BUSY , &xprt->xpt_flags))continue ; -svc_xprt_get (&svsk->sk_xprt); +svc_xprt_get (xprt);list_move (le, &to_be_aged); -set_bit (XPT_CLOSE , &svsk->sk_xprt.xpt_flags); -set_bit (XPT_DETACHED , &svsk->sk_xprt.xpt_flags); +set_bit (XPT_CLOSE , &xprt->xpt_flags); +set_bit (XPT_DETACHED , &xprt->xpt_flags); }spin_unlock_bh (&serv->sv_lock);while (!list_empty (&to_be_aged)) { le = to_be_aged.next; -/* fiddling the sk_xprt.xpt_list node is safe 'cos we're XPT_DETACHED */ +/* fiddling the xpt_list node is safe 'cos we're XPT_DETACHED */ list_del_init (le); - svsk = list_entry(le, struct svc_sock, sk_xprt.xpt_list); + xprt = list_entry(le, struct svc_xprt, xpt_list); -dprintk ("queuing svsk %p for closing\n" , svsk); +dprintk ("queuing xprt %p for closing\n" , xprt);/* a thread will dequeue and close it soon */ -svc_xprt_enqueue (&svsk->sk_xprt); -svc_xprt_put (&svsk->sk_xprt); +svc_xprt_enqueue (xprt); +svc_xprt_put (xprt); }mod_timer (&serv->sv_temptimer, jiffies + svc_conn_age_period *HZ );
@@ -1772,7 +1774,7 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv, serv->sv_tmpcnt++;if (serv->sv_temptimer.function ==NULL ) {/* setup timer to age temp sockets */ -setup_timer (&serv->sv_temptimer, svc_age_temp_sockets, +setup_timer (&serv->sv_temptimer, svc_age_temp_xprts, (unsigned long )serv);mod_timer (&serv->sv_temptimer, jiffies + svc_conn_age_period *HZ );
RFC PATCH 29/38 svc: Move common create logic to common code
In reply to a message not in the archiveMove the code that adds a transport instance to the sv_tempsocks and sv_permsocks lists out of the transport specific functions and into core logic.
---
net/sunrpc/svc_xprt.c | 9 ++++++++- net/sunrpc/svcsock.c | 39 +++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 21 deletions(-)
net/sunrpc/svc_xprt.c +8 -1
@@ -145,8 +145,15 @@ int svc_create_xprt(struct svc_serv *serv, char *xprt_name, unsigned short port,if (IS_ERR (newxprt)) {module_put (xcl->xcl_owner); ret =PTR_ERR (newxprt); - }else + }else { +clear_bit (XPT_TEMP , + &newxprt->xpt_flags); +spin_lock_bh (&serv->sv_lock); +list_add (&newxprt->xpt_list, + &serv->sv_permsocks); +spin_unlock_bh (&serv->sv_lock); ret =svc_xprt_local_port (newxprt); + } } goto out; }
net/sunrpc/svcsock.c +19 -20
@@ -94,6 +94,7 @@ static int svc_deferred_recv(struct svc_rqst *rqstp);static struct cache_deferred_req *svc_defer (struct cache_req *req);static struct svc_xprt *svc_create_socket (struct svc_serv *,int ,struct sockaddr *,int ,int ); +static void svc_age_temp_xprts (unsigned long closure);/* apparently the "standard" is that clients close * idle connections after 5 minutes, servers after
@@ -1588,7 +1589,20 @@ svc_recv(struct svc_rqst *rqstp, long timeout)* listener holds a reference too */ __module_get (newxpt->xpt_class->xcl_owner); -svc_check_conn_limits (svsk->sk_xprt.xpt_server); +svc_check_conn_limits (xprt->xpt_server); +spin_lock_bh (&serv->sv_lock); +set_bit (XPT_TEMP , &newxpt->xpt_flags); +list_add (&newxpt->xpt_list, &serv->sv_tempsocks); + serv->sv_tmpcnt++; +if (serv->sv_temptimer.function ==NULL ) { +/* setup timer to age temp sockets */ +setup_timer (&serv->sv_temptimer, + svc_age_temp_xprts, + (unsigned long )serv); +mod_timer (&serv->sv_temptimer, + jiffies + svc_conn_age_period *HZ ); + } +spin_unlock_bh (&serv->sv_lock);svc_xprt_received (newxpt); }svc_xprt_received (xprt);
@@ -1733,7 +1747,6 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv,struct svc_sock *svsk;struct sock *inet;int pmap_register = !(flags &SVC_SOCK_ANONYMOUS ); -int is_temporary = flags &SVC_SOCK_TEMPORARY ;dprintk ("svc: svc_setup_socket %p\n" , sock);if (!(svsk =kzalloc (sizeof (*svsk),GFP_KERNEL ))) {
@@ -1767,24 +1780,6 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv,else svc_tcp_init (svsk, serv); -spin_lock_bh (&serv->sv_lock); -if (is_temporary) { -set_bit (XPT_TEMP , &svsk->sk_xprt.xpt_flags); -list_add (&svsk->sk_xprt.xpt_list, &serv->sv_tempsocks); - serv->sv_tmpcnt++; -if (serv->sv_temptimer.function ==NULL ) { -/* setup timer to age temp sockets */ -setup_timer (&serv->sv_temptimer, svc_age_temp_xprts, - (unsigned long )serv); -mod_timer (&serv->sv_temptimer, - jiffies + svc_conn_age_period *HZ ); - } - }else { -clear_bit (XPT_TEMP , &svsk->sk_xprt.xpt_flags); -list_add (&svsk->sk_xprt.xpt_list, &serv->sv_permsocks); - } -spin_unlock_bh (&serv->sv_lock); -dprintk ("svc: svc_setup_socket created %p (inet %p)\n" , svsk, svsk->sk_sk);
@@ -1820,6 +1815,10 @@ int svc_addsock(struct svc_serv *serv,svc_xprt_received (&svsk->sk_xprt); err =0 ; } +clear_bit (XPT_TEMP , &svsk->sk_xprt.xpt_flags); +spin_lock_bh (&serv->sv_lock); +list_add (&svsk->sk_xprt.xpt_list, &serv->sv_permsocks); +spin_unlock_bh (&serv->sv_lock); }if (err) {sockfd_put (so);
RFC PATCH 30/38 svc: Removing remaining references to rq_sock in rqstp
In reply to a message not in the archiveThis functionally empty patch removes rq_sock and unamed union from rqstp structure.
---
include/linux/sunrpc/svc.h | 5 +---- net/sunrpc/svcsock.c | 38 ++++++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 18 deletions(-)
include/linux/sunrpc/svc.h +1 -4
@@ -204,10 +204,7 @@ union svc_addr_u {struct svc_rqst {struct list_head rq_list;/* idle list */ struct list_head rq_all;/* all threads list */ -union { -struct svc_xprt * rq_xprt;/* transport ptr */ -struct svc_sock * rq_sock;/* socket ptr */ - }; +struct svc_xprt * rq_xprt;/* transport ptr */ struct sockaddr_storage rq_addr;/* peer address */ size_t rq_addrlen;
net/sunrpc/svcsock.c +24 -14
@@ -201,10 +201,12 @@ static void svc_release_skb(struct svc_rqst *rqstp)struct svc_deferred_req *dr = rqstp->rq_deferred;if (skb) { +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt); rqstp->rq_xprt_ctxt =NULL ;dprintk ("svc: service %p, releasing skb %p\n" , rqstp, skb); -skb_free_datagram (rqstp->rq_sock->sk_sk, skb); +skb_free_datagram (svsk->sk_sk, skb); }if (dr) { rqstp->rq_deferred =NULL ;
@@ -433,7 +435,7 @@ svc_wake_up(struct svc_serv *serv)dprintk ("svc: daemon %p woken up.\n" , rqstp);/* svc_thread_dequeue(pool, rqstp); -rqstp->rq_sock = NULL; +rqstp->rq_xprt = NULL; */ wake_up (&rqstp->rq_wait); }
@@ -450,7 +452,9 @@ union svc_pktinfo_u {static void svc_set_cmsg_data (struct svc_rqst *rqstp,struct cmsghdr *cmh) { -switch (rqstp->rq_sock->sk_sk->sk_family) { +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt); +switch (svsk->sk_sk->sk_family) {case AF_INET : {struct in_pktinfo *pki =CMSG_DATA (cmh);
@@ -483,7 +487,8 @@ static void svc_set_cmsg_data(struct svc_rqst *rqstp, struct cmsghdr *cmh)static int svc_sendto (struct svc_rqst *rqstp,struct xdr_buf *xdr) { -struct svc_sock *svsk = rqstp->rq_sock; +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);struct socket *sock = svsk->sk_sock;int slen;union {
@@ -556,7 +561,7 @@ svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr) } out:dprintk ("svc: socket %p sendto([%p %Zu... ], %d) = %d (addr %s)\n" , - rqstp->rq_sock, xdr->head[0 ].iov_base, xdr->head[0 ].iov_len, + svsk, xdr->head[0 ].iov_base, xdr->head[0 ].iov_len, xdr->len, len,svc_print_addr (rqstp, buf,sizeof (buf)));return len;
@@ -632,7 +637,8 @@ svc_recv_available(struct svc_sock *svsk)static int svc_recvfrom (struct svc_rqst *rqstp,struct kvec *iov,int nr,int buflen) { -struct svc_sock *svsk = rqstp->rq_sock; +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);struct msghdr msg = { .msg_flags =MSG_DONTWAIT , };
@@ -722,7 +728,9 @@ svc_write_space(struct sock *sk)static void svc_udp_get_dest_address (struct svc_rqst *rqstp,struct cmsghdr *cmh) { -switch (rqstp->rq_sock->sk_sk->sk_family) { +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt); +switch (svsk->sk_sk->sk_family) {case AF_INET : {struct in_pktinfo *pki =CMSG_DATA (cmh); rqstp->rq_daddr.addr.s_addr = pki->ipi_spec_dst.s_addr;
@@ -742,7 +750,8 @@ static void svc_udp_get_dest_address(struct svc_rqst *rqstp,static int svc_udp_recvfrom (struct svc_rqst *rqstp) { -struct svc_sock *svsk = rqstp->rq_sock; +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);struct svc_serv *serv = svsk->sk_xprt.xpt_server;struct sk_buff *skb;union {
@@ -1126,7 +1135,8 @@ failed:static int svc_tcp_recvfrom (struct svc_rqst *rqstp) { -struct svc_sock *svsk = rqstp->rq_sock; +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);struct svc_serv *serv = svsk->sk_xprt.xpt_server;int len;struct kvec *vec;
@@ -1290,16 +1300,16 @@ svc_tcp_sendto(struct svc_rqst *rqstp) reclen =htonl (0x80000000 |((xbufp->len ) -4 ));memcpy (xbufp->head[0 ].iov_base, &reclen,4 ); -if (test_bit (XPT_DEAD , &rqstp->rq_sock->sk_xprt.xpt_flags)) +if (test_bit (XPT_DEAD , &rqstp->rq_xprt->xpt_flags))return -ENOTCONN ; sent =svc_sendto (rqstp, &rqstp->rq_res);if (sent != xbufp->len) {printk (KERN_NOTICE "rpc-srv/tcp: %s: %s %d when sending %d bytes - shutting down socket\n" , - rqstp->rq_sock->sk_xprt.xpt_server->sv_name, + rqstp->rq_xprt->xpt_server->sv_name, (sent<0 )?"got error" :"sent only" , sent, xbufp->len); -set_bit (XPT_CLOSE , &rqstp->rq_sock->sk_xprt.xpt_flags); +set_bit (XPT_CLOSE , &rqstp->rq_xprt->xpt_flags);svc_xprt_enqueue (rqstp->rq_xprt); sent = -EAGAIN ; }
@@ -1319,7 +1329,7 @@ static void svc_tcp_prep_reply_hdr(struct svc_rqst *rqstp)static int svc_tcp_has_wspace (struct svc_xprt *xprt) { - struct svc_sock *svsk = container_of(xprt, struct svc_sock, sk_xprt); + struct svc_sock *svsk = container_of(xprt, struct svc_sock, sk_xprt);struct svc_serv *serv = svsk->sk_xprt.xpt_server;int required;
@@ -1641,7 +1651,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)void svc_drop (struct svc_rqst *rqstp) { -dprintk ("svc: socket %p dropped request\n" , rqstp->rq_sock); +dprintk ("svc: xprt %p dropped request\n" , rqstp->rq_xprt);svc_xprt_release (rqstp); }
RFC PATCH 31/38 svc: Make svc_check_conn_limits xprt independent
In reply to a message not in the archiveThe svc_check_conn_limits function only manipulates xprt fields. Change references to svc_sock->sk_xprt to svc_xprt directly.
---
net/sunrpc/svcsock.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-)
net/sunrpc/svcsock.c +15 -16
@@ -1457,38 +1457,37 @@ svc_check_conn_limits(struct svc_serv *serv)* seconds. An attacker can easily beat that. * * The only somewhat efficient mechanism would be if drop -* old connections from the same IP first. But right now -* we don't even record the client IP in svc_sock. +* old connections from the same IP first. */ if (serv->sv_tmpcnt > (serv->sv_nrthreads+3 )*20 ) { -struct svc_sock *svsk =NULL ; +struct svc_xprt *xprt =NULL ;spin_lock_bh (&serv->sv_lock);if (!list_empty (&serv->sv_tempsocks)) {if (net_ratelimit ()) {/* Try to help the admin */ -printk (KERN_NOTICE "%s: too many open TCP " -"sockets, consider increasing the " +printk (KERN_NOTICE "%s: too many open " +"connections, consider increasing the " "number of nfsd threads\n" , - serv->sv_name); + serv->sv_name);printk (KERN_NOTICE -"%s: last TCP connect from %s\n" , +"%s: last connection from %s\n" , serv->sv_name, buf); }/* -* Always select the oldest socket. It's not fair, +* Always select the oldest connection. It's not fair, * but so is life */ - svsk =list_entry (serv->sv_tempsocks.prev, - struct svc_sock, - sk_xprt.xpt_list); -set_bit (XPT_CLOSE , &svsk->sk_xprt.xpt_flags); -svc_xprt_get (&svsk->sk_xprt); + xprt =list_entry (serv->sv_tempsocks.prev, + struct svc_xprt, + xpt_list); +set_bit (XPT_CLOSE , &xprt->xpt_flags); +svc_xprt_get (xprt); }spin_unlock_bh (&serv->sv_lock); -if (svsk) { -svc_xprt_enqueue (&svsk->sk_xprt); -svc_xprt_put (&svsk->sk_xprt); +if (xprt) { +svc_xprt_enqueue (xprt); +svc_xprt_put (xprt); } } }
RFC PATCH 32/38 svc: Move the xprt independent code to the svc_xprt.c file
In reply to a message not in the archiveThis functionally trivial patch moves all of the transport independent functions from the svcsock.c file to the transport independent svc_xprt.c file.
---
include/linux/sunrpc/svc_xprt.h | 5 net/sunrpc/svc_xprt.c | 708 ++++++++++++++++++++++++++++++++++++++ net/sunrpc/svcsock.c | 719 --------------------------------------- 3 files changed, 713 insertions(+), 719 deletions(-)
include/linux/sunrpc/svc_xprt.h +5 -0
@@ -72,9 +72,14 @@ int svc_unreg_xprt_class(struct svc_xprt_class *);void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *,struct svc_serv *);int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int ); +void svc_close_xprt (struct svc_xprt *xprt);void svc_xprt_received (struct svc_xprt *);void svc_xprt_put (struct svc_xprt *xprt);void svc_xprt_copy_addrs (struct svc_rqst *rqstp,struct svc_xprt *xprt); +void svc_xprt_enqueue (struct svc_xprt *xprt); +int svc_port_is_privileged (struct sockaddr *sin); +void svc_delete_xprt (struct svc_xprt *xprt); +static inline void svc_xprt_get (struct svc_xprt *xprt) {kref_get (&xprt->xpt_ref);
net/sunrpc/svc_xprt.c +708 -0
717 lines not on this page · raw message
net/sunrpc/svcsock.c +0 -719
760 lines not on this page · raw message
RFC PATCH 33/38 svc: Add transport hdr size for defer/revisit
In reply to a message not in the archiveSome transports have a header in front of the RPC header. The current defer/revisit processing considers only the iov_len and arg_len to determine how much to back up when saving the original request to revisit. Add a field to the rqstp structure to save the size of the transport header so svc_defer can correctly compute the start of a request.
---
include/linux/sunrpc/svc.h | 2 ++ net/sunrpc/svc_xprt.c | 36 +++++++++++++++++++++++++++--------- net/sunrpc/svcsock.c | 2 ++ 3 files changed, 31 insertions(+), 9 deletions(-)
include/linux/sunrpc/svc.h +2 -0
@@ -217,6 +217,7 @@ struct svc_rqst {void * rq_xprt_ctxt;/* transport specific context ptr */ struct svc_deferred_req *rq_deferred;/* deferred request we are replaying */ +size_t rq_xprt_hlen;/* xprt header len */ struct xdr_buf rq_arg;struct xdr_buf rq_res;struct page * rq_pages[RPCSVC_MAXPAGES ];
@@ -322,6 +323,7 @@ struct svc_deferred_req {size_t addrlen;union svc_addr_u daddr;/* where reply must come from */ struct cache_deferred_req handle; +int xprt_hlen;int argslen;__be32 args[0 ]; };
net/sunrpc/svc_xprt.c +27 -9
@@ -29,7 +29,6 @@#include <linux/sunrpc/types.h> #include <linux/sunrpc/clnt.h> #include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svcsock.h> #include <linux/sunrpc/stats.h> #include <linux/sunrpc/svc_xprt.h>
@@ -827,10 +826,18 @@ static void svc_revisit(struct cache_deferred_req *dreq, int too_many)svc_xprt_put (xprt); } +/* +* Save the request off for later processing. The request buffer looks +* like this: +* +* <xprt-header><rpc-header><rpc-pagelist><rpc-tail> +* +* This code can only handle requests that consist of an xprt-header +* and rpc-header. +*/ static struct cache_deferred_req *svc_defer (struct cache_req *req) { struct svc_rqst *rqstp = container_of(req, struct svc_rqst, rq_chandle); -int size =sizeof (struct svc_deferred_req ) + (rqstp->rq_arg.len);struct svc_deferred_req *dr;if (rqstp->rq_arg.page_len)
@@ -839,8 +846,10 @@ static struct cache_deferred_req *svc_defer(struct cache_req *req) dr = rqstp->rq_deferred; rqstp->rq_deferred =NULL ; }else { -int skip = rqstp->rq_arg.len - rqstp->rq_arg.head[0 ].iov_len; +int skip; +int size;/* FIXME maybe discard if size too large */ + size =sizeof (struct svc_deferred_req ) + rqstp->rq_arg.len; dr =kmalloc (size,GFP_KERNEL );if (dr ==NULL )return NULL ;
@@ -851,8 +860,12 @@ static struct cache_deferred_req *svc_defer(struct cache_req *req) dr->addrlen = rqstp->rq_addrlen; dr->daddr = rqstp->rq_daddr; dr->argslen = rqstp->rq_arg.len >>2 ; -memcpy (dr->args, rqstp->rq_arg.head[0 ].iov_base-skip, - dr->argslen<<2 ); + dr->xprt_hlen = rqstp->rq_xprt_hlen; + +/* back up head to the start of the buffer and copy */ + skip = rqstp->rq_arg.len - rqstp->rq_arg.head[0 ].iov_len; +memcpy (dr->args, rqstp->rq_arg.head[0 ].iov_base - skip, + dr->argslen <<2 ); }svc_xprt_get (rqstp->rq_xprt); dr->xprt = rqstp->rq_xprt;
@@ -868,16 +881,21 @@ static int svc_deferred_recv(struct svc_rqst *rqstp) {struct svc_deferred_req *dr = rqstp->rq_deferred; - rqstp->rq_arg.head[0 ].iov_base = dr->args; - rqstp->rq_arg.head[0 ].iov_len = dr->argslen<<2 ; +/* setup iov_base past transport header */ + rqstp->rq_arg.head[0 ].iov_base = dr->args + (dr->xprt_hlen>>2 ); +/* The iov_len does not include the transport header bytes */ + rqstp->rq_arg.head[0 ].iov_len = (dr->argslen<<2 ) - dr->xprt_hlen; rqstp->rq_arg.page_len =0 ; - rqstp->rq_arg.len = dr->argslen<<2 ; +/* The rq_arg.len includes the transport header bytes */ + rqstp->rq_arg.len = dr->argslen<<2 ; rqstp->rq_prot = dr->prot;memcpy (&rqstp->rq_addr, &dr->addr, dr->addrlen); rqstp->rq_addrlen = dr->addrlen; +/* Save off transport header len in case we get deferred again */ + rqstp->rq_xprt_hlen = dr->xprt_hlen; rqstp->rq_daddr = dr->daddr; rqstp->rq_respages = rqstp->rq_pages; -return dr->argslen<<2 ; +return (dr->argslen<<2 ) - dr->xprt_hlen; }
net/sunrpc/svcsock.c +2 -0
@@ -397,6 +397,8 @@ svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr, int buflen) };int len; + rqstp->rq_xprt_hlen =0 ; + len =kernel_recvmsg (svsk->sk_sock, &msg, iov, nr, buflen, msg.msg_flags);
A message that is not in the archive (sent off-list or not yet received): 20071129224103.14563.72780.stgit-gUwIgmpLGaKNDNWfRnPdfg@public.gmane.org
Re: [RFC,PATCH 33/38] svc: Add transport hdr size for defer/revisit
Quoted 30 lines · Tom Tucker
Some transports have a header in front of the RPC header. The current defer/revisit processing considers only the
iov_lenandarg_lento determine how much to back up when saving the original request to revisit. Add a field to the rqstp structure to save the size of the transport header sosvc_defercan correctly compute the start of a request.Signed-off-by Tom Tucker <[email protected]>---
include/linux/sunrpc/svc.h | 2 ++ net/sunrpc/svc_xprt.c | 36 ++++++++++++++++++++++++++ +--------- net/sunrpc/svcsock.c | 2 ++ 3 files changed, 31 insertions(+), 9 deletions(-)include/linux/sunrpc/svc.h +0
-0@@ -217,6 +217,7 @@ struct svc_rqst {void * rq_xprt_ctxt;/* transport specific context ptr */ struct svc_deferred_req *rq_deferred;/* deferred request we are replaying */
include/linux/sunrpc/svc.h +1
-0+size_t rq_xprt_hlen;/* xprt header len */ struct xdr_buf rq_arg;struct xdr_buf rq_res;struct page * rq_pages[RPCSVC_MAXPAGES ];
include/linux/sunrpc/svc.h struct svc_deferred_req { · line 329
Quoted 7 lines
include/linux/sunrpc/svc.h +1
-0@@ -322,6 +323,7 @@ struct svc_deferred_req {size_t addrlen;union svc_addr_u daddr;/* where reply must come from */ struct cache_deferred_req handle; +int xprt_hlen;int argslen;__be32 args[0 ]; };
Why is xprt_hlen an int if rq_xprt_hlen is a size_t? Shouldn't they both be size_t?
I don't see xprt_hlen going negative, but it is used in a bunch of computations involving unsigned ints and size_ts. Since size_t can be wider than 32 bits on non-i386, I think we should be defensive about not using ints as temporary variables when doing computations with iov_base and iov_len.
Quoted 36 lines
net/sunrpc/svc_xprt.c +2
-1@@ -29,7 +29,6 @@#include <linux/sunrpc/types.h> #include <linux/sunrpc/clnt.h> #include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svcsock.h> #include <linux/sunrpc/stats.h> #include <linux/sunrpc/svc_xprt.h> @@ -827,10 +826,18 @@ static void svc_revisit(struct cache_deferred_req *dreq, int too_many)svc_xprt_put (xprt ); } +/* +* Save the request off for later processing. The request buffer looks
+ * like this:
+ *
+ * <xprt-header><rpc-header><rpc-pagelist><rpc-tail>
+ *
+ * This code can only handle requests that consist of an xprt-header
+ * and rpc-header.
+ */
static structcache_deferred_req*svc_defer(structcache_req*req) {
structsvc_rqst*rqstp = container_of(req, structsvc_rqst,rq_chandle);net/sunrpc/svc_xprt.c +0
-1-int size =sizeof (struct svc_deferred_req ) + (rqstp->rq_arg.len);struct svc_deferred_req *dr;if (rqstp->rq_arg.page_len)
net/sunrpc/svc_xprt.c static struct cache_deferred_req *svc_defer · line 851
Quoted 7 lines
net/sunrpc/svc_xprt.c +2
-1@@ -839,8 +846,10 @@ static struct cache_deferred_req *svc_defer (struct cache_req *req) dr = rqstp->rq_deferred; rqstp->rq_deferred =NULL ; }else { -int skip = rqstp->rq_arg.len - rqstp->rq_arg.head[0 ].iov_len; +int skip; +int size;
How about:
size_t size, skip;
instead?
Quoted 63 lines
net/sunrpc/svc_xprt.c +1
-0/* FIXME maybe discard if size too large */ + size =sizeof (struct svc_deferred_req ) + rqstp->rq_arg.len; dr =kmalloc (size,GFP_KERNEL );if (dr ==NULL )net/sunrpc/svc_xprt.c +6
-2return NULL ;@@ -851,8 +860,12 @@ static struct cache_deferred_req *svc_defer (struct cache_req *req) dr->addrlen = rqstp->rq_addrlen; dr->daddr = rqstp->rq_daddr; dr->argslen = rqstp->rq_arg.len >>2 ; -memcpy (dr->args, rqstp->rq_arg.head[0 ].iov_base-skip, - dr->argslen<<2 ); + dr->xprt_hlen = rqstp->rq_xprt_hlen; + +/* back up head to the start of the buffer and copy */ + skip = rqstp->rq_arg.len - rqstp->rq_arg.head[0 ].iov_len; +memcpy (dr->args, rqstp->rq_arg.head[0 ].iov_base - skip, + dr->argslen <<2 ); }svc_xprt_get (rqstp->rq_xprt);net/sunrpc/svc_xprt.c +9
-4dr->xprt = rqstp->rq_xprt;@@ -868,16 +881,21 @@ static int svc_deferred_recv(struct svc_rqst *rqstp) {struct svc_deferred_req *dr = rqstp->rq_deferred; - rqstp->rq_arg.head[0 ].iov_base = dr->args; - rqstp->rq_arg.head[0 ].iov_len = dr->argslen<<2 ; +/* setup iov_base past transport header */ + rqstp->rq_arg.head[0 ].iov_base = dr->args + (dr->xprt_hlen>>2 ); +/* The iov_len does not include the transport header bytes */ + rqstp->rq_arg.head[0 ].iov_len = (dr->argslen<<2 ) - dr->xprt_hlen; rqstp->rq_arg.page_len =0 ; - rqstp->rq_arg.len = dr->argslen<<2 ; +/* The rq_arg.len includes the transport header bytes */ + rqstp->rq_arg.len = dr->argslen<<2 ; rqstp->rq_prot = dr->prot;memcpy (&rqstp->rq_addr, &dr->addr, dr->addrlen); rqstp->rq_addrlen = dr->addrlen; +/* Save off transport header len in case we get deferred again */ + rqstp->rq_xprt_hlen = dr->xprt_hlen; rqstp->rq_daddr = dr->daddr; rqstp->rq_respages = rqstp->rq_pages; -return dr->argslen<<2 ; +return (dr->argslen<<2 ) - dr->xprt_hlen; }net/sunrpc/svcsock.c +2
-1@@ -397,6 +397,8 @@ svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr, int buflen) };int len; + rqstp->rq_xprt_hlen =0 ; + len =kernel_recvmsg (svsk->sk_sock, &msg, iov, nr, buflen, msg.msg_flags); -
Quoted 3 lines
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
RFC PATCH 34/38 svc: Add /proc/sys/sunrpc/transport files
In reply to a message not in the archiveAdd a file that when read lists the set of registered svc transports.
---
include/linux/sunrpc/svc_xprt.h | 2 ++ net/sunrpc/svc_xprt.c | 28 ++++++++++++++++++++++++++++ net/sunrpc/sysctl.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 0 deletions(-)
include/linux/sunrpc/svc_xprt.h +2 -0
@@ -79,11 +79,13 @@ void svc_xprt_copy_addrs(struct svc_rqst *rqstp, struct svc_xprt *xprt);void svc_xprt_enqueue (struct svc_xprt *xprt);int svc_port_is_privileged (struct sockaddr *sin);void svc_delete_xprt (struct svc_xprt *xprt); +int svc_print_xprts (char *buf,int maxlen);static inline void svc_xprt_get (struct svc_xprt *xprt) {kref_get (&xprt->xpt_ref); } +static inline void svc_xprt_set_local (struct svc_xprt *xprt,struct sockaddr *sa,int salen) {
net/sunrpc/svc_xprt.c +28 -0
@@ -93,6 +93,34 @@ int svc_unreg_xprt_class(struct svc_xprt_class *xcl) }EXPORT_SYMBOL_GPL (svc_unreg_xprt_class); +/* +* Format the transport list for printing +*/ +int svc_print_xprts (char *buf,int maxlen) +{ +struct list_head *le; +char tmpstr[80 ]; +int len =0 ; + buf[0 ] ='\0' ; + +spin_lock (&svc_xprt_class_lock); +list_for_each (le, &svc_xprt_class_list) { +int slen; +struct svc_xprt_class *xcl = + list_entry(le, struct svc_xprt_class, xcl_list); + +sprintf (tmpstr,"%s %d\n" , xcl->xcl_name, xcl->xcl_max_payload); + slen =strlen (tmpstr); +if (len + slen > maxlen) +break ; + len += slen; +strcat (buf, tmpstr); + } +spin_unlock (&svc_xprt_class_lock); + +return len; +} +static void svc_xprt_free (struct kref *kref) { struct svc_xprt *xprt =
net/sunrpc/sysctl.c +31 -0
@@ -18,6 +18,7 @@#include <linux/sunrpc/types.h> #include <linux/sunrpc/sched.h> #include <linux/sunrpc/stats.h> +#include <linux/sunrpc/svc_xprt.h> /* * Declare the debug flags here
@@ -48,6 +49,30 @@ rpc_unregister_sysctl(void) } } +static int proc_do_xprt (ctl_table *table,int write,struct file *file, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +char tmpbuf[256 ]; +int len; +if ((*ppos && !write) || !*lenp) { + *lenp =0 ; +return 0 ; + } +if (write) +return -EINVAL ; +else { + len =svc_print_xprts (tmpbuf,sizeof (tmpbuf)); +if (!access_ok (VERIFY_WRITE , buffer, len)) +return -EFAULT ; + +if (__copy_to_user (buffer, tmpbuf, len)) +return -EFAULT ; + } + *lenp -= len; + *ppos += len; +return 0 ; +} +static int proc_dodebug (ctl_table *table,int write,struct file *file,void __user *buffer,size_t *lenp,loff_t *ppos)
@@ -140,6 +165,12 @@ static ctl_table debug_table[] = { .mode = 0644, .proc_handler = &proc_dodebug }, + { + .procname = "transports", + .maxlen = 256, + .mode = 0444, + .proc_handler = &proc_do_xprt, + }, { .ctl_name = 0 } };
A message that is not in the archive (sent off-list or not yet received): 20071129224105.14563.48684.stgit-gUwIgmpLGaKNDNWfRnPdfg@public.gmane.org
Re: [RFC,PATCH 34/38] svc: Add /proc/sys/sunrpc/transport files
Quoted 36 lines · Tom Tucker
Add a file that when read lists the set of registered svc transports.
Signed-off-by Tom Tucker <[email protected]>---
include/linux/sunrpc/svc_xprt.h | 2 ++ net/sunrpc/svc_xprt.c | 28 ++++++++++++++++++++++++++++ net/sunrpc/sysctl.c | 31 ++++++++++++++++++++++++++++ +++ 3 files changed, 61 insertions(+), 0 deletions(-)include/linux/sunrpc/svc_xprt.h +2
-0@@ -79,11 +79,13 @@ void svc_xprt_copy_addrs(struct svc_rqst *rqstp, struct svc_xprt *xprt);void svc_xprt_enqueue (struct svc_xprt *xprt);int svc_port_is_privileged (struct sockaddr *sin);void svc_delete_xprt (struct svc_xprt *xprt); +int svc_print_xprts (char *buf,int maxlen);static inline void svc_xprt_get (struct svc_xprt *xprt) {kref_get (&xprt->xpt_ref); } +static inline void svc_xprt_set_local (struct svc_xprt *xprt,struct sockaddr *sa,int salen){
net/sunrpc/svc_xprt.c +0
-0
net/sunrpc/svc_xprt.c int svc_unreg_xprt_class(struct svc_xprt_class · line 100
Quoted 8 lines
net/sunrpc/svc_xprt.c +4
-0@@ -93,6 +93,34 @@ int svc_unreg_xprt_class(struct svc_xprt_class *xcl) }EXPORT_SYMBOL_GPL (svc_unreg_xprt_class); +/* +* Format the transport list for printing +*/ +int svc_print_xprts (char *buf,int maxlen)
One last one, then I will crawl back into my hole.
Arguments and variables that handle string lengths should be of type size_t (or at the very least, should be unsigned).
Otherwise, I don't see any architectural problems with the patch series.
Quoted 73 lines
net/sunrpc/svc_xprt.c +24
-0+{ +struct list_head *le; +char tmpstr[80 ]; +int len =0 ; + buf[0 ] ='\0' ; + +spin_lock (&svc_xprt_class_lock); +list_for_each (le, &svc_xprt_class_list) { +int slen; +struct svc_xprt_class *xcl = + list_entry(le, struct svc_xprt_class, xcl_list); + +sprintf (tmpstr,"%s %d\n" , xcl->xcl_name, xcl->xcl_max_payload); + slen =strlen (tmpstr); +if (len + slen > maxlen) +break ; + len += slen; +strcat (buf, tmpstr); + } +spin_unlock (&svc_xprt_class_lock); + +return len; +} +static void svc_xprt_free (struct kref *kref) {net/sunrpc/svc_xprt.c +0
-0struct svc_xprt *xprt =net/sunrpc/sysctl.c +25
-0@@ -18,6 +18,7 @@#include <linux/sunrpc/types.h> #include <linux/sunrpc/sched.h> #include <linux/sunrpc/stats.h> +#include <linux/sunrpc/svc_xprt.h> /* * Declare the debug flags here @@ -48,6 +49,30 @@ rpc_unregister_sysctl(void) } } +static int proc_do_xprt (ctl_table *table,int write,struct file *file, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +char tmpbuf[256 ]; +int len; +if ((*ppos && !write) || !*lenp) { + *lenp =0 ; +return 0 ; + } +if (write) +return -EINVAL ; +else { + len =svc_print_xprts (tmpbuf,sizeof (tmpbuf)); +if (!access_ok (VERIFY_WRITE , buffer, len)) +return -EFAULT ; + +if (__copy_to_user (buffer, tmpbuf, len)) +return -EFAULT ; + } + *lenp -= len; + *ppos += len; +return 0 ; +} + static int proc_dodebug(ctl_table *table, int write, struct file *file,net/sunrpc/sysctl.c +0
-0void __user *buffer, size_t *lenp, loff_t *ppos)@@ -140,6 +165,12 @@ static ctl_table debug_table[] = { .mode = 0644,
net/sunrpc/sysctl.c static ctl_table debug_table[] = { · line 175
Quoted 10 lines
net/sunrpc/sysctl.c +6
-0.proc_handler = &proc_dodebug }, + { + .procname = "transports", + .maxlen = 256, + .mode = 0444, + .proc_handler = &proc_do_xprt, + }, { .ctl_name = 0 } };
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
Re: [RFC,PATCH 34/38] svc: Add /proc/sys/sunrpc/transport files
Quoted 1 line · Chuck Lever
One last one, then I will crawl back into my hole.
By the way, based on who I recall making a lot of comments, I'm planning on just adding:
to all of the server transport-switch and rdma patches. Does that sound right?
And I'm assuming there are no objections to submitting this come the next merge window.
--b.
Re: [RFC,PATCH 34/38] svc: Add /proc/sys/sunrpc/transport files
Quoted 6 lines · J. Bruce Fields
Quoted 1 line · Chuck Lever
One last one, then I will crawl back into my hole.
By the way, based on who I recall making a lot of comments, I'm planning on just adding:
Quoted 6 lines
Acked-by Neil Brown <[email protected]>Reviewed-by Chuck Lever <[email protected]>Reviewed-by Greg Banks <[email protected]>to all of the server transport-switch and rdma patches. Does that sound right?
OK for the transport switch. I'm not qualified to review the bulk of the RDMA work, so I would prefer that you don't add Reviewed-by "me" for those patches. My eyes glazed over a few lines after the GPL boilerplate.
Quoted 2 lines
And I'm assuming there are no objections to submitting this come the next merge window.
Refactoring the server-side write space logic has exposed some problems that really shouldn't be allowed to stand. I think we should resolve the issues in the TCP write space callback before merging. Realistically those problems are non-architectural and should be fixable before the window opens.
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
Re: [RFC,PATCH 34/38] svc: Add /proc/sys/sunrpc/transport files
Quoted 25 lines · Chuck Lever
Quoted 7 lines · J. Bruce Fields
Quoted 1 line · Chuck Lever
One last one, then I will crawl back into my hole.
By the way, based on who I recall making a lot of comments, I'm planning
on just adding:Quoted 7 lines
Acked-by Neil Brown <[email protected]>Reviewed-by Chuck Lever <[email protected]>Reviewed-by Greg Banks <[email protected]>to all of the server transport-switch and rdma patches. Does that sound
right?OK for the transport switch. I'm not qualified to review the bulk of the RDMA work, so I would prefer that you don't add Reviewed-by "me" for those patches. My eyes glazed over a few lines after the GPL boilerplate.
Quoted 2 lines
And I'm assuming there are no objections to submitting this come the next merge window.
Quoted 6 lines
Refactoring the server-side write space logic has exposed some problems that really shouldn't be allowed to stand. I think we should resolve the issues in the TCP write space callback before merging. Realistically those problems are non-architectural and should be fixable before the window opens.
Could you be more specific on what these problems are?
Quoted 3 lines
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [RFC,PATCH 34/38] svc: Add /proc/sys/sunrpc/transport files
Quoted 25 lines · Tom Tucker
Quoted 24 lines · Chuck Lever
Quoted 7 lines · J. Bruce Fields
Quoted 1 line · Chuck Lever
One last one, then I will crawl back into my hole.
By the way, based on who I recall making a lot of comments, I'm planning
on just adding:Quoted 7 lines
Acked-by Neil Brown <[email protected]>Reviewed-by Chuck Lever <[email protected]>Reviewed-by Greg Banks <[email protected]>to all of the server transport-switch and rdma patches. Does that sound
right?OK for the transport switch. I'm not qualified to review the bulk of the RDMA work, so I would prefer that you don't add Reviewed-by "me" for those patches. My eyes glazed over a few lines after the GPL boilerplate.
Quoted 2 lines
And I'm assuming there are no objections to submitting this come the next merge window.
Quoted 7 lines
Quoted 5 lines
Refactoring the server-side write space logic has exposed some problems that really shouldn't be allowed to stand. I think we should resolve the issues in the TCP write space callback before merging. Realistically those problems are non-architectural and should be fixable before the window opens.
Could you be more specific on what these problems are?
The problems we discussed on Friday about svc_tcp_has_wspace(), introduced in 9/38.
The mess is hidden by implicit type casts in the write space check, replaced by 9/38, in svc_sock_enqueue(). The return type of svc_sock_wspace() is unsigned long, which means the other side of the comparison in svc_sock_enqueue() (the sum that becomes "required" in your patch) is implicitly promoted to unsigned long before the comparison is done.
Your patch misses the implicit cast at least by making "required" an int in the new callback functions. "required" should be an unsigned long in both the UDP and TCP callback to preserve the semantics of the existing logic.
It's also the case that sk_stream_wspace() can return a negative value if sk_wmem_queued somehow becomes larger than sk_sndbuf. However, in the existing svc_sock_enqueue() logic, a negative result from sk_stream_wspace() is converted to an unsigned long, making it a large positive number. The server then thinks it may continue writing to a socket whose buffer is already full.
I'm also worried about whether sk_reserved, which is an int and is incremented and decremented without a check to see if it has gone negative, can go negative during normal operation -- and if it does, what does that do to the value of "required" and the result of the write space check, in either the UDP or TCP case?
In addition, the server's TCP write space check is missing a comparison that every other TCP write space callback in the kernel has (comparing sk_stream_wspace and sk_stream_min_wspace). If we don't include it here, then we need some testing to validate that it isn't needed, and a comment to explain why this write space callback is different from the others.
I was hoping for some comment from Neil or Bruce.
From Friday's post:
Quoted 21 lines
If
sk_reservedgoes negative, it will be converted to unsigned, and become a very large positive number. The result of the sum will be recast back to an int when it's assigned to "required," and we probably get a reasonable result. I doubt an explicit cast will change things at all.Instead, perhaps we should add an explicit check to ensure
sk_reservedis a reasonable positive value before doing any other checks. (Likewise in the UDP case as well).I wonder if this is really the correct write space check to use for TCP, though. I remember fixing a similar issue in the RPC client a long time ago -- both UDP and TCP used the same wspace check. It resulted in the
sk_write_spacecallback hammering on the RPC client, and forward progress on TCP socket writes would slow to a crawl.You probably want something like this instead:
set_bit(SOCK_NOSPACE, &svsk->sk_sock->flags); required = atomic_read(&svsk->sk_reserved) + serv->sv_max_mesg; wspace = sk_stream_wspace(svsk->sk_sk); if (wspace < sk_stream_min_wspace(svsk->sk_sk)) return 0; if (required * 2 > wspace) return 0; clear_bit(SOCK_NOSPACE, &svsk->sk_sock->flags); return 1;
Quoted 1 line
The first test mimics
sk_stream_write_space()andxs_tcp_write_space(). I'm still unsure what to do about the possibility of one of these signed integers going negative on us.
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
Re: [RFC,PATCH 34/38] svc: Add /proc/sys/sunrpc/transport files
Quoted 6 lines · Chuck Lever
Quoted 5 lines · Tom Tucker
Quoted 2 lines · Chuck Lever
Quoted 1 line · J. Bruce Fields
On Mon, Dec 03, 2007 at 11:44:15AM -0500, Chuck Lever wrote:
Could you be more specific on what these problems are?
[...snip...]
Quoted 29 lines
The problems we discussed on Friday about
svc_tcp_has_wspace(), introduced in 9/38.The mess is hidden by implicit type casts in the write space check,
replaced by 9/38, insvc_sock_enqueue(). The return type ofsvc_sock_wspace()is unsigned long, which means the other side of the comparison insvc_sock_enqueue()(the sum that becomes "required" in your patch) is implicitly promoted to unsigned long before the comparison is done.Your patch misses the implicit cast at least by making "required" an int in the new callback functions. "required" should be an unsigned long in both the UDP and TCP callback to preserve the semantics of the existing logic.
It's also the case that
sk_stream_wspace()can return a negative value ifsk_wmem_queuedsomehow becomes larger thansk_sndbuf. However, in the existingsvc_sock_enqueue()logic, a negative result fromsk_stream_wspace()is converted to an unsigned long, making it a large positive number. The server then thinks it may continue writing to a socket whose buffer is already full.I'm also worried about whether
sk_reserved, which is an int and is incremented and decremented without a check to see if it has gone negative, can go negative during normal operation -- and if it does, what does that do to the value of "required" and the result of the write space check, in either the UDP or TCP case?
Quoted 8 lines
In addition, the server's TCP write space check is missing a comparison that every other TCP write space callback in the kernel has (comparing
sk_stream_wspaceandsk_stream_min_wspace). If we don't include it here, then we need some testing to validate that it isn't needed, and a comment to explain why this write space callback is different from the others.I was hoping for some comment from Neil or Bruce.
Ok, cool. I just didn't get the map from "refactoring" to this. These changes are straightforward. I have already modified the patch to resolve the type promotion issue and added a check for negative. I planned on reposting the whole series with the updates after we get the build issues hammered out.
Thanks,
Tom
Quoted 42 lines
From Friday's post:
Quoted 29 lines
If
sk_reservedgoes negative, it will be converted to unsigned, and become a very large positive number. The result of the sum will be recast back to an int when it's assigned to "required," and we probably get a reasonable result. I doubt an explicit cast will change things at all.Instead, perhaps we should add an explicit check to ensure
sk_reservedis a reasonable positive value before doing any other checks. (Likewise in the UDP case as well).I wonder if this is really the correct write space check to use for TCP, though. I remember fixing a similar issue in the RPC client a long time ago -- both UDP and TCP used the same wspace check. It resulted in the
sk_write_spacecallback hammering on the RPC client, and forward progress on TCP socket writes would slow to a crawl.You probably want something like this instead:
set_bit(SOCK_NOSPACE, &svsk->sk_sock->flags);required =
atomic_read(&svsk->sk_reserved)+serv->sv_max_mesg; wspace =sk_stream_wspace(svsk->sk_sk);if (wspace <
sk_stream_min_wspace(svsk->sk_sk))
return 0;
if (required * 2 > wspace)
return 0;Quoted 6 lines
clear_bit(SOCK_NOSPACE, &svsk->sk_sock->flags);
return 1;The first test mimics
sk_stream_write_space()andxs_tcp_write_space(). I'm still unsure what to do about the possibility of one of these signed integers going negative on us.--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
Re: [RFC,PATCH 34/38] svc: Add /proc/sys/sunrpc/transport files
In reply to J. Bruce FieldsQuoted 6 lines · J. Bruce Fields
Quoted 1 line · Chuck Lever
One last one, then I will crawl back into my hole.
By the way, based on who I recall making a lot of comments, I'm planning on just adding:
Quoted 6 lines
Acked-by Neil Brown <[email protected]>Reviewed-by Chuck Lever <[email protected]>Reviewed-by Greg Banks <[email protected]>to all of the server transport-switch and rdma patches. Does that sound right?
For the server transport switch patches: yes please.
For the server RDMA patches: I've not had a chance to read the latest versions (a long-running drama has been sucking up all my time for some weeks now), but after all the discussion I'm not expecting any nasty surprises. I'll get back to you in a few days.
Quoted 2 lines
And I'm assuming there are no objections to submitting this come the next merge window.
Agreed.
Greg.
Signature · 3 lines
Greg Banks, R&D Software Engineer, SGI Australian Software Group. Apparently, I'm Bedevere. Which MPHG character are you? I don't speak for SGI.
RFC PATCH 35/38 knfsd: Support adding transports by writing portlist file
In reply to a message not in the archiveUpdate the write handler for the portlist file to allow creating new listening endpoints on a transport. The general form of the string is:
<transport_name><space><port number>
For example:
tcp 2049
This is intended to support the creation of a listening endpoint for RDMA transports without adding #ifdef code to the nfssvc.c file.
---
fs/nfsd/nfsctl.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
fs/nfsd/nfsctl.c +16 -0
@@ -554,6 +554,22 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size)kfree (toclose);return len; } +/* +* Add a transport listener by writing it's transport name +*/ +if (isalnum (buf[0 ])) { +int err; +char transport[16 ]; +int port; +if (sscanf (buf,"%15s %4d" , transport, &port) ==2 ) { + err =nfsd_create_serv (); +if (!err) + err =svc_create_xprt (nfsd_serv, + transport, port, +SVC_SOCK_ANONYMOUS ); +return err <0 ? err :0 ; + } + }return -EINVAL ; }
RFC PATCH 36/38 svc: Add svc API that queries for a transport instance
In reply to a message not in the archiveAdd a new svc function that allows a service to query whether a transport instance has already been created. This is used in lockd to determine whether or not a transport needs to be created when a lockd instance is brought up.
Specifying 0 for the address family or port is effectively a wild-card, and will result in matching the first transport in the service's list that has a matching class name.
---
fs/lockd/svc.c | 16 ++-------------- include/linux/sunrpc/svc_xprt.h | 2 ++ net/sunrpc/svc_xprt.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 14 deletions(-)
fs/lockd/svc.c +2 -14
@@ -219,18 +219,6 @@ lockd(struct svc_rqst *rqstp)module_put_and_exit (0 ); } -static int find_xprt (struct svc_serv *serv,char *proto) -{ -struct svc_xprt *xprt; -int found =0 ; -list_for_each_entry (xprt, &serv->sv_permsocks, xpt_list) -if (strcmp (xprt->xpt_class->xcl_name, proto) ==0 ) { - found =1 ; -break ; - } -return found; -} -/* * Make any sockets that are needed but not present. * If nlm_udpport or nlm_tcpport were set as module
@@ -242,11 +230,11 @@ static int make_socks(struct svc_serv *serv, int proto)int err =0 ;if (proto ==IPPROTO_UDP || nlm_udpport) -if (!find_xprt (serv,"udp" )) +if (!svc_find_xprt (serv,"udp" ,0 ,0 )) err =svc_create_xprt (serv,"udp" , nlm_udpport,SVC_SOCK_DEFAULTS );if (err >=0 && (proto ==IPPROTO_TCP || nlm_tcpport)) -if (!find_xprt (serv,"tcp" )) +if (!svc_find_xprt (serv,"tcp" ,0 ,0 )) err =svc_create_xprt (serv,"tcp" , nlm_tcpport,SVC_SOCK_DEFAULTS );
include/linux/sunrpc/svc_xprt.h +2 -0
@@ -80,6 +80,8 @@ void svc_xprt_enqueue(struct svc_xprt *xprt);int svc_port_is_privileged (struct sockaddr *sin);void svc_delete_xprt (struct svc_xprt *xprt);int svc_print_xprts (char *buf,int maxlen); +struct svc_xprt * +svc_find_xprt (struct svc_serv *serv,char *xprt_class,int af,int port);static inline void svc_xprt_get (struct svc_xprt *xprt) {
net/sunrpc/svc_xprt.c +31 -0
@@ -945,3 +945,34 @@ static struct svc_deferred_req *svc_deferred_dequeue(struct svc_xprt *xprt)spin_unlock (&xprt->xpt_lock);return dr; } + +/* +* Return the transport instance pointer for the endpoint accepting +* connections/peer traffic from the specified transport class, +* address family and port. +*/ +struct svc_xprt *svc_find_xprt (struct svc_serv *serv,char *xcl_name, +int af,int port) +{ +struct svc_xprt *xprt; +struct svc_xprt *found =NULL ; + +/* Sanity check the args */ +if (!serv || !xcl_name) +return found; + +spin_lock_bh (&serv->sv_lock); +list_for_each_entry (xprt, &serv->sv_permsocks, xpt_list) { +if (strcmp (xprt->xpt_class->xcl_name, xcl_name)) +continue ; +if (af !=AF_UNSPEC && af != xprt->xpt_local.ss_family) +continue ; +if (port && port !=svc_xprt_local_port (xprt)) +continue ; + found = xprt; +break ; + } +spin_unlock_bh (&serv->sv_lock); +return found; +} +EXPORT_SYMBOL_GPL (svc_find_xprt);
A message that is not in the archive (sent off-list or not yet received): 20071129224109.14563.34563.stgit-gUwIgmpLGaKNDNWfRnPdfg@public.gmane.org
Re: [RFC,PATCH 36/38] svc: Add svc API that queries for a transport instance
Quoted 8 lines · Tom Tucker
Add a new svc function that allows a service to query whether a transport instance has already been created. This is used in lockd to determine whether or not a transport needs to be created when a lockd instance is brought up.
Specifying 0 for the address family or port is effectively a wild-card, and will result in matching the first transport in the service's list that has a matching class name.
Suggestion: this paragraph ^^^ would be good documentation to add to the block comment in front of svc_find_xprt().
Quoted 52 lines
Signed-off-by Tom Tucker <[email protected]>---
fs/lockd/svc.c | 16 ++-------------- include/linux/sunrpc/svc_xprt.h | 2 ++ net/sunrpc/svc_xprt.c | 31 ++++++++++++++++++++++++++++ +++ 3 files changed, 35 insertions(+), 14 deletions(-)fs/lockd/svc.c +2
-14@@ -219,18 +219,6 @@ lockd(struct svc_rqst *rqstp)module_put_and_exit (0 ); } -static int find_xprt (struct svc_serv *serv,char *proto) -{ -struct svc_xprt *xprt; -int found =0 ; -list_for_each_entry (xprt, &serv->sv_permsocks, xpt_list) -if (strcmp (xprt->xpt_class->xcl_name, proto) ==0 ) { - found =1 ; -break ; - } -return found; -} -/* * Make any sockets that are needed but not present. * If nlm_udpport or nlm_tcpport were set as module @@ -242,11 +230,11 @@ static int make_socks(struct svc_serv *serv, int proto)int err =0 ;if (proto ==IPPROTO_UDP || nlm_udpport) -if (!find_xprt (serv,"udp" )) +if (!svc_find_xprt (serv,"udp" ,0 ,0 )) err =svc_create_xprt (serv,"udp" , nlm_udpport,SVC_SOCK_DEFAULTS );if (err >=0 && (proto ==IPPROTO_TCP || nlm_tcpport)) -if (!find_xprt (serv,"tcp" )) +if (!svc_find_xprt (serv,"tcp" ,0 ,0 )) err =svc_create_xprt (serv,"tcp" , nlm_tcpport,SVC_SOCK_DEFAULTS );include/linux/sunrpc/svc_xprt.h +0
-0
include/linux/sunrpc/svc_xprt.h void svc_xprt_enqueue(struct svc_xprt *xprt); · line 85
Quoted 6 lines
include/linux/sunrpc/svc_xprt.h +2
-0@@ -80,6 +80,8 @@ void svc_xprt_enqueue(struct svc_xprt *xprt);int svc_port_is_privileged (struct sockaddr *sin);void svc_delete_xprt (struct svc_xprt *xprt);int svc_print_xprts (char *buf,int maxlen); +struct svc_xprt * +svc_find_xprt (struct svc_serv *serv,char *xprt_class,int af,int port);
Nit: usually
struct svc_xprt *svc_find_xprt(struct svc_serv *serv,
char *xprt_class, int af, int port);
is preferred instead for forward declarations.
Quoted 32 lines
include/linux/sunrpc/svc_xprt.h +0
-0static inline void svc_xprt_get (struct svc_xprt *xprt) {net/sunrpc/svc_xprt.c +21
-0@@ -945,3 +945,34 @@ static struct svc_deferred_req *svc_deferred_dequeue(struct svc_xprt *xprt)spin_unlock (&xprt->xpt_lock);return dr; } + +/* +* Return the transport instance pointer for the endpoint accepting +* connections/peer traffic from the specified transport class, +* address family and port. +*/ +struct svc_xprt *svc_find_xprt (struct svc_serv *serv,char *xcl_name, +int af,int port) +{ +struct svc_xprt *xprt; +struct svc_xprt *found =NULL ; + +/* Sanity check the args */ +if (!serv || !xcl_name) +return found; + +spin_lock_bh (&serv->sv_lock); +list_for_each_entry (xprt, &serv->sv_permsocks, xpt_list) { +if (strcmp (xprt->xpt_class->xcl_name, xcl_name)) +continue ; +if (af !=AF_UNSPEC && af != xprt->xpt_local.ss_family)
net/sunrpc/svc_xprt.c static struct svc_deferred_req · line 978
Quoted 10 lines
net/sunrpc/svc_xprt.c +10
-0+continue ; +if (port && port !=svc_xprt_local_port (xprt)) +continue ; + found = xprt; +break ; + } +spin_unlock_bh (&serv->sv_lock); +return found; +} +EXPORT_SYMBOL_GPL (svc_find_xprt);
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
RFC PATCH 37/38 knfsd: Modify write_ports to use svc_find_xprt service
In reply to a message not in the archiveThis patch enhances the write_ports function as follows:
- Check if a server transport instance already exists before attempting to create a new one, and
- Implement the ability to remove a previously created server transport instance.
---
fs/nfsd/nfsctl.c | 36 +++++++++++++++++++++++++++++++++--- net/sunrpc/svc_xprt.c | 1 + 2 files changed, 34 insertions(+), 3 deletions(-)
fs/nfsd/nfsctl.c +33 -3
@@ -540,7 +540,7 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size) }return err <0 ? err :0 ; } -if (buf[0 ] =='-' ) { +if (buf[0 ] =='-' &&isdigit (buf[1 ])) {char *toclose =kstrdup (buf+1 ,GFP_KERNEL );int len =0 ;if (!toclose)
@@ -557,16 +557,46 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size)/* * Add a transport listener by writing it's transport name */ -if (isalnum (buf[0 ])) { +if (isalpha (buf[0 ])) {int err;char transport[16 ];int port;if (sscanf (buf,"%15s %4d" , transport, &port) ==2 ) { err =nfsd_create_serv (); -if (!err) +if (!err) { +if (svc_find_xprt (nfsd_serv, transport, +AF_UNSPEC , port)) +return -EADDRINUSE ; + err =svc_create_xprt (nfsd_serv, transport, port,SVC_SOCK_ANONYMOUS ); + } +return err <0 ? err :0 ; + } + } +/* +* Remove a transport by writing it's transport name and port number +*/ +if (buf[0 ] =='-' &&isalpha (buf[1 ])) { +struct svc_xprt *xprt; +int err = -EINVAL ; +char transport[16 ]; +int port; +if (sscanf (&buf[1 ],"%15s %4d" , transport, &port) ==2 ) { +if (port ==0 ) +return -EINVAL ; +lock_kernel (); +if (nfsd_serv) { + xprt =svc_find_xprt (nfsd_serv, transport, +AF_UNSPEC , port); +if (xprt) { +svc_close_xprt (xprt); + err =0 ; + }else + err = -ENOENT ; + } +unlock_kernel ();return err <0 ? err :0 ; } }
net/sunrpc/svc_xprt.c +1 -0
@@ -810,6 +810,7 @@ void svc_close_xprt(struct svc_xprt *xprt)clear_bit (XPT_BUSY , &xprt->xpt_flags);svc_xprt_put (xprt); } +EXPORT_SYMBOL_GPL (svc_close_xprt);void svc_close_all (struct list_head *xprt_list) {
RFC PATCH 38/38 svc: Add svc_xprt_names service to replace svc_sock_names
In reply to a message not in the archiveCreate a transport independent version of the svc_sock_names function.
The toclose capability of the svc_sock_names service can be implemented using the svc_xprt_find and svc_xprt_close services.
---
fs/nfsd/nfsctl.c | 2 +- include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svc_xprt.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletions(-)
fs/nfsd/nfsctl.c +1 -1
@@ -503,7 +503,7 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size)int len =0 ;lock_kernel ();if (nfsd_serv) - len =svc_sock_names (buf, nfsd_serv,NULL ); + len =svc_xprt_names (nfsd_serv, buf,0 );unlock_kernel ();return len; }
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -80,6 +80,7 @@ void svc_xprt_enqueue(struct svc_xprt *xprt);int svc_port_is_privileged (struct sockaddr *sin);void svc_delete_xprt (struct svc_xprt *xprt);int svc_print_xprts (char *buf,int maxlen); +int svc_xprt_names (struct svc_serv *serv,char *buf,int buflen);struct svc_xprt *svc_find_xprt (struct svc_serv *serv,char *xprt_class,int af,int port);
net/sunrpc/svc_xprt.c +35 -0
@@ -977,3 +977,38 @@ struct svc_xprt *svc_find_xprt(struct svc_serv *serv, char *xcl_name,return found; }EXPORT_SYMBOL_GPL (svc_find_xprt); + +/* +* Format a buffer with a list of the active transports. A zero for +* the buflen parameter disables target buffer overflow checking. +*/ +int svc_xprt_names (struct svc_serv *serv,char *buf,int buflen) +{ +struct svc_xprt *xprt; +char xprt_str[64 ]; +int totlen =0 ; +int len; + +/* Sanity check args */ +if (!serv) +return 0 ; + +spin_lock_bh (&serv->sv_lock); +list_for_each_entry (xprt, &serv->sv_permsocks, xpt_list) { + len =snprintf (xprt_str,sizeof (xprt_str), +"%s %d\n" , xprt->xpt_class->xcl_name, +svc_xprt_local_port (xprt)); +/* If the string was truncated, replace with error string */ +if (len >=sizeof (xprt_str)) +strcpy (xprt_str,"name-too-long\n" ); +/* Don't overflow buffer */ + len =strlen (xprt_str); +if (buflen && (len + totlen >= buflen)) +break ; +strcpy (buf+totlen, xprt_str); + totlen += len; + } +spin_unlock_bh (&serv->sv_lock); +return totlen; +} +EXPORT_SYMBOL_GPL (svc_xprt_names);
I finger fumbled Bruce's address in the first set. I sent another one because I wanted people to be able to reply and get Bruce's correct address information in the reply.
Please forgive me for the clutter I've caused.
Tom
Quoted 23 lines · Tom Tucker
The following series implements a pluggable transport switch for RPC servers. This patchset is a rollup of the original plus incremental patches.
In addition to the incremental change rollup:
- The address management logic in
svc_xprtwas cleaned up a based on feedback from Chuck Lever,- A race was fixed whereby UDP RPC from different clients in parallel could corrupt each other's addresses.
- Changes were made to the sysctl implementation to comply with the new 2.6.24 requirements regarding sysctl ids.
The following testing was done:
- Connectathon on V3 and V4 on TCP, UDP and RDMA mounts
- Kernel build on V3 RDMA mount.
This patchset is against the 2.6.24-rc3 kernel tree.