[PATCH 003 of 13] knfsd: SUNRPC: Cache remote peer's address in svc_sock.

NeilBrown
2006-12-08T12:02:47Z

The remote peer's address won't change after the socket has been
accepted. We don't need to call ->getname on every incoming request.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: Neil Brown <neilb@suse.de>

### Diffstat output
./include/linux/sunrpc/svcsock.h | 3 +++
./net/sunrpc/svcsock.c | 11 +++++------
2 files changed, 8 insertions(+), 6 deletions(-)

diff .prev/include/linux/sunrpc/svcsock.h ./include/linux/sunrpc/svcsock.h
--- .prev/include/linux/sunrpc/svcsock.h 2006-12-08 13:36:33.000000000 +1100
+++ ./include/linux/sunrpc/svcsock.h 2006-12-08 13:42:26.000000000 +1100
@@ -57,6 +57,9 @@ struct svc_sock {

/* cache of various info for TCP sockets */
void *sk_info_authunix;
+
+ struct sockaddr_storage sk_remote; /* remote peer's address */
+ int sk_remotelen; /* length of address */
};

/*

diff .prev/net/sunrpc/svcsock.c ./net/sunrpc/svcsock.c
--- .prev/net/sunrpc/svcsock.c 2006-12-08 13:36:33.000000000 +1100
+++ ./net/sunrpc/svcsock.c 2006-12-08 13:42:26.000000000 +1100
@@ -577,11 +577,9 @@ svc_recvfrom(struct svc_rqst *rqstp, str
len = kernel_recvmsg(sock, &msg, iov, nr, buflen, MSG_DONTWAIT);

/* sock_recvmsg doesn't fill in the name/namelen, so we must..
- * possibly we should cache this in the svc_sock structure
- * at accept time. FIXME
*/
- alen = sizeof(rqstp->rq_addr);
- kernel_getpeername(sock, (struct sockaddr *)&rqstp->rq_addr, &alen);
+ memcpy(&rqstp->rq_addr, &svsk->sk_remote, svsk->sk_remotelen);
+ rqstp->rq_addrlen = svsk->sk_remotelen;

dprintk("svc: socket %p recvfrom(%p, %Zu) = %d\n",
rqstp->rq_sock, iov[0].iov_base, iov[0].iov_len, len);
@@ -873,7 +871,7 @@ svc_tcp_accept(struct svc_sock *svsk)
struct socket *sock = svsk->sk_sock;
struct socket *newsock;
struct svc_sock *newsvsk;
- int err, slen;
+ int err, slen = 0;

dprintk("svc: tcp_accept %p sock %p\n", svsk, sock);
if (!sock)
@@ -925,7 +923,8 @@ svc_tcp_accept(struct svc_sock *svsk)
if (!(newsvsk = svc_setup_socket(serv, newsock, &err,
(SVC_SOCK_ANONYMOUS | SVC_SOCK_TEMPORARY))))
goto failed;
-
+ memcpy(&newsvsk->sk_remote, &sin, slen);
+ newsvsk->sk_remotelen = slen;

/* make sure that we don't have too many active connections.
* If we have, something must be dropped.