]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
vxlan: Rename FDB Tx lookup function
authorIdo Schimmel <idosch@nvidia.com>
Tue, 15 Apr 2025 12:11:39 +0000 (15:11 +0300)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 22 Apr 2025 09:11:16 +0000 (11:11 +0200)
vxlan_find_mac() is only expected to be called from the Tx path as it
updates the 'used' timestamp. Rename it to vxlan_find_mac_tx() to
reflect that and to avoid incorrect updates of this timestamp like those
addressed by commit 9722f834fe9a ("vxlan: Avoid unnecessary updates to
FDB 'used' time").

No functional changes intended.

Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/20250415121143.345227-12-idosch@nvidia.com
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/vxlan/vxlan_core.c

index 762dde70d9e9cc09f09ce94cceda7d49a9a01ba7..397b1691ab069fb07df21b95140d1ba96832e1de 100644 (file)
@@ -429,8 +429,8 @@ static struct vxlan_fdb *__vxlan_find_mac(struct vxlan_dev *vxlan,
        return NULL;
 }
 
-static struct vxlan_fdb *vxlan_find_mac(struct vxlan_dev *vxlan,
-                                       const u8 *mac, __be32 vni)
+static struct vxlan_fdb *vxlan_find_mac_tx(struct vxlan_dev *vxlan,
+                                          const u8 *mac, __be32 vni)
 {
        struct vxlan_fdb *f;
 
@@ -1897,7 +1897,7 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
                }
 
                rcu_read_lock();
-               f = vxlan_find_mac(vxlan, n->ha, vni);
+               f = vxlan_find_mac_tx(vxlan, n->ha, vni);
                if (f && vxlan_addr_any(&(first_remote_rcu(f)->remote_ip))) {
                        /* bridge-local neighbor */
                        neigh_release(n);
@@ -2063,7 +2063,7 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
                        goto out;
                }
 
-               f = vxlan_find_mac(vxlan, n->ha, vni);
+               f = vxlan_find_mac_tx(vxlan, n->ha, vni);
                if (f && vxlan_addr_any(&(first_remote_rcu(f)->remote_ip))) {
                        /* bridge-local neighbor */
                        neigh_release(n);
@@ -2762,7 +2762,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
 
        eth = eth_hdr(skb);
        rcu_read_lock();
-       f = vxlan_find_mac(vxlan, eth->h_dest, vni);
+       f = vxlan_find_mac_tx(vxlan, eth->h_dest, vni);
        did_rsc = false;
 
        if (f && (f->flags & NTF_ROUTER) && (vxlan->cfg.flags & VXLAN_F_RSC) &&
@@ -2770,11 +2770,11 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
             ntohs(eth->h_proto) == ETH_P_IPV6)) {
                did_rsc = route_shortcircuit(dev, skb);
                if (did_rsc)
-                       f = vxlan_find_mac(vxlan, eth->h_dest, vni);
+                       f = vxlan_find_mac_tx(vxlan, eth->h_dest, vni);
        }
 
        if (f == NULL) {
-               f = vxlan_find_mac(vxlan, all_zeros_mac, vni);
+               f = vxlan_find_mac_tx(vxlan, all_zeros_mac, vni);
                if (f == NULL) {
                        if ((vxlan->cfg.flags & VXLAN_F_L2MISS) &&
                            !is_multicast_ether_addr(eth->h_dest))