net: Call skb_get_hash in get_xps_queue and __skb_tx_hash
Call standard function to get a packet hash instead of taking this from skb->sk->sk_hash or only using skb->protocol. Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b73c3d0e4f
commit
0e001614e8
3 changed files with 7 additions and 26 deletions
|
@ -2486,7 +2486,7 @@ static inline int netif_set_xps_queue(struct net_device *dev,
|
||||||
* as a distribution range limit for the returned value.
|
* as a distribution range limit for the returned value.
|
||||||
*/
|
*/
|
||||||
static inline u16 skb_tx_hash(const struct net_device *dev,
|
static inline u16 skb_tx_hash(const struct net_device *dev,
|
||||||
const struct sk_buff *skb)
|
struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
return __skb_tx_hash(dev, skb, dev->real_num_tx_queues);
|
return __skb_tx_hash(dev, skb, dev->real_num_tx_queues);
|
||||||
}
|
}
|
||||||
|
|
|
@ -3005,7 +3005,7 @@ static inline bool skb_rx_queue_recorded(const struct sk_buff *skb)
|
||||||
return skb->queue_mapping != 0;
|
return skb->queue_mapping != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
u16 __skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb,
|
u16 __skb_tx_hash(const struct net_device *dev, struct sk_buff *skb,
|
||||||
unsigned int num_tx_queues);
|
unsigned int num_tx_queues);
|
||||||
|
|
||||||
static inline struct sec_path *skb_sec_path(struct sk_buff *skb)
|
static inline struct sec_path *skb_sec_path(struct sk_buff *skb)
|
||||||
|
|
|
@ -196,12 +196,6 @@ static __always_inline u32 __flow_hash_3words(u32 a, u32 b, u32 c)
|
||||||
return jhash_3words(a, b, c, hashrnd);
|
return jhash_3words(a, b, c, hashrnd);
|
||||||
}
|
}
|
||||||
|
|
||||||
static __always_inline u32 __flow_hash_1word(u32 a)
|
|
||||||
{
|
|
||||||
__flow_hash_secret_init();
|
|
||||||
return jhash_1word(a, hashrnd);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline u32 __flow_hash_from_keys(struct flow_keys *keys)
|
static inline u32 __flow_hash_from_keys(struct flow_keys *keys)
|
||||||
{
|
{
|
||||||
u32 hash;
|
u32 hash;
|
||||||
|
@ -253,7 +247,7 @@ EXPORT_SYMBOL(__skb_get_hash);
|
||||||
* Returns a Tx hash based on the given packet descriptor a Tx queues' number
|
* Returns a Tx hash based on the given packet descriptor a Tx queues' number
|
||||||
* to be used as a distribution range.
|
* to be used as a distribution range.
|
||||||
*/
|
*/
|
||||||
u16 __skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb,
|
u16 __skb_tx_hash(const struct net_device *dev, struct sk_buff *skb,
|
||||||
unsigned int num_tx_queues)
|
unsigned int num_tx_queues)
|
||||||
{
|
{
|
||||||
u32 hash;
|
u32 hash;
|
||||||
|
@ -273,13 +267,7 @@ u16 __skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb,
|
||||||
qcount = dev->tc_to_txq[tc].count;
|
qcount = dev->tc_to_txq[tc].count;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (skb->sk && skb->sk->sk_hash)
|
return (u16) (((u64)skb_get_hash(skb) * qcount) >> 32) + qoffset;
|
||||||
hash = skb->sk->sk_hash;
|
|
||||||
else
|
|
||||||
hash = (__force u16) skb->protocol;
|
|
||||||
hash = __flow_hash_1word(hash);
|
|
||||||
|
|
||||||
return (u16) (((u64) hash * qcount) >> 32) + qoffset;
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(__skb_tx_hash);
|
EXPORT_SYMBOL(__skb_tx_hash);
|
||||||
|
|
||||||
|
@ -351,17 +339,10 @@ static inline int get_xps_queue(struct net_device *dev, struct sk_buff *skb)
|
||||||
if (map) {
|
if (map) {
|
||||||
if (map->len == 1)
|
if (map->len == 1)
|
||||||
queue_index = map->queues[0];
|
queue_index = map->queues[0];
|
||||||
else {
|
else
|
||||||
u32 hash;
|
|
||||||
if (skb->sk && skb->sk->sk_hash)
|
|
||||||
hash = skb->sk->sk_hash;
|
|
||||||
else
|
|
||||||
hash = (__force u16) skb->protocol ^
|
|
||||||
skb->hash;
|
|
||||||
hash = __flow_hash_1word(hash);
|
|
||||||
queue_index = map->queues[
|
queue_index = map->queues[
|
||||||
((u64)hash * map->len) >> 32];
|
((u64)skb_get_hash(skb) * map->len) >> 32];
|
||||||
}
|
|
||||||
if (unlikely(queue_index >= dev->real_num_tx_queues))
|
if (unlikely(queue_index >= dev->real_num_tx_queues))
|
||||||
queue_index = -1;
|
queue_index = -1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue