10 RPC transport switch patches, take 3
Subsystems (3)
cover 10 RPC transport switch patches, take 3
Hi Trond-
I've removed the patches you've already applied, and reworked the remaining patches as suggested. Please review.
Signature · 10 lines
corporate: <chuck dot lever at oracle dot com> ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ NFS maillist - [email protected] https://lists.sourceforge.net/lists/listinfo/nfs
PATCH 1/10 SUNRPC: Allocate a private data area for socket-specific rpc_xprt fields
When setting up a new transport instance, allocate enough memory for an rpc_xprt and a private area. As part of the same memory allocation, it will be easy to find one, given a pointer to the other.
---
net/sunrpc/xprtsock.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
net/sunrpc/xprtsock.c +8 -2
@@ -125,6 +125,10 @@ static inline void xs_pktdump(char *msg, }#endif +struct sock_xprt { +struct rpc_xprt xprt; +}; +static void xs_format_peer_addresses (struct rpc_xprt *xprt) {struct sockaddr_in *addr = (struct sockaddr_in *) &xprt->addr;
@@ -1352,6 +1356,7 @@ static struct rpc_xprt_ops xs_tcp_ops =static struct rpc_xprt *xs_setup_xprt (struct sockaddr *addr,size_t addrlen,unsigned int slot_table_size) { +struct sock_xprt *sx;struct rpc_xprt *xprt;if (addrlen >sizeof (xprt->addr)) {
@@ -1359,11 +1364,12 @@ static struct rpc_xprt *xs_setup_xprt(streturn ERR_PTR (-EBADF ); } - xprt =kzalloc (sizeof (struct rpc_xprt ),GFP_KERNEL ); -if (xprt ==NULL ) { + sx =kzalloc (sizeof (struct sock_xprt ),GFP_KERNEL ); +if (sx ==NULL ) {dprintk ("RPC: xs_setup_xprt: couldn't allocate rpc_xprt\n" );return ERR_PTR (-ENOMEM ); } + xprt = &sx->xprt; xprt->max_reqs = slot_table_size; xprt->slot =kcalloc (xprt->max_reqs,sizeof (struct rpc_rqst ),GFP_KERNEL );
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
Re: [PATCH 01/10] SUNRPC: Allocate a private data area for socket-specific rpc_xprt fields
Quoted 26 lines · Chuck Lever
When setting up a new transport instance, allocate enough memory for an
rpc_xprtand a private area. As part of the same memory allocation, it will be easy to find one, given a pointer to the other.Signed-off-by Chuck Lever <[email protected]>---
net/sunrpc/xprtsock.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)net/sunrpc/xprtsock.c +4
-0@@ -125,6 +125,10 @@ static inline void xs_pktdump(char *msg, }#endif +struct sock_xprt { +struct rpc_xprt xprt; +}; +static void xs_format_peer_addresses (struct rpc_xprt *xprt) {struct sockaddr_in *addr = (struct sockaddr_in *) &xprt->addr;
net/sunrpc/xprtsock.c static struct rpc_xprt_ops xs_tcp_ops = · line 1359
Quoted 4 lines
net/sunrpc/xprtsock.c +1
-0@@ -1352,6 +1356,7 @@ static struct rpc_xprt_ops xs_tcp_ops =static struct rpc_xprt *xs_setup_xprt (struct sockaddr *addr,size_t addrlen,unsigned int slot_table_size) { +struct sock_xprt *sx;
^^ sux?
Could we please just call these sock_xprt?
net/sunrpc/xprtsock.c static struct rpc_xprt *xs_setup_xprt(st · line 1367
Quoted 10 lines
net/sunrpc/xprtsock.c +1
-2struct rpc_xprt *xprt;if (addrlen >sizeof (xprt->addr)) {@@ -1359,11 +1364,12 @@ static struct rpc_xprt *xs_setup_xprt(streturn ERR_PTR (-EBADF ); } - xprt =kzalloc (sizeof (struct rpc_xprt ),GFP_KERNEL ); -if (xprt ==NULL ) { + sx =kzalloc (sizeof (struct sock_xprt ),GFP_KERNEL );
sizeof(*sock_xprt) please.
net/sunrpc/xprtsock.c static struct rpc_xprt *xs_setup_xprt(st · line 1375
Quoted 8 lines
net/sunrpc/xprtsock.c +2
-0+if (sx ==NULL ) {dprintk ("RPC: xs_setup_xprt: couldn't allocate rpc_xprt\n" );return ERR_PTR (-ENOMEM ); } + xprt = &sx->xprt; xprt->max_reqs = slot_table_size; xprt->slot =kcalloc (xprt->max_reqs,sizeof (struct rpc_rqst ),GFP_KERNEL );
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
PATCH 2/10 SUNRPC: Remove sock and inet fields from rpc_xprt
In reply to Chuck LeverThe "sock" and "inet" fields are socket-specific. Move them to a private data structure maintained entirely within net/sunrpc/xprtsock.c
---
include/linux/sunrpc/xprt.h | 4 +-- net/sunrpc/xprtsock.c | 62 +++++++++++++++++++++++++++---------------- 2 files changed, 41 insertions(+), 25 deletions(-)
include/linux/sunrpc/xprt.h +2 -2
@@ -17,6 +17,8 @@ #include <linux/sunrpc/sched.h>#include <linux/sunrpc/xdr.h> #include <linux/sunrpc/msg_prot.h> +#include <net/sock.h> +extern unsigned int xprt_udp_slot_table_entries;extern unsigned int xprt_tcp_slot_table_entries;
@@ -126,8 +128,6 @@ struct rpc_xprt_ops {struct rpc_xprt {struct kref kref;/* Reference count */ struct rpc_xprt_ops * ops;/* transport methods */ -struct socket * sock;/* BSD socket layer */ -struct sock * inet;/* INET layer */ struct rpc_timeout timeout;/* timeout parms */ struct sockaddr_storage addr;/* server address */
net/sunrpc/xprtsock.c +39 -23
190 lines not on this page · raw message
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
PATCH 3/10 SUNRPC: Move TCP receive state variables into private data structure
In reply to Chuck LeverMove the TCP receive state variables from the generic rpc_xprt structure to a private structure maintained inside net/sunrpc/xprtsock.c.
Also rename a function/variable pair to refer to RPC fragment headers instead of record markers, to be consistent with types defined in sunrpc/*.h.
---
include/linux/sunrpc/xprt.h | 9 --- net/sunrpc/xprtsock.c | 150 ++++++++++++++++++++++++------------------- 2 files changed, 83 insertions(+), 76 deletions(-)
include/linux/sunrpc/xprt.h +0 -9
@@ -158,15 +158,6 @@ struct rpc_xprt { resvport :1 ;/* use a reserved port */ /* -* State of TCP reply receive stuff -*/ -__be32 tcp_recm,/* Fragment header */ - tcp_xid;/* Current XID */ -u32 tcp_reclen,/* fragment length */ - tcp_offset;/* fragment offset */ -unsigned long tcp_copied,/* copied to request */ - tcp_flags; -/* * Connection of transports */ unsigned long connect_timeout,
net/sunrpc/xprtsock.c +83 -67
284 lines not on this page · raw message
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
PATCH 4/10 SUNRPC: Move TCP state flags into xprtsock.c
In reply to Chuck LeverMove "XPRT_LAST_FRAG" and friends from xprt.h into xprtsock.c, and rename them to use the naming scheme in use in xprtsock.c.
---
include/linux/sunrpc/xprt.h | 5 ---- net/sunrpc/xprtsock.c | 48 +++++++++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 25 deletions(-)
include/linux/sunrpc/xprt.h +0 -5
@@ -203,11 +203,6 @@ struct rpc_xprt {char * address_strings[RPC_DISPLAY_MAX ]; }; -#define XPRT_LAST_FRAG (1 << 0) -#define XPRT_COPY_RECM (1 << 1) -#define XPRT_COPY_XID (1 << 2) -#define XPRT_COPY_DATA (1 << 3) -#ifdef __KERNEL__/*
net/sunrpc/xprtsock.c +28 -20
123 lines not on this page · raw message
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
Re: [PATCH 04/10] SUNRPC: Move TCP state flags into xprtsock.c
Quoted 31 lines · Chuck Lever
Move "
XPRT_LAST_FRAG" and friends fromxprt.hintoxprtsock.c, and rename them to use the naming scheme in use inxprtsock.c.Signed-off-by Chuck Lever <[email protected]>---
include/linux/sunrpc/xprt.h | 5 ---- net/sunrpc/xprtsock.c | 48 +++++++++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 25 deletions(-)include/linux/sunrpc/xprt.h +0
-5@@ -203,11 +203,6 @@ struct rpc_xprt {char * address_strings[RPC_DISPLAY_MAX ]; }; -#define XPRT_LAST_FRAG (1 << 0) -#define XPRT_COPY_RECM (1 << 1) -#define XPRT_COPY_XID (1 << 2) -#define XPRT_COPY_DATA (1 << 3) -#ifdef __KERNEL__/* net/sunrpc/xprtsock.c +0
-0
net/sunrpc/xprtsock.c struct sock_xprt { · line 156
Quoted 10 lines
net/sunrpc/xprtsock.c +7
-0@@ -147,6 +147,14 @@ struct sock_xprt { tcp_flags; }; +/* +* TCP receive state flags +*/ +#define XS_LAST_FRAG (1UL << 0) +#define XS_COPY_FRGH (1UL << 1) +#define XS_COPY_XID (1UL << 2) +#define XS_COPY_DATA (1UL << 3)
If you are going to rename these, how about just using RPCMSG_LAST_FRAG, RPCMSG_COPY_FRAGHDR (FRGH == ugh), RPCMSG_COPY_XID, and RPCMSG_COPY_DATA?
Quoted 113 lines
net/sunrpc/xprtsock.c +20
-19+static void xs_format_peer_addresses (struct rpc_xprt *xprt) {struct sockaddr_in *addr = (struct sockaddr_in *) &xprt->addr;@@ -663,12 +671,12 @@ static inline void xs_tcp_read_fraghdr(s sx->tcp_reclen =ntohl (sx->tcp_fraghdr);if (sx->tcp_reclen &RPC_LAST_STREAM_FRAGMENT ) - sx->tcp_flags |=XPRT_LAST_FRAG ; + sx->tcp_flags |=XS_LAST_FRAG ;else - sx->tcp_flags &= ~XPRT_LAST_FRAG ; + sx->tcp_flags &= ~XS_LAST_FRAG ; sx->tcp_reclen &=RPC_FRAGMENT_SIZE_MASK ; - sx->tcp_flags &= ~XPRT_COPY_RECM ; + sx->tcp_flags &= ~XS_COPY_FRGH ; sx->tcp_offset =0 ;/* Sanity check of the record length */ @@ -684,11 +692,11 @@ static inline void xs_tcp_read_fraghdr(sstatic void xs_tcp_check_fraghdr (struct sock_xprt *sx) {if (sx->tcp_offset == sx->tcp_reclen) { - sx->tcp_flags |=XPRT_COPY_RECM ; + sx->tcp_flags |=XS_COPY_FRGH ; sx->tcp_offset =0 ; -if (sx->tcp_flags &XPRT_LAST_FRAG ) { - sx->tcp_flags &= ~XPRT_COPY_DATA ; - sx->tcp_flags |=XPRT_COPY_XID ; +if (sx->tcp_flags &XS_LAST_FRAG ) { + sx->tcp_flags &= ~XS_COPY_DATA ; + sx->tcp_flags |=XS_COPY_XID ; sx->tcp_copied =0 ; } }@@ -706,8 +714,8 @@ static inline void xs_tcp_read_xid(struc sx->tcp_offset += used;if (used != len)return ; - sx->tcp_flags &= ~XPRT_COPY_XID ; - sx->tcp_flags |=XPRT_COPY_DATA ; + sx->tcp_flags &= ~XS_COPY_XID ; + sx->tcp_flags |=XS_COPY_DATA ; sx->tcp_copied =4 ;dprintk ("RPC: reading reply for XID %08x\n" ,ntohl (sx->tcp_xid));@@ -726,7 +734,7 @@ static inline void xs_tcp_read_request(sspin_lock (&xprt->transport_lock); req =xprt_lookup_rqst (xprt, sx->tcp_xid);if (!req) { - sx->tcp_flags &= ~XPRT_COPY_DATA ; + sx->tcp_flags &= ~XS_COPY_DATA ;dprintk ("RPC: XID %08x request not found!\n" ,ntohl (sx->tcp_xid));spin_unlock (&xprt->transport_lock);@@ -757,13 +765,13 @@ static inline void xs_tcp_read_request(s/* Error when copying to the receive buffer, * usually because we weren't able to allocate * additional buffer pages. All we can do now -* is turn off XPRT_COPY_DATA, so the request +* is turn off XS_COPY_DATA, so the request * will not receive any additional updates, * and time out. * Any remaining data from this record will * be discarded. */ - sx->tcp_flags &= ~XPRT_COPY_DATA ; + sx->tcp_flags &= ~XS_COPY_DATA ;dprintk ("RPC: XID %08x truncated request\n" ,ntohl (sx->tcp_xid)); dprintk("RPC: xprt = %p, tcp_copied = %lu, tcp_offset = %u, tcp_reclen = %u\n",@@ -777,14 +785,14 @@ static inline void xs_tcp_read_request(s xprt, sx->tcp_copied, sx->tcp_offset, sx->tcp_reclen);if (sx->tcp_copied == req->rq_private_buf.buflen) - sx->tcp_flags &= ~XPRT_COPY_DATA ; + sx->tcp_flags &= ~XS_COPY_DATA ;else if (sx->tcp_offset == sx->tcp_reclen) { -if (sx->tcp_flags &XPRT_LAST_FRAG ) - sx->tcp_flags &= ~XPRT_COPY_DATA ; +if (sx->tcp_flags &XS_LAST_FRAG ) + sx->tcp_flags &= ~XS_COPY_DATA ; } out: -if (!(sx->tcp_flags &XPRT_COPY_DATA )) +if (!(sx->tcp_flags &XS_COPY_DATA ))xprt_complete_rqst (req->rq_task, sx->tcp_copied);spin_unlock (&xprt->transport_lock);xs_tcp_check_fraghdr (sx);@@ -818,17 +826,17 @@ static int xs_tcp_data_recv(read_descrip do { /* Read in a new fragment marker if necessary */ /* Can we ever really expect to get completely empty fragments? */ - if (sx->tcp_flags & XPRT_COPY_RECM) { + if (sx->tcp_flags & XS_COPY_FRGH) { xs_tcp_read_fraghdr(xprt, &desc); continue; } /* Read in the xid if necessary */ - if (sx->tcp_flags & XPRT_COPY_XID) { + if (sx->tcp_flags & XS_COPY_XID) { xs_tcp_read_xid(sx, &desc); continue; } /* Read in the request data */ - if (sx->tcp_flags & XPRT_COPY_DATA) { + if (sx->tcp_flags & XS_COPY_DATA) { xs_tcp_read_request(xprt, &desc); continue; }
net/sunrpc/xprtsock.c static void xs_tcp_state_change(struct s · line 908
Quoted 8 lines
net/sunrpc/xprtsock.c +1
-1@@ -894,7 +902,7 @@ static void xs_tcp_state_change(struct s sx->tcp_offset =0 ; sx->tcp_reclen =0 ; sx->tcp_copied =0 ; - sx->tcp_flags =XPRT_COPY_RECM |XPRT_COPY_XID ; + sx->tcp_flags =XS_COPY_FRGH |XS_COPY_XID ; xprt->reestablish_timeout =XS_TCP_INIT_REEST_TO ;xprt_wake_pending_tasks (xprt,0 );
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
PATCH 5/10 SUNRPC: Move rpc_xprt socket connect fields into private data structure
In reply to Chuck LeverMove the socket-specific connection management fields out of the generic rpc_xprt structure into a private data structure maintained in net/sunrpc/xprtsock.c.
---
include/linux/sunrpc/xprt.h | 2 -- net/sunrpc/xprtsock.c | 51 ++++++++++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 20 deletions(-)
include/linux/sunrpc/xprt.h +0 -2
@@ -163,8 +163,6 @@ struct rpc_xprt {unsigned long connect_timeout, bind_timeout, reestablish_timeout; -struct work_struct connect_worker; -unsigned short port;/* * Disconnection of idle transports
net/sunrpc/xprtsock.c +33 -18
181 lines not on this page · raw message
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
PATCH 6/10 SUNRPC: Move the UDP socket bufsize parameters to a private data structure
In reply to Chuck LeverMove the socket-specific buffer size parameters for UDP sockets to a private data structure maintained in net/sunrpc/xprtsock.c.
---
include/linux/sunrpc/xprt.h | 3 --- net/sunrpc/xprtsock.c | 24 ++++++++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-)
include/linux/sunrpc/xprt.h +0 -3
@@ -137,9 +137,6 @@ struct rpc_xprt {unsigned long cong;/* current congestion */ unsigned long cwnd;/* congestion window */ -size_t rcvsize,/* transport rcv buffer size */ - sndsize;/* transport send buffer size */ -size_t max_payload;/* largest RPC payload size, in bytes */ unsigned int tsh_size;/* size of transport specific
net/sunrpc/xprtsock.c +16 -8
@@ -151,6 +151,12 @@ struct sock_xprt {*/ struct work_struct connect_worker;unsigned short port; + +/* +* UDP socket buffer size parameters +*/ +size_t rcvsize, + sndsize; };/*
@@ -1003,13 +1009,13 @@ static void xs_udp_do_set_buffer_size(st struct sock_xprt *sx = container_of(xprt, struct sock_xprt, xprt);struct sock *sk = sx->inet; -if (xprt->rcvsize) { +if (sx->rcvsize) { sk->sk_userlocks |=SOCK_RCVBUF_LOCK ; - sk->sk_rcvbuf = xprt->rcvsize * xprt->max_reqs *2 ; + sk->sk_rcvbuf = sx->rcvsize * xprt->max_reqs *2 ; } -if (xprt->sndsize) { +if (sx->sndsize) { sk->sk_userlocks |=SOCK_SNDBUF_LOCK ; - sk->sk_sndbuf = xprt->sndsize * xprt->max_reqs *2 ; + sk->sk_sndbuf = sx->sndsize * xprt->max_reqs *2 ; sk->sk_write_space (sk); } }
@@ -1024,12 +1030,14 @@ static void xs_udp_do_set_buffer_size(st*/ static void xs_udp_set_buffer_size (struct rpc_xprt *xprt,size_t sndsize,size_t rcvsize) { - xprt->sndsize =0 ; + struct sock_xprt *sx = container_of(xprt, struct sock_xprt, xprt); + + sx->sndsize =0 ;if (sndsize) - xprt->sndsize = sndsize +1024 ; - xprt->rcvsize =0 ; + sx->sndsize = sndsize +1024 ; + sx->rcvsize =0 ;if (rcvsize) - xprt->rcvsize = rcvsize +1024 ; + sx->rcvsize = rcvsize +1024 ;xs_udp_do_set_buffer_size (xprt); }
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
PATCH 7/10 SUNRPC: move saved socket callback functions to a private data structure
In reply to Chuck LeverMove the three fields for saving socket callback functions out of the rpc_xprt structure and into a private data structure maintained in net/sunrpc/xprtsock.c.
---
include/linux/sunrpc/xprt.h | 6 ------ net/sunrpc/xprtsock.c | 25 ++++++++++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-)
include/linux/sunrpc/xprt.h +0 -6
@@ -17,8 +17,6 @@ #include <linux/sunrpc/sched.h>#include <linux/sunrpc/xdr.h> #include <linux/sunrpc/msg_prot.h> -#include <net/sock.h> -extern unsigned int xprt_udp_slot_table_entries;extern unsigned int xprt_tcp_slot_table_entries;
@@ -191,10 +189,6 @@ struct rpc_xprt { bklog_u;/* backlog queue utilization */ } stat; -void (*old_data_ready)(struct sock *,int ); -void (*old_state_change)(struct sock *); -void (*old_write_space)(struct sock *); -char * address_strings[RPC_DISPLAY_MAX ]; };
net/sunrpc/xprtsock.c +16 -9
@@ -157,6 +157,13 @@ struct sock_xprt {*/ size_t rcvsize, sndsize; + +/* +* Saved socket callback addresses +*/ +void (*old_data_ready)(struct sock *,int ); +void (*old_state_change)(struct sock *); +void (*old_write_space)(struct sock *); };/*
@@ -546,9 +553,9 @@ static void xs_close(struct rpc_xprt *xp sx->sock =NULL ; sk->sk_user_data =NULL ; - sk->sk_data_ready = xprt->old_data_ready; - sk->sk_state_change = xprt->old_state_change; - sk->sk_write_space = xprt->old_write_space; + sk->sk_data_ready = sx->old_data_ready; + sk->sk_state_change = sx->old_state_change; + sk->sk_write_space = sx->old_write_space;write_unlock_bh (&sk->sk_callback_lock); sk->sk_no_check =0 ;
@@ -1154,9 +1161,9 @@ static void xs_udp_connect_worker(void *write_lock_bh (&sk->sk_callback_lock); sk->sk_user_data = xprt; - xprt->old_data_ready = sk->sk_data_ready; - xprt->old_state_change = sk->sk_state_change; - xprt->old_write_space = sk->sk_write_space; + sx->old_data_ready = sk->sk_data_ready; + sx->old_state_change = sk->sk_state_change; + sx->old_write_space = sk->sk_write_space; sk->sk_data_ready = xs_udp_data_ready; sk->sk_write_space = xs_udp_write_space; sk->sk_no_check =UDP_CSUM_NORCV ;
@@ -1241,9 +1248,9 @@ static void xs_tcp_connect_worker(void *write_lock_bh (&sk->sk_callback_lock); sk->sk_user_data = xprt; - xprt->old_data_ready = sk->sk_data_ready; - xprt->old_state_change = sk->sk_state_change; - xprt->old_write_space = sk->sk_write_space; + sx->old_data_ready = sk->sk_data_ready; + sx->old_state_change = sk->sk_state_change; + sx->old_write_space = sk->sk_write_space; sk->sk_data_ready = xs_tcp_data_ready; sk->sk_state_change = xs_tcp_state_change; sk->sk_write_space = xs_tcp_write_space;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
PATCH 8/10 SUNRPC: Make address format buffers more generic
In reply to Chuck LeverFor now we will assume that all transports will use the address format buffers in the rpc_xprt struct to store their addresses. Change rpc_peer2str() to be a generic routine to handle this, and get rid of the print_address() op in the rpc_xprt_ops vector.
---
include/linux/sunrpc/xprt.h | 1 - net/sunrpc/clnt.c | 6 +++++- net/sunrpc/xprtsock.c | 23 ++++------------------- 3 files changed, 9 insertions(+), 21 deletions(-)
include/linux/sunrpc/xprt.h +0 -1
@@ -106,7 +106,6 @@ #define rq_slen rq_snd_buf.lenstruct rpc_xprt_ops {void (*set_buffer_size)(struct rpc_xprt *xprt,size_t sndsize,size_t rcvsize); -char * (*print_addr)(struct rpc_xprt *xprt,enum rpc_display_format_t format);int (*reserve_xprt)(struct rpc_task *task);void (*release_xprt)(struct rpc_xprt *xprt,struct rpc_task *task);void (*rpcbind)(struct rpc_task *task);
net/sunrpc/clnt.c +5 -1
@@ -582,7 +582,11 @@ EXPORT_SYMBOL_GPL(rpc_peeraddr);char *rpc_peeraddr2str (struct rpc_clnt *clnt,enum rpc_display_format_t format) {struct rpc_xprt *xprt = clnt->cl_xprt; -return xprt->ops->print_addr (xprt, format); + +if (xprt->address_strings[format] !=NULL ) +return xprt->address_strings[format]; +else +return "unprintable" ; }EXPORT_SYMBOL_GPL (rpc_peeraddr2str);
net/sunrpc/xprtsock.c +4 -19
@@ -1068,19 +1068,6 @@ static unsigned short xs_get_random_port }/** -* xs_print_peer_address - format an IPv4 address for printing -* @xprt: generic transport -* @format: flags field indicating which parts of the address to render -*/ -static char *xs_print_peer_address (struct rpc_xprt *xprt,enum rpc_display_format_t format) -{ -if (xprt->address_strings[format] !=NULL ) -return xprt->address_strings[format]; -else -return "unprintable" ; -} - -/** * xs_set_port - reset the port number in the remote endpoint address * @xprt: generic transport * @port: new port number
@@ -1153,7 +1140,7 @@ static void xs_udp_connect_worker(void * }dprintk ("RPC: worker connecting xprt %p to address: %s\n" , - xprt,xs_print_peer_address (xprt,RPC_DISPLAY_ALL )); + xprt, xprt->address_strings[RPC_DISPLAY_ALL ]);if (!sx->inet) {struct sock *sk = sock->sk;
@@ -1240,7 +1227,7 @@ static void xs_tcp_connect_worker(void *xs_tcp_reuse_connection (xprt);dprintk ("RPC: worker connecting xprt %p to address: %s\n" , - xprt,xs_print_peer_address (xprt,RPC_DISPLAY_ALL )); + xprt, xprt->address_strings[RPC_DISPLAY_ALL ]);if (!sx->inet) {struct sock *sk = sock->sk;
@@ -1387,7 +1374,6 @@ static void xs_tcp_print_stats(struct rpstatic struct rpc_xprt_ops xs_udp_ops = { .set_buffer_size = xs_udp_set_buffer_size, - .print_addr = xs_print_peer_address, .reserve_xprt = xprt_reserve_xprt_cong, .release_xprt = xprt_release_xprt_cong, .rpcbind = rpc_getport,
@@ -1405,7 +1391,6 @@ static struct rpc_xprt_ops xs_udp_ops = };static struct rpc_xprt_ops xs_tcp_ops = { - .print_addr = xs_print_peer_address, .reserve_xprt = xprt_reserve_xprt, .release_xprt = xs_tcp_release_xprt, .rpcbind = rpc_getport,
@@ -1492,7 +1477,7 @@ struct rpc_xprt *xs_setup_udp(struct socxs_format_peer_addresses (xprt);dprintk ("RPC: set up transport to address %s\n" , -xs_print_peer_address (xprt,RPC_DISPLAY_ALL )); + xprt->address_strings[RPC_DISPLAY_ALL ]);return xprt; }
@@ -1536,7 +1521,7 @@ struct rpc_xprt *xs_setup_tcp(struct socxs_format_peer_addresses (xprt);dprintk ("RPC: set up transport to address %s\n" , -xs_print_peer_address (xprt,RPC_DISPLAY_ALL )); + xprt->address_strings[RPC_DISPLAY_ALL ]);return xprt; }
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
PATCH 9/10 SUNRPC: skb_read_bits is the same as xs_tcp_copy_data
In reply to Chuck LeverClean-up: eliminate xs_tcp_copy_data -- it's exactly the same logic as the common routine skb_read_bits. The UDP and TCP socket read code now share the same routine for copying data into an xdr_buf.
Now that skb_read_bits() is exported, rename it to avoid confusing it with a generic skb_* function. As these functions are XDR-specific, they should not have names that suggest they are of generic use. Also rename skb_read_and_csum_bits() to be consistent.
---
include/linux/sunrpc/xdr.h | 1 + net/sunrpc/socklib.c | 14 +++++++------- net/sunrpc/xprtsock.c | 24 ++++-------------------- 3 files changed, 12 insertions(+), 27 deletions(-)
include/linux/sunrpc/xdr.h +1 -0
@@ -156,6 +156,7 @@ typedef struct {typedef size_t (*skb_read_actor_t )(skb_reader_t *desc,void *to,size_t len); +size_t xdr_skb_read_bits (skb_reader_t *desc,void *to,size_t len);extern int csum_partial_copy_to_xdr (struct xdr_buf *,struct sk_buff *);extern ssize_t xdr_partial_copy_from_skb (struct xdr_buf *,unsigned int ,skb_reader_t *,skb_read_actor_t );
net/sunrpc/socklib.c +7 -7
@@ -16,7 +16,7 @@ #include <linux/sunrpc/xdr.h>/** -* skb_read_bits - copy some data bits from skb to internal buffer +* xdr_skb_read_bits - copy some data bits from skb to internal buffer * @desc: sk_buff copy helper * @to: copy destination * @len: number of bytes to copy
@@ -24,11 +24,11 @@ #include <linux/sunrpc/xdr.h>* Possibly called several times to iterate over an sk_buff and copy * data out of it. */ -static size_t skb_read_bits (skb_reader_t *desc,void *to,size_t len) +size_t xdr_skb_read_bits (skb_reader_t *desc,void *to,size_t len) {if (len > desc->count) len = desc->count; -if (skb_copy_bits (desc->skb, desc->offset, to, len)) +if (unlikely (skb_copy_bits (desc->skb, desc->offset, to, (int ) len)))return 0 ; desc->count -= len; desc->offset += len;
@@ -36,14 +36,14 @@ static size_t skb_read_bits(skb_reader_t }/** -* skb_read_and_csum_bits - copy and checksum from skb to buffer +* xdr_skb_read_and_csum_bits - copy and checksum from skb to buffer * @desc: sk_buff copy helper * @to: copy destination * @len: number of bytes to copy * * Same as skb_read_bits, but calculate a checksum at the same time. */ -static size_t skb_read_and_csum_bits (skb_reader_t *desc,void *to,size_t len) +static size_t xdr_skb_read_and_csum_bits (skb_reader_t *desc,void *to,size_t len) {unsigned int csum2, pos;
@@ -157,7 +157,7 @@ int csum_partial_copy_to_xdr(struct xdr_ goto no_checksum; desc.csum =csum_partial (skb->data, desc.offset, skb->csum); -if (xdr_partial_copy_from_skb (xdr,0 , &desc, skb_read_and_csum_bits) <0 ) +if (xdr_partial_copy_from_skb (xdr,0 , &desc, xdr_skb_read_and_csum_bits) <0 )return -1 ;if (desc.offset != skb->len) {unsigned int csum2;
@@ -172,7 +172,7 @@ int csum_partial_copy_to_xdr(struct xdr_netdev_rx_csum_fault (skb->dev);return 0 ; no_checksum: -if (xdr_partial_copy_from_skb (xdr,0 , &desc, skb_read_bits) <0 ) +if (xdr_partial_copy_from_skb (xdr,0 , &desc, xdr_skb_read_bits) <0 )return -1 ;if (desc.count)return -1 ;
net/sunrpc/xprtsock.c +4 -20
@@ -661,22 +661,6 @@ static void xs_udp_data_ready(struct socread_unlock (&sk->sk_callback_lock); } -static inline size_t xs_tcp_copy_data (skb_reader_t *desc,void *p,size_t len) -{ -if (len > desc->count) - len = desc->count; -if (skb_copy_bits (desc->skb, desc->offset, p, len)) { -dprintk ("RPC: failed to copy %zu bytes from skb. %zu bytes remain\n" , - len, desc->count); -return 0 ; - } - desc->offset += len; - desc->count -= len; -dprintk ("RPC: copied %zu bytes from skb. %zu bytes remain\n" , - len, desc->count); -return len; -} -static inline void xs_tcp_read_fraghdr (struct rpc_xprt *xprt,skb_reader_t *desc) { struct sock_xprt *sx = container_of(xprt, struct sock_xprt, xprt);
@@ -685,7 +669,7 @@ static inline void xs_tcp_read_fraghdr(s p = ((char *) &sx->tcp_fraghdr) + sx->tcp_offset; len =sizeof (sx->tcp_fraghdr) - sx->tcp_offset; - used =xs_tcp_copy_data (desc, p, len); + used =xdr_skb_read_bits (desc, p, len); sx->tcp_offset += used;if (used != len)return ;
@@ -731,7 +715,7 @@ static inline void xs_tcp_read_xid(struc len =sizeof (sx->tcp_xid) - sx->tcp_offset;dprintk ("RPC: reading XID (%Zu bytes)\n" , len); p = ((char *) &sx->tcp_xid) + sx->tcp_offset; - used =xs_tcp_copy_data (desc, p, len); + used =xdr_skb_read_bits (desc, p, len); sx->tcp_offset += used;if (used != len)return ;
@@ -771,12 +755,12 @@ static inline void xs_tcp_read_request(smemcpy (&my_desc, desc,sizeof (my_desc)); my_desc.count = len; r =xdr_partial_copy_from_skb (rcvbuf, sx->tcp_copied, - &my_desc, xs_tcp_copy_data); + &my_desc, xdr_skb_read_bits); desc->count -= r; desc->offset += r; }else r =xdr_partial_copy_from_skb (rcvbuf, sx->tcp_copied, - desc, xs_tcp_copy_data); + desc, xdr_skb_read_bits);if (r >0 ) { sx->tcp_copied += r;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
Re: [PATCH 09/10] SUNRPC: skb_read_bits is the same as xs_tcp_copy_data
Quoted 43 lines · Chuck Lever
Clean-up: eliminate
xs_tcp_copy_data-- it's exactly the same logic as the common routineskb_read_bits. The UDP and TCP socket read code now share the same routine for copying data into anxdr_buf.Now that
skb_read_bits()is exported, rename it to avoid confusing it with a generic skb_* function. As these functions are XDR-specific, they should not have names that suggest they are of generic use. Also renameskb_read_and_csum_bits()to be consistent.Signed-off-by Chuck Lever <[email protected]>---
include/linux/sunrpc/xdr.h | 1 + net/sunrpc/socklib.c | 14 +++++++------- net/sunrpc/xprtsock.c | 24 ++++-------------------- 3 files changed, 12 insertions(+), 27 deletions(-)include/linux/sunrpc/xdr.h +1
-0@@ -156,6 +156,7 @@ typedef struct {typedef size_t (*skb_read_actor_t )(skb_reader_t *desc,void *to,size_t len); +size_t xdr_skb_read_bits (skb_reader_t *desc,void *to,size_t len);extern int csum_partial_copy_to_xdr (struct xdr_buf *,struct sk_buff *);extern ssize_t xdr_partial_copy_from_skb (struct xdr_buf *,unsigned int ,skb_reader_t *,skb_read_actor_t );net/sunrpc/socklib.c +1
-1@@ -16,7 +16,7 @@ #include <linux/sunrpc/xdr.h>/** -* skb_read_bits - copy some data bits from skb to internal buffer +* xdr_skb_read_bits - copy some data bits from skb to internal buffer * @desc: sk_buff copy helper * @to: copy destination * @len: number of bytes to copy
net/sunrpc/socklib.c #include <linux/sunrpc/xdr.h> · line 31
Quoted 10 lines
net/sunrpc/socklib.c +2
-2@@ -24,11 +24,11 @@ #include <linux/sunrpc/xdr.h>* Possibly called several times to iterate over an sk_buff and copy * data out of it. */ -static size_t skb_read_bits (skb_reader_t *desc,void *to,size_t len) +size_t xdr_skb_read_bits (skb_reader_t *desc,void *to,size_t len) {if (len > desc->count) len = desc->count; -if (skb_copy_bits (desc->skb, desc->offset, to, len)) +if (unlikely (skb_copy_bits (desc->skb, desc->offset, to, (int ) len)))
Hmm... That cast looks iffy...
Quoted 88 lines
net/sunrpc/socklib.c +4
-4return 0 ; desc->count -= len; desc->offset += len;@@ -36,14 +36,14 @@ static size_t skb_read_bits(skb_reader_t }/** -* skb_read_and_csum_bits - copy and checksum from skb to buffer +* xdr_skb_read_and_csum_bits - copy and checksum from skb to buffer * @desc: sk_buff copy helper * @to: copy destination * @len: number of bytes to copy * * Same as skb_read_bits, but calculate a checksum at the same time. */ -static size_t skb_read_and_csum_bits (skb_reader_t *desc,void *to,size_t len) +static size_t xdr_skb_read_and_csum_bits (skb_reader_t *desc,void *to,size_t len) {unsigned int csum2, pos;@@ -157,7 +157,7 @@ int csum_partial_copy_to_xdr(struct xdr_ goto no_checksum; desc.csum =csum_partial (skb->data, desc.offset, skb->csum); -if (xdr_partial_copy_from_skb (xdr,0 , &desc, skb_read_and_csum_bits) <0 ) +if (xdr_partial_copy_from_skb (xdr,0 , &desc, xdr_skb_read_and_csum_bits) <0 )return -1 ;if (desc.offset != skb->len) {unsigned int csum2;@@ -172,7 +172,7 @@ int csum_partial_copy_to_xdr(struct xdr_netdev_rx_csum_fault (skb->dev);return 0 ; no_checksum: -if (xdr_partial_copy_from_skb (xdr,0 , &desc, skb_read_bits) <0 ) +if (xdr_partial_copy_from_skb (xdr,0 , &desc, xdr_skb_read_bits) <0 )return -1 ;if (desc.count)return -1 ;net/sunrpc/xprtsock.c +2
-19@@ -661,22 +661,6 @@ static void xs_udp_data_ready(struct socread_unlock (&sk->sk_callback_lock); } -static inline size_t xs_tcp_copy_data (skb_reader_t *desc,void *p,size_t len) -{ -if (len > desc->count) - len = desc->count; -if (skb_copy_bits (desc->skb, desc->offset, p, len)) { -dprintk ("RPC: failed to copy %zu bytes from skb. %zu bytes remain\n" , - len, desc->count); -return 0 ; - } - desc->offset += len; - desc->count -= len; -dprintk ("RPC: copied %zu bytes from skb. %zu bytes remain\n" , - len, desc->count); -return len; -} -static inline void xs_tcp_read_fraghdr (struct rpc_xprt *xprt,skb_reader_t *desc) { struct sock_xprt *sx = container_of(xprt, struct sock_xprt, xprt);@@ -685,7 +669,7 @@ static inline void xs_tcp_read_fraghdr(s p = ((char *) &sx->tcp_fraghdr) + sx->tcp_offset; len =sizeof (sx->tcp_fraghdr) - sx->tcp_offset; - used =xs_tcp_copy_data (desc, p, len); + used =xdr_skb_read_bits (desc, p, len); sx->tcp_offset += used;if (used != len)return ;@@ -731,7 +715,7 @@ static inline void xs_tcp_read_xid(struc len =sizeof (sx->tcp_xid) - sx->tcp_offset;dprintk ("RPC: reading XID (%Zu bytes)\n" , len); p = ((char *) &sx->tcp_xid) + sx->tcp_offset; - used =xs_tcp_copy_data (desc, p, len); + used =xdr_skb_read_bits (desc, p, len); sx->tcp_offset += used;if (used != len)return ;@@ -771,12 +755,12 @@ static inline void xs_tcp_read_request(smemcpy (&my_desc, desc,sizeof (my_desc)); my_desc.count = len; r = xdr_partial_copy_from_skb(rcvbuf, sx->tcp_copied, - &my_desc, xs_tcp_copy_data);
net/sunrpc/xprtsock.c static inline void xs_tcp_read_request(s · line 766
Quoted 10 lines
net/sunrpc/xprtsock.c +2
-1+ &my_desc, xdr_skb_read_bits); desc->count -= r; desc->offset += r; }else r =xdr_partial_copy_from_skb (rcvbuf, sx->tcp_copied, - desc, xs_tcp_copy_data); + desc, xdr_skb_read_bits);if (r >0 ) { sx->tcp_copied += r;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
PATCH 10/10 SUNRPC: Rename skb_reader_t and friends
In reply to Chuck LeverClean-up: hch suggested that the RPC client shouldn't pollute the name space used by the generic skb manipulation routines in net/core/skbuff.c.
Rename a couple of types in xdr.h to adhere to this convention.
---
include/linux/sunrpc/xdr.h | 8 ++++---- net/sunrpc/socklib.c | 8 ++++---- net/sunrpc/xprtsock.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-)
include/linux/sunrpc/xdr.h +4 -4
@@ -152,14 +152,14 @@ typedef struct {unsigned int offset;size_t count;unsigned int csum; -} skb_reader_t; +} xdr_skb_reader_t; -typedef size_t (*skb_read_actor_t )(skb_reader_t *desc,void *to,size_t len); +typedef size_t (*xdr_skb_read_actor_t )(xdr_skb_reader_t *desc,void *to,size_t len); -size_t xdr_skb_read_bits (skb_reader_t *desc,void *to,size_t len); +size_t xdr_skb_read_bits (xdr_skb_reader_t *desc,void *to,size_t len);extern int csum_partial_copy_to_xdr (struct xdr_buf *,struct sk_buff *);extern ssize_t xdr_partial_copy_from_skb (struct xdr_buf *,unsigned int , -skb_reader_t *,skb_read_actor_t ); +xdr_skb_reader_t *,xdr_skb_read_actor_t );extern int xdr_encode_word (struct xdr_buf *,int ,u32 );extern int xdr_decode_word (struct xdr_buf *,int ,u32 *);
net/sunrpc/socklib.c +4 -4
@@ -24,7 +24,7 @@ #include <linux/sunrpc/xdr.h>* Possibly called several times to iterate over an sk_buff and copy * data out of it. */ -size_t xdr_skb_read_bits (skb_reader_t *desc,void *to,size_t len) +size_t xdr_skb_read_bits (xdr_skb_reader_t *desc,void *to,size_t len) {if (len > desc->count) len = desc->count;
@@ -43,7 +43,7 @@ size_t xdr_skb_read_bits(skb_reader_t *d* * Same as skb_read_bits, but calculate a checksum at the same time. */ -static size_t xdr_skb_read_and_csum_bits (skb_reader_t *desc,void *to,size_t len) +static size_t xdr_skb_read_and_csum_bits (xdr_skb_reader_t *desc,void *to,size_t len) {unsigned int csum2, pos;
@@ -65,7 +65,7 @@ static size_t xdr_skb_read_and_csum_bits* @copy_actor: virtual method for copying data * */ -ssize_t xdr_partial_copy_from_skb (struct xdr_buf *xdr,unsigned int base,skb_reader_t *desc,skb_read_actor_t copy_actor) +ssize_t xdr_partial_copy_from_skb (struct xdr_buf *xdr,unsigned int base,xdr_skb_reader_t *desc,xdr_skb_read_actor_t copy_actor) {struct page **ppage = xdr->pages;unsigned int len, pglen = xdr->page_len;
@@ -147,7 +147,7 @@ out:*/ int csum_partial_copy_to_xdr (struct xdr_buf *xdr,struct sk_buff *skb) { -skb_reader_t desc; +xdr_skb_reader_t desc; desc.skb = skb; desc.offset =sizeof (struct udphdr );
net/sunrpc/xprtsock.c +6 -6
@@ -661,7 +661,7 @@ static void xs_udp_data_ready(struct socread_unlock (&sk->sk_callback_lock); } -static inline void xs_tcp_read_fraghdr (struct rpc_xprt *xprt,skb_reader_t *desc) +static inline void xs_tcp_read_fraghdr (struct rpc_xprt *xprt,xdr_skb_reader_t *desc) { struct sock_xprt *sx = container_of(xprt, struct sock_xprt, xprt);size_t len, used;
@@ -707,7 +707,7 @@ static void xs_tcp_check_fraghdr(struct } } -static inline void xs_tcp_read_xid (struct sock_xprt *sx,skb_reader_t *desc) +static inline void xs_tcp_read_xid (struct sock_xprt *sx,xdr_skb_reader_t *desc) {size_t len, used;char *p;
@@ -727,7 +727,7 @@ static inline void xs_tcp_read_xid(strucxs_tcp_check_fraghdr (sx); } -static inline void xs_tcp_read_request (struct rpc_xprt *xprt,skb_reader_t *desc) +static inline void xs_tcp_read_request (struct rpc_xprt *xprt,xdr_skb_reader_t *desc) { struct sock_xprt *sx = container_of(xprt, struct sock_xprt, xprt);struct rpc_rqst *req;
@@ -749,7 +749,7 @@ static inline void xs_tcp_read_request(s rcvbuf = &req->rq_private_buf; len = desc->count;if (len > sx->tcp_reclen - sx->tcp_offset) { -skb_reader_t my_desc; +xdr_skb_reader_t my_desc; len = sx->tcp_reclen - sx->tcp_offset;memcpy (&my_desc, desc,sizeof (my_desc));
@@ -803,7 +803,7 @@ out:xs_tcp_check_fraghdr (sx); } -static inline void xs_tcp_read_discard (struct sock_xprt *sx,skb_reader_t *desc) +static inline void xs_tcp_read_discard (struct sock_xprt *sx,xdr_skb_reader_t *desc) {size_t len;
@@ -821,7 +821,7 @@ static int xs_tcp_data_recv(read_descrip {struct rpc_xprt *xprt = rd_desc->arg.data; struct sock_xprt *sx = container_of(xprt, struct sock_xprt, xprt); -skb_reader_t desc = { +xdr_skb_reader_t desc = { .skb = skb, .offset = offset, .count = len,
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs
Re: [PATCH 10/10] SUNRPC: Rename skb_reader_t and friends
Quoted 18 lines · Chuck Lever
Clean-up: hch suggested that the RPC client shouldn't pollute the name space used by the generic skb manipulation routines in
net/core/skbuff.c.Rename a couple of types in
xdr.hto adhere to this convention.Signed-off-by Chuck Lever <[email protected]>---
include/linux/sunrpc/xdr.h | 8 ++++---- net/sunrpc/socklib.c | 8 ++++---- net/sunrpc/xprtsock.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-)include/linux/sunrpc/xdr.h +0
-0
include/linux/sunrpc/xdr.h typedef struct { · line 155
Quoted 5 lines
include/linux/sunrpc/xdr.h +1
-1@@ -152,14 +152,14 @@ typedef struct {unsigned int offset;size_t count;unsigned int csum; -} skb_reader_t; +} xdr_skb_reader_t;
struct xdr_skb_reader {
....
};
? Might as well follow the ever-changing CodingStyle while we're renaming all this.
Quoted 102 lines
include/linux/sunrpc/xdr.h +3
-3-typedef size_t (*skb_read_actor_t )(skb_reader_t *desc,void *to,size_t len); +typedef size_t (*xdr_skb_read_actor_t )(xdr_skb_reader_t *desc,void *to,size_t len); -size_t xdr_skb_read_bits (skb_reader_t *desc,void *to,size_t len); +size_t xdr_skb_read_bits (xdr_skb_reader_t *desc,void *to,size_t len);extern int csum_partial_copy_to_xdr (struct xdr_buf *,struct sk_buff *);extern ssize_t xdr_partial_copy_from_skb (struct xdr_buf *,unsigned int , -skb_reader_t *,skb_read_actor_t ); +xdr_skb_reader_t *,xdr_skb_read_actor_t );extern int xdr_encode_word (struct xdr_buf *,int ,u32 );extern int xdr_decode_word (struct xdr_buf *,int ,u32 *);net/sunrpc/socklib.c +4
-4@@ -24,7 +24,7 @@ #include <linux/sunrpc/xdr.h>* Possibly called several times to iterate over an sk_buff and copy * data out of it. */ -size_t xdr_skb_read_bits (skb_reader_t *desc,void *to,size_t len) +size_t xdr_skb_read_bits (xdr_skb_reader_t *desc,void *to,size_t len) {if (len > desc->count) len = desc->count;@@ -43,7 +43,7 @@ size_t xdr_skb_read_bits(skb_reader_t *d* * Same as skb_read_bits, but calculate a checksum at the same time. */ -static size_t xdr_skb_read_and_csum_bits (skb_reader_t *desc,void *to,size_t len) +static size_t xdr_skb_read_and_csum_bits (xdr_skb_reader_t *desc,void *to,size_t len) {unsigned int csum2, pos;@@ -65,7 +65,7 @@ static size_t xdr_skb_read_and_csum_bits* @copy_actor: virtual method for copying data * */ -ssize_t xdr_partial_copy_from_skb (struct xdr_buf *xdr,unsigned int base,skb_reader_t *desc,skb_read_actor_t copy_actor) +ssize_t xdr_partial_copy_from_skb (struct xdr_buf *xdr,unsigned int base,xdr_skb_reader_t *desc,xdr_skb_read_actor_t copy_actor) {struct page **ppage = xdr->pages;unsigned int len, pglen = xdr->page_len;@@ -147,7 +147,7 @@ out:*/ int csum_partial_copy_to_xdr (struct xdr_buf *xdr,struct sk_buff *skb) { -skb_reader_t desc; +xdr_skb_reader_t desc; desc.skb = skb; desc.offset =sizeof (struct udphdr );net/sunrpc/xprtsock.c +5
-5@@ -661,7 +661,7 @@ static void xs_udp_data_ready(struct socread_unlock (&sk->sk_callback_lock); } -static inline void xs_tcp_read_fraghdr (struct rpc_xprt *xprt,skb_reader_t *desc) +static inline void xs_tcp_read_fraghdr (struct rpc_xprt *xprt,xdr_skb_reader_t *desc) { struct sock_xprt *sx = container_of(xprt, struct sock_xprt, xprt);size_t len, used;@@ -707,7 +707,7 @@ static void xs_tcp_check_fraghdr(struct } } -static inline void xs_tcp_read_xid (struct sock_xprt *sx,skb_reader_t *desc) +static inline void xs_tcp_read_xid (struct sock_xprt *sx,xdr_skb_reader_t *desc) {size_t len, used;char *p;@@ -727,7 +727,7 @@ static inline void xs_tcp_read_xid(strucxs_tcp_check_fraghdr (sx); } -static inline void xs_tcp_read_request (struct rpc_xprt *xprt,skb_reader_t *desc) +static inline void xs_tcp_read_request (struct rpc_xprt *xprt,xdr_skb_reader_t *desc) { struct sock_xprt *sx = container_of(xprt, struct sock_xprt, xprt);struct rpc_rqst *req;@@ -749,7 +749,7 @@ static inline void xs_tcp_read_request(s rcvbuf = &req->rq_private_buf; len = desc->count;if (len > sx->tcp_reclen - sx->tcp_offset) { -skb_reader_t my_desc; +xdr_skb_reader_t my_desc; len = sx->tcp_reclen - sx->tcp_offset;memcpy (&my_desc, desc,sizeof (my_desc));@@ -803,7 +803,7 @@ out:xs_tcp_check_fraghdr (sx); } -static inline void xs_tcp_read_discard (struct sock_xprt *sx,skb_reader_t *desc) +static inline void xs_tcp_read_discard (struct sock_xprt *sx,xdr_skb_reader_t *desc) {size_t len;
net/sunrpc/xprtsock.c static int xs_tcp_data_recv(read_descrip · line 827
Quoted 8 lines
net/sunrpc/xprtsock.c +1
-1@@ -821,7 +821,7 @@ static int xs_tcp_data_recv(read_descrip {struct rpc_xprt *xprt = rd_desc->arg.data; struct sock_xprt *sx = container_of(xprt, struct sock_xprt, xprt); -skb_reader_t desc = { +xdr_skb_reader_t desc = { .skb = skb, .offset = offset, .count = len,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs