Commit fe477558 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller

net: Allow setting sock flow hash without a sock

This patch adds sock_rps_record_flow_hash and sock_rps_reset_flow_hash
which take a hash value as an argument and sets the sock_flow_table
accordingly.  This allows the table to be populated in cases where flow
is being tracked outside of a sock structure.

sock_rps_record_flow and sock_rps_reset_flow call this function
where the hash is taken from sk_rxhash.
Signed-off-by: default avatarTom Herbert <therbert@google.com>
Signed-off-by: default avatarZhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84a6a0ac
...@@ -820,30 +820,40 @@ static inline int sk_backlog_rcv(struct sock *sk, struct sk_buff *skb) ...@@ -820,30 +820,40 @@ static inline int sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)
return sk->sk_backlog_rcv(sk, skb); return sk->sk_backlog_rcv(sk, skb);
} }
static inline void sock_rps_record_flow(const struct sock *sk) static inline void sock_rps_record_flow_hash(__u32 hash)
{ {
#ifdef CONFIG_RPS #ifdef CONFIG_RPS
struct rps_sock_flow_table *sock_flow_table; struct rps_sock_flow_table *sock_flow_table;
rcu_read_lock(); rcu_read_lock();
sock_flow_table = rcu_dereference(rps_sock_flow_table); sock_flow_table = rcu_dereference(rps_sock_flow_table);
rps_record_sock_flow(sock_flow_table, sk->sk_rxhash); rps_record_sock_flow(sock_flow_table, hash);
rcu_read_unlock(); rcu_read_unlock();
#endif #endif
} }
static inline void sock_rps_reset_flow(const struct sock *sk) static inline void sock_rps_reset_flow_hash(__u32 hash)
{ {
#ifdef CONFIG_RPS #ifdef CONFIG_RPS
struct rps_sock_flow_table *sock_flow_table; struct rps_sock_flow_table *sock_flow_table;
rcu_read_lock(); rcu_read_lock();
sock_flow_table = rcu_dereference(rps_sock_flow_table); sock_flow_table = rcu_dereference(rps_sock_flow_table);
rps_reset_sock_flow(sock_flow_table, sk->sk_rxhash); rps_reset_sock_flow(sock_flow_table, hash);
rcu_read_unlock(); rcu_read_unlock();
#endif #endif
} }
static inline void sock_rps_record_flow(const struct sock *sk)
{
sock_rps_record_flow_hash(sk->sk_rxhash);
}
static inline void sock_rps_reset_flow(const struct sock *sk)
{
sock_rps_reset_flow_hash(sk->sk_rxhash);
}
static inline void sock_rps_save_rxhash(struct sock *sk, static inline void sock_rps_save_rxhash(struct sock *sk,
const struct sk_buff *skb) const struct sk_buff *skb)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment