Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 067d7817310569f7b76ca08c4d071ca95ad4c1d3

Authored by Chuck Lever
Committed by Linus Torvalds
1 parent e79eff1f90
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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

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>

Showing 2 changed files with 11 additions and 6 deletions Side-by-side Diff

include/linux/sunrpc/svcsock.h
Diff comments   View file @ 067d781
... ... @@ -57,6 +57,9 @@
57 57  
58 58 /* cache of various info for TCP sockets */
59 59 void *sk_info_authunix;
  60 +
  61 + struct sockaddr_storage sk_remote; /* remote peer's address */
  62 + int sk_remotelen; /* length of address */
60 63 };
61 64  
62 65 /*
net/sunrpc/svcsock.c
Diff comments   View file @ 067d781
... ... @@ -568,12 +568,13 @@
568 568 static int
569 569 svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr, int buflen)
570 570 {
  571 + struct svc_sock *svsk = rqstp->rq_sock;
571 572 struct msghdr msg;
572 573 struct socket *sock;
573   - int len, alen;
  574 + int len;
574 575  
575 576 rqstp->rq_addrlen = sizeof(rqstp->rq_addr);
576   - sock = rqstp->rq_sock->sk_sock;
  577 + sock = svsk->sk_sock;
577 578  
578 579 msg.msg_name = &rqstp->rq_addr;
579 580 msg.msg_namelen = sizeof(rqstp->rq_addr);
580 581  
... ... @@ -585,11 +586,9 @@
585 586 len = kernel_recvmsg(sock, &msg, iov, nr, buflen, MSG_DONTWAIT);
586 587  
587 588 /* sock_recvmsg doesn't fill in the name/namelen, so we must..
588   - * possibly we should cache this in the svc_sock structure
589   - * at accept time. FIXME
590 589 */
591   - alen = sizeof(rqstp->rq_addr);
592   - kernel_getpeername(sock, (struct sockaddr *)&rqstp->rq_addr, &alen);
  590 + memcpy(&rqstp->rq_addr, &svsk->sk_remote, svsk->sk_remotelen);
  591 + rqstp->rq_addrlen = svsk->sk_remotelen;
593 592  
594 593 dprintk("svc: socket %p recvfrom(%p, %Zu) = %d\n",
595 594 rqstp->rq_sock, iov[0].iov_base, iov[0].iov_len, len);
... ... @@ -938,6 +937,9 @@
938 937 if (!(newsvsk = svc_setup_socket(serv, newsock, &err,
939 938 (SVC_SOCK_ANONYMOUS | SVC_SOCK_TEMPORARY))))
940 939 goto failed;
  940 + memcpy(&newsvsk->sk_remote, &sin, slen);
  941 + newsvsk->sk_remotelen = slen;
  942 +
941 943 svc_sock_received(newsvsk);
942 944  
943 945 /* make sure that we don't have too many active connections.