Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47482f13 authored by Neil Horman's avatar Neil Horman Committed by David S. Miller
Browse files

ipv6: Enable RFS sk_rxhash tracking for ipv6 sockets (v2) 



properly record sk_rxhash in ipv6 sockets (v2)

Noticed while working on another project that flows to sockets which I had open
on a test systems weren't getting steered properly when I had RFS enabled.
Looking more closely I found that:

1) The affected sockets were all ipv6
2) They weren't getting steered because sk->sk_rxhash was never set from the
incomming skbs on that socket.

This was occuring because there are several points in the IPv4 tcp and udp code
which save the rxhash value when a new connection is established.  Those calls
to sock_rps_save_rxhash were never added to the corresponding ipv6 code paths.
This patch adds those calls.  Tested by myself to properly enable RFS
functionalty on ipv6.

Change notes:
v2:
	Filtered UDP to only arm RFS on bound sockets (Eric Dumazet)

Signed-off-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d5d4154

net/ipv6/tcp_ipv6.c

+3 −1
Original line number Diff line number Diff line
@@ -1622,6 +1622,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
		opt_skb = skb_clone(skb, GFP_ATOMIC);



	if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */

		sock_rps_save_rxhash(sk, skb->rxhash);

		if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len))

			goto reset;

		if (opt_skb)
@@ -1649,7 +1650,8 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
				__kfree_skb(opt_skb);

			return 0;

		}

	}

	} else

		sock_rps_save_rxhash(sk, skb->rxhash);



	if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb), skb->len))

		goto reset;

net/ipv6/udp.c

+3 −0
Original line number Diff line number Diff line
@@ -505,6 +505,9 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) 
	int rc;

	int is_udplite = IS_UDPLITE(sk);



	if (!ipv6_addr_any(&inet6_sk(sk)->daddr))

		sock_rps_save_rxhash(sk, skb->rxhash);



	if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))

		goto drop;