Message ID | 20180104024711.257600-1-soheil.kdev@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Series | [net-next,1/2] ip: do not set RFS core on error queue reads | expand |
From: Soheil Hassas Yeganeh <soheil.kdev@gmail.com> Date: Wed, 3 Jan 2018 21:47:10 -0500 > From: Soheil Hassas Yeganeh <soheil@google.com> > > We should only record RPS on normal reads and writes. > In single threaded processes, all calls record the same state. In > multi-threaded processes where a separate thread processes > errors, the RFS table mispredicts. > > Note that, when CONFIG_RPS is disabled, sock_rps_record_flow > is a noop and no branch is added as a result of this patch. > > Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com> > Signed-off-by: Willem de Bruijn <willemb@google.com> > Signed-off-by: Eric Dumazet <edumazet@google.com> > Signed-off-by: Neal Cardwell <ncardwell@google.com> Applied.
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index bab98a4fedad..54cccdd8b1e3 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -790,7 +790,8 @@ int inet_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, int addr_len = 0; int err; - sock_rps_record_flow(sk); + if (likely(!(flags & MSG_ERRQUEUE))) + sock_rps_record_flow(sk); err = sk->sk_prot->recvmsg(sk, msg, size, flags & MSG_DONTWAIT, flags & ~MSG_DONTWAIT, &addr_len);