repost of transport switch patches for 2.6.20
Subsystems (3)
cover repost of transport switch patches for 2.6.20
Hi Trond-
I'm reposting the patches you reviewed this week, and including a few extras that appear to be ready. The first patch is a fix for the pmap bug you noticed this week, and the second and third you may already have.
Signature · 10 lines
corporate: <chuck dot lever at oracle dot com> ------------------------------------------------------------------------- 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 1/21 SUNRPC: another pmap wakeup fix
Don't wake up bind waiters if a task finds that another task is already trying to bind.
---
net/sunrpc/pmap_clnt.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
net/sunrpc/pmap_clnt.c +6 -5
@@ -101,14 +101,14 @@ void rpc_getport(struct rpc_task *task)/* Autobind on cloned rpc clients is discouraged */ BUG_ON (clnt->cl_parent != clnt); + status = -EACCES ;/* tell caller to check again */ +if (xprt_test_and_set_binding (xprt)) + goto bailout_nowake; +/* Put self on queue before sending rpcbind request, in case * pmap_getport_done completes before we return from rpc_run_task */ rpc_sleep_on (&xprt->binding, task,NULL ,NULL ); - status = -EACCES ;/* tell caller to check again */ -if (xprt_test_and_set_binding (xprt)) - goto bailout_nofree; -/* Someone else may have bound if we slept */ status =0 ;if (xprt_bound (xprt))
@@ -143,8 +143,9 @@ bailout:pmap_map_free (map);xprt_put (xprt); bailout_nofree: - task->tk_status = status;pmap_wake_portmap_waiters (xprt, status); +bailout_nowake: + task->tk_status = status; }#ifdef CONFIG_ROOT_NFS
-------------------------------------------------------------------------
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/21 SUNRPC: minor optimization of "xid" field in rpc_xprt
In reply to Chuck LeverMove the xid field in the rpc_xprt structure to be in the same cache line as the reserve_lock, since these are used at the same time.
---
include/linux/sunrpc/xprt.h | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-)
include/linux/sunrpc/xprt.h +1 -6
@@ -158,11 +158,6 @@ struct rpc_xprt { resvport :1 ;/* use a reserved port */ /* -* XID -*/ -__u32 xid;/* Next XID value to use */ - -/* * State of TCP reply receive stuff */ __be32 tcp_recm, /* Fragment header */
@@ -193,8 +188,8 @@ struct rpc_xprt {*/ spinlock_t transport_lock;/* lock transport info */ spinlock_t reserve_lock;/* lock slot table */ +u32 xid;/* Next XID value to use */ struct rpc_task * snd_task;/* Task blocked in send */ -struct list_head recv;struct {
-------------------------------------------------------------------------
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 3/21 SUNRPC: Make the transport-specific setup routine allocate rpc_xprt
In reply to Chuck LeverChange the location where the rpc_xprt structure is allocated so each transport implementation can allocate a private area from the same chunk of memory.
Note also that xprt->ops->destroy, rather than xprt_destroy, is now responsible for freeing rpc_xprt when the transport is destroyed.
---
include/linux/sunrpc/xprt.h | 4 +- net/sunrpc/xprt.c | 31 ++++++------------ net/sunrpc/xprtsock.c | 73 +++++++++++++++++++++++++++++-------------- 3 files changed, 61 insertions(+), 47 deletions(-)
include/linux/sunrpc/xprt.h +2 -2
@@ -265,8 +265,8 @@ void xprt_disconnect(struct rpc_xprt */* * Socket transport setup operations */ -int xs_setup_udp (struct rpc_xprt *xprt,struct rpc_timeout *to); -int xs_setup_tcp (struct rpc_xprt *xprt,struct rpc_timeout *to); +struct rpc_xprt *xs_setup_udp (struct sockaddr *addr,size_t addrlen,struct rpc_timeout *to); +struct rpc_xprt *xs_setup_tcp (struct sockaddr *addr,size_t addrlen,struct rpc_timeout *to);/* * Reserved bit positions in xprt->state
net/sunrpc/xprt.c +10 -21
@@ -891,39 +891,25 @@ void xprt_set_timeout(struct rpc_timeout*/ struct rpc_xprt *xprt_create_transport (int proto,struct sockaddr *ap,size_t size,struct rpc_timeout *to) { -int result;struct rpc_xprt *xprt;struct rpc_rqst *req; -if ((xprt =kzalloc (sizeof (struct rpc_xprt ),GFP_KERNEL )) ==NULL ) { -dprintk ("RPC: xprt_create_transport: no memory\n" ); -return ERR_PTR (-ENOMEM ); - } -if (size <=sizeof (xprt->addr)) { -memcpy (&xprt->addr, ap, size); - xprt->addrlen = size; - }else { -kfree (xprt); -dprintk ("RPC: xprt_create_transport: address too large\n" ); -return ERR_PTR (-EBADF ); - } -switch (proto) {case IPPROTO_UDP : - result =xs_setup_udp (xprt, to); + xprt =xs_setup_udp (ap, size, to);break ;case IPPROTO_TCP : - result =xs_setup_tcp (xprt, to); + xprt =xs_setup_tcp (ap, size, to);break ;default :printk (KERN_ERR "RPC: unrecognized transport protocol: %d\n" , proto);return ERR_PTR (-EIO ); } -if (result) { -kfree (xprt); -dprintk ("RPC: xprt_create_transport: failed, %d\n" , result); -return ERR_PTR (result); +if (IS_ERR (xprt)) { +dprintk ("RPC: xprt_create_transport: failed, %ld\n" , + -PTR_ERR (xprt)); +return xprt; }kref_init (&xprt->kref);
@@ -969,8 +955,11 @@ static void xprt_destroy(struct kref *krdprintk ("RPC: destroying transport %p\n" , xprt); xprt->shutdown =1 ;del_timer_sync (&xprt->timer); + +/* +* Tear down transport state and free the rpc_xprt +*/ xprt->ops->destroy (xprt); -kfree (xprt); }/**
net/sunrpc/xprtsock.c +49 -24
115 lines not on this page · raw message
-------------------------------------------------------------------------
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 4/21 SUNRPC: Allocate a private data area for socket-specific rpc_xprt fields
In reply to Chuck LeverWhen 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;
@@ -1353,17 +1357,19 @@ 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 rpc_xprt *xprt; +struct sock_xprt *new;if (addrlen >sizeof (xprt->addr)) {dprintk ("RPC: xs_setup_xprt: address too large\n" );return ERR_PTR (-EBADF ); } - xprt =kzalloc (sizeof (struct rpc_xprt ),GFP_KERNEL ); -if (xprt ==NULL ) { + new =kzalloc (sizeof (*new),GFP_KERNEL ); +if (new ==NULL ) {dprintk ("RPC: xs_setup_xprt: couldn't allocate rpc_xprt\n" );return ERR_PTR (-ENOMEM ); } + xprt = &new->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 5/21 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
-------------------------------------------------------------------------
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 6/21 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 | 154 ++++++++++++++++++++++++------------------- 2 files changed, 86 insertions(+), 77 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 +86 -68
287 lines not on this page · raw message
-------------------------------------------------------------------------
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 7/21 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 | 49 +++++++++++++++++++++++++------------------ 2 files changed, 29 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 +29 -20
124 lines not on this page · raw message
-------------------------------------------------------------------------
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 8/21 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
-------------------------------------------------------------------------
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 9/21 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; };/*
@@ -1006,13 +1012,13 @@ static void xs_udp_do_set_buffer_size(st struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);struct sock *sk = transport->inet; -if (xprt->rcvsize) { +if (transport->rcvsize) { sk->sk_userlocks |=SOCK_RCVBUF_LOCK ; - sk->sk_rcvbuf = xprt->rcvsize * xprt->max_reqs *2 ; + sk->sk_rcvbuf = transport->rcvsize * xprt->max_reqs *2 ; } -if (xprt->sndsize) { +if (transport->sndsize) { sk->sk_userlocks |=SOCK_SNDBUF_LOCK ; - sk->sk_sndbuf = xprt->sndsize * xprt->max_reqs *2 ; + sk->sk_sndbuf = transport->sndsize * xprt->max_reqs *2 ; sk->sk_write_space (sk); } }
@@ -1027,12 +1033,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 *transport = container_of(xprt, struct sock_xprt, xprt); + + transport->sndsize =0 ;if (sndsize) - xprt->sndsize = sndsize +1024 ; - xprt->rcvsize =0 ; + transport->sndsize = sndsize +1024 ; + transport->rcvsize =0 ;if (rcvsize) - xprt->rcvsize = rcvsize +1024 ; + transport->rcvsize = rcvsize +1024 ;xs_udp_do_set_buffer_size (xprt); }
-------------------------------------------------------------------------
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/21 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 transport->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 = transport->old_data_ready; + sk->sk_state_change = transport->old_state_change; + sk->sk_write_space = transport->old_write_space;write_unlock_bh (&sk->sk_callback_lock); sk->sk_no_check =0 ;
@@ -1157,9 +1164,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; + transport->old_data_ready = sk->sk_data_ready; + transport->old_state_change = sk->sk_state_change; + transport->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 ;
@@ -1244,9 +1251,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; + transport->old_data_ready = sk->sk_data_ready; + transport->old_state_change = sk->sk_state_change; + transport->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;
-------------------------------------------------------------------------
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 11/21 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
@@ -1071,19 +1071,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
@@ -1156,7 +1143,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 (!transport->inet) {struct sock *sk = sock->sk;
@@ -1243,7 +1230,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 (!transport->inet) {struct sock *sk = sock->sk;
@@ -1390,7 +1377,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,
@@ -1408,7 +1394,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,
@@ -1495,7 +1480,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; }
@@ -1539,7 +1524,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; }
-------------------------------------------------------------------------
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 12/21 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, 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 *transport = container_of(xprt, struct sock_xprt, xprt);
@@ -685,7 +669,7 @@ static inline void xs_tcp_read_fraghdr(s p = ((char *) &transport->tcp_fraghdr) + transport->tcp_offset; len =sizeof (transport->tcp_fraghdr) - transport->tcp_offset; - used =xs_tcp_copy_data (desc, p, len); + used =xdr_skb_read_bits (desc, p, len); transport->tcp_offset += used;if (used != len)return ;
@@ -731,7 +715,7 @@ static inline void xs_tcp_read_xid(struc len =sizeof (transport->tcp_xid) - transport->tcp_offset;dprintk ("RPC: reading XID (%Zu bytes)\n" , len); p = ((char *) &transport->tcp_xid) + transport->tcp_offset; - used =xs_tcp_copy_data (desc, p, len); + used =xdr_skb_read_bits (desc, p, len); transport->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, transport->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, transport->tcp_copied, - desc, xs_tcp_copy_data); + desc, xdr_skb_read_bits);if (r >0 ) { transport->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 13/21 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; -typedef size_t (*skb_read_actor_t )(skb_reader_t *desc,void *to,size_t len); +typedef size_t (*xdr_skb_read_actor )(xdr_skb_reader *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 *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 *,xdr_skb_read_actor );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 *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 *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 *desc,xdr_skb_read_actor 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 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 *desc) { struct sock_xprt *transport = 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 *transport,skb_reader_t *desc) +static inline void xs_tcp_read_xid (struct sock_xprt *transport,xdr_skb_reader *desc) {size_t len, used;char *p;
@@ -727,7 +727,7 @@ static inline void xs_tcp_read_xid(strucxs_tcp_check_fraghdr (transport); } -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 *desc) { struct sock_xprt *transport = 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 > transport->tcp_reclen - transport->tcp_offset) { -skb_reader_t my_desc; +xdr_skb_reader my_desc; len = transport->tcp_reclen - transport->tcp_offset;memcpy (&my_desc, desc,sizeof (my_desc));
@@ -805,7 +805,7 @@ out:xs_tcp_check_fraghdr (transport); } -static inline void xs_tcp_read_discard (struct sock_xprt *transport,skb_reader_t *desc) +static inline void xs_tcp_read_discard (struct sock_xprt *transport,xdr_skb_reader *desc) {size_t len;
@@ -823,7 +823,7 @@ static int xs_tcp_data_recv(read_descrip {struct rpc_xprt *xprt = rd_desc->arg.data; struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); -skb_reader_t desc = { +xdr_skb_reader 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
PATCH 14/21 SUNRPC: create stubs for xprtsock init and cleanup
In reply to Chuck LeverOver time we will want to add some specific init and cleanup logic for the xprtsock implementation. Add stub routines for initialization and exit processing.
---
net/sunrpc/sunrpc_syms.c | 4 ++++ net/sunrpc/xprtsock.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-)
net/sunrpc/sunrpc_syms.c +4 -0
@@ -139,6 +139,8 @@ #endifextern int register_rpc_pipefs (void );extern void unregister_rpc_pipefs (void );extern struct cache_detail ip_map_cache; +extern int init_socket_xprt (void ); +extern void cleanup_socket_xprt (void );static int __init init_sunrpc (void )
@@ -156,6 +158,7 @@ #ifdef CONFIG_PROC_FSrpc_proc_init ();#endif cache_register (&ip_map_cache); +init_socket_xprt (); out:return err; }
@@ -163,6 +166,7 @@ out: static void __exitcleanup_sunrpc (void ) { +cleanup_socket_xprt ();unregister_rpc_pipefs ();rpc_destroy_mempool ();if (cache_unregister (&ip_map_cache))
net/sunrpc/xprtsock.c +18 -0
@@ -1512,3 +1512,21 @@ struct rpc_xprt *xs_setup_tcp(struct socreturn xprt; } + +/** +* init_socket_xprt - stub +* +*/ +int init_socket_xprt (void ) +{ +return 0 ; +} + +/** +* cleanup_socket_xprt - stub +* +*/ +void cleanup_socket_xprt (void ) +{ +return ; +}
-------------------------------------------------------------------------
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 15/21 SUNRPC: relocate the creation of socket-specific tunables
In reply to Chuck LeverClean-up:
The RPC client currently creates some sysctls that are specific to the socket transport. Move those entirely into xprtsock.c.
---
net/sunrpc/sysctl.c | 50 ----------------------- net/sunrpc/xprtsock.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 104 insertions(+), 53 deletions(-)
net/sunrpc/sysctl.c +0 -50
@@ -18,7 +18,6 @@ #include <asm/uaccess.h>#include <linux/sunrpc/types.h> #include <linux/sunrpc/sched.h> #include <linux/sunrpc/stats.h> -#include <linux/sunrpc/xprt.h> /* * Declare the debug flags here
@@ -119,11 +118,6 @@ done: } -static unsigned int min_slot_table_size =RPC_MIN_SLOT_TABLE ; -static unsigned int max_slot_table_size =RPC_MAX_SLOT_TABLE ; -static unsigned int xprt_min_resvport_limit =RPC_MIN_RESVPORT ; -static unsigned int xprt_max_resvport_limit =RPC_MAX_RESVPORT ; -static ctl_table debug_table[] = { { .ctl_name =CTL_RPCDEBUG ,
@@ -157,50 +151,6 @@ static ctl_table debug_table[] = { .mode = 0644, .proc_handler = &proc_dodebug }, - { - .ctl_name = CTL_SLOTTABLE_UDP, - .procname = "udp_slot_table_entries", - .data = &xprt_udp_slot_table_entries, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = &proc_dointvec_minmax, - .strategy = &sysctl_intvec, - .extra1 = &min_slot_table_size, - .extra2 = &max_slot_table_size - }, - { - .ctl_name = CTL_SLOTTABLE_TCP, - .procname = "tcp_slot_table_entries", - .data = &xprt_tcp_slot_table_entries, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = &proc_dointvec_minmax, - .strategy = &sysctl_intvec, - .extra1 = &min_slot_table_size, - .extra2 = &max_slot_table_size - }, - { - .ctl_name = CTL_MIN_RESVPORT, - .procname = "min_resvport", - .data = &xprt_min_resvport, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = &proc_dointvec_minmax, - .strategy = &sysctl_intvec, - .extra1 = &xprt_min_resvport_limit, - .extra2 = &xprt_max_resvport_limit - }, - { - .ctl_name = CTL_MAX_RESVPORT, - .procname = "max_resvport", - .data = &xprt_max_resvport, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = &proc_dointvec_minmax, - .strategy = &sysctl_intvec, - .extra1 = &xprt_min_resvport_limit, - .extra2 = &xprt_max_resvport_limit - }, { .ctl_name = 0 } };
net/sunrpc/xprtsock.c +104 -3
129 lines not on this page · raw message
-------------------------------------------------------------------------
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 16/21 SUNRPC: optimize socket send_request path
In reply to Chuck LeverCalling PageHighMem in the RPC client's socket send path is no longer necessary because the device layer handles mapping high memory as required (in fact by calling PageHighMem).
Clean up the socket send_request path by removing now invariant tests.
This will have a significant CPU benefit. Kernel execution profiling showed that the PageHighMem invocation here introduced a nasty AGI stall in the middle of xs_sendpages; *page is never referenced again until we get deep into the network layer.
---
net/sunrpc/xprtsock.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-)
net/sunrpc/xprtsock.c +21 -9
@@ -219,6 +219,7 @@ struct sock_xprt {*/ struct socket * sock;struct sock * inet; + unsigned char sendpage : 1;/* * State of TCP reply receive
@@ -338,15 +339,18 @@ static int xs_send_tail(struct socket *s/** * xs_sendpages - write pages directly to a socket -* @sock: socket to send on +* @priv: transport-specific info * @addr: UDP only -- address of destination * @addrlen: UDP only -- length of destination address * @xdr: buffer containing this request * @base: starting position in the buffer * */ -static inline int xs_sendpages (struct socket *sock,struct sockaddr *addr,int addrlen,struct xdr_buf *xdr,unsigned int base) +static int xs_sendpages (struct sock_xprt *transport,struct sockaddr *addr, +int addrlen,struct xdr_buf *xdr, +unsigned int base) { +struct socket *sock = transport->sock;struct page **ppage = xdr->pages;unsigned int len, pglen = xdr->page_len;int err, ret =0 ;
@@ -394,7 +398,10 @@ static inline int xs_sendpages(struct soif (pglen != len || xdr->tail[0 ].iov_len !=0 ) flags |=MSG_MORE ; - err =kernel_sendpage (sock, *ppage, base, len, flags); +if (likely (transport->sendpage)) + err =kernel_sendpage (sock, *ppage, base, len, flags); +else + err =sock_no_sendpage (sock, *ppage, base, len, flags);if (ret ==0 ) ret = err;else if (err >0 )
@@ -472,10 +479,8 @@ static int xs_udp_send_request(struct rp req->rq_svec->iov_len); req->rq_xtime = jiffies; - status =xs_sendpages (transport->sock, - (struct sockaddr *) &xprt->addr, - xprt->addrlen, xdr, - req->rq_bytes_sent); + status =xs_sendpages (transport, (struct sockaddr *) &xprt->addr, + xprt->addrlen, xdr, req->rq_bytes_sent);dprintk ("RPC: xs_udp_send_request(%u) = %d\n" , xdr->len - req->rq_bytes_sent, status);
@@ -546,8 +551,7 @@ static int xs_tcp_send_request(struct rp* called sendmsg(). */ while (1 ) { req->rq_xtime = jiffies; - status =xs_sendpages (transport->sock, -NULL ,0 , xdr, req->rq_bytes_sent); + status =xs_sendpages (transport,NULL ,0 , xdr, req->rq_bytes_sent);dprintk ("RPC: xs_tcp_send_request(%u) = %d\n" , xdr->len - req->rq_bytes_sent, status);
@@ -1235,6 +1239,10 @@ static void xs_udp_connect_worker(void * transport->sock = sock; transport->inet = sk; + transport->sendpage =0 ; +if (sock->ops->sendpage !=NULL ) + transport->sendpage =1 ; +write_unlock_bh (&sk->sk_callback_lock); }xs_udp_do_set_buffer_size (xprt);
@@ -1328,6 +1336,10 @@ static void xs_tcp_connect_worker(void * transport->sock = sock; transport->inet = sk; + transport->sendpage =0 ; +if (sock->ops->sendpage !=NULL ) + transport->sendpage =1 ; +write_unlock_bh (&sk->sk_callback_lock); }
-------------------------------------------------------------------------
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 17/21 NLM: fix print format for tk_pid
In reply to Chuck LeverThe tk_pid field is an unsigned short. The proper print format specifier for that type is %5u, not %4d.
---
fs/lockd/clntproc.c | 2 +- fs/lockd/svc4proc.c | 2 +- fs/lockd/svcproc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
fs/lockd/clntproc.c +1 -1
@@ -729,7 +729,7 @@ static void nlmclnt_cancel_callback(stru goto retry_cancel; } -dprintk ("lockd: cancel status %d (task %d)\n" , +dprintk ("lockd: cancel status %u (task %5u)\n" , req->a_res.status, task->tk_pid);switch (req->a_res.status) {
fs/lockd/svc4proc.c +1 -1
@@ -234,7 +234,7 @@ nlm4svc_proc_granted(struct svc_rqst *rq*/ static void nlm4svc_callback_exit (struct rpc_task *task,void *data) { -dprintk ("lockd: %4d callback returned %d\n" , task->tk_pid, +dprintk ("lockd: %5u callback returned %d\n" , task->tk_pid, -task->tk_status); }
fs/lockd/svcproc.c +1 -1
@@ -263,7 +263,7 @@ nlmsvc_proc_granted(struct svc_rqst *rqs*/ static void nlmsvc_callback_exit (struct rpc_task *task,void *data) { -dprintk ("lockd: %4d callback returned %d\n" , task->tk_pid, +dprintk ("lockd: %5u callback returned %d\n" , task->tk_pid, -task->tk_status); }
-------------------------------------------------------------------------
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 18/21 NFS: fix print format for tk_pid
In reply to Chuck LeverThe tk_pid field is an unsigned short. The proper print format specifier for that type is %5u, not %4d.
Also clean up some miscellaneous print formatting nits.
---
fs/nfs/direct.c | 8 ++++---- fs/nfs/read.c | 4 ++-- fs/nfs/write.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-)
fs/nfs/direct.c +4 -4
@@ -115,7 +115,7 @@ static inline int put_dreq(struct nfs_di*/ ssize_t nfs_direct_IO (int rw,struct kiocb *iocb,const struct iovec *iov,loff_t pos,unsigned long nr_segs) { -dprintk ("NFS: nfs_direct_IO (%s) off/no(%Ld/%lu) EINVAL\n" , +dprintk ("nfs: nfs_direct_IO (%s) off/no(%Ld/%lu) EINVAL\n" , iocb->ki_filp->f_dentry->d_name.name, (long long ) pos, nr_segs);
@@ -311,7 +311,7 @@ static ssize_t nfs_direct_read_schedule(rpc_execute (&data->task);unlock_kernel (); - dfprintk(VFS, "NFS: %5u initiated direct read call (req %s/%Ld, %zu bytes @ offset %Lu)\n", + dprintk("NFS: %5u initiated direct read call (req %s/%Ld, %zu bytes @ offset %Lu)\n", data->task.tk_pid, inode->i_sb->s_id, (long long)NFS_FILEID(inode),
@@ -645,7 +645,7 @@ static ssize_t nfs_direct_write_schedulerpc_execute (&data->task);unlock_kernel (); - dfprintk(VFS, "NFS: %5u initiated direct write call (req %s/%Ld, %zu bytes @ offset %Lu)\n", + dprintk("NFS: %5u initiated direct write call (req %s/%Ld, %zu bytes @ offset %Lu)\n", data->task.tk_pid, inode->i_sb->s_id, (long long)NFS_FILEID(inode),
@@ -803,7 +803,7 @@ ssize_t nfs_file_direct_write(struct kioconst char __user *buf = iov[0 ].iov_base;size_t count = iov[0 ].iov_len; -dfprintk (VFS ,"nfs: direct write(%s/%s, %lu@%Ld)\n" , +dprintk ("nfs: direct write(%s/%s, %lu@%Ld)\n" , file->f_dentry->d_parent->d_name.name, file->f_dentry->d_name.name, (unsigned long ) count, (long long ) pos);
fs/nfs/read.c +2 -2
@@ -286,7 +286,7 @@ static void nfs_read_rpcsetup(struct nfs data->task.tk_cookie = (unsigned long )inode; - dprintk("NFS: %4d initiated read call (req %s/%Ld, %u bytes @ offset %Lu)\n", + dprintk("NFS: %5u initiated read call (req %s/%Ld, %u bytes @ offset %Lu)\n", data->task.tk_pid, inode->i_sb->s_id, (long long)NFS_FILEID(inode),
@@ -559,7 +559,7 @@ int nfs_readpage_result(struct rpc_taskstruct nfs_readres *resp = &data->res;int status; -dprintk ("NFS: %4d nfs_readpage_result, (status %d)\n" , +dprintk ("NFS: %5u nfs_readpage_result, (status %d)\n" , task->tk_pid, task->tk_status); status =NFS_PROTO (data->inode)->read_done (task, data);
fs/nfs/write.c +4 -4
@@ -965,7 +965,7 @@ static void nfs_write_rpcsetup(struct nf data->task.tk_priority =flush_task_priority (how); data->task.tk_cookie = (unsigned long )inode; - dprintk("NFS: %4d initiated write call (req %s/%Ld, %u bytes @ offset %Lu)\n", + dprintk("NFS: %5u initiated write call (req %s/%Ld, %u bytes @ offset %Lu)\n", data->task.tk_pid, inode->i_sb->s_id, (long long)NFS_FILEID(inode),
@@ -1251,7 +1251,7 @@ int nfs_writeback_done(struct rpc_task *struct nfs_writeres *resp = &data->res;int status; -dprintk ("NFS: %4d nfs_writeback_done (status %d)\n" , +dprintk ("NFS: %5u nfs_writeback_done (status %d)\n" , task->tk_pid, task->tk_status);/*
@@ -1367,7 +1367,7 @@ static void nfs_commit_rpcsetup(struct l data->task.tk_priority =flush_task_priority (how); data->task.tk_cookie = (unsigned long )inode; -dprintk ("NFS: %4d initiated commit call\n" , data->task.tk_pid); +dprintk ("NFS: %5u initiated commit call\n" , data->task.tk_pid); }/*
@@ -1408,7 +1408,7 @@ static void nfs_commit_done(struct rpc_tstruct nfs_write_data *data = calldata;struct nfs_page *req; -dprintk ("NFS: %4d nfs_commit_done (status %d)\n" , +dprintk ("NFS: %5u nfs_commit_done (status %d)\n" , task->tk_pid, task->tk_status);/* Call the NFS version-specific code */
-------------------------------------------------------------------------
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 19/21 SUNRPC: fix print format for tk_pid in auth_gss support
In reply to Chuck LeverThe tk_pid field is an unsigned short. The proper print format specifier for that type is %5u, not %4d.
Also clean up some miscellaneous print formatting nits.
---
net/sunrpc/auth_gss/auth_gss.c | 46 ++++++++++++++++---------------- net/sunrpc/auth_gss/gss_krb5_crypto.c | 18 ++++++------- net/sunrpc/auth_gss/gss_krb5_mech.c | 3 +- net/sunrpc/auth_gss/gss_krb5_seal.c | 8 +++--- net/sunrpc/auth_gss/gss_krb5_seqnum.c | 2 + net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 + net/sunrpc/auth_gss/gss_krb5_wrap.c | 10 +++---- net/sunrpc/auth_gss/gss_mech_switch.c | 6 ++-- net/sunrpc/auth_gss/gss_spkm3_mech.c | 12 ++++---- net/sunrpc/auth_gss/gss_spkm3_seal.c | 10 +++---- net/sunrpc/auth_gss/gss_spkm3_token.c | 12 ++++---- net/sunrpc/auth_gss/gss_spkm3_unseal.c | 12 ++++---- net/sunrpc/auth_gss/svcauth_gss.c | 6 ++-- 13 files changed, 74 insertions(+), 73 deletions(-)
net/sunrpc/auth_gss/auth_gss.c +23 -23
@@ -282,7 +282,7 @@ gss_fill_context(const void *p, const vo }return q; err: -dprintk ("RPC: gss_fill_context returning %ld\n" , -PTR_ERR (p)); +dprintk ("RPC: gss_fill_context returning %ld\n" , -PTR_ERR (p));return p; }
@@ -317,10 +317,10 @@ __gss_find_upcall(struct gss_auth *gss_aif (pos->uid != uid)continue ;atomic_inc (&pos->count); -dprintk ("RPC: gss_find_upcall found msg %p\n" , pos); +dprintk ("RPC: gss_find_upcall found msg %p\n" , pos);return pos; } -dprintk ("RPC: gss_find_upcall found nothing\n" ); +dprintk ("RPC: gss_find_upcall found nothing\n" );return NULL ; }
@@ -434,7 +434,7 @@ gss_refresh_upcall(struct rpc_task *taskstruct gss_upcall_msg *gss_msg;int err =0 ; -dprintk ("RPC: %4u gss_refresh_upcall for uid %u\n" , task->tk_pid, cred->cr_uid); +dprintk ("RPC: %5u gss_refresh_upcall for uid %u\n" , task->tk_pid, cred->cr_uid); gss_msg =gss_setup_upcall (task->tk_client, gss_auth, cred);if (IS_ERR (gss_msg)) { err =PTR_ERR (gss_msg);
@@ -454,7 +454,7 @@ gss_refresh_upcall(struct rpc_task *taskspin_unlock (&gss_auth->lock);gss_release_msg (gss_msg); out: -dprintk ("RPC: %4u gss_refresh_upcall for uid %u result %d\n" , task->tk_pid, +dprintk ("RPC: %5u gss_refresh_upcall for uid %u result %d\n" , task->tk_pid, cred->cr_uid, err);return err; }
@@ -467,7 +467,7 @@ gss_create_upcall(struct gss_auth *gss_aDEFINE_WAIT (wait);int err =0 ; -dprintk ("RPC: gss_upcall for uid %u\n" , cred->cr_uid); +dprintk ("RPC: gss_upcall for uid %u\n" , cred->cr_uid); gss_msg =gss_setup_upcall (gss_auth->client, gss_auth, cred);if (IS_ERR (gss_msg)) { err =PTR_ERR (gss_msg);
@@ -495,7 +495,7 @@ out_intr:finish_wait (&gss_msg->waitqueue, &wait);gss_release_msg (gss_msg); out: -dprintk ("RPC: gss_create_upcall for uid %u result %d\n" , cred->cr_uid, err); +dprintk ("RPC: gss_create_upcall for uid %u result %d\n" , cred->cr_uid, err);return err; }
@@ -587,14 +587,14 @@ gss_pipe_downcall(struct file *filp, con }gss_put_ctx (ctx);kfree (buf); -dprintk ("RPC: gss_pipe_downcall returning length %Zu\n" , mlen); +dprintk ("RPC: gss_pipe_downcall returning length %Zu\n" , mlen);return mlen; err_put_ctx:gss_put_ctx (ctx); err:kfree (buf); out: -dprintk ("RPC: gss_pipe_downcall returning %d\n" , err); +dprintk ("RPC: gss_pipe_downcall returning %d\n" , err);return err; }
@@ -632,7 +632,7 @@ gss_pipe_destroy_msg(struct rpc_pipe_msgstatic unsigned long ratelimit;if (msg->errno <0 ) { -dprintk ("RPC: gss_pipe_destroy_msg releasing msg %p\n" , +dprintk ("RPC: gss_pipe_destroy_msg releasing msg %p\n" , gss_msg);atomic_inc (&gss_msg->count);gss_unhash_msg (gss_msg);
@@ -659,7 +659,7 @@ gss_create(struct rpc_clnt *clnt, rpc_austruct rpc_auth * auth;int err = -ENOMEM ;/* XXX? */ -dprintk ("RPC: creating GSS authenticator for client %p\n" ,clnt); +dprintk ("RPC: creating GSS authenticator for client %p\n" ,clnt);if (!try_module_get (THIS_MODULE ))return ERR_PTR (err);
@@ -711,7 +711,7 @@ gss_destroy(struct rpc_auth *auth) {struct gss_auth *gss_auth; -dprintk ("RPC: destroying GSS authenticator %p flavor %d\n" , +dprintk ("RPC: destroying GSS authenticator %p flavor %d\n" , auth, auth->au_flavor); gss_auth = container_of(auth, struct gss_auth, rpc_auth);
@@ -730,7 +730,7 @@ gss_destroy(struct rpc_auth *auth)static void gss_destroy_ctx (struct gss_cl_ctx *ctx) { -dprintk ("RPC: gss_destroy_ctx\n" ); +dprintk ("RPC: gss_destroy_ctx\n" );if (ctx->gc_gss_ctx)gss_delete_sec_context (&ctx->gc_gss_ctx);
@@ -744,7 +744,7 @@ gss_destroy_cred(struct rpc_cred *rc) { struct gss_cred *cred = container_of(rc, struct gss_cred, gc_base); -dprintk ("RPC: gss_destroy_cred \n" ); +dprintk ("RPC: gss_destroy_cred \n" );if (cred->gc_ctx)gss_put_ctx (cred->gc_ctx);
@@ -767,7 +767,7 @@ gss_create_cred(struct rpc_auth *auth, sstruct gss_cred *cred =NULL ;int err = -ENOMEM ; -dprintk ("RPC: gss_create_cred for uid %d, flavor %d\n" , +dprintk ("RPC: gss_create_cred for uid %d, flavor %d\n" , acred->uid, auth->au_flavor);if (!(cred =kzalloc (sizeof (*cred),GFP_KERNEL )))
@@ -786,7 +786,7 @@ gss_create_cred(struct rpc_auth *auth, sreturn &cred->gc_base; out_err: -dprintk ("RPC: gss_create_cred failed with error %d\n" , err); +dprintk ("RPC: gss_create_cred failed with error %d\n" , err);return ERR_PTR (err); }
@@ -840,7 +840,7 @@ gss_marshal(struct rpc_task *task, __be3struct kvec iov;struct xdr_buf verf_buf; -dprintk ("RPC: %4u gss_marshal\n" , task->tk_pid); +dprintk ("RPC: %5u gss_marshal\n" , task->tk_pid); *p++ =htonl (RPC_AUTH_GSS ); cred_len = p++;
@@ -906,7 +906,7 @@ gss_validate(struct rpc_task *task, __beu32 flav,len;u32 maj_stat; -dprintk ("RPC: %4u gss_validate\n" , task->tk_pid); +dprintk ("RPC: %5u gss_validate\n" , task->tk_pid); flav =ntohl (*p++);if ((len =ntohl (*p++)) >RPC_MAX_AUTH_SIZE )
@@ -929,12 +929,12 @@ gss_validate(struct rpc_task *task, __be* calculate the length of the verifier: */ task->tk_auth->au_verfsize =XDR_QUADLEN (len) +2 ;gss_put_ctx (ctx); -dprintk ("RPC: %4u GSS gss_validate: gss_verify_mic succeeded.\n" , +dprintk ("RPC: %5u gss_validate: gss_verify_mic succeeded.\n" , task->tk_pid);return p +XDR_QUADLEN (len); out_bad:gss_put_ctx (ctx); -dprintk ("RPC: %4u gss_validate failed.\n" , task->tk_pid); +dprintk ("RPC: %5u gss_validate failed.\n" , task->tk_pid);return NULL ; }
@@ -1104,7 +1104,7 @@ gss_wrap_req(struct rpc_task *task,struct gss_cl_ctx *ctx =gss_cred_get_ctx (cred);int status = -EIO ; -dprintk ("RPC: %4u gss_wrap_req\n" , task->tk_pid); +dprintk ("RPC: %5u gss_wrap_req\n" , task->tk_pid);if (ctx->gc_proc !=RPC_GSS_PROC_DATA ) {/* The spec seems a little ambiguous here, but I think that not * wrapping context destruction requests makes the most sense.
@@ -1127,7 +1127,7 @@ gss_wrap_req(struct rpc_task *task, } out:gss_put_ctx (ctx); -dprintk ("RPC: %4u gss_wrap_req returning %d\n" , task->tk_pid, status); +dprintk ("RPC: %5u gss_wrap_req returning %d\n" , task->tk_pid, status);return status; }
@@ -1233,7 +1233,7 @@ out_decode: status =decode (rqstp, p, obj); out:gss_put_ctx (ctx); -dprintk ("RPC: %4u gss_unwrap_resp returning %d\n" , task->tk_pid, +dprintk ("RPC: %5u gss_unwrap_resp returning %d\n" , task->tk_pid, status);return status; }
net/sunrpc/auth_gss/gss_krb5_crypto.c +9 -9
@@ -61,14 +61,14 @@ krb5_encrypt(u8 local_iv[16 ] = {0 };struct blkcipher_desc desc = { .tfm = tfm, .info = local_iv }; -dprintk ("RPC: krb5_encrypt: input data:\n" ); +dprintk ("RPC: krb5_encrypt: input data:\n" );print_hexl ((u32 *)in, length,0 );if (length %crypto_blkcipher_blocksize (tfm) !=0 ) goto out;if (crypto_blkcipher_ivsize (tfm) >16 ) { -dprintk ("RPC: gss_k5encrypt: tfm iv size to large %d\n" , +dprintk ("RPC: gss_k5encrypt: tfm iv size to large %d\n" ,crypto_blkcipher_ivsize (tfm)); goto out; }
@@ -81,10 +81,10 @@ krb5_encrypt( ret =crypto_blkcipher_encrypt_iv (&desc, sg, sg, length); -dprintk ("RPC: krb5_encrypt: output data:\n" ); +dprintk ("RPC: krb5_encrypt: output data:\n" );print_hexl ((u32 *)out, length,0 ); out: -dprintk ("RPC: krb5_encrypt returns %d\n" ,ret); +dprintk ("RPC: krb5_encrypt returns %d\n" ,ret);return (ret); }
@@ -103,14 +103,14 @@ krb5_decrypt(u8 local_iv[16 ] = {0 };struct blkcipher_desc desc = { .tfm = tfm, .info = local_iv }; -dprintk ("RPC: krb5_decrypt: input data:\n" ); +dprintk ("RPC: krb5_decrypt: input data:\n" );print_hexl ((u32 *)in, length,0 );if (length %crypto_blkcipher_blocksize (tfm) !=0 ) goto out;if (crypto_blkcipher_ivsize (tfm) >16 ) { -dprintk ("RPC: gss_k5decrypt: tfm iv size to large %d\n" , +dprintk ("RPC: gss_k5decrypt: tfm iv size to large %d\n" ,crypto_blkcipher_ivsize (tfm)); goto out; }
@@ -122,10 +122,10 @@ krb5_decrypt( ret =crypto_blkcipher_decrypt_iv (&desc, sg, sg, length); -dprintk ("RPC: krb5_decrypt: output_data:\n" ); +dprintk ("RPC: krb5_decrypt: output_data:\n" );print_hexl ((u32 *)out, length,0 ); out: -dprintk ("RPC: gss_k5decrypt returns %d\n" ,ret); +dprintk ("RPC: gss_k5decrypt returns %d\n" ,ret);return (ret); }
@@ -220,7 +220,7 @@ make_checksum(s32 cksumtype, char *heade cksumname ="md5" ;break ;default : -dprintk ("RPC: krb5_make_checksum:" +dprintk ("RPC: krb5_make_checksum:" " unsupported checksum %d" , cksumtype);return GSS_S_FAILURE ; }
net/sunrpc/auth_gss/gss_krb5_mech.c +2 -1
@@ -170,7 +170,8 @@ gss_import_sec_context_kerberos(const vo } ctx_id->internal_ctx_id = ctx; -dprintk ("RPC: Successfully imported new context.\n" ); + +dprintk ("RPC: Successfully imported new context.\n" );return 0 ; out_err_free_key2:
net/sunrpc/auth_gss/gss_krb5_seal.c +4 -4
@@ -84,7 +84,7 @@ gss_get_mic_kerberos(struct gss_ctx *gsss32 now;u32 seq_send; -dprintk ("RPC: gss_krb5_seal\n" ); +dprintk ("RPC: gss_krb5_seal\n" ); now =get_seconds ();
@@ -93,12 +93,12 @@ gss_get_mic_kerberos(struct gss_ctx *gss checksum_type =CKSUMTYPE_RSA_MD5 ;break ;default : -dprintk ("RPC: gss_krb5_seal: ctx->signalg %d not" +dprintk ("RPC: gss_krb5_seal: ctx->signalg %d not" " supported\n" , ctx->signalg); goto out_err; }if (ctx->sealalg !=SEAL_ALG_NONE && ctx->sealalg !=SEAL_ALG_DES ) { -dprintk ("RPC: gss_krb5_seal: ctx->sealalg %d not supported\n" , +dprintk ("RPC: gss_krb5_seal: ctx->sealalg %d not supported\n" , ctx->sealalg); goto out_err; }
@@ -130,7 +130,7 @@ gss_get_mic_kerberos(struct gss_ctx *gss md5cksum.data + md5cksum.len -KRB5_CKSUM_LENGTH , KRB5_CKSUM_LENGTH); -dprintk ("RPC: make_seal_token: cksum data: \n" ); +dprintk ("RPC: make_seal_token: cksum data: \n" );print_hexl ((u32 *) (krb5_hdr +16 ),KRB5_CKSUM_LENGTH ,0 );break ;default :
net/sunrpc/auth_gss/gss_krb5_seqnum.c +1 -1
@@ -70,7 +70,7 @@ krb5_get_seq_num(struct crypto_blkciphers32 code;unsigned char plain[8 ]; -dprintk ("RPC: krb5_get_seq_num:\n" ); +dprintk ("RPC: krb5_get_seq_num:\n" );if ((code =krb5_decrypt (key, cksum, buf, plain,8 )))return code;
net/sunrpc/auth_gss/gss_krb5_unseal.c +1 -1
@@ -88,7 +88,7 @@ gss_verify_mic_kerberos(struct gss_ctx *int bodysize;u32 ret =GSS_S_DEFECTIVE_TOKEN ; -dprintk ("RPC: krb5_read_token\n" ); +dprintk ("RPC: krb5_read_token\n" );if (g_verify_token_header (&ctx->mech_used, &bodysize, &ptr, read_token->len))
net/sunrpc/auth_gss/gss_krb5_wrap.c +5 -5
@@ -130,7 +130,7 @@ gss_wrap_kerberos(struct gss_ctx *ctx, istruct page **tmp_pages;u32 seq_send; -dprintk ("RPC: gss_wrap_kerberos\n" ); +dprintk ("RPC: gss_wrap_kerberos\n" ); now =get_seconds ();
@@ -139,12 +139,12 @@ gss_wrap_kerberos(struct gss_ctx *ctx, i checksum_type =CKSUMTYPE_RSA_MD5 ;break ;default : -dprintk ("RPC: gss_krb5_seal: kctx->signalg %d not" +dprintk ("RPC: gss_krb5_seal: kctx->signalg %d not" " supported\n" , kctx->signalg); goto out_err; }if (kctx->sealalg !=SEAL_ALG_NONE && kctx->sealalg !=SEAL_ALG_DES ) { -dprintk ("RPC: gss_krb5_seal: kctx->sealalg %d not supported\n" , +dprintk ("RPC: gss_krb5_seal: kctx->sealalg %d not supported\n" , kctx->sealalg); goto out_err; }
@@ -200,7 +200,7 @@ gss_wrap_kerberos(struct gss_ctx *ctx, i md5cksum.data + md5cksum.len -KRB5_CKSUM_LENGTH , KRB5_CKSUM_LENGTH); -dprintk ("RPC: make_seal_token: cksum data: \n" ); +dprintk ("RPC: make_seal_token: cksum data: \n" );print_hexl ((u32 *) (krb5_hdr +16 ),KRB5_CKSUM_LENGTH ,0 );break ;default :
@@ -245,7 +245,7 @@ gss_unwrap_kerberos(struct gss_ctx *ctx,int data_len;int blocksize; -dprintk ("RPC: gss_unwrap_kerberos\n" ); +dprintk ("RPC: gss_unwrap_kerberos\n" ); ptr = (u8 *)buf->head[0 ].iov_base + offset; if (g_verify_token_header(&kctx->mech_used, &bodysize, &ptr,
net/sunrpc/auth_gss/gss_mech_switch.c +3 -3
@@ -113,7 +113,7 @@ gss_mech_register(struct gss_api_mech *gspin_lock (®istered_mechs_lock);list_add (&gm->gm_list, ®istered_mechs);spin_unlock (®istered_mechs_lock); -dprintk ("RPC: registered gss mechanism %s\n" , gm->gm_name); +dprintk ("RPC: registered gss mechanism %s\n" , gm->gm_name);return 0 ; }
@@ -125,7 +125,7 @@ gss_mech_unregister(struct gss_api_mechspin_lock (®istered_mechs_lock);list_del (&gm->gm_list);spin_unlock (®istered_mechs_lock); -dprintk ("RPC: unregistered gss mechanism %s\n" , gm->gm_name); +dprintk ("RPC: unregistered gss mechanism %s\n" , gm->gm_name);gss_mech_free (gm); }
@@ -298,7 +298,7 @@ gss_unwrap(struct gss_ctx *ctx_id,u32 gss_delete_sec_context (struct gss_ctx **context_handle) { -dprintk ("RPC: gss_delete_sec_context deleting %p\n" , +dprintk ("RPC: gss_delete_sec_context deleting %p\n" , *context_handle);if (!*context_handle)
net/sunrpc/auth_gss/gss_spkm3_mech.c +6 -6
@@ -110,13 +110,13 @@ get_key(const void *p, const void *end,break ;case NID_md5:if (key.len ==0 ) { -dprintk ("RPC: SPKM3 get_key: NID_md5 zero Key length\n" ); +dprintk ("RPC: SPKM3 get_key: NID_md5 zero Key length\n" ); } alg_name ="md5" ; setkey =0 ;break ;default : -dprintk ("gss_spkm3_mech: unsupported algorithm %d\n" , *resalg); +dprintk ("RPC: SPKM3 get_key: unsupported algorithm %d\n" , *resalg); goto out_err_free_key; } *res =crypto_alloc_blkcipher (alg_name,0 ,CRYPTO_ALG_ASYNC );
@@ -201,7 +201,7 @@ gss_import_sec_context_spkm3(const void ctx_id->internal_ctx_id = ctx; -dprintk ("Successfully imported new spkm context.\n" ); +dprintk ("RPC: Successfully imported new spkm context.\n" );return 0 ; out_err_free_key2:
@@ -239,10 +239,10 @@ gss_verify_mic_spkm3(struct gss_ctx *ctu32 maj_stat =0 ;struct spkm3_ctx *sctx = ctx->internal_ctx_id; -dprintk ("RPC: gss_verify_mic_spkm3 calling spkm3_read_token\n" ); +dprintk ("RPC: gss_verify_mic_spkm3 calling spkm3_read_token\n" ); maj_stat =spkm3_read_token (sctx, checksum, signbuf,SPKM_MIC_TOK ); -dprintk ("RPC: gss_verify_mic_spkm3 returning %d\n" , maj_stat); +dprintk ("RPC: gss_verify_mic_spkm3 returning %d\n" , maj_stat);return maj_stat; }
@@ -254,7 +254,7 @@ gss_get_mic_spkm3(struct gss_ctx *ctx,u32 err =0 ;struct spkm3_ctx *sctx = ctx->internal_ctx_id; -dprintk ("RPC: gss_get_mic_spkm3\n" ); +dprintk ("RPC: gss_get_mic_spkm3\n" ); err =spkm3_make_token (sctx, message_buffer, message_token,SPKM_MIC_TOK );
net/sunrpc/auth_gss/gss_spkm3_seal.c +5 -5
@@ -66,12 +66,12 @@ spkm3_make_token(struct spkm3_ctx *ctx,int ctxelen =0 , ctxzbit =0 ;int md5elen =0 , md5zbit =0 ; -dprintk ("RPC: spkm3_make_token\n" ); +dprintk ("RPC: spkm3_make_token\n" ); now = jiffies;if (ctx->ctx_id.len !=16 ) { -dprintk ("RPC: spkm3_make_token BAD ctx_id.len %d\n" , +dprintk ("RPC: spkm3_make_token BAD ctx_id.len %d\n" , ctx->ctx_id.len); goto out_err; }
@@ -81,13 +81,13 @@ spkm3_make_token(struct spkm3_ctx *ctx, checksum_type =CKSUMTYPE_RSA_MD5 ;break ;default : -dprintk ("RPC: gss_spkm3_seal: ctx->signalg %d not" +dprintk ("RPC: gss_spkm3_seal: ctx->signalg %d not" " supported\n" , ctx->intg_alg); goto out_err; }/* XXX since we don't support WRAP, perhaps we don't care... */ if (ctx->conf_alg != NID_cast5_cbc) { -dprintk ("RPC: gss_spkm3_seal: ctx->sealalg %d not supported\n" , +dprintk ("RPC: gss_spkm3_seal: ctx->sealalg %d not supported\n" , ctx->conf_alg); goto out_err; }
@@ -113,7 +113,7 @@ spkm3_make_token(struct spkm3_ctx *ctx,spkm3_make_mic_token (&ptr, tokenlen, &mic_hdr, &md5cksum, md5elen, md5zbit); }else if (toktype ==SPKM_WRAP_TOK ) {/* Not Supported */ -dprintk ("RPC: gss_spkm3_seal: SPKM_WRAP_TOK not supported\n" ); +dprintk ("RPC: gss_spkm3_seal: SPKM_WRAP_TOK not supported\n" ); goto out_err; }
net/sunrpc/auth_gss/gss_spkm3_token.c +6 -6
@@ -209,7 +209,7 @@ spkm3_verify_mic_token(unsigned char **t/* spkm3 innercontext token preamble */ if ((ptr[0 ] !=0xa4 ) || (ptr[2 ] !=0x30 )) { -dprintk ("RPC: BAD SPKM ictoken preamble\n" ); +dprintk ("RPC: BAD SPKM ictoken preamble\n" ); goto out; }
@@ -217,25 +217,25 @@ spkm3_verify_mic_token(unsigned char **t/* token type */ if ((ptr[4 ] !=0x02 ) || (ptr[5 ] !=0x02 )) { -dprintk ("RPC: BAD asn1 SPKM3 token type\n" ); +dprintk ("RPC: BAD asn1 SPKM3 token type\n" ); goto out; }/* only support SPKM_MIC_TOK */ if ((ptr[6 ] !=0x01 ) || (ptr[7 ] !=0x01 )) { -dprintk ("RPC: ERROR unsupported SPKM3 token \n" ); +dprintk ("RPC: ERROR unsupported SPKM3 token \n" ); goto out; }/* contextid */ if (ptr[8 ] !=0x03 ) { -dprintk ("RPC: BAD SPKM3 asn1 context-id type\n" ); +dprintk ("RPC: BAD SPKM3 asn1 context-id type\n" ); goto out; } ctxelen = ptr[9 ];if (ctxelen >17 ) {/* length includes asn1 zbit octet */ -dprintk ("RPC: BAD SPKM3 contextid len %d\n" , ctxelen); +dprintk ("RPC: BAD SPKM3 contextid len %d\n" , ctxelen); goto out; }
@@ -251,7 +251,7 @@ spkm3_verify_mic_token(unsigned char **t*/ if (*mic_hdrlen !=6 + ctxelen) { -dprintk ("RPC: BAD SPKM_ MIC_TOK header len %d: we only support default int-alg (should be absent) and do not support snd-seq\n" , *mic_hdrlen); +dprintk ("RPC: BAD SPKM_ MIC_TOK header len %d: we only support default int-alg (should be absent) and do not support snd-seq\n" , *mic_hdrlen); goto out; }/* checksum */
net/sunrpc/auth_gss/gss_spkm3_unseal.c +6 -6
@@ -64,7 +64,7 @@ spkm3_read_token(struct spkm3_ctx *ctx,int mic_hdrlen;u32 ret =GSS_S_DEFECTIVE_TOKEN ; -dprintk ("RPC: spkm3_read_token read_token->len %d\n" , read_token->len); +dprintk ("RPC: spkm3_read_token read_token->len %d\n" , read_token->len);if (g_verify_token_header ((struct xdr_netobj *) &ctx->mech_used, &bodysize, &ptr, read_token->len))
@@ -78,7 +78,7 @@ spkm3_read_token(struct spkm3_ctx *ctx, goto out;if (*cksum++ !=0x03 ) { -dprintk ("RPC: spkm3_read_token BAD checksum type\n" ); +dprintk ("RPC: spkm3_read_token BAD checksum type\n" ); goto out; } md5elen = *cksum++;
@@ -101,11 +101,11 @@ spkm3_read_token(struct spkm3_ctx *ctx,if (code) goto out; -dprintk ("RPC: spkm3_read_token: digest wire_cksum.len %d:\n" , +dprintk ("RPC: spkm3_read_token: digest wire_cksum.len %d:\n" , wire_cksum.len); -dprintk (" md5cksum.data\n" ); +dprintk (" md5cksum.data\n" );print_hexl ((u32 *) md5cksum.data,16 ,0 ); -dprintk (" cksum.data:\n" ); +dprintk (" cksum.data:\n" );print_hexl ((u32 *) wire_cksum.data, wire_cksum.len,0 ); ret =GSS_S_BAD_SIG ;
@@ -114,7 +114,7 @@ spkm3_read_token(struct spkm3_ctx *ctx, goto out; }else { -dprintk ("RPC: BAD or UNSUPPORTED SPKM3 token type: %d\n" ,toktype); +dprintk ("RPC: BAD or UNSUPPORTED SPKM3 token type: %d\n" ,toktype); goto out; }
net/sunrpc/auth_gss/svcauth_gss.c +3 -3
@@ -671,13 +671,13 @@ gss_verify_header(struct svc_rqst *rqstp }if (gc->gc_seq >MAXSEQ ) { -dprintk ("RPC: svcauth_gss: discarding request with large sequence number %d\n" , +dprintk ("RPC: svcauth_gss: discarding request with large sequence number %d\n" , gc->gc_seq); *authp = rpcsec_gsserr_ctxproblem;return SVC_DENIED ; }if (!gss_check_seq_num (rsci, gc->gc_seq)) { -dprintk ("RPC: svcauth_gss: discarding request with old sequence number %d\n" , +dprintk ("RPC: svcauth_gss: discarding request with old sequence number %d\n" , gc->gc_seq);return SVC_DROP ; }
@@ -960,7 +960,7 @@ svcauth_gss_accept(struct svc_rqst *rqst__be32 *reject_stat = resv->iov_base + resv->iov_len;int ret; -dprintk ("RPC: svcauth_gss: argv->iov_len = %zd\n" ,argv->iov_len); +dprintk ("RPC: svcauth_gss: argv->iov_len = %zd\n" ,argv->iov_len); *authp = rpc_autherr_badcred;if (!svcdata)
-------------------------------------------------------------------------
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 20/21 SUNRPC: Remove pprintk() from net/sunrpc/xprt.c
In reply to Chuck LeverThese appear to be deprecated. Removing them also gets rid of some sparse noise.
---
net/sunrpc/xprt.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
net/sunrpc/xprt.c +0 -2
@@ -459,7 +459,6 @@ int xprt_adjust_timeout(struct rpc_rqstif (to->to_maxval && req->rq_timeout >= to->to_maxval) req->rq_timeout = to->to_maxval; req->rq_retries++; -pprintk ("RPC: %lu retrans\n" , jiffies); }else { req->rq_timeout = to->to_initval; req->rq_retries =0 ;
@@ -468,7 +467,6 @@ int xprt_adjust_timeout(struct rpc_rqstspin_lock_bh (&xprt->transport_lock);rpc_init_rtt (req->rq_task->tk_client->cl_rtt, to->to_initval);spin_unlock_bh (&xprt->transport_lock); -pprintk ("RPC: %lu timeout\n" , jiffies); status = -ETIMEDOUT ; }
-------------------------------------------------------------------------
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 21/21 SUNRPC: fix print format for tk_pid
In reply to Chuck LeverThe tk_pid field is an unsigned short. The proper print format specifier for that type is %5u, not %4d.
Also clean up some miscellaneous print formatting nits.
---
net/sunrpc/auth.c | 22 ++++++------ net/sunrpc/auth_unix.c | 6 ++- net/sunrpc/clnt.c | 86 ++++++++++++++++++++++++++---------------------- net/sunrpc/pmap_clnt.c | 14 ++++---- net/sunrpc/sched.c | 52 +++++++++++++++-------------- net/sunrpc/stats.c | 6 ++- net/sunrpc/xprt.c | 47 ++++++++++++++------------ net/sunrpc/xprtsock.c | 85 ++++++++++++++++++++++++----------------------- 8 files changed, 165 insertions(+), 153 deletions(-)
net/sunrpc/auth.c +11 -11
@@ -181,7 +181,7 @@ rpcauth_gc_credcache(struct rpc_auth *austruct rpc_cred *cred;int i; -dprintk ("RPC: gc'ing RPC credentials for auth %p\n" , auth); +dprintk ("RPC: gc'ing RPC credentials for auth %p\n" , auth);for (i =0 ; i <RPC_CREDCACHE_NR ; i++) {hlist_for_each_safe (pos, next, &cache->hashtable[i]) { cred = hlist_entry(pos, struct rpc_cred, cr_hash);
@@ -267,7 +267,7 @@ rpcauth_lookupcred(struct rpc_auth *auth };struct rpc_cred *ret; -dprintk ("RPC: looking up %s cred\n" , +dprintk ("RPC: looking up %s cred\n" , auth->au_ops->au_name);get_group_info (acred.group_info); ret = auth->au_ops->lookup_cred (auth, &acred, flags);
@@ -287,7 +287,7 @@ rpcauth_bindcred(struct rpc_task *task)struct rpc_cred *ret;int flags =0 ; -dprintk ("RPC: %4d looking up %s cred\n" , +dprintk ("RPC: %5u looking up %s cred\n" , task->tk_pid, task->tk_auth->au_ops->au_name);get_group_info (acred.group_info);if (task->tk_flags &RPC_TASK_ROOTCREDS )
@@ -304,7 +304,7 @@ rpcauth_bindcred(struct rpc_task *task)void rpcauth_holdcred (struct rpc_task *task) { -dprintk ("RPC: %4d holding %s cred %p\n" , +dprintk ("RPC: %5u holding %s cred %p\n" , task->tk_pid, task->tk_auth->au_ops->au_name, task->tk_msg.rpc_cred);if (task->tk_msg.rpc_cred)get_rpccred (task->tk_msg.rpc_cred);
@@ -324,7 +324,7 @@ rpcauth_unbindcred(struct rpc_task *task {struct rpc_cred *cred = task->tk_msg.rpc_cred; -dprintk ("RPC: %4d releasing %s cred %p\n" , +dprintk ("RPC: %5u releasing %s cred %p\n" , task->tk_pid, task->tk_auth->au_ops->au_name, cred);put_rpccred (cred);
@@ -336,7 +336,7 @@ rpcauth_marshcred(struct rpc_task *task, {struct rpc_cred *cred = task->tk_msg.rpc_cred; -dprintk ("RPC: %4d marshaling %s cred %p\n" , +dprintk ("RPC: %5u marshaling %s cred %p\n" , task->tk_pid, task->tk_auth->au_ops->au_name, cred);return cred->cr_ops->crmarshal (task, p);
@@ -347,7 +347,7 @@ rpcauth_checkverf(struct rpc_task *task, {struct rpc_cred *cred = task->tk_msg.rpc_cred; -dprintk ("RPC: %4d validating %s cred %p\n" , +dprintk ("RPC: %5u validating %s cred %p\n" , task->tk_pid, task->tk_auth->au_ops->au_name, cred);return cred->cr_ops->crvalidate (task, p);
@@ -359,7 +359,7 @@ rpcauth_wrap_req(struct rpc_task *task, {struct rpc_cred *cred = task->tk_msg.rpc_cred; -dprintk ("RPC: %4d using %s cred %p to wrap rpc data\n" , +dprintk ("RPC: %5u using %s cred %p to wrap rpc data\n" , task->tk_pid, cred->cr_ops->cr_name, cred);if (cred->cr_ops->crwrap_req)return cred->cr_ops->crwrap_req (task, encode, rqstp, data, obj);
@@ -373,7 +373,7 @@ rpcauth_unwrap_resp(struct rpc_task *tas {struct rpc_cred *cred = task->tk_msg.rpc_cred; -dprintk ("RPC: %4d using %s cred %p to unwrap rpc data\n" , +dprintk ("RPC: %5u using %s cred %p to unwrap rpc data\n" , task->tk_pid, cred->cr_ops->cr_name, cred);if (cred->cr_ops->crunwrap_resp) return cred->cr_ops->crunwrap_resp(task, decode, rqstp,
@@ -388,7 +388,7 @@ rpcauth_refreshcred(struct rpc_task *tasstruct rpc_cred *cred = task->tk_msg.rpc_cred;int err; -dprintk ("RPC: %4d refreshing %s cred %p\n" , +dprintk ("RPC: %5u refreshing %s cred %p\n" , task->tk_pid, task->tk_auth->au_ops->au_name, cred); err = cred->cr_ops->crrefresh (task);
@@ -400,7 +400,7 @@ rpcauth_refreshcred(struct rpc_task *tasvoid rpcauth_invalcred (struct rpc_task *task) { -dprintk ("RPC: %4d invalidating %s cred %p\n" , +dprintk ("RPC: %5u invalidating %s cred %p\n" , task->tk_pid, task->tk_auth->au_ops->au_name, task->tk_msg.rpc_cred);spin_lock (&rpc_credcache_lock);if (task->tk_msg.rpc_cred)
net/sunrpc/auth_unix.c +3 -3
@@ -39,7 +39,7 @@ static struct rpc_credops unix_credops;static struct rpc_auth *unx_create (struct rpc_clnt *clnt,rpc_authflavor_t flavor) { -dprintk ("RPC: creating UNIX authenticator for client %p\n" , clnt); +dprintk ("RPC: creating UNIX authenticator for client %p\n" , clnt);if (atomic_inc_return (&unix_auth.au_count) ==0 ) unix_cred_cache.nextgc = jiffies + (unix_cred_cache.expire >>1 );return &unix_auth;
@@ -48,7 +48,7 @@ unx_create(struct rpc_clnt *clnt, rpc_austatic void unx_destroy (struct rpc_auth *auth) { -dprintk ("RPC: destroying UNIX authenticator %p\n" , auth); +dprintk ("RPC: destroying UNIX authenticator %p\n" , auth);rpcauth_free_credcache (auth); }
@@ -67,7 +67,7 @@ unx_create_cred(struct rpc_auth *auth, sstruct unx_cred *cred;int i; -dprintk ("RPC: allocating UNIX cred for uid %d gid %d\n" , +dprintk ("RPC: allocating UNIX cred for uid %d gid %d\n" , acred->uid, acred->gid);if (!(cred =kmalloc (sizeof (*cred),GFP_KERNEL )))
net/sunrpc/clnt.c +47 -39
284 lines not on this page · raw message
net/sunrpc/pmap_clnt.c +7 -7
@@ -94,7 +94,7 @@ void rpc_getport(struct rpc_task *task)struct rpc_task *child;int status; -dprintk ("RPC: %4d rpc_getport(%s, %u, %u, %d)\n" , +dprintk ("RPC: %5u rpc_getport(%s, %u, %u, %d)\n" , task->tk_pid, clnt->cl_server, clnt->cl_prog, clnt->cl_vers, xprt->prot);
@@ -175,7 +175,7 @@ int rpc_getport_external(struct sockaddrchar hostname[32 ];int status; -dprintk ("RPC: rpc_getport_external(%u.%u.%u.%u, %u, %u, %d)\n" , +dprintk ("RPC: rpc_getport_external(%u.%u.%u.%u, %u, %u, %d)\n" ,NIPQUAD (sin->sin_addr.s_addr), prog, vers, prot);sprintf (hostname,"%u.%u.%u.%u" ,NIPQUAD (sin->sin_addr.s_addr));
@@ -218,7 +218,7 @@ static void pmap_getport_done(struct rpc status =0 ; } -dprintk ("RPC: %4d pmap_getport_done(status %d, port %u)\n" , +dprintk ("RPC: %5u pmap_getport_done(status %d, port %u)\n" , child->tk_pid, status, map->pm_port);pmap_wake_portmap_waiters (xprt, status);
@@ -255,13 +255,13 @@ int rpc_register(u32 prog, u32 vers, intstruct rpc_clnt *pmap_clnt;int error =0 ; -dprintk ("RPC: registering (%u, %u, %d, %u) with portmapper.\n" , +dprintk ("RPC: registering (%u, %u, %d, %u) with portmapper.\n" , prog, vers, prot, port); pmap_clnt =pmap_create ("localhost" , &sin,IPPROTO_UDP ,1 );if (IS_ERR (pmap_clnt)) { error =PTR_ERR (pmap_clnt); -dprintk ("RPC: couldn't create pmap client. Error = %d\n" , error); +dprintk ("RPC: couldn't create pmap client. Error = %d\n" , error);return error; }
@@ -272,7 +272,7 @@ int rpc_register(u32 prog, u32 vers, int"RPC: failed to contact portmap (errno %d).\n" , error); } -dprintk ("RPC: registration status %d/%d\n" , error, *okay); +dprintk ("RPC: registration status %d/%d\n" , error, *okay);/* Client deleted automatically because cl_oneshot == 1 */ return error;
@@ -303,7 +303,7 @@ static struct rpc_clnt *pmap_create(char*/ static int xdr_encode_mapping (struct rpc_rqst *req,__be32 *p,struct portmap_args *map) { -dprintk ("RPC: xdr_encode_mapping(%u, %u, %u, %u)\n" , +dprintk ("RPC: xdr_encode_mapping(%u, %u, %u, %u)\n" , map->pm_prog, map->pm_vers, map->pm_prot, map->pm_port); *p++ =htonl (map->pm_prog); *p++ =htonl (map->pm_vers);
net/sunrpc/sched.c +26 -26
203 lines not on this page · raw message
net/sunrpc/stats.c +3 -3
@@ -226,7 +226,7 @@ do_register(const char *name, void *datastruct proc_dir_entry *ent;rpc_proc_init (); -dprintk ("RPC: registering /proc/net/rpc/%s\n" , name); +dprintk ("RPC: registering /proc/net/rpc/%s\n" , name); ent =create_proc_entry (name,0 , proc_net_rpc);if (ent) {
@@ -263,7 +263,7 @@ svc_proc_unregister(const char *name)void rpc_proc_init (void ) { -dprintk ("RPC: registering /proc/net/rpc\n" ); +dprintk ("RPC: registering /proc/net/rpc\n" );if (!proc_net_rpc) {struct proc_dir_entry *ent; ent =proc_mkdir ("rpc" , proc_net);
@@ -277,7 +277,7 @@ rpc_proc_init(void)void rpc_proc_exit (void ) { -dprintk ("RPC: unregistering /proc/net/rpc\n" ); +dprintk ("RPC: unregistering /proc/net/rpc\n" );if (proc_net_rpc) { proc_net_rpc =NULL ;remove_proc_entry ("net/rpc" ,NULL );
net/sunrpc/xprt.c +25 -22
176 lines not on this page · raw message
net/sunrpc/xprtsock.c +43 -42
317 lines not on this page · raw message
-------------------------------------------------------------------------
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