aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorSoheil Hassas Yeganeh <soheil@google.com>2018-01-03 21:47:10 -0500
committerDavid S. Miller <davem@davemloft.net>2018-01-05 11:14:56 -0500
commite3f2c4a3db1413bebfd502f7ac94fb55e3ba8c84 (patch)
treef2aede6896cc108e16f9bc785c13d3261d0c1800 /net/ipv4
parentMerge branch 'l2tp-remove-configurable-offset-parameters' (diff)
downloadlinux-dev-e3f2c4a3db1413bebfd502f7ac94fb55e3ba8c84.tar.xz
linux-dev-e3f2c4a3db1413bebfd502f7ac94fb55e3ba8c84.zip
ip: do not set RFS core on error queue reads
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/af_inet.c3
1 files changed, 2 insertions, 1 deletions
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);