36bdfc8bae
Following are 11 patches from Greg Banks which combine to make knfsd more Numa-aware. They reduce hitting on 'global' data structures, and create some data-structures that can be node-local. knfsd threads are bound to a particular node, and the thread to handle a new request is chosen from the threads that are attach to the node that received the interrupt. The distribution of threads across nodes can be controlled by a new file in the 'nfsd' filesystem, though the default approach of an even spread is probably fine for most sites. Some (old) numbers that show the efficacy of these patches: N == number of NICs == number of CPUs == nmber of clients. Number of NUMA nodes == N/2 N Throughput, MiB/s CPU usage, % (max=N*100) Before After Before After --- ------ ---- ----- ----- 4 312 435 350 228 6 500 656 501 418 8 562 804 690 589 This patch: Move the aging of RPC/TCP connection sockets from the main svc_recv() loop to a timer which uses a mark-and-sweep algorithm every 6 minutes. This reduces the amount of work that needs to be done in the main RPC loop and the length of time we need to hold the (effectively global) svc_serv->sv_lock. [akpm@osdl.org: cleanup] Signed-off-by: Greg Banks <gnb@melbourne.sgi.com> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
73 lines
2.2 KiB
C
73 lines
2.2 KiB
C
/*
|
|
* linux/include/linux/sunrpc/svcsock.h
|
|
*
|
|
* RPC server socket I/O.
|
|
*
|
|
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
|
|
*/
|
|
|
|
#ifndef SUNRPC_SVCSOCK_H
|
|
#define SUNRPC_SVCSOCK_H
|
|
|
|
#include <linux/sunrpc/svc.h>
|
|
|
|
/*
|
|
* RPC server socket.
|
|
*/
|
|
struct svc_sock {
|
|
struct list_head sk_ready; /* list of ready sockets */
|
|
struct list_head sk_list; /* list of all sockets */
|
|
struct socket * sk_sock; /* berkeley socket layer */
|
|
struct sock * sk_sk; /* INET layer */
|
|
|
|
struct svc_serv * sk_server; /* service for this socket */
|
|
unsigned int sk_inuse; /* use count */
|
|
unsigned long sk_flags;
|
|
#define SK_BUSY 0 /* enqueued/receiving */
|
|
#define SK_CONN 1 /* conn pending */
|
|
#define SK_CLOSE 2 /* dead or dying */
|
|
#define SK_DATA 3 /* data pending */
|
|
#define SK_TEMP 4 /* temp (TCP) socket */
|
|
#define SK_DEAD 6 /* socket closed */
|
|
#define SK_CHNGBUF 7 /* need to change snd/rcv buffer sizes */
|
|
#define SK_DEFERRED 8 /* request on sk_deferred */
|
|
#define SK_OLD 9 /* used for temp socket aging mark+sweep */
|
|
#define SK_DETACHED 10 /* detached from tempsocks list */
|
|
|
|
int sk_reserved; /* space on outq that is reserved */
|
|
|
|
struct list_head sk_deferred; /* deferred requests that need to
|
|
* be revisted */
|
|
struct mutex sk_mutex; /* to serialize sending data */
|
|
|
|
int (*sk_recvfrom)(struct svc_rqst *rqstp);
|
|
int (*sk_sendto)(struct svc_rqst *rqstp);
|
|
|
|
/* We keep the old state_change and data_ready CB's here */
|
|
void (*sk_ostate)(struct sock *);
|
|
void (*sk_odata)(struct sock *, int bytes);
|
|
void (*sk_owspace)(struct sock *);
|
|
|
|
/* private TCP part */
|
|
int sk_reclen; /* length of record */
|
|
int sk_tcplen; /* current read length */
|
|
time_t sk_lastrecv; /* time of last received request */
|
|
};
|
|
|
|
/*
|
|
* Function prototypes.
|
|
*/
|
|
int svc_makesock(struct svc_serv *, int, unsigned short);
|
|
void svc_delete_socket(struct svc_sock *);
|
|
int svc_recv(struct svc_rqst *, long);
|
|
int svc_send(struct svc_rqst *);
|
|
void svc_drop(struct svc_rqst *);
|
|
void svc_sock_update_bufs(struct svc_serv *serv);
|
|
int svc_sock_names(char *buf, struct svc_serv *serv, char *toclose);
|
|
int svc_addsock(struct svc_serv *serv,
|
|
int fd,
|
|
char *name_return,
|
|
int *proto);
|
|
|
|
#endif /* SUNRPC_SVCSOCK_H */
|