net: Change skb_get_rxhash to skb_get_hash

Changing name of function as part of making the hash in skbuff to be
generic property, not just for receive path.

Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 64409af0da3185fd050cbbc34d7c615c84c11b0d..431f58cb2ceb4399009702b3182195ce9a0f6cb2 100644 (file)
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -224,7 +224,7 @@ static struct macvtap_queue *macvtap_get_queue(struct net_device *dev,
                goto out;
 
        /* Check if we can use flow to select a queue */
-       rxq = skb_get_rxhash(skb);
+       rxq = skb_get_hash(skb);
        if (rxq) {
                tap = rcu_dereference(vlan->taps[rxq % numvtaps]);
                goto out;

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 3c5a8d8cde5077bc0c2d39d2f0aadc4e7d4a6231..8569da24833633087948047db2b2a26eb66e9e4b 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -358,7 +358,7 @@ static u16 tun_select_queue(struct net_device *dev, struct sk_buff *skb)
        rcu_read_lock();
        numqueues = ACCESS_ONCE(tun->numqueues);
 
-       txq = skb_get_rxhash(skb);
+       txq = skb_get_hash(skb);
        if (txq) {
                e = tun_flow_find(&tun->flows[tun_hashfn(txq)], txq);
                if (e)
@@ -1146,7 +1146,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
        skb_reset_network_header(skb);
        skb_probe_transport_header(skb, 0);
 
-       rxhash = skb_get_rxhash(skb);
+       rxhash = skb_get_hash(skb);
        netif_rx_ni(skb);
 
        tun->dev->stats.rx_packets++;

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 58f6a0c02b173f7ad2d753630e1fc69f778d2789..b247a7a29366fab559da3c1256dd22049e632c65 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1405,7 +1405,7 @@ __be16 vxlan_src_port(__u16 port_min, __u16 port_max, struct sk_buff *skb)
        unsigned int range = (port_max - port_min) + 1;
        u32 hash;
 
-       hash = skb_get_rxhash(skb);
+       hash = skb_get_hash(skb);
        if (!hash)
                hash = jhash(skb->data, 2 * ETH_ALEN,
                             (__force u32) skb->protocol);

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 77c7aae1c6b20d7d72baff3fa0f6de05851b44ba..4725b953e00d0cee125591a5902476cc94a2f234 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -703,11 +703,11 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,
                           unsigned int to, struct ts_config *config,
                           struct ts_state *state);
 
-void __skb_get_rxhash(struct sk_buff *skb);
-static inline __u32 skb_get_rxhash(struct sk_buff *skb)
+void __skb_get_hash(struct sk_buff *skb);
+static inline __u32 skb_get_hash(struct sk_buff *skb)
 {
        if (!skb->l4_rxhash)
-               __skb_get_rxhash(skb);
+               __skb_get_hash(skb);
 
        return skb->rxhash;
 }

diff --git a/net/core/dev.c b/net/core/dev.c
index 9d4369ece6797c1dbdd3157b1f0dafe2c8717bdb..c482fe8abf8768e54ebfa9642731216540112090 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3006,7 +3006,7 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,
        }
 
        skb_reset_network_header(skb);
-       if (!skb_get_rxhash(skb))
+       if (!skb_get_hash(skb))
                goto done;
 
        flow_table = rcu_dereference(rxqueue->rps_flow_table);
@@ -3151,7 +3151,7 @@ static bool skb_flow_limit(struct sk_buff *skb, unsigned int qlen)
        rcu_read_lock();
        fl = rcu_dereference(sd->flow_limit);
        if (fl) {
-               new_flow = skb_get_rxhash(skb) & (fl->num_buckets - 1);
+               new_flow = skb_get_hash(skb) & (fl->num_buckets - 1);
                old_flow = fl->history[fl->history_head];
                fl->history[fl->history_head] = new_flow;
 

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index d6ef173225008ec1946ed232f781cc63754b9575..b324bfa3485cfa992160ab43a050ebe15b0d7e59 100644 (file)
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -202,12 +202,12 @@ static __always_inline u32 __flow_hash_1word(u32 a)
 }
 
 /*
- * __skb_get_rxhash: calculate a flow hash based on src/dst addresses
+ * __skb_get_hash: calculate a flow hash based on src/dst addresses
  * and src/dst port numbers.  Sets rxhash in skb to non-zero hash value
  * on success, zero indicates no valid hash.  Also, sets l4_rxhash in skb
  * if hash is a canonical 4-tuple hash over transport ports.
  */
-void __skb_get_rxhash(struct sk_buff *skb)
+void __skb_get_hash(struct sk_buff *skb)
 {
        struct flow_keys keys;
        u32 hash;
@@ -234,7 +234,7 @@ void __skb_get_rxhash(struct sk_buff *skb)
 
        skb->rxhash = hash;
 }
-EXPORT_SYMBOL(__skb_get_rxhash);
+EXPORT_SYMBOL(__skb_get_hash);
 
 /*
  * Returns a Tx hash based on the given packet descriptor a Tx queues' number

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index cc803c63059a9adb386392412997cb40ff61b29e..24675f06f4fd25203c493b75d3af9a7593ade86a 100644 (file)
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -963,7 +963,7 @@ static void prb_clear_blk_fill_status(struct packet_ring_buffer *rb)
 static void prb_fill_rxhash(struct tpacket_kbdq_core *pkc,
                        struct tpacket3_hdr *ppd)
 {
-       ppd->hv1.tp_rxhash = skb_get_rxhash(pkc->skb);
+       ppd->hv1.tp_rxhash = skb_get_hash(pkc->skb);
 }
 
 static void prb_clear_rxhash(struct tpacket_kbdq_core *pkc,
@@ -1295,7 +1295,7 @@ static int packet_rcv_fanout(struct sk_buff *skb, struct net_device *dev,
                        if (!skb)
                                return 0;
                }
-               skb_get_rxhash(skb);
+               skb_get_hash(skb);
                idx = fanout_demux_hash(f, skb, num);
                break;
        case PACKET_FANOUT_LB:

diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index 7881e2fccbc2ea1b7cd0eaf98ac3f0675836e150..83a6322b7751b9c93f46937839c76330df16e7a5 100644 (file)
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -220,7 +220,7 @@ static u32 flow_get_vlan_tag(const struct sk_buff *skb)
 
 static u32 flow_get_rxhash(struct sk_buff *skb)
 {
-       return skb_get_rxhash(skb);
+       return skb_get_hash(skb);
 }
 
 static u32 flow_key_get(struct sk_buff *skb, int key, struct flow_keys *flow)

diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 382519a5d7f94a056bf2bcf1d51ea19122b7558d..9b8c0b0e60d7dbc34260ae8fc010844eeda4e8ad 100644 (file)
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -222,7 +222,7 @@ META_COLLECTOR(int_maclen)
 
 META_COLLECTOR(int_rxhash)
 {
-       dst->value = skb_get_rxhash(skb);
+       dst->value = skb_get_hash(skb);
 }
 
 /**************************************************************************

diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c
index f2fb92dd970d628eb6d288f73f07e340c200ea09..08ef7a42c0e411657e789cb140fad522aef97ed1 100644 (file)
--- a/net/sched/sch_fq.c
+++ b/net/sched/sch_fq.c
@@ -226,7 +226,7 @@ static struct fq_flow *fq_classify(struct sk_buff *skb, struct fq_sched_data *q)
                /* By forcing low order bit to 1, we make sure to not
                 * collide with a local flow (socket pointers are word aligned)
                 */
-               sk = (struct sock *)(skb_get_rxhash(skb) | 1L);
+               sk = (struct sock *)(skb_get_hash(skb) | 1L);
        }
 
        root = &q->fq_root[hash_32((u32)(long)sk, q->fq_trees_log)];