Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

[PATCH] knfsd: SUNRPC: Cache remote peer's address in svc_sock

Browse source 
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Chuck Lever 2007-02-12 00:53:30 -08:00 committed by Linus Torvalds
parent e79eff1f90
commit 067d781731
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/linux/sunrpc/svcsock.h
View file

@ -57,6 +57,9 @@ struct svc_sock {
/* cache of various info for TCP sockets */ /* cache of various info for TCP sockets */
void *sk_info_authunix; void *sk_info_authunix;
struct sockaddr_storage sk_remote; /* remote peer's address */
int sk_remotelen; /* length of address */
}; };
/* /*

14
net/sunrpc/svcsock.c
View file

@ -568,12 +568,13 @@ svc_recv_available(struct svc_sock *svsk)
static int static int
svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr, int buflen) svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr, int buflen)
{ {
struct svc_sock *svsk = rqstp->rq_sock;
struct msghdr msg; struct msghdr msg;
struct socket *sock; struct socket *sock;
int len, alen; int len;
rqstp->rq_addrlen = sizeof(rqstp->rq_addr); rqstp->rq_addrlen = sizeof(rqstp->rq_addr);
sock = rqstp->rq_sock->sk_sock; sock = svsk->sk_sock;
msg.msg_name = &rqstp->rq_addr; msg.msg_name = &rqstp->rq_addr;
msg.msg_namelen = sizeof(rqstp->rq_addr); msg.msg_namelen = sizeof(rqstp->rq_addr);
@ -585,11 +586,9 @@ svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr, int buflen)
len = kernel_recvmsg(sock, &msg, iov, nr, buflen, MSG_DONTWAIT); len = kernel_recvmsg(sock, &msg, iov, nr, buflen, MSG_DONTWAIT);
/* sock_recvmsg doesn't fill in the name/namelen, so we must.. /* 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); memcpy(&rqstp->rq_addr, &svsk->sk_remote, svsk->sk_remotelen);
kernel_getpeername(sock, (struct sockaddr *)&rqstp->rq_addr, &alen); rqstp->rq_addrlen = svsk->sk_remotelen;
dprintk("svc: socket %p recvfrom(%p, %Zu) = %d\n", dprintk("svc: socket %p recvfrom(%p, %Zu) = %d\n",
rqstp->rq_sock, iov[0].iov_base, iov[0].iov_len, len); rqstp->rq_sock, iov[0].iov_base, iov[0].iov_len, len);
@ -938,6 +937,9 @@ svc_tcp_accept(struct svc_sock *svsk)
if (!(newsvsk = svc_setup_socket(serv, newsock, &err, if (!(newsvsk = svc_setup_socket(serv, newsock, &err,
(SVC_SOCK_ANONYMOUS | SVC_SOCK_TEMPORARY)))) (SVC_SOCK_ANONYMOUS | SVC_SOCK_TEMPORARY))))
goto failed; goto failed;
memcpy(&newsvsk->sk_remote, &sin, slen);
newsvsk->sk_remotelen = slen;
svc_sock_received(newsvsk); svc_sock_received(newsvsk);
/* make sure that we don't have too many active connections. /* make sure that we don't have too many active connections.