| Seq | Timestamp | Type | Name | Duration |
|---|---|---|---|---|
| 0/0 | 2026/09/23 07:53 | flow | patch-triage |
3mArgs:null Results: {
"EnableConfigs": [
"VXLAN",
"INET",
"IPV6"
],
"FocusSymbols": [
"vxlan_changelink",
"vxlan_dev_configure",
"vxlan_free_dev",
"vxlan_xmit",
"vxlan_rcv",
"vxlan_update_default_fdb_entry",
"vxlan_vnilist_update_group",
"vxlan_vnifilter_dump_dev"
],
"KMSANReasoning": "The patch refactors the VXLAN subsystem to make the device configuration RCU-protected (`vxlan-\u003ecfg` dynamically allocated and managed via RCU rather than embedded in `struct vxlan_dev`), removes the legacy `default_dst` struct in favor of direct config lookups and a `lowerdev` pointer, and moves dynamic flags like `VXLAN_DEV_F_MDB` to `vxlan-\u003eflags`.\n\nAnalysis of memory initialization and leak risks:\n1. Heap structures: Newly allocated config structures (`new_cfg`) are created via `kmemdup()` from `conf`, which is fully cleared with `memset(conf, 0, sizeof(*conf))` in `vxlan_nl2conf()`. There are no uninitialized padding bytes or fields in the allocated config.\n2. Netlink / user space copies: In `vxlan_fill_info()`, `struct ifla_vxlan_port_range ports` has its initialization changed from aggregate to member assignments (`ports.low = ...; ports.high = ...;`). The UAPI `struct ifla_vxlan_port_range` consists strictly of two `__be16` fields (4 bytes total) with zero padding. Both fields are initialized prior to `nla_put()`. All other attributes emitted to userspace are scalars or copied from the zero-initialized config.\n3. Driver-internal structs: In `mlxsw_sp_bridge_vlan_aware_vxlan_join()`, `struct mlxsw_sp_nve_params` has all member fields explicitly assigned, and it is strictly driver-internal without being copied to userspace or read via memcmp.\n\nApplicability of KASAN vs KMSAN:\nThe potential risks of these changes lie in RCU lifetime correctness, use-after-free across grace periods, NULL pointer dereferences, and locking during configuration updates. These are effectively detected by KASAN, PROVE_RCU, and LOCKDEP. There are no uninitialized memory reads or kernel-to-user info-leak risks, so a dedicated KMSAN fuzzing session is not warranted.",
"NeedsKMSAN": false,
"Reasoning": "The patch refactors the VXLAN driver's configuration management by turning vxlan-\u003ecfg into an RCU-managed dynamically allocated object (struct vxlan_config __rcu *cfg), removing default_dst, adding RCU grace periods via kfree_rcu, updating changelink/error unwind logic, and altering lockless RCU walks for VNIFILTER dumping. VXLAN is a standard virtual netdevice reachable in virtualized QEMU environments through netlink and packet sockets, making this series an ideal target for syzkaller fuzzing.",
"WorthFuzzing": true
} |
| 1/1 | 2026/09/23 07:53 | action | read-patch-diff |
0mArgs:null Results: {
"PatchDiff": "commit 0b6e000f211d41c0ddec43751848309380949d38\nAuthor: syz-cluster \u003ctriage@syzkaller.com\u003e\nDate: Wed Sep 23 07:53:12 2026 +0000\n\n syz-cluster: applied patch under review\n\ndiff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c\nindex 7a18a469961db..467fbe43b89e9 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c\n@@ -241,9 +241,16 @@ static bool mlx5e_tc_tun_encap_info_equal_vxlan(struct mlx5e_encap_key *a,\n static int mlx5e_tc_tun_get_remote_ifindex(struct net_device *mirred_dev)\n {\n \tconst struct vxlan_dev *vxlan = netdev_priv(mirred_dev);\n-\tconst struct vxlan_rdst *dst = \u0026vxlan-\u003edefault_dst;\n+\tconst struct vxlan_config *cfg;\n+\tint ifindex = 0;\n \n-\treturn dst-\u003eremote_ifindex;\n+\trcu_read_lock();\n+\tcfg = rcu_dereference(vxlan-\u003ecfg);\n+\tif (cfg)\n+\t\tifindex = cfg-\u003eremote_ifindex;\n+\trcu_read_unlock();\n+\n+\treturn ifindex;\n }\n \n struct mlx5e_tc_tunnel vxlan_tunnel = {\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c\nindex 52c2fe3644d4b..21e7b499f3879 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c\n@@ -59,8 +59,11 @@ static bool mlxsw_sp_nve_vxlan_can_offload(const struct mlxsw_sp_nve *nve,\n \t\t\t\t\t const struct mlxsw_sp_nve_params *params,\n \t\t\t\t\t struct netlink_ext_ack *extack)\n {\n-\tstruct vxlan_dev *vxlan = netdev_priv(params-\u003edev);\n-\tstruct vxlan_config *cfg = \u0026vxlan-\u003ecfg;\n+\tconst struct vxlan_config *cfg;\n+\tstruct vxlan_dev *vxlan;\n+\n+\tvxlan = netdev_priv(params-\u003edev);\n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n \n \tif (vxlan_addr_multicast(\u0026cfg-\u003eremote_ip)) {\n \t\tNL_SET_ERR_MSG_MOD(extack, \"VxLAN: Multicast destination IP is not supported\");\n@@ -92,6 +95,11 @@ static bool mlxsw_sp_nve_vxlan_can_offload(const struct mlxsw_sp_nve *nve,\n \t\treturn false;\n \t}\n \n+\tif (test_bit(VXLAN_DEV_F_MDB, \u0026vxlan-\u003eflags)) {\n+\t\tNL_SET_ERR_MSG_MOD(extack, \"VxLAN: MDB entries are not supported\");\n+\t\treturn false;\n+\t}\n+\n \tswitch (cfg-\u003esaddr.sa.sa_family) {\n \tcase AF_INET:\n \t\tif (!mlxsw_sp_nve_vxlan_ipv4_flags_check(cfg, extack))\n@@ -148,8 +156,11 @@ static void mlxsw_sp_nve_vxlan_config(const struct mlxsw_sp_nve *nve,\n \t\t\t\t const struct mlxsw_sp_nve_params *params,\n \t\t\t\t struct mlxsw_sp_nve_config *config)\n {\n-\tstruct vxlan_dev *vxlan = netdev_priv(params-\u003edev);\n-\tstruct vxlan_config *cfg = \u0026vxlan-\u003ecfg;\n+\tconst struct vxlan_config *cfg;\n+\tstruct vxlan_dev *vxlan;\n+\n+\tvxlan = netdev_priv(params-\u003edev);\n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n \n \tconfig-\u003etype = MLXSW_SP_NVE_TYPE_VXLAN;\n \tconfig-\u003ettl = cfg-\u003ettl;\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\nindex fe45e533a4b2e..de60b698bea98 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\n@@ -2513,15 +2513,17 @@ mlxsw_sp_bridge_vlan_aware_vxlan_join(struct mlxsw_sp_bridge_device *bridge_devi\n {\n \tstruct mlxsw_sp *mlxsw_sp = mlxsw_sp_lower_get(bridge_device-\u003edev);\n \tstruct vxlan_dev *vxlan = netdev_priv(vxlan_dev);\n-\tstruct mlxsw_sp_nve_params params = {\n-\t\t.type = MLXSW_SP_NVE_TYPE_VXLAN,\n-\t\t.vni = vxlan-\u003ecfg.vni,\n-\t\t.dev = vxlan_dev,\n-\t\t.ethertype = ethertype,\n-\t};\n+\tstruct mlxsw_sp_nve_params params;\n+\tconst struct vxlan_config *cfg;\n \tstruct mlxsw_sp_fid *fid;\n \tint err;\n \n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tparams.type = MLXSW_SP_NVE_TYPE_VXLAN;\n+\tparams.vni = cfg-\u003evni;\n+\tparams.dev = vxlan_dev;\n+\tparams.ethertype = ethertype;\n+\n \t/* If the VLAN is 0, we need to find the VLAN that is configured as\n \t * PVID and egress untagged on the bridge port of the VxLAN device.\n \t * It is possible no such VLAN exists\n@@ -2704,15 +2706,17 @@ mlxsw_sp_bridge_8021d_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,\n {\n \tstruct mlxsw_sp *mlxsw_sp = mlxsw_sp_lower_get(bridge_device-\u003edev);\n \tstruct vxlan_dev *vxlan = netdev_priv(vxlan_dev);\n-\tstruct mlxsw_sp_nve_params params = {\n-\t\t.type = MLXSW_SP_NVE_TYPE_VXLAN,\n-\t\t.vni = vxlan-\u003ecfg.vni,\n-\t\t.dev = vxlan_dev,\n-\t\t.ethertype = ETH_P_8021Q,\n-\t};\n+\tstruct mlxsw_sp_nve_params params;\n+\tconst struct vxlan_config *cfg;\n \tstruct mlxsw_sp_fid *fid;\n \tint err;\n \n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tparams.type = MLXSW_SP_NVE_TYPE_VXLAN;\n+\tparams.vni = cfg-\u003evni;\n+\tparams.dev = vxlan_dev;\n+\tparams.ethertype = ETH_P_8021Q;\n+\n \tfid = mlxsw_sp_fid_8021d_get(mlxsw_sp, bridge_device-\u003edev-\u003eifindex);\n \tif (IS_ERR(fid)) {\n \t\tNL_SET_ERR_MSG_MOD(extack, \"Failed to create 802.1D FID\");\n@@ -2933,10 +2937,13 @@ static void __mlxsw_sp_bridge_vxlan_leave(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t\t const struct net_device *vxlan_dev)\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(vxlan_dev);\n+\tconst struct vxlan_config *cfg;\n \tstruct mlxsw_sp_fid *fid;\n \n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\n \t/* If the VxLAN device is down, then the FID does not have a VNI */\n-\tfid = mlxsw_sp_fid_lookup_by_vni(mlxsw_sp, vxlan-\u003ecfg.vni);\n+\tfid = mlxsw_sp_fid_lookup_by_vni(mlxsw_sp, cfg-\u003evni);\n \tif (!fid)\n \t\treturn;\n \n@@ -3029,11 +3036,13 @@ static void mlxsw_sp_fdb_vxlan_call_notifiers(struct net_device *dev,\n \tstruct switchdev_notifier_vxlan_fdb_info info;\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n \tenum switchdev_notifier_type type;\n+\tconst struct vxlan_config *cfg;\n \n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n \ttype = adding ? SWITCHDEV_VXLAN_FDB_ADD_TO_BRIDGE :\n \t\t\tSWITCHDEV_VXLAN_FDB_DEL_TO_BRIDGE;\n \tmlxsw_sp_switchdev_addr_vxlan_convert(proto, addr, \u0026info.remote_ip);\n-\tinfo.remote_port = vxlan-\u003ecfg.dst_port;\n+\tinfo.remote_port = cfg-\u003edst_port;\n \tinfo.remote_vni = vni;\n \tinfo.remote_ifindex = 0;\n \tether_addr_copy(info.eth_addr, mac);\n@@ -3236,8 +3245,10 @@ __mlxsw_sp_fdb_notify_mac_uc_tunnel_process(struct mlxsw_sp *mlxsw_sp,\n \n \tif (adding \u0026\u0026 netif_is_vxlan(dev)) {\n \t\tstruct vxlan_dev *vxlan = netdev_priv(dev);\n+\t\tconst struct vxlan_config *cfg;\n \n-\t\tif (!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_LEARN))\n+\t\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\t\tif (!(cfg-\u003eflags \u0026 VXLAN_F_LEARN))\n \t\t\treturn -EINVAL;\n \t}\n \n@@ -3722,9 +3733,11 @@ mlxsw_sp_switchdev_vxlan_work_prepare(struct mlxsw_sp_switchdev_event_work *\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(switchdev_work-\u003edev);\n \tstruct switchdev_notifier_vxlan_fdb_info *vxlan_fdb_info;\n-\tstruct vxlan_config *cfg = \u0026vxlan-\u003ecfg;\n+\tconst struct vxlan_config *cfg;\n \tstruct netlink_ext_ack *extack;\n \n+\tcfg = rcu_dereference_rtnl(vxlan-\u003ecfg);\n+\n \textack = switchdev_notifier_info_to_extack(info);\n \tvxlan_fdb_info = container_of(info,\n \t\t\t\t struct switchdev_notifier_vxlan_fdb_info,\n@@ -3851,11 +3864,15 @@ mlxsw_sp_switchdev_vxlan_vlan_add(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t struct netlink_ext_ack *extack)\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(vxlan_dev);\n-\t__be32 vni = vxlan-\u003ecfg.vni;\n+\tconst struct vxlan_config *cfg;\n \tstruct mlxsw_sp_fid *fid;\n \tu16 old_vid;\n+\t__be32 vni;\n \tint err;\n \n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tvni = cfg-\u003evni;\n+\n \t/* We cannot have the same VLAN as PVID and egress untagged on multiple\n \t * VxLAN devices. Note that we get this notification before the VLAN is\n \t * actually added to the bridge's database, so it is not possible for\n@@ -3935,12 +3952,16 @@ mlxsw_sp_switchdev_vxlan_vlan_del(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t const struct net_device *vxlan_dev, u16 vid)\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(vxlan_dev);\n-\t__be32 vni = vxlan-\u003ecfg.vni;\n+\tconst struct vxlan_config *cfg;\n \tstruct mlxsw_sp_fid *fid;\n+\t__be32 vni;\n \n \tif (!netif_running(vxlan_dev))\n \t\treturn;\n \n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tvni = cfg-\u003evni;\n+\n \tfid = mlxsw_sp_fid_lookup_by_vni(mlxsw_sp, vni);\n \tif (!fid)\n \t\treturn;\ndiff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c\nindex 347245cc1de4e..2e975294c69ec 100644\n--- a/drivers/net/vxlan/vxlan_core.c\n+++ b/drivers/net/vxlan/vxlan_core.c\n@@ -110,20 +110,23 @@ static struct vxlan_dev *vxlan_vs_find_vni(struct vxlan_sock *vs,\n \t\tvni = 0;\n \n \thlist_for_each_entry_rcu(node, vni_head(vs, vni), hlist) {\n+\t\tconst struct vxlan_config *cfg;\n+\n \t\tif (!node-\u003evxlan)\n \t\t\tcontinue;\n+\n+\t\tcfg = rcu_dereference(node-\u003evxlan-\u003ecfg);\n+\n \t\tvnode = NULL;\n-\t\tif (node-\u003evxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER) {\n+\t\tif (cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER) {\n \t\t\tvnode = vxlan_vnifilter_lookup(node-\u003evxlan, vni);\n \t\t\tif (!vnode)\n \t\t\t\tcontinue;\n-\t\t} else if (node-\u003evxlan-\u003edefault_dst.remote_vni != vni) {\n+\t\t} else if (cfg-\u003evni != vni) {\n \t\t\tcontinue;\n \t\t}\n \n \t\tif (IS_ENABLED(CONFIG_IPV6)) {\n-\t\t\tconst struct vxlan_config *cfg = \u0026node-\u003evxlan-\u003ecfg;\n-\n \t\t\tif ((cfg-\u003eflags \u0026 VXLAN_F_IPV6_LINKLOCAL) \u0026\u0026\n \t\t\t cfg-\u003eremote_ifindex != ifindex)\n \t\t\t\tcontinue;\n@@ -157,6 +160,7 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,\n \t\t\t u32 portid, u32 seq, int type, unsigned int flags,\n \t\t\t const struct vxlan_rdst *rdst)\n {\n+\tconst struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan-\u003ecfg);\n \tunsigned long now = jiffies;\n \tstruct nda_cacheinfo ci;\n \tbool send_ip, send_eth;\n@@ -216,10 +220,10 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,\n \t\t\tgoto nla_put_failure;\n \n \t\tif (rdst-\u003eremote_port \u0026\u0026\n-\t\t rdst-\u003eremote_port != vxlan-\u003ecfg.dst_port \u0026\u0026\n+\t\t rdst-\u003eremote_port != cfg-\u003edst_port \u0026\u0026\n \t\t nla_put_be16(skb, NDA_PORT, rdst-\u003eremote_port))\n \t\t\tgoto nla_put_failure;\n-\t\tif (rdst-\u003eremote_vni != vxlan-\u003edefault_dst.remote_vni \u0026\u0026\n+\t\tif (rdst-\u003eremote_vni != cfg-\u003evni \u0026\u0026\n \t\t nla_put_u32(skb, NDA_VNI, be32_to_cpu(rdst-\u003eremote_vni)))\n \t\t\tgoto nla_put_failure;\n \t\tif (rdst-\u003eremote_ifindex \u0026\u0026\n@@ -227,7 +231,7 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,\n \t\t\tgoto nla_put_failure;\n \t}\n \n-\tif ((vxlan-\u003ecfg.flags \u0026 VXLAN_F_COLLECT_METADATA) \u0026\u0026 fdb-\u003ekey.vni \u0026\u0026\n+\tif ((cfg-\u003eflags \u0026 VXLAN_F_COLLECT_METADATA) \u0026\u0026 fdb-\u003ekey.vni \u0026\u0026\n \t nla_put_u32(skb, NDA_SRC_VNI,\n \t\t\tbe32_to_cpu(fdb-\u003ekey.vni)))\n \t\tgoto nla_put_failure;\n@@ -377,14 +381,15 @@ static void vxlan_fdb_miss(struct vxlan_dev *vxlan, const u8 eth_addr[ETH_ALEN])\n \n /* Look up Ethernet address in forwarding table */\n static struct vxlan_fdb *vxlan_find_mac_rcu(struct vxlan_dev *vxlan,\n+\t\t\t\t\t const struct vxlan_config *cfg,\n \t\t\t\t\t const u8 *mac, __be32 vni)\n {\n \tstruct vxlan_fdb_key key;\n \n \tmemset(\u0026key, 0, sizeof(key));\n \tmemcpy(key.eth_addr, mac, sizeof(key.eth_addr));\n-\tif (!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_COLLECT_METADATA))\n-\t\tkey.vni = vxlan-\u003edefault_dst.remote_vni;\n+\tif (!(cfg-\u003eflags \u0026 VXLAN_F_COLLECT_METADATA))\n+\t\tkey.vni = cfg-\u003evni;\n \telse\n \t\tkey.vni = vni;\n \n@@ -393,11 +398,12 @@ static struct vxlan_fdb *vxlan_find_mac_rcu(struct vxlan_dev *vxlan,\n }\n \n static struct vxlan_fdb *vxlan_find_mac_tx(struct vxlan_dev *vxlan,\n+\t\t\t\t\t const struct vxlan_config *cfg,\n \t\t\t\t\t const u8 *mac, __be32 vni)\n {\n \tstruct vxlan_fdb *f;\n \n-\tf = vxlan_find_mac_rcu(vxlan, mac, vni);\n+\tf = vxlan_find_mac_rcu(vxlan, cfg, mac, vni);\n \tif (f) {\n \t\tunsigned long now = jiffies;\n \n@@ -416,7 +422,7 @@ static struct vxlan_fdb *vxlan_find_mac(struct vxlan_dev *vxlan,\n \tlockdep_assert_held_once(\u0026vxlan-\u003ehash_lock);\n \n \trcu_read_lock();\n-\tf = vxlan_find_mac_rcu(vxlan, mac, vni);\n+\tf = vxlan_find_mac_rcu(vxlan, rcu_dereference(vxlan-\u003ecfg), mac, vni);\n \trcu_read_unlock();\n \n \treturn f;\n@@ -457,7 +463,7 @@ int vxlan_fdb_find_uc(struct net_device *dev, const u8 *mac, __be32 vni,\n \n \trcu_read_lock();\n \n-\tf = vxlan_find_mac_rcu(vxlan, eth_addr, vni);\n+\tf = vxlan_find_mac_rcu(vxlan, rcu_dereference(vxlan-\u003ecfg), eth_addr, vni);\n \tif (f)\n \t\trdst = first_remote_rcu(f);\n \tif (!rdst) {\n@@ -798,6 +804,7 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,\n \t\t\t u32 nhid, struct netlink_ext_ack *extack)\n {\n \tstruct nexthop *old_nh = rtnl_dereference(fdb-\u003enh);\n+\tconst struct vxlan_config *cfg;\n \tstruct nexthop *nh;\n \tint err = -EINVAL;\n \n@@ -826,7 +833,8 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,\n \t}\n \n \t/* check nexthop group family */\n-\tswitch (vxlan-\u003edefault_dst.remote_ip.sa.sa_family) {\n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tswitch (cfg-\u003eremote_ip.sa.sa_family) {\n \tcase AF_INET:\n \t\tif (!nexthop_has_v4(nh)) {\n \t\t\terr = -EAFNOSUPPORT;\n@@ -863,12 +871,13 @@ int vxlan_fdb_create(struct vxlan_dev *vxlan,\n \t\t u32 nhid, struct vxlan_fdb **fdb,\n \t\t struct netlink_ext_ack *extack)\n {\n+\tconst struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan-\u003ecfg);\n \tstruct vxlan_rdst *rd = NULL;\n \tstruct vxlan_fdb *f;\n \tint rc;\n \n-\tif (vxlan-\u003ecfg.addrmax \u0026\u0026\n-\t vxlan-\u003eaddrcnt \u003e= vxlan-\u003ecfg.addrmax)\n+\tif (cfg-\u003eaddrmax \u0026\u0026\n+\t vxlan-\u003eaddrcnt \u003e= cfg-\u003eaddrmax)\n \t\treturn -ENOSPC;\n \n \tnetdev_dbg(vxlan-\u003edev, \"add %pM -\u003e %pIS\\n\", mac, ip);\n@@ -1154,6 +1163,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,\n \t\t\t __be32 *vni, u32 *ifindex, u32 *nhid,\n \t\t\t struct netlink_ext_ack *extack)\n {\n+\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n \tstruct net *net = dev_net(vxlan-\u003edev);\n \tint err;\n \n@@ -1170,7 +1180,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,\n \t\t\treturn err;\n \t\t}\n \t} else {\n-\t\tunion vxlan_addr *remote = \u0026vxlan-\u003edefault_dst.remote_ip;\n+\t\tconst union vxlan_addr *remote = \u0026cfg-\u003eremote_ip;\n \n \t\tif (remote-\u003esa.sa_family == AF_INET) {\n \t\t\tip-\u003esin.sin_addr.s_addr = htonl(INADDR_ANY);\n@@ -1190,7 +1200,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,\n \t\t}\n \t\t*port = nla_get_be16(tb[NDA_PORT]);\n \t} else {\n-\t\t*port = vxlan-\u003ecfg.dst_port;\n+\t\t*port = cfg-\u003edst_port;\n \t}\n \n \tif (tb[NDA_VNI]) {\n@@ -1200,7 +1210,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,\n \t\t}\n \t\t*vni = cpu_to_be32(nla_get_u32(tb[NDA_VNI]));\n \t} else {\n-\t\t*vni = vxlan-\u003edefault_dst.remote_vni;\n+\t\t*vni = cfg-\u003evni;\n \t}\n \n \tif (tb[NDA_SRC_VNI]) {\n@@ -1210,7 +1220,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,\n \t\t}\n \t\t*src_vni = cpu_to_be32(nla_get_u32(tb[NDA_SRC_VNI]));\n \t} else {\n-\t\t*src_vni = vxlan-\u003edefault_dst.remote_vni;\n+\t\t*src_vni = cfg-\u003evni;\n \t}\n \n \tif (tb[NDA_IFINDEX]) {\n@@ -1241,6 +1251,7 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],\n \t\t\t const unsigned char *addr, u16 vid, u16 flags,\n \t\t\t bool *notified, struct netlink_ext_ack *extack)\n {\n+\tconst struct vxlan_config *cfg;\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n \t/* struct net *net = dev_net(vxlan-\u003edev); */\n \tunion vxlan_addr ip;\n@@ -1268,7 +1279,8 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],\n \t\treturn -EINVAL;\n \t}\n \n-\tif (vxlan-\u003edefault_dst.remote_ip.sa.sa_family != ip.sa.sa_family)\n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tif (cfg-\u003eremote_ip.sa.sa_family != ip.sa.sa_family)\n \t\treturn -EAFNOSUPPORT;\n \n \tspin_lock_bh(\u0026vxlan-\u003ehash_lock);\n@@ -1405,18 +1417,21 @@ static int vxlan_fdb_get(struct sk_buff *skb,\n \t\t\t struct netlink_ext_ack *extack)\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n+\tconst struct vxlan_config *cfg;\n \tstruct vxlan_fdb *f;\n \t__be32 vni;\n \tint err;\n \n+\tcfg = rcu_dereference_rtnl(vxlan-\u003ecfg);\n+\n \tif (tb[NDA_VNI])\n \t\tvni = cpu_to_be32(nla_get_u32(tb[NDA_VNI]));\n \telse\n-\t\tvni = vxlan-\u003edefault_dst.remote_vni;\n+\t\tvni = cfg-\u003evni;\n \n \trcu_read_lock();\n \n-\tf = vxlan_find_mac_rcu(vxlan, addr, vni);\n+\tf = vxlan_find_mac_rcu(vxlan, cfg, addr, vni);\n \tif (!f) {\n \t\tNL_SET_ERR_MSG(extack, \"Fdb entry not found\");\n \t\terr = -ENOENT;\n@@ -1434,6 +1449,7 @@ static int vxlan_fdb_get(struct sk_buff *skb,\n * and Tunnel endpoint.\n */\n static enum skb_drop_reason vxlan_snoop(struct net_device *dev,\n+\t\t\t\t\tconst struct vxlan_config *cfg,\n \t\t\t\t\tunion vxlan_addr *src_ip,\n \t\t\t\t\tconst u8 *src_mac, u32 src_ifindex,\n \t\t\t\t\t__be32 vni)\n@@ -1452,7 +1468,7 @@ static enum skb_drop_reason vxlan_snoop(struct net_device *dev,\n \t\tifindex = src_ifindex;\n #endif\n \n-\tf = vxlan_find_mac_rcu(vxlan, src_mac, vni);\n+\tf = vxlan_find_mac_rcu(vxlan, cfg, src_mac, vni);\n \tif (likely(f)) {\n \t\tstruct vxlan_rdst *rdst = first_remote_rcu(f);\n \t\tunsigned long now = jiffies;\n@@ -1488,9 +1504,9 @@ static enum skb_drop_reason vxlan_snoop(struct net_device *dev,\n \t\t\tvxlan_fdb_update(vxlan, src_mac, src_ip,\n \t\t\t\t\t NUD_REACHABLE,\n \t\t\t\t\t NLM_F_EXCL|NLM_F_CREATE,\n-\t\t\t\t\t vxlan-\u003ecfg.dst_port,\n+\t\t\t\t\t cfg-\u003edst_port,\n \t\t\t\t\t vni,\n-\t\t\t\t\t vxlan-\u003edefault_dst.remote_vni,\n+\t\t\t\t\t cfg-\u003evni,\n \t\t\t\t\t ifindex, NTF_SELF, 0, true, NULL);\n \t\tspin_unlock(\u0026vxlan-\u003ehash_lock);\n \t}\n@@ -1518,6 +1534,7 @@ static bool __vxlan_sock_release_prep(struct vxlan_sock *vs)\n \n static void vxlan_sock_release(struct vxlan_dev *vxlan)\n {\n+\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n \tstruct vxlan_sock *sock4 = rtnl_dereference(vxlan-\u003evn4_sock);\n #if IS_ENABLED(CONFIG_IPV6)\n \tstruct vxlan_sock *sock6 = rtnl_dereference(vxlan-\u003evn6_sock);\n@@ -1527,7 +1544,7 @@ static void vxlan_sock_release(struct vxlan_dev *vxlan)\n \n \tRCU_INIT_POINTER(vxlan-\u003evn4_sock, NULL);\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER)\n+\tif (cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER)\n \t\tvxlan_vs_del_vnigrp(vxlan);\n \telse\n \t\tvxlan_vs_del_dev(vxlan);\n@@ -1598,6 +1615,7 @@ static void vxlan_parse_gbp_hdr(struct sk_buff *skb, u32 vxflags,\n }\n \n static enum skb_drop_reason vxlan_set_mac(struct vxlan_dev *vxlan,\n+\t\t\t\t\t const struct vxlan_config *cfg,\n \t\t\t\t\t struct vxlan_sock *vs,\n \t\t\t\t\t struct sk_buff *skb, __be32 vni)\n {\n@@ -1623,10 +1641,10 @@ static enum skb_drop_reason vxlan_set_mac(struct vxlan_dev *vxlan,\n #endif\n \t}\n \n-\tif (!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_LEARN))\n+\tif (!(cfg-\u003eflags \u0026 VXLAN_F_LEARN))\n \t\treturn SKB_NOT_DROPPED_YET;\n \n-\treturn vxlan_snoop(skb-\u003edev, \u0026saddr, eth_hdr(skb)-\u003eh_source,\n+\treturn vxlan_snoop(skb-\u003edev, cfg, \u0026saddr, eth_hdr(skb)-\u003eh_source,\n \t\t\t ifindex, vni);\n }\n \n@@ -1657,18 +1675,21 @@ static bool vxlan_ecn_decapsulate(struct vxlan_sock *vs, void *oiph,\n static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)\n {\n \tstruct vxlan_vni_node *vninode = NULL;\n-\tconst struct vxlanhdr *vh;\n-\tstruct vxlan_dev *vxlan;\n-\tstruct vxlan_sock *vs;\n-\tstruct vxlan_metadata _md;\n-\tstruct vxlan_metadata *md = \u0026_md;\n \t__be16 protocol = htons(ETH_P_TEB);\n+\tconst struct vxlan_config *cfg;\n \tenum skb_drop_reason reason;\n+\tconst struct vxlanhdr *vh;\n+\tstruct vxlan_metadata *md;\n+\tstruct vxlan_metadata _md;\n+\tstruct vxlan_dev *vxlan;\n \tbool raw_proto = false;\n-\tvoid *oiph;\n+\tstruct vxlan_sock *vs;\n \t__be32 vni = 0;\n+\tvoid *oiph;\n \tint nh;\n \n+\tmd = \u0026_md;\n+\n \t/* Need UDP and VXLAN header to be present */\n \treason = pskb_may_pull_reason(skb, VXLAN_HLEN);\n \tif (reason)\n@@ -1696,8 +1717,10 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)\n \t\tgoto drop;\n \t}\n \n-\tif (vh-\u003evx_flags \u0026 vxlan-\u003ecfg.reserved_bits.vx_flags ||\n-\t vh-\u003evx_vni \u0026 vxlan-\u003ecfg.reserved_bits.vx_vni) {\n+\tcfg = rcu_dereference(vxlan-\u003ecfg);\n+\n+\tif (vh-\u003evx_flags \u0026 cfg-\u003ereserved_bits.vx_flags ||\n+\t vh-\u003evx_vni \u0026 cfg-\u003ereserved_bits.vx_vni) {\n \t\t/* If the header uses bits besides those enabled by the\n \t\t * netdevice configuration, treat this as a malformed packet.\n \t\t * This behavior diverges from VXLAN RFC (RFC7348) which\n@@ -1709,12 +1732,12 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)\n \t\treason = SKB_DROP_REASON_VXLAN_INVALID_HDR;\n \t\tDEV_STATS_INC(vxlan-\u003edev, rx_frame_errors);\n \t\tDEV_STATS_INC(vxlan-\u003edev, rx_errors);\n-\t\tvxlan_vnifilter_count(vxlan, vni, vninode,\n+\t\tvxlan_vnifilter_count(vxlan, cfg, vni, vninode,\n \t\t\t\t VXLAN_VNI_STATS_RX_ERRORS, 0);\n \t\tgoto drop;\n \t}\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_GPE) {\n+\tif (cfg-\u003eflags \u0026 VXLAN_F_GPE) {\n \t\tif (!vxlan_parse_gpe_proto(vh, \u0026protocol))\n \t\t\tgoto drop;\n \t\traw_proto = true;\n@@ -1726,8 +1749,8 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)\n \t\tgoto drop;\n \t}\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_REMCSUM_RX) {\n-\t\treason = vxlan_remcsum(skb, vxlan-\u003ecfg.flags);\n+\tif (cfg-\u003eflags \u0026 VXLAN_F_REMCSUM_RX) {\n+\t\treason = vxlan_remcsum(skb, cfg-\u003eflags);\n \t\tif (unlikely(reason))\n \t\t\tgoto drop;\n \t}\n@@ -1752,14 +1775,14 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)\n \t\tmemset(md, 0, sizeof(*md));\n \t}\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_GBP)\n-\t\tvxlan_parse_gbp_hdr(skb, vxlan-\u003ecfg.flags, md);\n+\tif (cfg-\u003eflags \u0026 VXLAN_F_GBP)\n+\t\tvxlan_parse_gbp_hdr(skb, cfg-\u003eflags, md);\n \t/* Note that GBP and GPE can never be active together. This is\n \t * ensured in vxlan_dev_configure.\n \t */\n \n \tif (!raw_proto) {\n-\t\treason = vxlan_set_mac(vxlan, vs, skb, vni);\n+\t\treason = vxlan_set_mac(vxlan, cfg, vs, skb, vni);\n \t\tif (reason)\n \t\t\tgoto drop;\n \t} else {\n@@ -1780,7 +1803,7 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)\n \tif (reason) {\n \t\tDEV_STATS_INC(vxlan-\u003edev, rx_length_errors);\n \t\tDEV_STATS_INC(vxlan-\u003edev, rx_errors);\n-\t\tvxlan_vnifilter_count(vxlan, vni, vninode,\n+\t\tvxlan_vnifilter_count(vxlan, cfg, vni, vninode,\n \t\t\t\t VXLAN_VNI_STATS_RX_ERRORS, 0);\n \t\tgoto drop;\n \t}\n@@ -1792,7 +1815,7 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)\n \t\treason = SKB_DROP_REASON_IP_TUNNEL_ECN;\n \t\tDEV_STATS_INC(vxlan-\u003edev, rx_frame_errors);\n \t\tDEV_STATS_INC(vxlan-\u003edev, rx_errors);\n-\t\tvxlan_vnifilter_count(vxlan, vni, vninode,\n+\t\tvxlan_vnifilter_count(vxlan, cfg, vni, vninode,\n \t\t\t\t VXLAN_VNI_STATS_RX_ERRORS, 0);\n \t\tgoto drop;\n \t}\n@@ -1802,14 +1825,15 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)\n \tif (unlikely(!(vxlan-\u003edev-\u003eflags \u0026 IFF_UP))) {\n \t\trcu_read_unlock();\n \t\tdev_dstats_rx_dropped(vxlan-\u003edev);\n-\t\tvxlan_vnifilter_count(vxlan, vni, vninode,\n+\t\tvxlan_vnifilter_count(vxlan, cfg, vni, vninode,\n \t\t\t\t VXLAN_VNI_STATS_RX_DROPS, 0);\n \t\treason = SKB_DROP_REASON_DEV_READY;\n \t\tgoto drop;\n \t}\n \n \tdev_dstats_rx_add(vxlan-\u003edev, skb-\u003elen);\n-\tvxlan_vnifilter_count(vxlan, vni, vninode, VXLAN_VNI_STATS_RX, skb-\u003elen);\n+\tvxlan_vnifilter_count(vxlan, cfg, vni, vninode, VXLAN_VNI_STATS_RX,\n+\t\t\t skb-\u003elen);\n \tgro_cells_receive(\u0026vxlan-\u003egro_cells, skb);\n \n \trcu_read_unlock();\n@@ -1850,7 +1874,8 @@ static int vxlan_err_lookup(struct sock *sk, struct sk_buff *skb)\n \treturn 0;\n }\n \n-static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)\n+static int arp_reduce(struct net_device *dev, struct sk_buff *skb,\n+\t\t const struct vxlan_config *cfg, __be32 vni)\n {\n \tstruct neigh_table *tbl = arp_table(dev_net(dev));\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n@@ -1864,7 +1889,7 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)\n \n \tif (!pskb_network_may_pull(skb, arp_hdr_len(dev))) {\n \t\tdev_dstats_tx_dropped(dev);\n-\t\tvxlan_vnifilter_count(vxlan, vni, NULL,\n+\t\tvxlan_vnifilter_count(vxlan, cfg, vni, NULL,\n \t\t\t\t VXLAN_VNI_STATS_TX_DROPS, 0);\n \t\tgoto out;\n \t}\n@@ -1905,7 +1930,7 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)\n \t\tneigh_ha_snapshot(ha, n, n-\u003edev);\n \n \t\trcu_read_lock();\n-\t\tf = vxlan_find_mac_tx(vxlan, ha, vni);\n+\t\tf = vxlan_find_mac_tx(vxlan, cfg, ha, vni);\n \t\tif (f)\n \t\t\trdst = first_remote_rcu(f);\n \t\tif (rdst \u0026\u0026 vxlan_addr_any(\u0026rdst-\u003eremote_ip)) {\n@@ -1931,11 +1956,11 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)\n \n \t\tif (netif_rx(reply) == NET_RX_DROP) {\n \t\t\tdev_dstats_rx_dropped(dev);\n-\t\t\tvxlan_vnifilter_count(vxlan, vni, NULL,\n+\t\t\tvxlan_vnifilter_count(vxlan, cfg, vni, NULL,\n \t\t\t\t\t VXLAN_VNI_STATS_RX_DROPS, 0);\n \t\t}\n \n-\t} else if (vxlan-\u003ecfg.flags \u0026 VXLAN_F_L3MISS) {\n+\t} else if (cfg-\u003eflags \u0026 VXLAN_F_L3MISS) {\n \t\tunion vxlan_addr ipa = {\n \t\t\t.sin.sin_addr.s_addr = tip,\n \t\t\t.sin.sin_family = AF_INET,\n@@ -2043,7 +2068,8 @@ static struct sk_buff *vxlan_na_create(struct sk_buff *request,\n \treturn reply;\n }\n \n-static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)\n+static int neigh_reduce(struct net_device *dev, struct sk_buff *skb,\n+\t\t\tconst struct vxlan_config *cfg, __be32 vni)\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n \tconst struct in6_addr *daddr;\n@@ -2077,7 +2103,7 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)\n \t\t}\n \n \t\tneigh_ha_snapshot(ha, n, n-\u003edev);\n-\t\tf = vxlan_find_mac_tx(vxlan, ha, vni);\n+\t\tf = vxlan_find_mac_tx(vxlan, cfg, ha, vni);\n \t\tif (f)\n \t\t\trdst = first_remote_rcu(f);\n \t\tif (rdst \u0026\u0026 vxlan_addr_any(\u0026rdst-\u003eremote_ip)) {\n@@ -2096,10 +2122,10 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)\n \n \t\tif (netif_rx(reply) == NET_RX_DROP) {\n \t\t\tdev_dstats_rx_dropped(dev);\n-\t\t\tvxlan_vnifilter_count(vxlan, vni, NULL,\n+\t\t\tvxlan_vnifilter_count(vxlan, cfg, vni, NULL,\n \t\t\t\t\t VXLAN_VNI_STATS_RX_DROPS, 0);\n \t\t}\n-\t} else if (vxlan-\u003ecfg.flags \u0026 VXLAN_F_L3MISS) {\n+\t} else if (cfg-\u003eflags \u0026 VXLAN_F_L3MISS) {\n \t\tunion vxlan_addr ipa = {\n \t\t\t.sin6.sin6_addr = msg-\u003etarget,\n \t\t\t.sin6.sin6_family = AF_INET6,\n@@ -2115,9 +2141,9 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)\n }\n #endif\n \n-static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)\n+static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb,\n+\t\t\t const struct vxlan_config *cfg)\n {\n-\tstruct vxlan_dev *vxlan = netdev_priv(dev);\n \tstruct neigh_table *tbl;\n \tstruct neighbour *n;\n \n@@ -2136,7 +2162,7 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)\n \t\ttbl = arp_table(dev_net(dev));\n \t\tpip = ip_hdr(skb);\n \t\tn = neigh_lookup(tbl, \u0026pip-\u003edaddr, dev);\n-\t\tif (!n \u0026\u0026 (vxlan-\u003ecfg.flags \u0026 VXLAN_F_L3MISS)) {\n+\t\tif (!n \u0026\u0026 (cfg-\u003eflags \u0026 VXLAN_F_L3MISS)) {\n \t\t\tunion vxlan_addr ipa = {\n \t\t\t\t.sin.sin_addr.s_addr = pip-\u003edaddr,\n \t\t\t\t.sin.sin_family = AF_INET,\n@@ -2164,7 +2190,7 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)\n \t\ttbl = nd_table(dev_net(dev));\n \t\tpip6 = ipv6_hdr(skb);\n \t\tn = neigh_lookup(tbl, \u0026pip6-\u003edaddr, dev);\n-\t\tif (!n \u0026\u0026 (vxlan-\u003ecfg.flags \u0026 VXLAN_F_L3MISS)) {\n+\t\tif (!n \u0026\u0026 (cfg-\u003eflags \u0026 VXLAN_F_L3MISS)) {\n \t\t\tunion vxlan_addr ipa = {\n \t\t\t\t.sin6.sin6_addr = pip6-\u003edaddr,\n \t\t\t\t.sin6.sin6_family = AF_INET6,\n@@ -2282,20 +2308,28 @@ static int vxlan_build_skb(struct sk_buff *skb, struct dst_entry *dst,\n \n /* Bypass encapsulation if the destination is local */\n static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,\n-\t\t\t struct vxlan_dev *dst_vxlan, __be32 vni,\n-\t\t\t bool snoop)\n+\t\t\t struct vxlan_dev *dst_vxlan,\n+\t\t\t const struct vxlan_config *src_cfg,\n+\t\t\t __be32 vni, bool snoop)\n {\n+\tconst struct vxlan_config *dst_cfg;\n \tunion vxlan_addr loopback;\n-\tunion vxlan_addr *remote_ip = \u0026dst_vxlan-\u003edefault_dst.remote_ip;\n \tunsigned int len = skb-\u003elen;\n-\tstruct net_device *dev;\n+\tstruct net_device *dev = dst_vxlan-\u003edev;\n \n \tskb-\u003epkt_type = PACKET_HOST;\n \tskb-\u003eencapsulation = 0;\n-\tskb-\u003edev = dst_vxlan-\u003edev;\n+\tskb-\u003edev = dev;\n \t__skb_pull(skb, skb_network_offset(skb));\n \n-\tif (remote_ip-\u003esa.sa_family == AF_INET) {\n+\trcu_read_lock();\n+\tdst_cfg = rcu_dereference(dst_vxlan-\u003ecfg);\n+\tif (unlikely(!(dev-\u003eflags \u0026 IFF_UP))) {\n+\t\tkfree_skb_reason(skb, SKB_DROP_REASON_DEV_READY);\n+\t\tgoto drop;\n+\t}\n+\n+\tif (dst_cfg-\u003eremote_ip.sa.sa_family == AF_INET) {\n \t\tloopback.sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);\n \t\tloopback.sa.sa_family = AF_INET;\n #if IS_ENABLED(CONFIG_IPV6)\n@@ -2305,27 +2339,20 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,\n #endif\n \t}\n \n-\trcu_read_lock();\n-\tdev = skb-\u003edev;\n-\tif (unlikely(!(dev-\u003eflags \u0026 IFF_UP))) {\n-\t\tkfree_skb_reason(skb, SKB_DROP_REASON_DEV_READY);\n-\t\tgoto drop;\n-\t}\n-\n-\tif ((dst_vxlan-\u003ecfg.flags \u0026 VXLAN_F_LEARN) \u0026\u0026 snoop)\n-\t\tvxlan_snoop(dev, \u0026loopback, eth_hdr(skb)-\u003eh_source, 0, vni);\n+\tif ((dst_cfg-\u003eflags \u0026 VXLAN_F_LEARN) \u0026\u0026 snoop)\n+\t\tvxlan_snoop(dev, dst_cfg, \u0026loopback, eth_hdr(skb)-\u003eh_source, 0, vni);\n \n \tdev_dstats_tx_add(src_vxlan-\u003edev, len);\n-\tvxlan_vnifilter_count(src_vxlan, vni, NULL, VXLAN_VNI_STATS_TX, len);\n+\tvxlan_vnifilter_count(src_vxlan, src_cfg, vni, NULL, VXLAN_VNI_STATS_TX, len);\n \n \tif (__netif_rx(skb) == NET_RX_SUCCESS) {\n \t\tdev_dstats_rx_add(dst_vxlan-\u003edev, len);\n-\t\tvxlan_vnifilter_count(dst_vxlan, vni, NULL, VXLAN_VNI_STATS_RX,\n+\t\tvxlan_vnifilter_count(dst_vxlan, dst_cfg, vni, NULL, VXLAN_VNI_STATS_RX,\n \t\t\t\t len);\n \t} else {\n drop:\n \t\tdev_dstats_rx_dropped(dev);\n-\t\tvxlan_vnifilter_count(dst_vxlan, vni, NULL,\n+\t\tvxlan_vnifilter_count(dst_vxlan, dst_cfg, vni, NULL,\n \t\t\t\t VXLAN_VNI_STATS_RX_DROPS, 0);\n \t}\n \trcu_read_unlock();\n@@ -2333,6 +2360,7 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,\n \n static int encap_bypass_if_local(struct sk_buff *skb, struct net_device *dev,\n \t\t\t\t struct vxlan_dev *vxlan,\n+\t\t\t\t const struct vxlan_config *cfg,\n \t\t\t\t int addr_family,\n \t\t\t\t __be16 dst_port, int dst_ifindex, __be32 vni,\n \t\t\t\t struct dst_entry *dst,\n@@ -2348,22 +2376,22 @@ static int encap_bypass_if_local(struct sk_buff *skb, struct net_device *dev,\n \t/* Bypass encapsulation if the destination is local */\n \tif (rt_flags \u0026 RTCF_LOCAL \u0026\u0026\n \t !(rt_flags \u0026 (RTCF_BROADCAST | RTCF_MULTICAST)) \u0026\u0026\n-\t vxlan-\u003ecfg.flags \u0026 VXLAN_F_LOCALBYPASS) {\n+\t cfg-\u003eflags \u0026 VXLAN_F_LOCALBYPASS) {\n \t\tstruct vxlan_dev *dst_vxlan;\n \n \t\tdst_release(dst);\n \t\tdst_vxlan = vxlan_find_vni(vxlan-\u003enet, dst_ifindex, vni,\n \t\t\t\t\t addr_family, dst_port,\n-\t\t\t\t\t vxlan-\u003ecfg.flags);\n+\t\t\t\t\t cfg-\u003eflags);\n \t\tif (!dst_vxlan) {\n \t\t\tDEV_STATS_INC(dev, tx_errors);\n-\t\t\tvxlan_vnifilter_count(vxlan, vni, NULL,\n+\t\t\tvxlan_vnifilter_count(vxlan, cfg, vni, NULL,\n \t\t\t\t\t VXLAN_VNI_STATS_TX_ERRORS, 0);\n \t\t\tkfree_skb_reason(skb, SKB_DROP_REASON_VXLAN_VNI_NOT_FOUND);\n \n \t\t\treturn -ENOENT;\n \t\t}\n-\t\tvxlan_encap_bypass(skb, vxlan, dst_vxlan, vni, true);\n+\t\tvxlan_encap_bypass(skb, vxlan, dst_vxlan, cfg, vni, true);\n \t\treturn 1;\n \t}\n \n@@ -2371,30 +2399,35 @@ static int encap_bypass_if_local(struct sk_buff *skb, struct net_device *dev,\n }\n \n void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n+\t\t const struct vxlan_config *cfg,\n \t\t __be32 default_vni, struct vxlan_rdst *rdst, bool did_rsc)\n {\n+\tunsigned int pkt_len = skb-\u003elen;\n+\tstruct vxlan_metadata _md = {};\n+\t__be16 src_port = 0, dst_port;\n+\tstruct dst_entry *ndst = NULL;\n+\tenum skb_drop_reason reason;\n \tstruct dst_cache *dst_cache;\n+\tconst struct iphdr *old_iph;\n \tstruct ip_tunnel_info *info;\n \tstruct ip_tunnel_key *pkey;\n+\tstruct vxlan_metadata *md;\n \tstruct ip_tunnel_key key;\n-\tstruct vxlan_dev *vxlan = netdev_priv(dev);\n-\tconst struct iphdr *old_iph;\n-\tstruct vxlan_metadata _md = {};\n-\tstruct vxlan_metadata *md = \u0026_md;\n-\tunsigned int pkt_len = skb-\u003elen;\n-\t__be16 src_port = 0, dst_port;\n-\tstruct dst_entry *ndst = NULL;\n+\tstruct vxlan_dev *vxlan;\n+\tu32 flags = cfg-\u003eflags;\n+\tbool udp_sum = false;\n+\tbool no_eth_encap;\n \tint addr_family;\n+\tbool use_cache;\n+\t__be32 vni = 0;\n \t__u8 tos, ttl;\n \tint ifindex;\n \tint err = 0;\n-\tu32 flags = vxlan-\u003ecfg.flags;\n-\tbool use_cache;\n-\tbool udp_sum = false;\n-\tbool xnet = !net_eq(vxlan-\u003enet, dev_net(vxlan-\u003edev));\n-\tenum skb_drop_reason reason;\n-\tbool no_eth_encap;\n-\t__be32 vni = 0;\n+\tbool xnet;\n+\n+\tvxlan = netdev_priv(dev);\n+\txnet = !net_eq(vxlan-\u003enet, dev_net(vxlan-\u003edev));\n+\tmd = \u0026_md;\n \n \tno_eth_encap = flags \u0026 VXLAN_F_GPE \u0026\u0026 skb-\u003eprotocol != htons(ETH_P_TEB);\n \treason = skb_vlan_inet_prepare(skb, no_eth_encap);\n@@ -2414,23 +2447,23 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n \t\tif (vxlan_addr_any(\u0026rdst-\u003eremote_ip)) {\n \t\t\tif (did_rsc) {\n \t\t\t\t/* short-circuited back to local bridge */\n-\t\t\t\tvxlan_encap_bypass(skb, vxlan, vxlan,\n+\t\t\t\tvxlan_encap_bypass(skb, vxlan, vxlan, cfg,\n \t\t\t\t\t\t default_vni, true);\n \t\t\t\treturn;\n \t\t\t}\n \t\t\tgoto drop;\n \t\t}\n \n-\t\taddr_family = vxlan-\u003ecfg.saddr.sa.sa_family;\n-\t\tdst_port = rdst-\u003eremote_port ? rdst-\u003eremote_port : vxlan-\u003ecfg.dst_port;\n+\t\taddr_family = cfg-\u003esaddr.sa.sa_family;\n+\t\tdst_port = rdst-\u003eremote_port ? rdst-\u003eremote_port : cfg-\u003edst_port;\n \t\tvni = (rdst-\u003eremote_vni) ? : default_vni;\n \t\tifindex = rdst-\u003eremote_ifindex;\n \n \t\tif (addr_family == AF_INET) {\n-\t\t\tkey.u.ipv4.src = vxlan-\u003ecfg.saddr.sin.sin_addr.s_addr;\n+\t\t\tkey.u.ipv4.src = cfg-\u003esaddr.sin.sin_addr.s_addr;\n \t\t\tkey.u.ipv4.dst = rdst-\u003eremote_ip.sin.sin_addr.s_addr;\n \t\t} else {\n-\t\t\tkey.u.ipv6.src = vxlan-\u003ecfg.saddr.sin6.sin6_addr;\n+\t\t\tkey.u.ipv6.src = cfg-\u003esaddr.sin6.sin6_addr;\n \t\t\tkey.u.ipv6.dst = rdst-\u003eremote_ip.sin6.sin6_addr;\n \t\t}\n \n@@ -2439,11 +2472,11 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n \t\tif (flags \u0026 VXLAN_F_TTL_INHERIT) {\n \t\t\tttl = ip_tunnel_get_ttl(old_iph, skb);\n \t\t} else {\n-\t\t\tttl = vxlan-\u003ecfg.ttl;\n+\t\t\tttl = cfg-\u003ettl;\n \t\t\tif (!ttl \u0026\u0026 vxlan_addr_multicast(\u0026rdst-\u003eremote_ip))\n \t\t\t\tttl = 1;\n \t\t}\n-\t\ttos = vxlan-\u003ecfg.tos;\n+\t\ttos = cfg-\u003etos;\n \t\tif (tos == 1)\n \t\t\ttos = ip_tunnel_get_dsfield(old_iph, skb);\n \t\tif (tos \u0026\u0026 !info)\n@@ -2454,9 +2487,9 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n \t\telse\n \t\t\tudp_sum = !(flags \u0026 VXLAN_F_UDP_ZERO_CSUM6_TX);\n #if IS_ENABLED(CONFIG_IPV6)\n-\t\tswitch (vxlan-\u003ecfg.label_policy) {\n+\t\tswitch (cfg-\u003elabel_policy) {\n \t\tcase VXLAN_LABEL_FIXED:\n-\t\t\tkey.label = vxlan-\u003ecfg.label;\n+\t\t\tkey.label = cfg-\u003elabel;\n \t\t\tbreak;\n \t\tcase VXLAN_LABEL_INHERIT:\n \t\t\tkey.label = ip_tunnel_get_flowlabel(old_iph, skb);\n@@ -2474,7 +2507,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n \t\t}\n \t\tpkey = \u0026info-\u003ekey;\n \t\taddr_family = ip_tunnel_info_af(info);\n-\t\tdst_port = info-\u003ekey.tp_dst ? : vxlan-\u003ecfg.dst_port;\n+\t\tdst_port = info-\u003ekey.tp_dst ? : cfg-\u003edst_port;\n \t\tvni = tunnel_id_to_key32(info-\u003ekey.tun_id);\n \t\tifindex = 0;\n \t\tdst_cache = \u0026info-\u003edst_cache;\n@@ -2487,8 +2520,8 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n \t\ttos = info-\u003ekey.tos;\n \t\tudp_sum = test_bit(IP_TUNNEL_CSUM_BIT, info-\u003ekey.tun_flags);\n \t}\n-\tsrc_port = udp_flow_src_port(dev_net(dev), skb, vxlan-\u003ecfg.port_min,\n-\t\t\t\t vxlan-\u003ecfg.port_max, true);\n+\tsrc_port = udp_flow_src_port(dev_net(dev), skb, cfg-\u003eport_min,\n+\t\t\t\t cfg-\u003eport_max, true);\n \n \trcu_read_lock();\n \tif (addr_family == AF_INET) {\n@@ -2521,15 +2554,15 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n \n \t\tif (!info) {\n \t\t\t/* Bypass encapsulation if the destination is local */\n-\t\t\terr = encap_bypass_if_local(skb, dev, vxlan, AF_INET,\n+\t\t\terr = encap_bypass_if_local(skb, dev, vxlan, cfg, AF_INET,\n \t\t\t\t\t\t dst_port, ifindex, vni,\n \t\t\t\t\t\t \u0026rt-\u003edst, rt-\u003ert_flags);\n \t\t\tif (err)\n \t\t\t\tgoto out_unlock;\n \n-\t\t\tif (vxlan-\u003ecfg.df == VXLAN_DF_SET) {\n+\t\t\tif (cfg-\u003edf == VXLAN_DF_SET) {\n \t\t\t\tdf = htons(IP_DF);\n-\t\t\t} else if (vxlan-\u003ecfg.df == VXLAN_DF_INHERIT) {\n+\t\t\t} else if (cfg-\u003edf == VXLAN_DF_INHERIT) {\n \t\t\t\tstruct ethhdr *eth = eth_hdr(skb);\n \n \t\t\t\tif (ntohs(eth-\u003eh_proto) == ETH_P_IPV6 ||\n@@ -2558,7 +2591,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n \t\t\t\tunclone-\u003ekey.u.ipv4.src = pkey-\u003eu.ipv4.dst;\n \t\t\t\tunclone-\u003ekey.u.ipv4.dst = saddr;\n \t\t\t}\n-\t\t\tvxlan_encap_bypass(skb, vxlan, vxlan, vni, false);\n+\t\t\tvxlan_encap_bypass(skb, vxlan, vxlan, cfg, vni, false);\n \t\t\tdst_release(ndst);\n \t\t\tgoto out_unlock;\n \t\t}\n@@ -2608,7 +2641,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n \t\tif (!info) {\n \t\t\tu32 rt6i_flags = dst_rt6_info(ndst)-\u003ert6i_flags;\n \n-\t\t\terr = encap_bypass_if_local(skb, dev, vxlan, AF_INET6,\n+\t\t\terr = encap_bypass_if_local(skb, dev, vxlan, cfg, AF_INET6,\n \t\t\t\t\t\t dst_port, ifindex, vni,\n \t\t\t\t\t\t ndst, rt6i_flags);\n \t\t\tif (err)\n@@ -2632,7 +2665,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n \t\t\t\tunclone-\u003ekey.u.ipv6.dst = saddr;\n \t\t\t}\n \n-\t\t\tvxlan_encap_bypass(skb, vxlan, vxlan, vni, false);\n+\t\t\tvxlan_encap_bypass(skb, vxlan, vxlan, cfg, vni, false);\n \t\t\tdst_release(ndst);\n \t\t\tgoto out_unlock;\n \t\t}\n@@ -2653,14 +2686,14 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n \t\t\t\t ip6cb_flags);\n #endif\n \t}\n-\tvxlan_vnifilter_count(vxlan, vni, NULL, VXLAN_VNI_STATS_TX, pkt_len);\n+\tvxlan_vnifilter_count(vxlan, cfg, vni, NULL, VXLAN_VNI_STATS_TX, pkt_len);\n out_unlock:\n \trcu_read_unlock();\n \treturn;\n \n drop:\n \tdev_dstats_tx_dropped(dev);\n-\tvxlan_vnifilter_count(vxlan, vni, NULL, VXLAN_VNI_STATS_TX_DROPS, 0);\n+\tvxlan_vnifilter_count(vxlan, cfg, vni, NULL, VXLAN_VNI_STATS_TX_DROPS, 0);\n \tkfree_skb_reason(skb, reason);\n \treturn;\n \n@@ -2672,11 +2705,12 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n \t\tDEV_STATS_INC(dev, tx_carrier_errors);\n \tdst_release(ndst);\n \tDEV_STATS_INC(dev, tx_errors);\n-\tvxlan_vnifilter_count(vxlan, vni, NULL, VXLAN_VNI_STATS_TX_ERRORS, 0);\n+\tvxlan_vnifilter_count(vxlan, cfg, vni, NULL, VXLAN_VNI_STATS_TX_ERRORS, 0);\n \tkfree_skb_reason(skb, reason);\n }\n \n static void vxlan_xmit_nh(struct sk_buff *skb, struct net_device *dev,\n+\t\t\t const struct vxlan_config *cfg,\n \t\t\t struct vxlan_fdb *f, __be32 vni, bool did_rsc)\n {\n \tstruct vxlan_rdst nh_rdst;\n@@ -2693,7 +2727,7 @@ static void vxlan_xmit_nh(struct sk_buff *skb, struct net_device *dev,\n \tdo_xmit = vxlan_fdb_nh_path_select(nh, hash, \u0026nh_rdst);\n \n \tif (likely(do_xmit))\n-\t\tvxlan_xmit_one(skb, dev, vni, \u0026nh_rdst, did_rsc);\n+\t\tvxlan_xmit_one(skb, dev, cfg, vni, \u0026nh_rdst, did_rsc);\n \telse\n \t\tgoto drop;\n \n@@ -2701,15 +2735,15 @@ static void vxlan_xmit_nh(struct sk_buff *skb, struct net_device *dev,\n \n drop:\n \tdev_dstats_tx_dropped(dev);\n-\tvxlan_vnifilter_count(netdev_priv(dev), vni, NULL,\n+\tvxlan_vnifilter_count(netdev_priv(dev), cfg, vni, NULL,\n \t\t\t VXLAN_VNI_STATS_TX_DROPS, 0);\n \tdev_kfree_skb(skb);\n }\n \n static netdev_tx_t vxlan_xmit_nhid(struct sk_buff *skb, struct net_device *dev,\n-\t\t\t\t u32 nhid, __be32 vni)\n+\t\t\t\t u32 nhid, __be32 vni,\n+\t\t\t\t const struct vxlan_config *cfg)\n {\n-\tstruct vxlan_dev *vxlan = netdev_priv(dev);\n \tstruct vxlan_rdst nh_rdst;\n \tstruct nexthop *nh;\n \tbool do_xmit;\n@@ -2727,11 +2761,11 @@ static netdev_tx_t vxlan_xmit_nhid(struct sk_buff *skb, struct net_device *dev,\n \tdo_xmit = vxlan_fdb_nh_path_select(nh, hash, \u0026nh_rdst);\n \trcu_read_unlock();\n \n-\tif (vxlan-\u003ecfg.saddr.sa.sa_family != nh_rdst.remote_ip.sa.sa_family)\n+\tif (cfg-\u003esaddr.sa.sa_family != nh_rdst.remote_ip.sa.sa_family)\n \t\tgoto drop;\n \n \tif (likely(do_xmit))\n-\t\tvxlan_xmit_one(skb, dev, vni, \u0026nh_rdst, false);\n+\t\tvxlan_xmit_one(skb, dev, cfg, vni, \u0026nh_rdst, false);\n \telse\n \t\tgoto drop;\n \n@@ -2739,7 +2773,7 @@ static netdev_tx_t vxlan_xmit_nhid(struct sk_buff *skb, struct net_device *dev,\n \n drop:\n \tdev_dstats_tx_dropped(dev);\n-\tvxlan_vnifilter_count(netdev_priv(dev), vni, NULL,\n+\tvxlan_vnifilter_count(netdev_priv(dev), cfg, vni, NULL,\n \t\t\t VXLAN_VNI_STATS_TX_DROPS, 0);\n \tdev_kfree_skb(skb);\n \treturn NETDEV_TX_OK;\n@@ -2756,34 +2790,47 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n \tstruct vxlan_rdst *rdst, *fdst = NULL;\n \tconst struct ip_tunnel_info *info;\n+\tconst struct vxlan_config *cfg;\n+\t__be32 default_vni;\n \tstruct vxlan_fdb *f;\n \tstruct ethhdr *eth;\n \t__be32 vni = 0;\n-\tu32 nhid = 0;\n \tbool did_rsc;\n+\tu32 nhid = 0;\n+\tu32 flags;\n+\n+\trcu_read_lock();\n+\tcfg = rcu_dereference(vxlan-\u003ecfg);\n+\tflags = cfg-\u003eflags;\n+\tdefault_vni = cfg-\u003evni;\n \n \tinfo = skb_tunnel_info(skb);\n \n \tskb_reset_mac_header(skb);\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_COLLECT_METADATA) {\n+\tif (flags \u0026 VXLAN_F_COLLECT_METADATA) {\n \t\tif (info \u0026\u0026 info-\u003emode \u0026 IP_TUNNEL_INFO_BRIDGE \u0026\u0026\n \t\t info-\u003emode \u0026 IP_TUNNEL_INFO_TX) {\n \t\t\tvni = tunnel_id_to_key32(info-\u003ekey.tun_id);\n \t\t\tnhid = info-\u003ekey.nhid;\n \t\t} else {\n \t\t\tif (info \u0026\u0026 info-\u003emode \u0026 IP_TUNNEL_INFO_TX)\n-\t\t\t\tvxlan_xmit_one(skb, dev, vni, NULL, false);\n+\t\t\t\tvxlan_xmit_one(skb, dev, cfg, vni, NULL, false);\n \t\t\telse\n \t\t\t\tkfree_skb_reason(skb, SKB_DROP_REASON_TUNNEL_TXINFO);\n+\t\t\trcu_read_unlock();\n \t\t\treturn NETDEV_TX_OK;\n \t\t}\n \t}\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_PROXY) {\n+\tif (flags \u0026 VXLAN_F_PROXY) {\n \t\teth = eth_hdr(skb);\n-\t\tif (ntohs(eth-\u003eh_proto) == ETH_P_ARP)\n-\t\t\treturn arp_reduce(dev, skb, vni);\n+\t\tif (ntohs(eth-\u003eh_proto) == ETH_P_ARP) {\n+\t\t\tnetdev_tx_t res = arp_reduce(dev, skb, cfg, vni);\n+\n+\t\t\trcu_read_unlock();\n+\t\t\treturn res;\n+\t\t}\n #if IS_ENABLED(CONFIG_IPV6)\n \t\telse if (ntohs(eth-\u003eh_proto) == ETH_P_IPV6 \u0026\u0026\n \t\t\t pskb_network_may_pull(skb, sizeof(struct ipv6hdr) +\n@@ -2792,53 +2839,57 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)\n \t\t\tstruct nd_msg *m = (struct nd_msg *)(ipv6_hdr(skb) + 1);\n \n \t\t\tif (m-\u003eicmph.icmp6_code == 0 \u0026\u0026\n-\t\t\t m-\u003eicmph.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION)\n-\t\t\t\treturn neigh_reduce(dev, skb, vni);\n+\t\t\t m-\u003eicmph.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION) {\n+\t\t\t\tnetdev_tx_t res = neigh_reduce(dev, skb, cfg, vni);\n+\n+\t\t\t\trcu_read_unlock();\n+\t\t\t\treturn res;\n+\t\t\t}\n \t\t}\n #endif\n \t}\n \n-\tif (nhid)\n-\t\treturn vxlan_xmit_nhid(skb, dev, nhid, vni);\n+\tif (nhid) {\n+\t\tnetdev_tx_t res = vxlan_xmit_nhid(skb, dev, nhid, vni, cfg);\n+\n+\t\trcu_read_unlock();\n+\t\treturn res;\n+\t}\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_MDB) {\n+\tif (test_bit(VXLAN_DEV_F_MDB, \u0026vxlan-\u003eflags)) {\n \t\tstruct vxlan_mdb_entry *mdb_entry;\n \n-\t\trcu_read_lock();\n-\t\tmdb_entry = vxlan_mdb_entry_skb_get(vxlan, skb, vni);\n+\t\tmdb_entry = vxlan_mdb_entry_skb_get(vxlan, cfg, skb, vni);\n \t\tif (mdb_entry) {\n-\t\t\tnetdev_tx_t ret;\n+\t\t\tnetdev_tx_t ret = vxlan_mdb_xmit(vxlan, cfg, mdb_entry, skb);\n \n-\t\t\tret = vxlan_mdb_xmit(vxlan, mdb_entry, skb);\n \t\t\trcu_read_unlock();\n \t\t\treturn ret;\n \t\t}\n-\t\trcu_read_unlock();\n \t}\n \n \teth = eth_hdr(skb);\n-\trcu_read_lock();\n-\tf = vxlan_find_mac_tx(vxlan, eth-\u003eh_dest, vni);\n+\tf = vxlan_find_mac_tx(vxlan, cfg, eth-\u003eh_dest, vni);\n \tdid_rsc = false;\n \n-\tif (f \u0026\u0026 (f-\u003eflags \u0026 NTF_ROUTER) \u0026\u0026 (vxlan-\u003ecfg.flags \u0026 VXLAN_F_RSC) \u0026\u0026\n+\tif (f \u0026\u0026 (f-\u003eflags \u0026 NTF_ROUTER) \u0026\u0026 (flags \u0026 VXLAN_F_RSC) \u0026\u0026\n \t (ntohs(eth-\u003eh_proto) == ETH_P_IP ||\n \t ntohs(eth-\u003eh_proto) == ETH_P_IPV6)) {\n-\t\tdid_rsc = route_shortcircuit(dev, skb);\n+\t\tdid_rsc = route_shortcircuit(dev, skb, cfg);\n \t\teth = eth_hdr(skb);\n \t\tif (did_rsc)\n-\t\t\tf = vxlan_find_mac_tx(vxlan, eth-\u003eh_dest, vni);\n+\t\t\tf = vxlan_find_mac_tx(vxlan, cfg, eth-\u003eh_dest, vni);\n \t}\n \n \tif (f == NULL) {\n-\t\tf = vxlan_find_mac_tx(vxlan, all_zeros_mac, vni);\n+\t\tf = vxlan_find_mac_tx(vxlan, cfg, all_zeros_mac, vni);\n \t\tif (f == NULL) {\n-\t\t\tif ((vxlan-\u003ecfg.flags \u0026 VXLAN_F_L2MISS) \u0026\u0026\n+\t\t\tif ((flags \u0026 VXLAN_F_L2MISS) \u0026\u0026\n \t\t\t !is_multicast_ether_addr(eth-\u003eh_dest))\n \t\t\t\tvxlan_fdb_miss(vxlan, eth-\u003eh_dest);\n \n \t\t\tdev_dstats_tx_dropped(dev);\n-\t\t\tvxlan_vnifilter_count(vxlan, vni, NULL,\n+\t\t\tvxlan_vnifilter_count(vxlan, cfg, vni, NULL,\n \t\t\t\t\t VXLAN_VNI_STATS_TX_DROPS, 0);\n \t\t\tkfree_skb_reason(skb, SKB_DROP_REASON_NO_TX_TARGET);\n \t\t\tgoto out;\n@@ -2846,8 +2897,8 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)\n \t}\n \n \tif (rcu_access_pointer(f-\u003enh)) {\n-\t\tvxlan_xmit_nh(skb, dev, f,\n-\t\t\t (vni ? : vxlan-\u003edefault_dst.remote_vni), did_rsc);\n+\t\tvxlan_xmit_nh(skb, dev, cfg, f,\n+\t\t\t (vni ? : default_vni), did_rsc);\n \t} else {\n \t\tlist_for_each_entry_rcu(rdst, \u0026f-\u003eremotes, list) {\n \t\t\tstruct sk_buff *skb1;\n@@ -2858,10 +2909,10 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)\n \t\t\t}\n \t\t\tskb1 = skb_clone(skb, GFP_ATOMIC);\n \t\t\tif (skb1)\n-\t\t\t\tvxlan_xmit_one(skb1, dev, vni, rdst, did_rsc);\n+\t\t\t\tvxlan_xmit_one(skb1, dev, cfg, vni, rdst, did_rsc);\n \t\t}\n \t\tif (fdst)\n-\t\t\tvxlan_xmit_one(skb, dev, vni, fdst, did_rsc);\n+\t\t\tvxlan_xmit_one(skb, dev, cfg, vni, fdst, did_rsc);\n \t\telse\n \t\t\tkfree_skb_reason(skb, SKB_DROP_REASON_NO_TX_TARGET);\n \t}\n@@ -2876,12 +2927,15 @@ static void vxlan_cleanup(struct timer_list *t)\n {\n \tstruct vxlan_dev *vxlan = timer_container_of(vxlan, t, age_timer);\n \tunsigned long next_timer = jiffies + FDB_AGE_INTERVAL;\n+\tconst struct vxlan_config *cfg;\n \tstruct vxlan_fdb *f;\n \n \tif (!netif_running(vxlan-\u003edev))\n \t\treturn;\n \n \trcu_read_lock();\n+\tcfg = rcu_dereference(vxlan-\u003ecfg);\n+\n \thlist_for_each_entry_rcu(f, \u0026vxlan-\u003efdb_list, fdb_node) {\n \t\tunsigned long timeout;\n \n@@ -2891,7 +2945,7 @@ static void vxlan_cleanup(struct timer_list *t)\n \t\tif (f-\u003eflags \u0026 NTF_EXT_LEARNED)\n \t\t\tcontinue;\n \n-\t\ttimeout = READ_ONCE(f-\u003eupdated) + vxlan-\u003ecfg.age_interval * HZ;\n+\t\ttimeout = READ_ONCE(f-\u003eupdated) + cfg-\u003eage_interval * HZ;\n \t\tif (time_before_eq(timeout, jiffies)) {\n \t\t\tspin_lock(\u0026vxlan-\u003ehash_lock);\n \t\t\tif (!hlist_unhashed(\u0026f-\u003efdb_node)) {\n@@ -2923,10 +2977,14 @@ static void vxlan_vs_del_dev(struct vxlan_dev *vxlan)\n static void vxlan_vs_add_dev(struct vxlan_sock *vs, struct vxlan_dev *vxlan,\n \t\t\t struct vxlan_dev_node *node)\n {\n-\t__be32 vni = vxlan-\u003edefault_dst.remote_vni;\n+\tconst struct vxlan_config *cfg;\n+\t__be32 vni;\n \n \tASSERT_RTNL();\n \n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tvni = cfg-\u003evni;\n+\n \tnode-\u003evxlan = vxlan;\n \thlist_add_head_rcu(\u0026node-\u003ehlist, vni_head(vs, vni));\n }\n@@ -2935,13 +2993,16 @@ static void vxlan_vs_add_dev(struct vxlan_sock *vs, struct vxlan_dev *vxlan,\n static int vxlan_init(struct net_device *dev)\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n+\tconst struct vxlan_config *cfg;\n \tint err;\n \n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\n \terr = rhashtable_init(\u0026vxlan-\u003efdb_hash_tbl, \u0026vxlan_fdb_rht_params);\n \tif (err)\n \t\treturn err;\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER) {\n+\tif (cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER) {\n \t\terr = vxlan_vnigroup_init(vxlan);\n \t\tif (err)\n \t\t\tgoto err_rhashtable_destroy;\n@@ -2961,7 +3022,7 @@ static int vxlan_init(struct net_device *dev)\n err_gro_cells_destroy:\n \tgro_cells_destroy(\u0026vxlan-\u003egro_cells);\n err_vnigroup_uninit:\n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER)\n+\tif (cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER)\n \t\tvxlan_vnigroup_uninit(vxlan);\n err_rhashtable_destroy:\n \trhashtable_destroy(\u0026vxlan-\u003efdb_hash_tbl);\n@@ -2971,10 +3032,13 @@ static int vxlan_init(struct net_device *dev)\n static void vxlan_uninit(struct net_device *dev)\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n+\tconst struct vxlan_config *cfg;\n+\n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n \n \tvxlan_mdb_fini(vxlan);\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER)\n+\tif (cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER)\n \t\tvxlan_vnigroup_uninit(vxlan);\n \n \tgro_cells_destroy(\u0026vxlan-\u003egro_cells);\n@@ -2986,6 +3050,7 @@ static void vxlan_uninit(struct net_device *dev)\n static int vxlan_open(struct net_device *dev)\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n+\tconst struct vxlan_config *cfg;\n \tint ret;\n \n \tret = vxlan_sock_add(vxlan);\n@@ -2998,7 +3063,8 @@ static int vxlan_open(struct net_device *dev)\n \t\treturn ret;\n \t}\n \n-\tif (vxlan-\u003ecfg.age_interval)\n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tif (cfg-\u003eage_interval)\n \t\tmod_timer(\u0026vxlan-\u003eage_timer, jiffies + FDB_AGE_INTERVAL);\n \n \treturn ret;\n@@ -3020,8 +3086,10 @@ struct vxlan_fdb_flush_desc {\n static bool vxlan_fdb_is_default_entry(const struct vxlan_fdb *f,\n \t\t\t\t const struct vxlan_dev *vxlan)\n {\n+\tconst struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan-\u003ecfg);\n+\n \treturn is_zero_ether_addr(f-\u003ekey.eth_addr) \u0026\u0026\n-\t f-\u003ekey.vni == vxlan-\u003ecfg.vni;\n+\t f-\u003ekey.vni == cfg-\u003evni;\n }\n \n static bool vxlan_fdb_nhid_matches(const struct vxlan_fdb *f, u32 nhid)\n@@ -3238,15 +3306,18 @@ static void vxlan_set_multicast_list(struct net_device *dev)\n static int vxlan_change_mtu(struct net_device *dev, int new_mtu)\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n-\tstruct vxlan_rdst *dst = \u0026vxlan-\u003edefault_dst;\n-\tstruct net_device *lowerdev = __dev_get_by_index(vxlan-\u003enet,\n-\t\t\t\t\t\t\t dst-\u003eremote_ifindex);\n+\tconst struct vxlan_config *cfg;\n+\tstruct net_device *lowerdev;\n+\n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\n+\tlowerdev = __dev_get_by_index(vxlan-\u003enet, cfg-\u003eremote_ifindex);\n \n \t/* This check is different than dev-\u003emax_mtu, because it looks at\n \t * the lowerdev-\u003emtu, rather than the static dev-\u003emax_mtu\n \t */\n \tif (lowerdev) {\n-\t\tint max_mtu = lowerdev-\u003emtu - vxlan_headroom(vxlan-\u003ecfg.flags);\n+\t\tint max_mtu = lowerdev-\u003emtu - vxlan_headroom(cfg-\u003eflags);\n \t\tif (new_mtu \u003e max_mtu)\n \t\t\treturn -EINVAL;\n \t}\n@@ -3259,11 +3330,14 @@ static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n \tstruct ip_tunnel_info *info = skb_tunnel_info(skb);\n+\tconst struct vxlan_config *cfg;\n \t__be16 sport, dport;\n \n-\tsport = udp_flow_src_port(dev_net(dev), skb, vxlan-\u003ecfg.port_min,\n-\t\t\t\t vxlan-\u003ecfg.port_max, true);\n-\tdport = info-\u003ekey.tp_dst ? : vxlan-\u003ecfg.dst_port;\n+\tcfg = rcu_dereference(vxlan-\u003ecfg);\n+\n+\tsport = udp_flow_src_port(dev_net(dev), skb, cfg-\u003eport_min,\n+\t\t\t\t cfg-\u003eport_max, true);\n+\tdport = info-\u003ekey.tp_dst ? : cfg-\u003edst_port;\n \n \tif (ip_tunnel_info_af(info) == AF_INET) {\n \t\tstruct vxlan_sock *sock4 = rcu_dereference(vxlan-\u003evn4_sock);\n@@ -3373,6 +3447,15 @@ static void vxlan_offload_rx_ports(struct net_device *dev, bool push)\n \t}\n }\n \n+static void vxlan_free_dev(struct net_device *dev)\n+{\n+\tstruct vxlan_dev *vxlan = netdev_priv(dev);\n+\tstruct vxlan_config *cfg = rcu_dereference_protected(vxlan-\u003ecfg, 1);\n+\n+\tRCU_INIT_POINTER(vxlan-\u003ecfg, NULL);\n+\tkfree(cfg);\n+}\n+\n /* Initialize the device structure. */\n static void vxlan_setup(struct net_device *dev)\n {\n@@ -3381,6 +3464,8 @@ static void vxlan_setup(struct net_device *dev)\n \teth_hw_addr_random(dev);\n \tether_setup(dev);\n \n+\tdev-\u003epriv_destructor = vxlan_free_dev;\n+\n \tdev-\u003eneeds_free_netdev = true;\n \tSET_NETDEV_DEVTYPE(dev, \u0026vxlan_type);\n \n@@ -3555,9 +3640,11 @@ static int vxlan_get_link_ksettings(struct net_device *dev,\n \t\t\t\t struct ethtool_link_ksettings *cmd)\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n-\tstruct vxlan_rdst *dst = \u0026vxlan-\u003edefault_dst;\n-\tstruct net_device *lowerdev = __dev_get_by_index(vxlan-\u003enet,\n-\t\t\t\t\t\t\t dst-\u003eremote_ifindex);\n+\tconst struct vxlan_config *cfg;\n+\tstruct net_device *lowerdev;\n+\n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tlowerdev = __dev_get_by_index(vxlan-\u003enet, cfg-\u003eremote_ifindex);\n \n \tif (!lowerdev) {\n \t\tcmd-\u003ebase.duplex = DUPLEX_UNKNOWN;\n@@ -3663,21 +3750,22 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, bool ipv6,\n \n static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)\n {\n-\tbool metadata = vxlan-\u003ecfg.flags \u0026 VXLAN_F_COLLECT_METADATA;\n+\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tbool metadata = cfg-\u003eflags \u0026 VXLAN_F_COLLECT_METADATA;\n \tstruct vxlan_sock *vs = NULL;\n \tstruct vxlan_dev_node *node;\n \tint l3mdev_index = 0;\n \n \tASSERT_RTNL();\n \n-\tif (vxlan-\u003ecfg.remote_ifindex)\n+\tif (cfg-\u003eremote_ifindex)\n \t\tl3mdev_index = l3mdev_master_upper_ifindex_by_index(\n-\t\t\tvxlan-\u003enet, vxlan-\u003ecfg.remote_ifindex);\n+\t\t\tvxlan-\u003enet, cfg-\u003eremote_ifindex);\n \n-\tif (!vxlan-\u003ecfg.no_share) {\n+\tif (!cfg-\u003eno_share) {\n \t\trcu_read_lock();\n \t\tvs = vxlan_find_sock(vxlan-\u003enet, ipv6 ? AF_INET6 : AF_INET,\n-\t\t\t\t vxlan-\u003ecfg.dst_port, vxlan-\u003ecfg.flags,\n+\t\t\t\t cfg-\u003edst_port, cfg-\u003eflags,\n \t\t\t\t l3mdev_index);\n \t\tif (vs \u0026\u0026 !refcount_inc_not_zero(\u0026vs-\u003erefcnt)) {\n \t\t\trcu_read_unlock();\n@@ -3687,7 +3775,7 @@ static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)\n \t}\n \tif (!vs)\n \t\tvs = vxlan_socket_create(vxlan-\u003enet, ipv6,\n-\t\t\t\t\t vxlan-\u003ecfg.dst_port, vxlan-\u003ecfg.flags,\n+\t\t\t\t\t cfg-\u003edst_port, cfg-\u003eflags,\n \t\t\t\t\t l3mdev_index);\n \tif (IS_ERR(vs))\n \t\treturn PTR_ERR(vs);\n@@ -3702,7 +3790,7 @@ static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)\n \t\tnode = \u0026vxlan-\u003ehlist4;\n \t}\n \n-\tif (metadata \u0026\u0026 (vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER))\n+\tif (metadata \u0026\u0026 (cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER))\n \t\tvxlan_vs_add_vnigrp(vxlan, vs, ipv6);\n \telse\n \t\tvxlan_vs_add_dev(vs, vxlan, node);\n@@ -3712,11 +3800,14 @@ static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)\n \n static int vxlan_sock_add(struct vxlan_dev *vxlan)\n {\n-\tbool metadata = vxlan-\u003ecfg.flags \u0026 VXLAN_F_COLLECT_METADATA;\n-\tbool ipv6 = vxlan-\u003ecfg.flags \u0026 VXLAN_F_IPV6 || metadata;\n-\tbool ipv4 = !ipv6 || metadata;\n+\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tbool metadata, ipv6, ipv4;\n \tint ret = 0;\n \n+\tmetadata = cfg-\u003eflags \u0026 VXLAN_F_COLLECT_METADATA;\n+\tipv6 = (cfg-\u003eflags \u0026 VXLAN_F_IPV6) || metadata;\n+\tipv4 = !ipv6 || metadata;\n+\n \tRCU_INIT_POINTER(vxlan-\u003evn4_sock, NULL);\n #if IS_ENABLED(CONFIG_IPV6)\n \tRCU_INIT_POINTER(vxlan-\u003evn6_sock, NULL);\n@@ -3734,28 +3825,33 @@ static int vxlan_sock_add(struct vxlan_dev *vxlan)\n }\n \n int vxlan_vni_in_use(struct net *src_net, struct vxlan_dev *vxlan,\n-\t\t struct vxlan_config *conf, __be32 vni)\n+\t\t const struct vxlan_config *conf, __be32 vni)\n {\n \tstruct vxlan_net *vn = net_generic(src_net, vxlan_net_id);\n \tstruct vxlan_dev *tmp;\n \n \tlist_for_each_entry(tmp, \u0026vn-\u003evxlan_list, next) {\n+\t\tconst struct vxlan_config *tmp_cfg;\n+\n \t\tif (tmp == vxlan)\n \t\t\tcontinue;\n-\t\tif (tmp-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER) {\n+\n+\t\ttmp_cfg = rtnl_dereference(tmp-\u003ecfg);\n+\n+\t\tif (tmp_cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER) {\n \t\t\tif (!vxlan_vnifilter_lookup(tmp, vni))\n \t\t\t\tcontinue;\n-\t\t} else if (tmp-\u003ecfg.vni != vni) {\n+\t\t} else if (tmp_cfg-\u003evni != vni) {\n \t\t\tcontinue;\n \t\t}\n-\t\tif (tmp-\u003ecfg.dst_port != conf-\u003edst_port)\n+\t\tif (tmp_cfg-\u003edst_port != conf-\u003edst_port)\n \t\t\tcontinue;\n-\t\tif ((tmp-\u003ecfg.flags \u0026 (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)) !=\n+\t\tif ((tmp_cfg-\u003eflags \u0026 (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)) !=\n \t\t (conf-\u003eflags \u0026 (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)))\n \t\t\tcontinue;\n \n \t\tif ((conf-\u003eflags \u0026 VXLAN_F_IPV6_LINKLOCAL) \u0026\u0026\n-\t\t tmp-\u003ecfg.remote_ifindex != conf-\u003eremote_ifindex)\n+\t\t tmp_cfg-\u003eremote_ifindex != conf-\u003eremote_ifindex)\n \t\t\tcontinue;\n \n \t\treturn -EEXIST;\n@@ -3886,6 +3982,13 @@ static int vxlan_config_validate(struct net *src_net, struct vxlan_config *conf,\n \t\t\treturn -EINVAL;\n \t\t}\n \n+\t\tif ((conf-\u003eflags \u0026 VXLAN_F_VNIFILTER) \u0026\u0026 old \u0026\u0026\n+\t\t vxlan_vnifilter_has_multicast(old)) {\n+\t\t\tNL_SET_ERR_MSG(extack,\n+\t\t\t\t \"Local interface required for multicast remote group\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n #if IS_ENABLED(CONFIG_IPV6)\n \t\tif (conf-\u003eflags \u0026 VXLAN_F_IPV6_LINKLOCAL) {\n \t\t\tNL_SET_ERR_MSG(extack,\n@@ -3917,16 +4020,16 @@ static int vxlan_config_validate(struct net *src_net, struct vxlan_config *conf,\n }\n \n static void vxlan_config_apply(struct net_device *dev,\n-\t\t\t struct vxlan_config *conf,\n+\t\t\t struct vxlan_config *new_cfg,\n \t\t\t struct net_device *lowerdev,\n \t\t\t struct net *src_net,\n-\t\t\t bool changelink)\n+\t\t\t bool changelink, bool lowerdev_changed)\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n-\tstruct vxlan_rdst *dst = \u0026vxlan-\u003edefault_dst;\n \tunsigned short needed_headroom = ETH_HLEN;\n+\tstruct vxlan_config *old_cfg;\n \tint max_mtu = ETH_MAX_MTU;\n-\tu32 flags = conf-\u003eflags;\n+\tu32 flags = new_cfg-\u003eflags;\n \n \tif (!changelink) {\n \t\tif (flags \u0026 VXLAN_F_GPE)\n@@ -3934,19 +4037,14 @@ static void vxlan_config_apply(struct net_device *dev,\n \t\telse\n \t\t\tvxlan_ether_setup(dev);\n \n-\t\tif (conf-\u003emtu)\n-\t\t\tdev-\u003emtu = conf-\u003emtu;\n+\t\tif (new_cfg-\u003emtu)\n+\t\t\tWRITE_ONCE(dev-\u003emtu, new_cfg-\u003emtu);\n \n \t\tvxlan-\u003enet = src_net;\n \t}\n \n-\tdst-\u003eremote_vni = conf-\u003evni;\n-\n-\tmemcpy(\u0026dst-\u003eremote_ip, \u0026conf-\u003eremote_ip, sizeof(conf-\u003eremote_ip));\n-\n+\tdev-\u003eneeded_tailroom = 0;\n \tif (lowerdev) {\n-\t\tdst-\u003eremote_ifindex = conf-\u003eremote_ifindex;\n-\n \t\tnetif_inherit_tso_max(dev, lowerdev);\n \n \t\tneeded_headroom = lowerdev-\u003ehard_header_len;\n@@ -3954,23 +4052,27 @@ static void vxlan_config_apply(struct net_device *dev,\n \n \t\tdev-\u003eneeded_tailroom = lowerdev-\u003eneeded_tailroom;\n \n-\t\tmax_mtu = lowerdev-\u003emtu - vxlan_headroom(flags);\n+\t\tmax_mtu = READ_ONCE(lowerdev-\u003emtu) - vxlan_headroom(flags);\n \t\tif (max_mtu \u003c ETH_MIN_MTU)\n \t\t\tmax_mtu = ETH_MIN_MTU;\n \n-\t\tif (!changelink \u0026\u0026 !conf-\u003emtu)\n-\t\t\tdev-\u003emtu = max_mtu;\n+\t\tif (!changelink \u0026\u0026 !new_cfg-\u003emtu)\n+\t\t\tWRITE_ONCE(dev-\u003emtu, max_mtu);\n \t}\n \n-\tif (dev-\u003emtu \u003e max_mtu)\n-\t\tdev-\u003emtu = max_mtu;\n+\t/* A changelink leaving the lower device alone must not shrink the mtu */\n+\tif (lowerdev_changed \u0026\u0026 READ_ONCE(dev-\u003emtu) \u003e max_mtu)\n+\t\tWRITE_ONCE(dev-\u003emtu, max_mtu);\n \n \tif (flags \u0026 VXLAN_F_COLLECT_METADATA)\n \t\tflags |= VXLAN_F_IPV6;\n \tneeded_headroom += vxlan_headroom(flags);\n \tdev-\u003eneeded_headroom = needed_headroom;\n \n-\tmemcpy(\u0026vxlan-\u003ecfg, conf, sizeof(*conf));\n+\told_cfg = rtnl_dereference(vxlan-\u003ecfg);\n+\trcu_assign_pointer(vxlan-\u003ecfg, new_cfg);\n+\tif (old_cfg)\n+\t\tkfree_rcu(old_cfg, rcu);\n }\n \n static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,\n@@ -3979,13 +4081,18 @@ static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,\n {\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n \tstruct net_device *lowerdev;\n+\tstruct vxlan_config *new_cfg;\n \tint ret;\n \n \tret = vxlan_config_validate(src_net, conf, \u0026lowerdev, vxlan, extack);\n \tif (ret)\n \t\treturn ret;\n \n-\tvxlan_config_apply(dev, conf, lowerdev, src_net, false);\n+\tnew_cfg = kmemdup(conf, sizeof(*conf), GFP_KERNEL);\n+\tif (!new_cfg)\n+\t\treturn -ENOMEM;\n+\n+\tvxlan_config_apply(dev, new_cfg, lowerdev, src_net, false, true);\n \n \treturn 0;\n }\n@@ -3997,22 +4104,25 @@ static int vxlan_dev_create(struct net *net, struct net_device *dev,\n \tstruct vxlan_net *vn = net_generic(net, vxlan_net_id);\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n \tstruct net_device *remote_dev = NULL;\n-\tstruct vxlan_rdst *dst;\n+\tconst struct vxlan_config *cfg;\n \tint err;\n \n-\tdst = \u0026vxlan-\u003edefault_dst;\n \terr = vxlan_dev_configure(net, dev, conf, extack);\n \tif (err)\n \t\treturn err;\n \n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\n \tdev-\u003eethtool_ops = \u0026vxlan_ethtool_ops;\n \n \terr = register_netdevice(dev);\n-\tif (err)\n+\tif (err) {\n+\t\tvxlan_free_dev(dev);\n \t\treturn err;\n+\t}\n \n-\tif (dst-\u003eremote_ifindex) {\n-\t\tremote_dev = __dev_get_by_index(net, dst-\u003eremote_ifindex);\n+\tif (cfg-\u003eremote_ifindex) {\n+\t\tremote_dev = __dev_get_by_index(net, cfg-\u003eremote_ifindex);\n \t\tif (!remote_dev) {\n \t\t\terr = -ENODEV;\n \t\t\tgoto unregister;\n@@ -4022,7 +4132,7 @@ static int vxlan_dev_create(struct net *net, struct net_device *dev,\n \t\tif (err)\n \t\t\tgoto unregister;\n \n-\t\tdst-\u003eremote_dev = remote_dev;\n+\t\tvxlan-\u003elowerdev = remote_dev;\n \t}\n \n \terr = rtnl_configure_link(dev, NULL, 0, NULL);\n@@ -4030,16 +4140,18 @@ static int vxlan_dev_create(struct net *net, struct net_device *dev,\n \t\tgoto unlink;\n \n \t/* create an fdb entry for a valid default destination */\n-\tif (!vxlan_addr_any(\u0026dst-\u003eremote_ip)) {\n+\tif (!vxlan_addr_any(\u0026cfg-\u003eremote_ip)) {\n+\t\tunion vxlan_addr rip = cfg-\u003eremote_ip;\n+\n \t\tspin_lock_bh(\u0026vxlan-\u003ehash_lock);\n \t\terr = vxlan_fdb_update(vxlan, all_zeros_mac,\n-\t\t\t\t \u0026dst-\u003eremote_ip,\n+\t\t\t\t \u0026rip,\n \t\t\t\t NUD_REACHABLE | NUD_PERMANENT,\n \t\t\t\t NLM_F_EXCL | NLM_F_CREATE,\n-\t\t\t\t vxlan-\u003ecfg.dst_port,\n-\t\t\t\t dst-\u003eremote_vni,\n-\t\t\t\t dst-\u003eremote_vni,\n-\t\t\t\t dst-\u003eremote_ifindex,\n+\t\t\t\t cfg-\u003edst_port,\n+\t\t\t\t cfg-\u003evni,\n+\t\t\t\t cfg-\u003evni,\n+\t\t\t\t cfg-\u003eremote_ifindex,\n \t\t\t\t NTF_SELF, 0, true, extack);\n \t\tspin_unlock_bh(\u0026vxlan-\u003ehash_lock);\n \t\tif (err)\n@@ -4100,8 +4212,12 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],\n \tmemset(conf, 0, sizeof(*conf));\n \n \t/* if changelink operation, start with old existing cfg */\n-\tif (changelink)\n-\t\tmemcpy(conf, \u0026vxlan-\u003ecfg, sizeof(*conf));\n+\tif (changelink) {\n+\t\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n+\n+\t\tif (cfg)\n+\t\t\tmemcpy(conf, cfg, sizeof(*conf));\n+\t}\n \n \tif (data[IFLA_VXLAN_ID]) {\n \t\t__be32 vni = cpu_to_be32(nla_get_u32(data[IFLA_VXLAN_ID]));\n@@ -4447,17 +4563,19 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],\n \t\t\t struct nlattr *data[],\n \t\t\t struct netlink_ext_ack *extack)\n {\n+\tbool lowerdev_changed, rem_ip_changed, change_igmp;\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n-\tbool rem_ip_changed, change_igmp;\n+\tconst struct vxlan_config *cfg;\n+\tstruct vxlan_config *new_cfg;\n \tstruct net_device *lowerdev;\n \tstruct vxlan_config conf;\n-\tstruct vxlan_rdst *dst;\n \tint err;\n \n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\n \tif (!rtnl_dev_link_net_capable(dev, vxlan-\u003enet))\n \t\treturn -EPERM;\n \n-\tdst = \u0026vxlan-\u003edefault_dst;\n \terr = vxlan_nl2conf(tb, data, dev, \u0026conf, true, extack);\n \tif (err)\n \t\treturn err;\n@@ -4467,75 +4585,103 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],\n \tif (err)\n \t\treturn err;\n \n-\tif (dst-\u003eremote_dev == lowerdev)\n-\t\tlowerdev = NULL;\n+\tnew_cfg = kmemdup(\u0026conf, sizeof(conf), GFP_KERNEL);\n+\tif (!new_cfg)\n+\t\treturn -ENOMEM;\n \n-\terr = netdev_adjacent_change_prepare(dst-\u003eremote_dev, lowerdev, dev,\n-\t\t\t\t\t extack);\n-\tif (err)\n-\t\treturn err;\n+\tlowerdev_changed = vxlan-\u003elowerdev != lowerdev;\n+\tif (lowerdev_changed) {\n+\t\terr = netdev_adjacent_change_prepare(vxlan-\u003elowerdev, lowerdev,\n+\t\t\t\t\t\t dev, extack);\n+\t\tif (err) {\n+\t\t\tkfree(new_cfg);\n+\t\t\treturn err;\n+\t\t}\n+\t}\n \n-\trem_ip_changed = !vxlan_addr_equal(\u0026conf.remote_ip, \u0026dst-\u003eremote_ip);\n+\trem_ip_changed = !vxlan_addr_equal(\u0026conf.remote_ip, \u0026cfg-\u003eremote_ip);\n \tchange_igmp = vxlan-\u003edev-\u003eflags \u0026 IFF_UP \u0026\u0026\n \t\t (rem_ip_changed ||\n-\t\t dst-\u003eremote_ifindex != conf.remote_ifindex);\n+\t\t cfg-\u003eremote_ifindex != conf.remote_ifindex);\n \n \t/* handle default dst entry */\n-\tif (rem_ip_changed) {\n+\tif (rem_ip_changed || cfg-\u003eremote_ifindex != conf.remote_ifindex) {\n \t\tspin_lock_bh(\u0026vxlan-\u003ehash_lock);\n \t\tif (!vxlan_addr_any(\u0026conf.remote_ip)) {\n \t\t\terr = vxlan_fdb_update(vxlan, all_zeros_mac,\n \t\t\t\t\t \u0026conf.remote_ip,\n \t\t\t\t\t NUD_REACHABLE | NUD_PERMANENT,\n \t\t\t\t\t NLM_F_APPEND | NLM_F_CREATE,\n-\t\t\t\t\t vxlan-\u003ecfg.dst_port,\n+\t\t\t\t\t cfg-\u003edst_port,\n \t\t\t\t\t conf.vni, conf.vni,\n \t\t\t\t\t conf.remote_ifindex,\n \t\t\t\t\t NTF_SELF, 0, true, extack);\n \t\t\tif (err) {\n \t\t\t\tspin_unlock_bh(\u0026vxlan-\u003ehash_lock);\n-\t\t\t\tnetdev_adjacent_change_abort(dst-\u003eremote_dev,\n-\t\t\t\t\t\t\t lowerdev, dev);\n+\t\t\t\tif (lowerdev_changed)\n+\t\t\t\t\tnetdev_adjacent_change_abort(vxlan-\u003elowerdev,\n+\t\t\t\t\t\t\t\t lowerdev, dev);\n+\t\t\t\tkfree(new_cfg);\n \t\t\t\treturn err;\n \t\t\t}\n \t\t}\n-\t\tif (!vxlan_addr_any(\u0026dst-\u003eremote_ip))\n+\t\tif (!vxlan_addr_any(\u0026cfg-\u003eremote_ip))\n \t\t\t__vxlan_fdb_delete(vxlan, all_zeros_mac,\n-\t\t\t\t\t dst-\u003eremote_ip,\n-\t\t\t\t\t vxlan-\u003ecfg.dst_port,\n-\t\t\t\t\t dst-\u003eremote_vni,\n-\t\t\t\t\t dst-\u003eremote_vni,\n-\t\t\t\t\t dst-\u003eremote_ifindex,\n+\t\t\t\t\t cfg-\u003eremote_ip,\n+\t\t\t\t\t cfg-\u003edst_port,\n+\t\t\t\t\t cfg-\u003evni,\n+\t\t\t\t\t cfg-\u003evni,\n+\t\t\t\t\t cfg-\u003eremote_ifindex,\n \t\t\t\t\t true);\n \t\tspin_unlock_bh(\u0026vxlan-\u003ehash_lock);\n \n-\t\t/* If vni filtering device, also update fdb entries of\n-\t\t * all vnis that were using default remote ip\n+\t\t/* If vni filtering device, also update default fdb entries of\n+\t\t * all vnis\n \t\t */\n-\t\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER) {\n-\t\t\terr = vxlan_vnilist_update_group(vxlan, \u0026dst-\u003eremote_ip,\n-\t\t\t\t\t\t\t \u0026conf.remote_ip, extack);\n+\t\tif (cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER) {\n+\t\t\terr = vxlan_vnilist_update_group(vxlan, \u0026cfg-\u003eremote_ip,\n+\t\t\t\t\t\t\t \u0026conf.remote_ip,\n+\t\t\t\t\t\t\t cfg-\u003eremote_ifindex,\n+\t\t\t\t\t\t\t conf.remote_ifindex,\n+\t\t\t\t\t\t\t extack);\n \t\t\tif (err) {\n-\t\t\t\tnetdev_adjacent_change_abort(dst-\u003eremote_dev,\n-\t\t\t\t\t\t\t lowerdev, dev);\n+\t\t\t\tvxlan_update_default_fdb_entry(vxlan, conf.vni,\n+\t\t\t\t\t\t\t \u0026conf.remote_ip,\n+\t\t\t\t\t\t\t \u0026cfg-\u003eremote_ip,\n+\t\t\t\t\t\t\t conf.remote_ifindex,\n+\t\t\t\t\t\t\t cfg-\u003eremote_ifindex,\n+\t\t\t\t\t\t\t NULL);\n+\t\t\t\tif (lowerdev_changed)\n+\t\t\t\t\tnetdev_adjacent_change_abort(vxlan-\u003elowerdev,\n+\t\t\t\t\t\t\t\t lowerdev, dev);\n+\t\t\t\tkfree(new_cfg);\n \t\t\t\treturn err;\n \t\t\t}\n \t\t}\n \t}\n \n-\tif (change_igmp \u0026\u0026 vxlan_addr_multicast(\u0026dst-\u003eremote_ip))\n+\tif (change_igmp \u0026\u0026\n+\t (vxlan_addr_multicast(\u0026cfg-\u003eremote_ip) ||\n+\t (cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER)))\n \t\terr = vxlan_multicast_leave(vxlan);\n \n-\tif (netif_running(dev) \u0026\u0026 conf.age_interval != vxlan-\u003ecfg.age_interval)\n+\tif (netif_running(dev) \u0026\u0026 conf.age_interval != cfg-\u003eage_interval)\n \t\tmod_timer(\u0026vxlan-\u003eage_timer, jiffies);\n \n-\tnetdev_adjacent_change_commit(dst-\u003eremote_dev, lowerdev, dev);\n-\tif (lowerdev \u0026\u0026 lowerdev != dst-\u003eremote_dev)\n-\t\tdst-\u003eremote_dev = lowerdev;\n-\tvxlan_config_apply(dev, \u0026conf, lowerdev, vxlan-\u003enet, true);\n+\tif (lowerdev_changed) {\n+\t\tif (lowerdev)\n+\t\t\tnetdev_adjacent_change_commit(vxlan-\u003elowerdev, lowerdev,\n+\t\t\t\t\t\t dev);\n+\t\telse\n+\t\t\tnetdev_upper_dev_unlink(vxlan-\u003elowerdev, dev);\n+\t\tvxlan-\u003elowerdev = lowerdev;\n+\t}\n+\tvxlan_config_apply(dev, new_cfg, lowerdev, vxlan-\u003enet, true,\n+\t\t\t lowerdev_changed);\n \n \tif (!err \u0026\u0026 change_igmp \u0026\u0026\n-\t vxlan_addr_multicast(\u0026dst-\u003eremote_ip))\n+\t (vxlan_addr_multicast(\u0026new_cfg-\u003eremote_ip) ||\n+\t (new_cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER)))\n \t\terr = vxlan_multicast_join(vxlan);\n \n \treturn err;\n@@ -4550,8 +4696,8 @@ static void vxlan_dellink(struct net_device *dev, struct list_head *head)\n \n \tlist_del(\u0026vxlan-\u003enext);\n \tunregister_netdevice_queue(dev, head);\n-\tif (vxlan-\u003edefault_dst.remote_dev)\n-\t\tnetdev_upper_dev_unlink(vxlan-\u003edefault_dst.remote_dev, dev);\n+\tif (vxlan-\u003elowerdev)\n+\t\tnetdev_upper_dev_unlink(vxlan-\u003elowerdev, dev);\n }\n \n static size_t vxlan_get_size(const struct net_device *dev)\n@@ -4595,110 +4741,114 @@ static size_t vxlan_get_size(const struct net_device *dev)\n static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev)\n {\n \tconst struct vxlan_dev *vxlan = netdev_priv(dev);\n-\tconst struct vxlan_rdst *dst = \u0026vxlan-\u003edefault_dst;\n-\tstruct ifla_vxlan_port_range ports = {\n-\t\t.low = htons(vxlan-\u003ecfg.port_min),\n-\t\t.high = htons(vxlan-\u003ecfg.port_max),\n-\t};\n+\tstruct ifla_vxlan_port_range ports;\n+\tconst struct vxlan_config *cfg;\n+\n+\trcu_read_lock();\n+\tcfg = rcu_dereference(vxlan-\u003ecfg);\n \n-\tif (nla_put_u32(skb, IFLA_VXLAN_ID, be32_to_cpu(dst-\u003eremote_vni)))\n+\tif (nla_put_u32(skb, IFLA_VXLAN_ID, be32_to_cpu(cfg-\u003evni)))\n \t\tgoto nla_put_failure;\n \n-\tif (!vxlan_addr_any(\u0026dst-\u003eremote_ip)) {\n-\t\tif (dst-\u003eremote_ip.sa.sa_family == AF_INET) {\n+\tif (!vxlan_addr_any(\u0026cfg-\u003eremote_ip)) {\n+\t\tif (cfg-\u003eremote_ip.sa.sa_family == AF_INET) {\n \t\t\tif (nla_put_in_addr(skb, IFLA_VXLAN_GROUP,\n-\t\t\t\t\t dst-\u003eremote_ip.sin.sin_addr.s_addr))\n+\t\t\t\t\t cfg-\u003eremote_ip.sin.sin_addr.s_addr))\n \t\t\t\tgoto nla_put_failure;\n #if IS_ENABLED(CONFIG_IPV6)\n \t\t} else {\n \t\t\tif (nla_put_in6_addr(skb, IFLA_VXLAN_GROUP6,\n-\t\t\t\t\t \u0026dst-\u003eremote_ip.sin6.sin6_addr))\n+\t\t\t\t\t \u0026cfg-\u003eremote_ip.sin6.sin6_addr))\n \t\t\t\tgoto nla_put_failure;\n #endif\n \t\t}\n \t}\n \n-\tif (dst-\u003eremote_ifindex \u0026\u0026 nla_put_u32(skb, IFLA_VXLAN_LINK, dst-\u003eremote_ifindex))\n+\tif (cfg-\u003eremote_ifindex \u0026\u0026 nla_put_u32(skb, IFLA_VXLAN_LINK, cfg-\u003eremote_ifindex))\n \t\tgoto nla_put_failure;\n \n-\tif (!vxlan_addr_any(\u0026vxlan-\u003ecfg.saddr)) {\n-\t\tif (vxlan-\u003ecfg.saddr.sa.sa_family == AF_INET) {\n+\tif (!vxlan_addr_any(\u0026cfg-\u003esaddr)) {\n+\t\tif (cfg-\u003esaddr.sa.sa_family == AF_INET) {\n \t\t\tif (nla_put_in_addr(skb, IFLA_VXLAN_LOCAL,\n-\t\t\t\t\t vxlan-\u003ecfg.saddr.sin.sin_addr.s_addr))\n+\t\t\t\t\t cfg-\u003esaddr.sin.sin_addr.s_addr))\n \t\t\t\tgoto nla_put_failure;\n #if IS_ENABLED(CONFIG_IPV6)\n \t\t} else {\n \t\t\tif (nla_put_in6_addr(skb, IFLA_VXLAN_LOCAL6,\n-\t\t\t\t\t \u0026vxlan-\u003ecfg.saddr.sin6.sin6_addr))\n+\t\t\t\t\t \u0026cfg-\u003esaddr.sin6.sin6_addr))\n \t\t\t\tgoto nla_put_failure;\n #endif\n \t\t}\n \t}\n \n-\tif (nla_put_u8(skb, IFLA_VXLAN_TTL, vxlan-\u003ecfg.ttl) ||\n+\tif (nla_put_u8(skb, IFLA_VXLAN_TTL, cfg-\u003ettl) ||\n \t nla_put_u8(skb, IFLA_VXLAN_TTL_INHERIT,\n-\t\t !!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_TTL_INHERIT)) ||\n-\t nla_put_u8(skb, IFLA_VXLAN_TOS, vxlan-\u003ecfg.tos) ||\n-\t nla_put_u8(skb, IFLA_VXLAN_DF, vxlan-\u003ecfg.df) ||\n-\t nla_put_be32(skb, IFLA_VXLAN_LABEL, vxlan-\u003ecfg.label) ||\n-\t nla_put_u32(skb, IFLA_VXLAN_LABEL_POLICY, vxlan-\u003ecfg.label_policy) ||\n+\t\t !!(cfg-\u003eflags \u0026 VXLAN_F_TTL_INHERIT)) ||\n+\t nla_put_u8(skb, IFLA_VXLAN_TOS, cfg-\u003etos) ||\n+\t nla_put_u8(skb, IFLA_VXLAN_DF, cfg-\u003edf) ||\n+\t nla_put_be32(skb, IFLA_VXLAN_LABEL, cfg-\u003elabel) ||\n+\t nla_put_u32(skb, IFLA_VXLAN_LABEL_POLICY, cfg-\u003elabel_policy) ||\n \t nla_put_u8(skb, IFLA_VXLAN_LEARNING,\n-\t\t !!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_LEARN)) ||\n+\t\t !!(cfg-\u003eflags \u0026 VXLAN_F_LEARN)) ||\n \t nla_put_u8(skb, IFLA_VXLAN_PROXY,\n-\t\t !!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_PROXY)) ||\n+\t\t !!(cfg-\u003eflags \u0026 VXLAN_F_PROXY)) ||\n \t nla_put_u8(skb, IFLA_VXLAN_RSC,\n-\t\t !!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_RSC)) ||\n+\t\t !!(cfg-\u003eflags \u0026 VXLAN_F_RSC)) ||\n \t nla_put_u8(skb, IFLA_VXLAN_L2MISS,\n-\t\t !!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_L2MISS)) ||\n+\t\t !!(cfg-\u003eflags \u0026 VXLAN_F_L2MISS)) ||\n \t nla_put_u8(skb, IFLA_VXLAN_L3MISS,\n-\t\t !!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_L3MISS)) ||\n+\t\t !!(cfg-\u003eflags \u0026 VXLAN_F_L3MISS)) ||\n \t nla_put_u8(skb, IFLA_VXLAN_COLLECT_METADATA,\n-\t\t !!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_COLLECT_METADATA)) ||\n-\t nla_put_u32(skb, IFLA_VXLAN_AGEING, vxlan-\u003ecfg.age_interval) ||\n-\t nla_put_u32(skb, IFLA_VXLAN_LIMIT, vxlan-\u003ecfg.addrmax) ||\n-\t nla_put_be16(skb, IFLA_VXLAN_PORT, vxlan-\u003ecfg.dst_port) ||\n+\t\t !!(cfg-\u003eflags \u0026 VXLAN_F_COLLECT_METADATA)) ||\n+\t nla_put_u32(skb, IFLA_VXLAN_AGEING, cfg-\u003eage_interval) ||\n+\t nla_put_u32(skb, IFLA_VXLAN_LIMIT, cfg-\u003eaddrmax) ||\n+\t nla_put_be16(skb, IFLA_VXLAN_PORT, cfg-\u003edst_port) ||\n \t nla_put_u8(skb, IFLA_VXLAN_UDP_CSUM,\n-\t\t !(vxlan-\u003ecfg.flags \u0026 VXLAN_F_UDP_ZERO_CSUM_TX)) ||\n+\t\t !(cfg-\u003eflags \u0026 VXLAN_F_UDP_ZERO_CSUM_TX)) ||\n \t nla_put_u8(skb, IFLA_VXLAN_UDP_ZERO_CSUM6_TX,\n-\t\t !!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_UDP_ZERO_CSUM6_TX)) ||\n+\t\t !!(cfg-\u003eflags \u0026 VXLAN_F_UDP_ZERO_CSUM6_TX)) ||\n \t nla_put_u8(skb, IFLA_VXLAN_UDP_ZERO_CSUM6_RX,\n-\t\t !!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_UDP_ZERO_CSUM6_RX)) ||\n+\t\t !!(cfg-\u003eflags \u0026 VXLAN_F_UDP_ZERO_CSUM6_RX)) ||\n \t nla_put_u8(skb, IFLA_VXLAN_REMCSUM_TX,\n-\t\t !!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_REMCSUM_TX)) ||\n+\t\t !!(cfg-\u003eflags \u0026 VXLAN_F_REMCSUM_TX)) ||\n \t nla_put_u8(skb, IFLA_VXLAN_REMCSUM_RX,\n-\t\t !!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_REMCSUM_RX)) ||\n+\t\t !!(cfg-\u003eflags \u0026 VXLAN_F_REMCSUM_RX)) ||\n \t nla_put_u8(skb, IFLA_VXLAN_LOCALBYPASS,\n-\t\t !!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_LOCALBYPASS)))\n+\t\t !!(cfg-\u003eflags \u0026 VXLAN_F_LOCALBYPASS)))\n \t\tgoto nla_put_failure;\n \n+\tports.low = htons(cfg-\u003eport_min);\n+\tports.high = htons(cfg-\u003eport_max);\n \tif (nla_put(skb, IFLA_VXLAN_PORT_RANGE, sizeof(ports), \u0026ports))\n \t\tgoto nla_put_failure;\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_GBP \u0026\u0026\n+\tif (cfg-\u003eflags \u0026 VXLAN_F_GBP \u0026\u0026\n \t nla_put_flag(skb, IFLA_VXLAN_GBP))\n \t\tgoto nla_put_failure;\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_GPE \u0026\u0026\n+\tif (cfg-\u003eflags \u0026 VXLAN_F_GPE \u0026\u0026\n \t nla_put_flag(skb, IFLA_VXLAN_GPE))\n \t\tgoto nla_put_failure;\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_REMCSUM_NOPARTIAL \u0026\u0026\n+\tif (cfg-\u003eflags \u0026 VXLAN_F_REMCSUM_NOPARTIAL \u0026\u0026\n \t nla_put_flag(skb, IFLA_VXLAN_REMCSUM_NOPARTIAL))\n \t\tgoto nla_put_failure;\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER \u0026\u0026\n+\tif (cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER \u0026\u0026\n \t nla_put_u8(skb, IFLA_VXLAN_VNIFILTER,\n-\t\t !!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER)))\n+\t\t !!(cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER)))\n \t\tgoto nla_put_failure;\n \n \tif (nla_put(skb, IFLA_VXLAN_RESERVED_BITS,\n-\t\t sizeof(vxlan-\u003ecfg.reserved_bits),\n-\t\t \u0026vxlan-\u003ecfg.reserved_bits))\n+\t\t sizeof(cfg-\u003ereserved_bits),\n+\t\t \u0026cfg-\u003ereserved_bits))\n \t\tgoto nla_put_failure;\n \n+\trcu_read_unlock();\n \treturn 0;\n \n nla_put_failure:\n+\trcu_read_unlock();\n \treturn -EMSGSIZE;\n }\n \n@@ -4731,7 +4881,7 @@ static void vxlan_handle_lowerdev_unregister(struct vxlan_net *vn,\n \tLIST_HEAD(list_kill);\n \n \tlist_for_each_entry_safe(vxlan, next, \u0026vn-\u003evxlan_list, next) {\n-\t\tstruct vxlan_rdst *dst = \u0026vxlan-\u003edefault_dst;\n+\t\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n \n \t\t/* In case we created vxlan device with carrier\n \t\t * and we loose the carrier due to module unload\n@@ -4739,7 +4889,7 @@ static void vxlan_handle_lowerdev_unregister(struct vxlan_net *vn,\n \t\t * cases, it's not necessary and remote_ifindex\n \t\t * is 0 here, so no matches.\n \t\t */\n-\t\tif (dst-\u003eremote_ifindex == dev-\u003eifindex)\n+\t\tif (cfg-\u003eremote_ifindex == dev-\u003eifindex)\n \t\t\tvxlan_dellink(vxlan-\u003edev, \u0026list_kill);\n \t}\n \n@@ -4752,6 +4902,10 @@ static int vxlan_netdevice_event(struct notifier_block *unused,\n \tstruct net_device *dev = netdev_notifier_info_to_dev(ptr);\n \tstruct vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id);\n \n+\tif ((event == NETDEV_REGISTER || event == NETDEV_UNREGISTER) \u0026\u0026\n+\t netif_is_vxlan(dev))\n+\t\tvxlan_vnifilter_seq_inc(dev_net(dev));\n+\n \tif (event == NETDEV_UNREGISTER)\n \t\tvxlan_handle_lowerdev_unregister(vn, dev);\n \telse if (event == NETDEV_UDP_TUNNEL_PUSH_INFO)\ndiff --git a/drivers/net/vxlan/vxlan_mdb.c b/drivers/net/vxlan/vxlan_mdb.c\nindex 841f42ffecb9a..c1a0551990555 100644\n--- a/drivers/net/vxlan/vxlan_mdb.c\n+++ b/drivers/net/vxlan/vxlan_mdb.c\n@@ -165,6 +165,7 @@ static int vxlan_mdb_entry_info_fill(const struct vxlan_dev *vxlan,\n \t\t\t\t const struct vxlan_mdb_entry *mdb_entry,\n \t\t\t\t const struct vxlan_mdb_remote *remote)\n {\n+\tconst struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan-\u003ecfg);\n \tstruct vxlan_rdst *rd = rtnl_dereference(remote-\u003erd);\n \tstruct br_mdb_entry e;\n \tstruct nlattr *nest;\n@@ -189,12 +190,12 @@ static int vxlan_mdb_entry_info_fill(const struct vxlan_dev *vxlan,\n \t vxlan_nla_put_addr(skb, MDBA_MDB_EATTR_DST, \u0026rd-\u003eremote_ip))\n \t\tgoto nest_err;\n \n-\tif (rd-\u003eremote_port \u0026\u0026 rd-\u003eremote_port != vxlan-\u003ecfg.dst_port \u0026\u0026\n+\tif (rd-\u003eremote_port \u0026\u0026 rd-\u003eremote_port != cfg-\u003edst_port \u0026\u0026\n \t nla_put_u16(skb, MDBA_MDB_EATTR_DST_PORT,\n \t\t\tbe16_to_cpu(rd-\u003eremote_port)))\n \t\tgoto nest_err;\n \n-\tif (rd-\u003eremote_vni != vxlan-\u003edefault_dst.remote_vni \u0026\u0026\n+\tif (rd-\u003eremote_vni != cfg-\u003evni \u0026\u0026\n \t nla_put_u32(skb, MDBA_MDB_EATTR_VNI, be32_to_cpu(rd-\u003eremote_vni)))\n \t\tgoto nest_err;\n \n@@ -202,7 +203,7 @@ static int vxlan_mdb_entry_info_fill(const struct vxlan_dev *vxlan,\n \t nla_put_u32(skb, MDBA_MDB_EATTR_IFINDEX, rd-\u003eremote_ifindex))\n \t\tgoto nest_err;\n \n-\tif ((vxlan-\u003ecfg.flags \u0026 VXLAN_F_COLLECT_METADATA) \u0026\u0026\n+\tif ((cfg-\u003eflags \u0026 VXLAN_F_COLLECT_METADATA) \u0026\u0026\n \t mdb_entry-\u003ekey.vni \u0026\u0026 nla_put_u32(skb, MDBA_MDB_EATTR_SRC_VNI,\n \t\t\t\t\t be32_to_cpu(mdb_entry-\u003ekey.vni)))\n \t\tgoto nest_err;\n@@ -613,16 +614,19 @@ static int vxlan_mdb_config_init(struct vxlan_mdb_config *cfg,\n {\n \tstruct br_mdb_entry *entry = nla_data(tb[MDBA_SET_ENTRY]);\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n+\tconst struct vxlan_config *vcfg;\n+\n+\tvcfg = rtnl_dereference(vxlan-\u003ecfg);\n \n \tmemset(cfg, 0, sizeof(*cfg));\n \tcfg-\u003evxlan = vxlan;\n-\tcfg-\u003egroup.vni = vxlan-\u003edefault_dst.remote_vni;\n+\tcfg-\u003egroup.vni = vcfg-\u003evni;\n \tINIT_LIST_HEAD(\u0026cfg-\u003esrc_list);\n \tcfg-\u003enlflags = nlmsg_flags;\n \tcfg-\u003efilter_mode = MCAST_EXCLUDE;\n \tcfg-\u003ert_protocol = RTPROT_STATIC;\n-\tcfg-\u003eremote_vni = vxlan-\u003edefault_dst.remote_vni;\n-\tcfg-\u003eremote_port = vxlan-\u003ecfg.dst_port;\n+\tcfg-\u003eremote_vni = vcfg-\u003evni;\n+\tcfg-\u003eremote_port = vcfg-\u003edst_port;\n \n \tif (entry-\u003eifindex != dev-\u003eifindex) {\n \t\tNL_SET_ERR_MSG_MOD(extack, \"Port net device must be the VXLAN net device\");\n@@ -957,11 +961,12 @@ vxlan_mdb_nlmsg_remote_size(const struct vxlan_dev *vxlan,\n \t\t\t const struct vxlan_mdb_entry *mdb_entry,\n \t\t\t const struct vxlan_mdb_remote *remote)\n {\n+\tconst struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan-\u003ecfg);\n \tconst struct vxlan_mdb_entry_key *group = \u0026mdb_entry-\u003ekey;\n \tstruct vxlan_rdst *rd = rtnl_dereference(remote-\u003erd);\n \tsize_t nlmsg_size;\n \n-\t\t /* MDBA_MDB_ENTRY_INFO */\n+\t/* MDBA_MDB_ENTRY_INFO */\n \tnlmsg_size = nla_total_size(sizeof(struct br_mdb_entry)) +\n \t\t /* MDBA_MDB_EATTR_TIMER */\n \t\t nla_total_size(sizeof(u32));\n@@ -978,16 +983,16 @@ vxlan_mdb_nlmsg_remote_size(const struct vxlan_dev *vxlan,\n \t/* MDBA_MDB_EATTR_DST */\n \tnlmsg_size += nla_total_size(vxlan_addr_size(\u0026rd-\u003eremote_ip));\n \t/* MDBA_MDB_EATTR_DST_PORT */\n-\tif (rd-\u003eremote_port \u0026\u0026 rd-\u003eremote_port != vxlan-\u003ecfg.dst_port)\n+\tif (rd-\u003eremote_port \u0026\u0026 rd-\u003eremote_port != cfg-\u003edst_port)\n \t\tnlmsg_size += nla_total_size(sizeof(u16));\n \t/* MDBA_MDB_EATTR_VNI */\n-\tif (rd-\u003eremote_vni != vxlan-\u003edefault_dst.remote_vni)\n+\tif (rd-\u003eremote_vni != cfg-\u003evni)\n \t\tnlmsg_size += nla_total_size(sizeof(u32));\n \t/* MDBA_MDB_EATTR_IFINDEX */\n \tif (rd-\u003eremote_ifindex)\n \t\tnlmsg_size += nla_total_size(sizeof(u32));\n \t/* MDBA_MDB_EATTR_SRC_VNI */\n-\tif ((vxlan-\u003ecfg.flags \u0026 VXLAN_F_COLLECT_METADATA) \u0026\u0026 group-\u003evni)\n+\tif ((cfg-\u003eflags \u0026 VXLAN_F_COLLECT_METADATA) \u0026\u0026 group-\u003evni)\n \t\tnlmsg_size += nla_total_size(sizeof(u32));\n \n \treturn nlmsg_size;\n@@ -1216,7 +1221,7 @@ vxlan_mdb_entry_get(struct vxlan_dev *vxlan,\n \t\tgoto err_free_entry;\n \n \tif (hlist_is_singular_node(\u0026mdb_entry-\u003emdb_node, \u0026vxlan-\u003emdb_list))\n-\t\tvxlan-\u003ecfg.flags |= VXLAN_F_MDB;\n+\t\tset_bit(VXLAN_DEV_F_MDB, \u0026vxlan-\u003eflags);\n \n \treturn mdb_entry;\n \n@@ -1233,7 +1238,7 @@ static void vxlan_mdb_entry_put(struct vxlan_dev *vxlan,\n \t\treturn;\n \n \tif (hlist_is_singular_node(\u0026mdb_entry-\u003emdb_node, \u0026vxlan-\u003emdb_list))\n-\t\tvxlan-\u003ecfg.flags \u0026= ~VXLAN_F_MDB;\n+\t\tclear_bit(VXLAN_DEV_F_MDB, \u0026vxlan-\u003eflags);\n \n \trhashtable_remove_fast(\u0026vxlan-\u003emdb_tbl, \u0026mdb_entry-\u003erhnode,\n \t\t\t vxlan_mdb_rht_params);\n@@ -1483,11 +1488,13 @@ static int vxlan_mdb_get_parse(struct net_device *dev, struct nlattr *tb[],\n {\n \tstruct br_mdb_entry *entry = nla_data(tb[MDBA_GET_ENTRY]);\n \tstruct nlattr *mdbe_attrs[MDBE_ATTR_MAX + 1];\n+\tconst struct vxlan_config *cfg;\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n \tint err;\n \n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n \tmemset(group, 0, sizeof(*group));\n-\tgroup-\u003evni = vxlan-\u003edefault_dst.remote_vni;\n+\tgroup-\u003evni = cfg-\u003evni;\n \n \tif (!tb[MDBA_GET_ENTRY_ATTRS]) {\n \t\tvxlan_mdb_group_set(group, entry, NULL);\n@@ -1621,6 +1628,7 @@ int vxlan_mdb_get(struct net_device *dev, struct nlattr *tb[], u32 portid,\n }\n \n struct vxlan_mdb_entry *vxlan_mdb_entry_skb_get(struct vxlan_dev *vxlan,\n+\t\t\t\t\t\tconst struct vxlan_config *cfg,\n \t\t\t\t\t\tstruct sk_buff *skb,\n \t\t\t\t\t\t__be32 src_vni)\n {\n@@ -1634,8 +1642,8 @@ struct vxlan_mdb_entry *vxlan_mdb_entry_skb_get(struct vxlan_dev *vxlan,\n \t/* When not in collect metadata mode, 'src_vni' is zero, but MDB\n \t * entries are stored with the VNI of the VXLAN device.\n \t */\n-\tif (!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_COLLECT_METADATA))\n-\t\tsrc_vni = vxlan-\u003edefault_dst.remote_vni;\n+\tif (!(cfg-\u003eflags \u0026 VXLAN_F_COLLECT_METADATA))\n+\t\tsrc_vni = cfg-\u003evni;\n \n \tmemset(\u0026group, 0, sizeof(group));\n \tgroup.vni = src_vni;\n@@ -1700,6 +1708,7 @@ struct vxlan_mdb_entry *vxlan_mdb_entry_skb_get(struct vxlan_dev *vxlan,\n }\n \n netdev_tx_t vxlan_mdb_xmit(struct vxlan_dev *vxlan,\n+\t\t\t const struct vxlan_config *cfg,\n \t\t\t const struct vxlan_mdb_entry *mdb_entry,\n \t\t\t struct sk_buff *skb)\n {\n@@ -1721,12 +1730,12 @@ netdev_tx_t vxlan_mdb_xmit(struct vxlan_dev *vxlan,\n \n \t\tskb1 = skb_clone(skb, GFP_ATOMIC);\n \t\tif (skb1)\n-\t\t\tvxlan_xmit_one(skb1, vxlan-\u003edev, src_vni,\n+\t\t\tvxlan_xmit_one(skb1, vxlan-\u003edev, cfg, src_vni,\n \t\t\t\t rcu_dereference(remote-\u003erd), false);\n \t}\n \n \tif (fremote)\n-\t\tvxlan_xmit_one(skb, vxlan-\u003edev, src_vni,\n+\t\tvxlan_xmit_one(skb, vxlan-\u003edev, cfg, src_vni,\n \t\t\t rcu_dereference(fremote-\u003erd), false);\n \telse\n \t\tkfree_skb_reason(skb, SKB_DROP_REASON_NO_TX_TARGET);\n@@ -1757,7 +1766,7 @@ void vxlan_mdb_fini(struct vxlan_dev *vxlan)\n \tstruct vxlan_mdb_flush_desc desc = {};\n \n \tvxlan_mdb_flush(vxlan, \u0026desc);\n-\tWARN_ON_ONCE(vxlan-\u003ecfg.flags \u0026 VXLAN_F_MDB);\n+\tWARN_ON_ONCE(test_bit(VXLAN_DEV_F_MDB, \u0026vxlan-\u003eflags));\n \trhashtable_free_and_destroy(\u0026vxlan-\u003emdb_tbl, vxlan_mdb_check_empty,\n \t\t\t\t NULL);\n }\ndiff --git a/drivers/net/vxlan/vxlan_multicast.c b/drivers/net/vxlan/vxlan_multicast.c\nindex 3b75b48dc726d..6fcc4a3673436 100644\n--- a/drivers/net/vxlan/vxlan_multicast.c\n+++ b/drivers/net/vxlan/vxlan_multicast.c\n@@ -14,11 +14,12 @@\n /* Update multicast group membership when first VNI on\n * multicast address is brought up\n */\n-int vxlan_igmp_join(struct vxlan_dev *vxlan, union vxlan_addr *rip,\n+int vxlan_igmp_join(struct vxlan_dev *vxlan, const union vxlan_addr *rip,\n \t\t int rifindex)\n {\n-\tunion vxlan_addr *ip = (rip ? : \u0026vxlan-\u003edefault_dst.remote_ip);\n-\tint ifindex = (rifindex ? : vxlan-\u003edefault_dst.remote_ifindex);\n+\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tconst union vxlan_addr *ip = (rip ? : \u0026cfg-\u003eremote_ip);\n+\tint ifindex = (rifindex ? : cfg-\u003eremote_ifindex);\n \tint ret = -EINVAL;\n \tstruct sock *sk;\n \n@@ -47,11 +48,12 @@ int vxlan_igmp_join(struct vxlan_dev *vxlan, union vxlan_addr *rip,\n \treturn ret;\n }\n \n-int vxlan_igmp_leave(struct vxlan_dev *vxlan, union vxlan_addr *rip,\n+int vxlan_igmp_leave(struct vxlan_dev *vxlan, const union vxlan_addr *rip,\n \t\t int rifindex)\n {\n-\tunion vxlan_addr *ip = (rip ? : \u0026vxlan-\u003edefault_dst.remote_ip);\n-\tint ifindex = (rifindex ? : vxlan-\u003edefault_dst.remote_ifindex);\n+\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tconst union vxlan_addr *ip = (rip ? : \u0026cfg-\u003eremote_ip);\n+\tint ifindex = (rifindex ? : cfg-\u003eremote_ifindex);\n \tint ret = -EINVAL;\n \tstruct sock *sk;\n \n@@ -80,8 +82,8 @@ int vxlan_igmp_leave(struct vxlan_dev *vxlan, union vxlan_addr *rip,\n \treturn ret;\n }\n \n-static bool vxlan_group_used_match(union vxlan_addr *ip, int ifindex,\n-\t\t\t\t union vxlan_addr *rip, int rifindex)\n+static bool vxlan_group_used_match(const union vxlan_addr *ip, int ifindex,\n+\t\t\t\t const union vxlan_addr *rip, int rifindex)\n {\n \tif (!vxlan_addr_multicast(rip))\n \t\treturn false;\n@@ -96,14 +98,16 @@ static bool vxlan_group_used_match(union vxlan_addr *ip, int ifindex,\n }\n \n static bool vxlan_group_used_by_vnifilter(struct vxlan_dev *vxlan,\n-\t\t\t\t\t union vxlan_addr *ip, int ifindex)\n+\t\t\t\t\t const struct vxlan_config *cfg,\n+\t\t\t\t\t const union vxlan_addr *ip,\n+\t\t\t\t\t int ifindex)\n {\n \tstruct vxlan_vni_group *vg = rtnl_dereference(vxlan-\u003evnigrp);\n \tstruct vxlan_vni_node *v, *tmp;\n \n \tif (vxlan_group_used_match(ip, ifindex,\n-\t\t\t\t \u0026vxlan-\u003edefault_dst.remote_ip,\n-\t\t\t\t vxlan-\u003edefault_dst.remote_ifindex))\n+\t\t\t\t \u0026cfg-\u003eremote_ip,\n+\t\t\t\t cfg-\u003eremote_ifindex))\n \t\treturn true;\n \n \tlist_for_each_entry_safe(v, tmp, \u0026vg-\u003evni_list, vlist) {\n@@ -112,7 +116,7 @@ static bool vxlan_group_used_by_vnifilter(struct vxlan_dev *vxlan,\n \n \t\tif (vxlan_group_used_match(ip, ifindex,\n \t\t\t\t\t \u0026v-\u003eremote_ip,\n-\t\t\t\t\t vxlan-\u003edefault_dst.remote_ifindex))\n+\t\t\t\t\t cfg-\u003eremote_ifindex))\n \t\t\treturn true;\n \t}\n \n@@ -121,16 +125,17 @@ static bool vxlan_group_used_by_vnifilter(struct vxlan_dev *vxlan,\n \n /* See if multicast group is already in use by other ID */\n bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,\n-\t\t __be32 vni, union vxlan_addr *rip, int rifindex)\n+\t\t __be32 vni, const union vxlan_addr *rip, int rifindex)\n {\n-\tunion vxlan_addr *ip = (rip ? : \u0026dev-\u003edefault_dst.remote_ip);\n-\tint ifindex = (rifindex ? : dev-\u003edefault_dst.remote_ifindex);\n+\tconst struct vxlan_config *dev_cfg = rtnl_dereference(dev-\u003ecfg);\n+\tconst union vxlan_addr *ip = (rip ? : \u0026dev_cfg-\u003eremote_ip);\n+\tint ifindex = (rifindex ? : dev_cfg-\u003eremote_ifindex);\n \tstruct vxlan_dev *vxlan;\n \tstruct vxlan_sock *sock4;\n #if IS_ENABLED(CONFIG_IPV6)\n \tstruct vxlan_sock *sock6;\n #endif\n-\tunsigned short family = dev-\u003edefault_dst.remote_ip.sa.sa_family;\n+\tunsigned short family = dev_cfg-\u003eremote_ip.sa.sa_family;\n \n \tsock4 = rtnl_dereference(dev-\u003evn4_sock);\n \n@@ -147,6 +152,8 @@ bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,\n #endif\n \n \tlist_for_each_entry(vxlan, \u0026vn-\u003evxlan_list, next) {\n+\t\tconst struct vxlan_config *cfg;\n+\n \t\tif (!netif_running(vxlan-\u003edev) || vxlan == dev)\n \t\t\tcontinue;\n \n@@ -158,13 +165,15 @@ bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,\n \t\t rtnl_dereference(vxlan-\u003evn6_sock) != sock6)\n \t\t\tcontinue;\n #endif\n-\t\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER) {\n-\t\t\tif (!vxlan_group_used_by_vnifilter(vxlan, ip, ifindex))\n+\t\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\n+\t\tif (cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER) {\n+\t\t\tif (!vxlan_group_used_by_vnifilter(vxlan, cfg, ip, ifindex))\n \t\t\t\tcontinue;\n \t\t} else {\n \t\t\tif (!vxlan_group_used_match(ip, ifindex,\n-\t\t\t\t\t\t \u0026vxlan-\u003edefault_dst.remote_ip,\n-\t\t\t\t\t\t vxlan-\u003edefault_dst.remote_ifindex))\n+\t\t\t\t\t\t \u0026cfg-\u003eremote_ip,\n+\t\t\t\t\t\t cfg-\u003eremote_ifindex))\n \t\t\t\tcontinue;\n \t\t}\n \n@@ -174,7 +183,8 @@ bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,\n \treturn false;\n }\n \n-static int vxlan_multicast_join_vnigrp(struct vxlan_dev *vxlan)\n+static int vxlan_multicast_join_vnigrp(struct vxlan_dev *vxlan,\n+\t\t\t\t const struct vxlan_config *cfg)\n {\n \tstruct vxlan_vni_group *vg = rtnl_dereference(vxlan-\u003evnigrp);\n \tstruct vxlan_vni_node *v, *tmp, *vgood = NULL;\n@@ -185,7 +195,7 @@ static int vxlan_multicast_join_vnigrp(struct vxlan_dev *vxlan)\n \t\t\tcontinue;\n \t\t/* skip if address is same as default address */\n \t\tif (vxlan_addr_equal(\u0026v-\u003eremote_ip,\n-\t\t\t\t \u0026vxlan-\u003edefault_dst.remote_ip))\n+\t\t\t\t \u0026cfg-\u003eremote_ip))\n \t\t\tcontinue;\n \t\tret = vxlan_igmp_join(vxlan, \u0026v-\u003eremote_ip, 0);\n \t\tif (ret == -EADDRINUSE)\n@@ -200,7 +210,7 @@ static int vxlan_multicast_join_vnigrp(struct vxlan_dev *vxlan)\n \t\t\tif (!vxlan_addr_multicast(\u0026v-\u003eremote_ip))\n \t\t\t\tcontinue;\n \t\t\tif (vxlan_addr_equal(\u0026v-\u003eremote_ip,\n-\t\t\t\t\t \u0026vxlan-\u003edefault_dst.remote_ip))\n+\t\t\t\t\t \u0026cfg-\u003eremote_ip))\n \t\t\t\tcontinue;\n \t\t\tvxlan_igmp_leave(vxlan, \u0026v-\u003eremote_ip, 0);\n \t\t\tif (v == vgood)\n@@ -233,37 +243,39 @@ static int vxlan_multicast_leave_vnigrp(struct vxlan_dev *vxlan)\n \n int vxlan_multicast_join(struct vxlan_dev *vxlan)\n {\n+\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n \tint ret = 0;\n \n-\tif (vxlan_addr_multicast(\u0026vxlan-\u003edefault_dst.remote_ip)) {\n-\t\tret = vxlan_igmp_join(vxlan, \u0026vxlan-\u003edefault_dst.remote_ip,\n-\t\t\t\t vxlan-\u003edefault_dst.remote_ifindex);\n+\tif (vxlan_addr_multicast(\u0026cfg-\u003eremote_ip)) {\n+\t\tret = vxlan_igmp_join(vxlan, \u0026cfg-\u003eremote_ip,\n+\t\t\t\t cfg-\u003eremote_ifindex);\n \t\tif (ret == -EADDRINUSE)\n \t\t\tret = 0;\n \t\tif (ret)\n \t\t\treturn ret;\n \t}\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER)\n-\t\treturn vxlan_multicast_join_vnigrp(vxlan);\n+\tif (cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER)\n+\t\treturn vxlan_multicast_join_vnigrp(vxlan, cfg);\n \n \treturn 0;\n }\n \n int vxlan_multicast_leave(struct vxlan_dev *vxlan)\n {\n+\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n \tstruct vxlan_net *vn = net_generic(vxlan-\u003enet, vxlan_net_id);\n \tint ret = 0;\n \n-\tif (vxlan_addr_multicast(\u0026vxlan-\u003edefault_dst.remote_ip) \u0026\u0026\n+\tif (vxlan_addr_multicast(\u0026cfg-\u003eremote_ip) \u0026\u0026\n \t !vxlan_group_used(vn, vxlan, 0, NULL, 0)) {\n-\t\tret = vxlan_igmp_leave(vxlan, \u0026vxlan-\u003edefault_dst.remote_ip,\n-\t\t\t\t vxlan-\u003edefault_dst.remote_ifindex);\n+\t\tret = vxlan_igmp_leave(vxlan, \u0026cfg-\u003eremote_ip,\n+\t\t\t\t cfg-\u003eremote_ifindex);\n \t\tif (ret)\n \t\t\treturn ret;\n \t}\n \n-\tif (vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER)\n+\tif (cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER)\n \t\treturn vxlan_multicast_leave_vnigrp(vxlan);\n \n \treturn 0;\ndiff --git a/drivers/net/vxlan/vxlan_private.h b/drivers/net/vxlan/vxlan_private.h\nindex b1eec22163608..f0ee85f83732a 100644\n--- a/drivers/net/vxlan/vxlan_private.h\n+++ b/drivers/net/vxlan/vxlan_private.h\n@@ -22,6 +22,8 @@ struct vxlan_net {\n \t/* sock_list is protected by rtnl lock */\n \tstruct hlist_head sock_list[PORT_HASH_SIZE];\n \tstruct notifier_block nexthop_notifier_block;\n+\t/* Generation counter for RTM_GETTUNNEL dumps */\n+\tatomic_t vnifilter_seq;\n };\n \n struct vxlan_fdb_key {\n@@ -177,6 +179,13 @@ vxlan_vnifilter_lookup(struct vxlan_dev *vxlan, __be32 vni)\n \t\t\t\t vxlan_vni_rht_params);\n }\n \n+static inline void vxlan_vnifilter_seq_inc(const struct net *net)\n+{\n+\tstruct vxlan_net *vn = net_generic(net, vxlan_net_id);\n+\n+\tatomic_inc(\u0026vn-\u003evnifilter_seq);\n+}\n+\n /* vxlan_core.c */\n int vxlan_fdb_create(struct vxlan_dev *vxlan,\n \t\t const u8 *mac, union vxlan_addr *ip,\n@@ -195,9 +204,10 @@ int vxlan_fdb_update(struct vxlan_dev *vxlan,\n \t\t __u32 ifindex, __u16 ndm_flags, u32 nhid,\n \t\t bool swdev_notify, struct netlink_ext_ack *extack);\n void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n+\t\t const struct vxlan_config *cfg,\n \t\t __be32 default_vni, struct vxlan_rdst *rdst, bool did_rsc);\n int vxlan_vni_in_use(struct net *src_net, struct vxlan_dev *vxlan,\n-\t\t struct vxlan_config *conf, __be32 vni);\n+\t\t const struct vxlan_config *conf, __be32 vni);\n \n /* vxlan_vnifilter.c */\n int vxlan_vnigroup_init(struct vxlan_dev *vxlan);\n@@ -205,7 +215,8 @@ void vxlan_vnigroup_uninit(struct vxlan_dev *vxlan);\n \n int vxlan_vnifilter_init(void);\n void vxlan_vnifilter_uninit(void);\n-void vxlan_vnifilter_count(struct vxlan_dev *vxlan, __be32 vni,\n+void vxlan_vnifilter_count(struct vxlan_dev *vxlan,\n+\t\t\t const struct vxlan_config *cfg, __be32 vni,\n \t\t\t struct vxlan_vni_node *vninode,\n \t\t\t int type, unsigned int len);\n \n@@ -213,9 +224,16 @@ void vxlan_vs_add_vnigrp(struct vxlan_dev *vxlan,\n \t\t\t struct vxlan_sock *vs,\n \t\t\t bool ipv6);\n void vxlan_vs_del_vnigrp(struct vxlan_dev *vxlan);\n+bool vxlan_vnifilter_has_multicast(const struct vxlan_dev *vxlan);\n+int vxlan_update_default_fdb_entry(struct vxlan_dev *vxlan, __be32 vni,\n+\t\t\t\t const union vxlan_addr *old_remote_ip,\n+\t\t\t\t const union vxlan_addr *remote_ip,\n+\t\t\t\t u32 old_ifindex, u32 new_ifindex,\n+\t\t\t\t struct netlink_ext_ack *extack);\n int vxlan_vnilist_update_group(struct vxlan_dev *vxlan,\n-\t\t\t union vxlan_addr *old_remote_ip,\n-\t\t\t union vxlan_addr *new_remote_ip,\n+\t\t\t const union vxlan_addr *old_remote_ip,\n+\t\t\t const union vxlan_addr *new_remote_ip,\n+\t\t\t u32 old_ifindex, u32 new_ifindex,\n \t\t\t struct netlink_ext_ack *extack);\n \n \n@@ -223,10 +241,10 @@ int vxlan_vnilist_update_group(struct vxlan_dev *vxlan,\n int vxlan_multicast_join(struct vxlan_dev *vxlan);\n int vxlan_multicast_leave(struct vxlan_dev *vxlan);\n bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,\n-\t\t __be32 vni, union vxlan_addr *rip, int rifindex);\n-int vxlan_igmp_join(struct vxlan_dev *vxlan, union vxlan_addr *rip,\n+\t\t __be32 vni, const union vxlan_addr *rip, int rifindex);\n+int vxlan_igmp_join(struct vxlan_dev *vxlan, const union vxlan_addr *rip,\n \t\t int rifindex);\n-int vxlan_igmp_leave(struct vxlan_dev *vxlan, union vxlan_addr *rip,\n+int vxlan_igmp_leave(struct vxlan_dev *vxlan, const union vxlan_addr *rip,\n \t\t int rifindex);\n \n /* vxlan_mdb.c */\n@@ -241,9 +259,11 @@ int vxlan_mdb_del_bulk(struct net_device *dev, struct nlattr *tb[],\n int vxlan_mdb_get(struct net_device *dev, struct nlattr *tb[], u32 portid,\n \t\t u32 seq, struct netlink_ext_ack *extack);\n struct vxlan_mdb_entry *vxlan_mdb_entry_skb_get(struct vxlan_dev *vxlan,\n+\t\t\t\t\t\tconst struct vxlan_config *cfg,\n \t\t\t\t\t\tstruct sk_buff *skb,\n \t\t\t\t\t\t__be32 src_vni);\n netdev_tx_t vxlan_mdb_xmit(struct vxlan_dev *vxlan,\n+\t\t\t const struct vxlan_config *cfg,\n \t\t\t const struct vxlan_mdb_entry *mdb_entry,\n \t\t\t struct sk_buff *skb);\n int vxlan_mdb_init(struct vxlan_dev *vxlan);\ndiff --git a/drivers/net/vxlan/vxlan_vnifilter.c b/drivers/net/vxlan/vxlan_vnifilter.c\nindex dd94085e08865..48135ff9b95a1 100644\n--- a/drivers/net/vxlan/vxlan_vnifilter.c\n+++ b/drivers/net/vxlan/vxlan_vnifilter.c\n@@ -171,13 +171,14 @@ static void vxlan_vnifilter_stats_add(struct vxlan_vni_node *vninode,\n \tu64_stats_update_end(\u0026pstats-\u003esyncp);\n }\n \n-void vxlan_vnifilter_count(struct vxlan_dev *vxlan, __be32 vni,\n+void vxlan_vnifilter_count(struct vxlan_dev *vxlan,\n+\t\t\t const struct vxlan_config *cfg, __be32 vni,\n \t\t\t struct vxlan_vni_node *vninode,\n \t\t\t int type, unsigned int len)\n {\n \tstruct vxlan_vni_node *vnode;\n \n-\tif (!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER))\n+\tif (!(cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER))\n \t\treturn;\n \n \tif (vninode) {\n@@ -333,22 +334,36 @@ static int vxlan_vnifilter_dump_dev(const struct net_device *dev,\n \t\t\t\t struct sk_buff *skb,\n \t\t\t\t struct netlink_callback *cb)\n {\n-\tstruct vxlan_vni_node *tmp, *v, *vbegin = NULL, *vend = NULL;\n+\tstruct vxlan_vni_node *v, *vbegin = NULL, *vend = NULL;\n \tstruct vxlan_dev *vxlan = netdev_priv(dev);\n \tstruct tunnel_msg *new_tmsg, *tmsg;\n-\tint idx = 0, s_idx = cb-\u003eargs[1];\n+\tconst struct vxlan_config *cfg;\n \tstruct vxlan_vni_group *vg;\n \tstruct nlmsghdr *nlh;\n+\tint idx = 0, s_idx;\n \tbool dump_stats;\n \tint err = 0;\n \n-\tif (!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER))\n+\tif (cb-\u003eargs[2] != dev-\u003eifindex) {\n+\t\tcb-\u003eargs[1] = 0;\n+\t\tcb-\u003eargs[2] = dev-\u003eifindex;\n+\t}\n+\ts_idx = cb-\u003eargs[1];\n+\n+\tcfg = rcu_dereference(vxlan-\u003ecfg);\n+\tif (!(cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER)) {\n+\t\tcb-\u003eargs[1] = 0;\n+\t\tcb-\u003eargs[2] = 0;\n \t\treturn -EINVAL;\n+\t}\n \n \t/* RCU needed because of the vni locking rules (rcu || rtnl) */\n \tvg = rcu_dereference(vxlan-\u003evnigrp);\n-\tif (!vg || !vg-\u003enum_vnis)\n+\tif (!vg || !vg-\u003enum_vnis) {\n+\t\tcb-\u003eargs[1] = 0;\n+\t\tcb-\u003eargs[2] = 0;\n \t\treturn 0;\n+\t}\n \n \ttmsg = nlmsg_data(cb-\u003enlh);\n \tdump_stats = !!(tmsg-\u003eflags \u0026 TUNNEL_MSG_FLAG_STATS);\n@@ -362,7 +377,7 @@ static int vxlan_vnifilter_dump_dev(const struct net_device *dev,\n \tnew_tmsg-\u003efamily = PF_BRIDGE;\n \tnew_tmsg-\u003eifindex = dev-\u003eifindex;\n \n-\tlist_for_each_entry_safe(v, tmp, \u0026vg-\u003evni_list, vlist) {\n+\tlist_for_each_entry_rcu(v, \u0026vg-\u003evni_list, vlist) {\n \t\tif (idx \u003c s_idx) {\n \t\t\tidx++;\n \t\t\tcontinue;\n@@ -394,12 +409,26 @@ static int vxlan_vnifilter_dump_dev(const struct net_device *dev,\n \t}\n \n \tcb-\u003eargs[1] = err ? idx : 0;\n+\tcb-\u003eargs[2] = err ? dev-\u003eifindex : 0;\n \n \tnlmsg_end(skb, nlh);\n \n+\tnl_dump_check_consistent(cb, nlh);\n+\n \treturn err;\n }\n \n+static u32 vxlan_vnifilter_base_seq(const struct net *net)\n+{\n+\tconst struct vxlan_net *vn = net_generic(net, vxlan_net_id);\n+\tu32 res = atomic_read(\u0026vn-\u003evnifilter_seq);\n+\n+\t/* Must not return 0 (see nl_dump_check_consistent()) */\n+\tif (!res)\n+\t\tres = 0x80000000;\n+\treturn res;\n+}\n+\n static int vxlan_vnifilter_dump(struct sk_buff *skb, struct netlink_callback *cb)\n {\n \tint idx = 0, err = 0, s_idx = cb-\u003eargs[0];\n@@ -419,6 +448,9 @@ static int vxlan_vnifilter_dump(struct sk_buff *skb, struct netlink_callback *cb\n \t}\n \n \trcu_read_lock();\n+\n+\tcb-\u003eseq = vxlan_vnifilter_base_seq(net);\n+\n \tif (tmsg-\u003eifindex) {\n \t\tdev = dev_get_by_index_rcu(net, tmsg-\u003eifindex);\n \t\tif (!dev) {\n@@ -470,24 +502,48 @@ static const struct nla_policy vni_filter_policy[VXLAN_VNIFILTER_MAX + 1] = {\n \t[VXLAN_VNIFILTER_ENTRY] = { .type = NLA_NESTED },\n };\n \n-static int vxlan_update_default_fdb_entry(struct vxlan_dev *vxlan, __be32 vni,\n-\t\t\t\t\t union vxlan_addr *old_remote_ip,\n-\t\t\t\t\t union vxlan_addr *remote_ip,\n-\t\t\t\t\t struct netlink_ext_ack *extack)\n+bool vxlan_vnifilter_has_multicast(const struct vxlan_dev *vxlan)\n+{\n+\tstruct vxlan_vni_group *vg = rtnl_dereference(vxlan-\u003evnigrp);\n+\tstruct vxlan_vni_node *v;\n+\n+\tif (!vg)\n+\t\treturn false;\n+\n+\tlist_for_each_entry(v, \u0026vg-\u003evni_list, vlist) {\n+\t\tif (vxlan_addr_multicast(\u0026v-\u003eremote_ip))\n+\t\t\treturn true;\n+\t}\n+\n+\treturn false;\n+}\n+\n+int vxlan_update_default_fdb_entry(struct vxlan_dev *vxlan, __be32 vni,\n+\t\t\t\t const union vxlan_addr *old_remote_ip,\n+\t\t\t\t const union vxlan_addr *remote_ip,\n+\t\t\t\t u32 old_ifindex, u32 new_ifindex,\n+\t\t\t\t struct netlink_ext_ack *extack)\n {\n-\tstruct vxlan_rdst *dst = \u0026vxlan-\u003edefault_dst;\n+\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n \tint err = 0;\n \n+\tif (old_remote_ip \u0026\u0026 remote_ip \u0026\u0026\n+\t vxlan_addr_equal(old_remote_ip, remote_ip) \u0026\u0026\n+\t old_ifindex == new_ifindex)\n+\t\treturn 0;\n+\n \tspin_lock_bh(\u0026vxlan-\u003ehash_lock);\n \tif (remote_ip \u0026\u0026 !vxlan_addr_any(remote_ip)) {\n+\t\tunion vxlan_addr rip = *remote_ip;\n+\n \t\terr = vxlan_fdb_update(vxlan, all_zeros_mac,\n-\t\t\t\t remote_ip,\n+\t\t\t\t \u0026rip,\n \t\t\t\t NUD_REACHABLE | NUD_PERMANENT,\n \t\t\t\t NLM_F_APPEND | NLM_F_CREATE,\n-\t\t\t\t vxlan-\u003ecfg.dst_port,\n+\t\t\t\t cfg-\u003edst_port,\n \t\t\t\t vni,\n \t\t\t\t vni,\n-\t\t\t\t dst-\u003eremote_ifindex,\n+\t\t\t\t new_ifindex,\n \t\t\t\t NTF_SELF, 0, true, extack);\n \t\tif (err) {\n \t\t\tspin_unlock_bh(\u0026vxlan-\u003ehash_lock);\n@@ -498,9 +554,9 @@ static int vxlan_update_default_fdb_entry(struct vxlan_dev *vxlan, __be32 vni,\n \tif (old_remote_ip \u0026\u0026 !vxlan_addr_any(old_remote_ip)) {\n \t\t__vxlan_fdb_delete(vxlan, all_zeros_mac,\n \t\t\t\t *old_remote_ip,\n-\t\t\t\t vxlan-\u003ecfg.dst_port,\n+\t\t\t\t cfg-\u003edst_port,\n \t\t\t\t vni, vni,\n-\t\t\t\t dst-\u003eremote_ifindex,\n+\t\t\t\t old_ifindex,\n \t\t\t\t true);\n \t}\n \tspin_unlock_bh(\u0026vxlan-\u003ehash_lock);\n@@ -515,8 +571,8 @@ static int vxlan_vni_update_group(struct vxlan_dev *vxlan,\n \t\t\t\t struct netlink_ext_ack *extack)\n {\n \tstruct vxlan_net *vn = net_generic(vxlan-\u003enet, vxlan_net_id);\n-\tstruct vxlan_rdst *dst = \u0026vxlan-\u003edefault_dst;\n-\tunion vxlan_addr *newrip = NULL, *oldrip = NULL;\n+\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tconst union vxlan_addr *newrip = NULL, *oldrip = NULL;\n \tunion vxlan_addr old_remote_ip;\n \tint ret = 0;\n \n@@ -528,8 +584,8 @@ static int vxlan_vni_update_group(struct vxlan_dev *vxlan,\n \tif (group \u0026\u0026 !vxlan_addr_any(group)) {\n \t\tnewrip = group;\n \t} else {\n-\t\tif (!vxlan_addr_any(\u0026dst-\u003eremote_ip))\n-\t\t\tnewrip = \u0026dst-\u003eremote_ip;\n+\t\tif (!vxlan_addr_any(\u0026cfg-\u003eremote_ip))\n+\t\t\tnewrip = \u0026cfg-\u003eremote_ip;\n \t}\n \n \t/* if old rip exists, and no newrip,\n@@ -546,18 +602,23 @@ static int vxlan_vni_update_group(struct vxlan_dev *vxlan,\n \n \tret = vxlan_update_default_fdb_entry(vxlan, vninode-\u003evni,\n \t\t\t\t\t oldrip, newrip,\n+\t\t\t\t\t cfg-\u003eremote_ifindex,\n+\t\t\t\t\t cfg-\u003eremote_ifindex,\n \t\t\t\t\t extack);\n \tif (ret)\n \t\tgoto out;\n \n-\tif (group)\n+\tif (group) {\n \t\tmemcpy(\u0026vninode-\u003eremote_ip, group, sizeof(vninode-\u003eremote_ip));\n+\t\tif (!create)\n+\t\t\tvxlan_vnifilter_seq_inc(dev_net(vxlan-\u003edev));\n+\t}\n \n \tif (vxlan-\u003edev-\u003eflags \u0026 IFF_UP) {\n \t\tif (vxlan_addr_multicast(\u0026old_remote_ip) \u0026\u0026\n \t\t !vxlan_group_used(vn, vxlan, vninode-\u003evni,\n \t\t\t\t \u0026old_remote_ip,\n-\t\t\t\t vxlan-\u003edefault_dst.remote_ifindex)) {\n+\t\t\t\t cfg-\u003eremote_ifindex)) {\n \t\t\tret = vxlan_igmp_leave(vxlan, \u0026old_remote_ip,\n \t\t\t\t\t 0);\n \t\t\tif (ret)\n@@ -581,10 +642,12 @@ static int vxlan_vni_update_group(struct vxlan_dev *vxlan,\n }\n \n int vxlan_vnilist_update_group(struct vxlan_dev *vxlan,\n-\t\t\t union vxlan_addr *old_remote_ip,\n-\t\t\t union vxlan_addr *new_remote_ip,\n+\t\t\t const union vxlan_addr *old_remote_ip,\n+\t\t\t const union vxlan_addr *new_remote_ip,\n+\t\t\t u32 old_ifindex, u32 new_ifindex,\n \t\t\t struct netlink_ext_ack *extack)\n {\n+\tconst union vxlan_addr *oldrip, *newrip;\n \tstruct list_head *headp, *hpos;\n \tstruct vxlan_vni_group *vg;\n \tstruct vxlan_vni_node *vent;\n@@ -595,37 +658,66 @@ int vxlan_vnilist_update_group(struct vxlan_dev *vxlan,\n \theadp = \u0026vg-\u003evni_list;\n \tlist_for_each_prev(hpos, headp) {\n \t\tvent = list_entry(hpos, struct vxlan_vni_node, vlist);\n+\n \t\tif (vxlan_addr_any(\u0026vent-\u003eremote_ip)) {\n-\t\t\tret = vxlan_update_default_fdb_entry(vxlan, vent-\u003evni,\n-\t\t\t\t\t\t\t old_remote_ip,\n-\t\t\t\t\t\t\t new_remote_ip,\n-\t\t\t\t\t\t\t extack);\n-\t\t\tif (ret)\n-\t\t\t\treturn ret;\n+\t\t\toldrip = old_remote_ip;\n+\t\t\tnewrip = new_remote_ip;\n+\t\t} else {\n+\t\t\t/* A vni with its own group keeps it, but its fdb entry\n+\t\t\t * is still keyed on the device remote_ifindex.\n+\t\t\t */\n+\t\t\toldrip = \u0026vent-\u003eremote_ip;\n+\t\t\tnewrip = \u0026vent-\u003eremote_ip;\n \t\t}\n+\n+\t\tret = vxlan_update_default_fdb_entry(vxlan, vent-\u003evni,\n+\t\t\t\t\t\t oldrip, newrip,\n+\t\t\t\t\t\t old_ifindex, new_ifindex,\n+\t\t\t\t\t\t extack);\n+\t\tif (ret)\n+\t\t\tgoto err_unwind;\n \t}\n \n \treturn 0;\n+\n+err_unwind:\n+\tlist_for_each_continue(hpos, headp) {\n+\t\tvent = list_entry(hpos, struct vxlan_vni_node, vlist);\n+\n+\t\tif (vxlan_addr_any(\u0026vent-\u003eremote_ip)) {\n+\t\t\toldrip = old_remote_ip;\n+\t\t\tnewrip = new_remote_ip;\n+\t\t} else {\n+\t\t\toldrip = \u0026vent-\u003eremote_ip;\n+\t\t\tnewrip = \u0026vent-\u003eremote_ip;\n+\t\t}\n+\n+\t\tvxlan_update_default_fdb_entry(vxlan, vent-\u003evni,\n+\t\t\t\t\t newrip, oldrip,\n+\t\t\t\t\t new_ifindex, old_ifindex,\n+\t\t\t\t\t NULL);\n+\t}\n+\treturn ret;\n }\n \n static void vxlan_vni_delete_group(struct vxlan_dev *vxlan,\n \t\t\t\t struct vxlan_vni_node *vninode)\n {\n \tstruct vxlan_net *vn = net_generic(vxlan-\u003enet, vxlan_net_id);\n-\tstruct vxlan_rdst *dst = \u0026vxlan-\u003edefault_dst;\n+\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n \n \t/* if per vni remote_ip not present, delete the\n \t * default dst remote_ip previously added for this vni\n \t */\n \tif (!vxlan_addr_any(\u0026vninode-\u003eremote_ip) ||\n-\t !vxlan_addr_any(\u0026dst-\u003eremote_ip)) {\n+\t !vxlan_addr_any(\u0026cfg-\u003eremote_ip)) {\n \t\tspin_lock_bh(\u0026vxlan-\u003ehash_lock);\n \t\t__vxlan_fdb_delete(vxlan, all_zeros_mac,\n \t\t\t\t (vxlan_addr_any(\u0026vninode-\u003eremote_ip) ?\n-\t\t\t\t dst-\u003eremote_ip : vninode-\u003eremote_ip),\n-\t\t\t\t vxlan-\u003ecfg.dst_port,\n+\t\t\t\t cfg-\u003eremote_ip : vninode-\u003eremote_ip),\n+\t\t\t\t cfg-\u003edst_port,\n \t\t\t\t vninode-\u003evni, vninode-\u003evni,\n-\t\t\t\t dst-\u003eremote_ifindex,\n+\t\t\t\t cfg-\u003eremote_ifindex,\n \t\t\t\t true);\n \t\tspin_unlock_bh(\u0026vxlan-\u003ehash_lock);\n \t}\n@@ -634,7 +726,7 @@ static void vxlan_vni_delete_group(struct vxlan_dev *vxlan,\n \t\tif (vxlan_addr_multicast(\u0026vninode-\u003eremote_ip) \u0026\u0026\n \t\t !vxlan_group_used(vn, vxlan, vninode-\u003evni,\n \t\t\t\t \u0026vninode-\u003eremote_ip,\n-\t\t\t\t dst-\u003eremote_ifindex)) {\n+\t\t\t\t cfg-\u003eremote_ifindex)) {\n \t\t\tvxlan_igmp_leave(vxlan, \u0026vninode-\u003eremote_ip, 0);\n \t\t}\n \t}\n@@ -665,7 +757,8 @@ static int vxlan_vni_update(struct vxlan_dev *vxlan,\n \treturn 0;\n }\n \n-static void __vxlan_vni_add_list(struct vxlan_vni_group *vg,\n+static void __vxlan_vni_add_list(struct vxlan_dev *vxlan,\n+\t\t\t\t struct vxlan_vni_group *vg,\n \t\t\t\t struct vxlan_vni_node *v)\n {\n \tstruct list_head *headp, *hpos;\n@@ -681,13 +774,16 @@ static void __vxlan_vni_add_list(struct vxlan_vni_group *vg,\n \t}\n \tlist_add_rcu(\u0026v-\u003evlist, hpos);\n \tvg-\u003enum_vnis++;\n+\tvxlan_vnifilter_seq_inc(dev_net(vxlan-\u003edev));\n }\n \n-static void __vxlan_vni_del_list(struct vxlan_vni_group *vg,\n+static void __vxlan_vni_del_list(struct vxlan_dev *vxlan,\n+\t\t\t\t struct vxlan_vni_group *vg,\n \t\t\t\t struct vxlan_vni_node *v)\n {\n \tlist_del_rcu(\u0026v-\u003evlist);\n \tvg-\u003enum_vnis--;\n+\tvxlan_vnifilter_seq_inc(dev_net(vxlan-\u003edev));\n }\n \n static struct vxlan_vni_node *vxlan_vni_alloc(struct vxlan_dev *vxlan,\n@@ -723,6 +819,7 @@ static int vxlan_vni_add(struct vxlan_dev *vxlan,\n \t\t\t u32 vni, union vxlan_addr *group,\n \t\t\t struct netlink_ext_ack *extack)\n {\n+\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n \tstruct vxlan_vni_node *vninode;\n \t__be32 v = cpu_to_be32(vni);\n \tbool changed = false;\n@@ -731,7 +828,7 @@ static int vxlan_vni_add(struct vxlan_dev *vxlan,\n \tif (vxlan_vnifilter_lookup(vxlan, v))\n \t\treturn vxlan_vni_update(vxlan, vg, v, group, \u0026changed, extack);\n \n-\terr = vxlan_vni_in_use(vxlan-\u003enet, vxlan, \u0026vxlan-\u003ecfg, v);\n+\terr = vxlan_vni_in_use(vxlan-\u003enet, vxlan, cfg, v);\n \tif (err) {\n \t\tNL_SET_ERR_MSG(extack, \"VNI in use\");\n \t\treturn err;\n@@ -749,7 +846,7 @@ static int vxlan_vni_add(struct vxlan_dev *vxlan,\n \t\treturn err;\n \t}\n \n-\t__vxlan_vni_add_list(vg, vninode);\n+\t__vxlan_vni_add_list(vxlan, vg, vninode);\n \n \tif (vxlan-\u003edev-\u003eflags \u0026 IFF_UP)\n \t\tvxlan_vs_add_del_vninode(vxlan, vninode, false);\n@@ -795,7 +892,7 @@ static int vxlan_vni_del(struct vxlan_dev *vxlan,\n \tif (err)\n \t\tgoto out;\n \n-\t__vxlan_vni_del_list(vg, vninode);\n+\t__vxlan_vni_del_list(vxlan, vg, vninode);\n \n \tvxlan_vnifilter_notify(vxlan, vninode, RTM_DELTUNNEL);\n \n@@ -844,6 +941,7 @@ static int vxlan_process_vni_filter(struct vxlan_dev *vxlan,\n \t\t\t\t int cmd, struct netlink_ext_ack *extack)\n {\n \tstruct nlattr *vattrs[VXLAN_VNIFILTER_ENTRY_MAX + 1];\n+\tconst struct vxlan_config *cfg;\n \tu32 vni_start = 0, vni_end = 0;\n \tunion vxlan_addr group;\n \tint err;\n@@ -881,7 +979,8 @@ static int vxlan_process_vni_filter(struct vxlan_dev *vxlan,\n \t\tmemset(\u0026group, 0, sizeof(group));\n \t}\n \n-\tif (vxlan_addr_multicast(\u0026group) \u0026\u0026 !vxlan-\u003edefault_dst.remote_ifindex) {\n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n+\tif (vxlan_addr_multicast(\u0026group) \u0026\u0026 !cfg-\u003eremote_ifindex) {\n \t\tNL_SET_ERR_MSG(extack,\n \t\t\t \"Local interface required for multicast remote group\");\n \n@@ -909,7 +1008,7 @@ void vxlan_vnigroup_uninit(struct vxlan_dev *vxlan)\n #if IS_ENABLED(CONFIG_IPV6)\n \t\thlist_del_init_rcu(\u0026v-\u003ehlist6.hlist);\n #endif\n-\t\t__vxlan_vni_del_list(vg, v);\n+\t\t__vxlan_vni_del_list(vxlan, vg, v);\n \t\tvxlan_vnifilter_notify(vxlan, v, RTM_DELTUNNEL);\n \t\tcall_rcu(\u0026v-\u003ercu, vxlan_vni_node_rcu_free);\n \t}\n@@ -940,6 +1039,7 @@ static int vxlan_vnifilter_process(struct sk_buff *skb, struct nlmsghdr *nlh,\n \t\t\t\t struct netlink_ext_ack *extack)\n {\n \tstruct net *net = sock_net(skb-\u003esk);\n+\tconst struct vxlan_config *cfg;\n \tstruct tunnel_msg *tmsg;\n \tstruct vxlan_dev *vxlan;\n \tstruct net_device *dev;\n@@ -964,8 +1064,9 @@ static int vxlan_vnifilter_process(struct sk_buff *skb, struct nlmsghdr *nlh,\n \t}\n \n \tvxlan = netdev_priv(dev);\n+\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n \n-\tif (!(vxlan-\u003ecfg.flags \u0026 VXLAN_F_VNIFILTER))\n+\tif (!(cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER))\n \t\treturn -EOPNOTSUPP;\n \n \tnlmsg_for_each_attr_type(attr, VXLAN_VNIFILTER_ENTRY, nlh,\ndiff --git a/include/net/vxlan.h b/include/net/vxlan.h\nindex 7b82075055237..c3c9f2ccc3d1b 100644\n--- a/include/net/vxlan.h\n+++ b/include/net/vxlan.h\n@@ -204,7 +204,6 @@ struct vxlan_rdst {\n \tu8\t\t\t offloaded:1;\n \t__be32\t\t\t remote_vni;\n \tu32\t\t\t remote_ifindex;\n-\tstruct net_device\t *remote_dev;\n \tstruct list_head\t list;\n \tstruct rcu_head\t\t rcu;\n \tstruct dst_cache\t dst_cache;\n@@ -229,6 +228,7 @@ struct vxlan_config {\n \tbool\t\t\t\tno_share;\n \tenum ifla_vxlan_df\t\tdf;\n \tstruct vxlanhdr\t\t\treserved_bits;\n+\tstruct rcu_head\t\t\trcu;\n };\n \n enum {\n@@ -294,14 +294,15 @@ struct vxlan_dev {\n #endif\n \tstruct net_device *dev;\n \tstruct net\t *net;\t\t/* netns for packet i/o */\n-\tstruct vxlan_rdst default_dst;\t/* default destination */\n+\tstruct net_device *lowerdev;\n \n \tstruct timer_list age_timer;\n \tspinlock_t\t hash_lock;\n \tunsigned int\t addrcnt;\n \tstruct gro_cells gro_cells;\n+\tunsigned long\t flags;\n \n-\tstruct vxlan_config\tcfg;\n+\tstruct vxlan_config __rcu\t*cfg;\n \n \tstruct vxlan_vni_group __rcu *vnigrp;\n \n@@ -313,6 +314,10 @@ struct vxlan_dev {\n \tunsigned int mdb_seq;\n };\n \n+enum vxlan_dev_flags {\n+\tVXLAN_DEV_F_MDB,\n+};\n+\n #define VXLAN_F_LEARN\t\t\t0x01\n #define VXLAN_F_PROXY\t\t\t0x02\n #define VXLAN_F_RSC\t\t\t0x04\n@@ -331,7 +336,6 @@ struct vxlan_dev {\n #define VXLAN_F_IPV6_LINKLOCAL\t\t0x8000\n #define VXLAN_F_TTL_INHERIT\t\t0x10000\n #define VXLAN_F_VNIFILTER 0x20000\n-#define VXLAN_F_MDB\t\t\t0x40000\n #define VXLAN_F_LOCALBYPASS\t\t0x80000\n #define VXLAN_F_MC_ROUTE\t\t0x100000\n \n"
} |
| 2/1 | 2026/09/23 07:53 | agent | patch-evaluator |
1mModel:core Args: null Results: {
"EnableConfigs": [
"VXLAN",
"INET",
"IPV6"
],
"FocusSymbols": [
"vxlan_changelink",
"vxlan_dev_configure",
"vxlan_free_dev",
"vxlan_xmit",
"vxlan_rcv",
"vxlan_update_default_fdb_entry",
"vxlan_vnilist_update_group",
"vxlan_vnifilter_dump_dev"
],
"Reasoning": "The patch refactors the VXLAN driver's configuration management by turning vxlan-\u003ecfg into an RCU-managed dynamically allocated object (struct vxlan_config __rcu *cfg), removing default_dst, adding RCU grace periods via kfree_rcu, updating changelink/error unwind logic, and altering lockless RCU walks for VNIFILTER dumping. VXLAN is a standard virtual netdevice reachable in virtualized QEMU environments through netlink and packet sockets, making this series an ideal target for syzkaller fuzzing.",
"WorthFuzzing": true
}Instruction: You are an expert Linux kernel maintainer and security engineer.
Your job is to review a provided patch series and evaluate whether it warrants fuzzing with syzkaller.
IMPORTANT: The changes have ALREADY been applied and committed as the HEAD commit in
your workspace. Do NOT rely on internal assumptions. You must actively use your code access
tools to inspect the actual source code, callers, and surrounding context.
================================================================================
1. CORE TRIAGE PHILOSOPHY
================================================================================
The goal of patch fuzzing is to discover crashes, regressions, exposed latent bugs,
and newly triggered assertions introduced by the patch series.
- REACHABILITY IS THE PRIMARY GATE:
Fuzzing can only discover bugs in code that can actually execute in standard virtualized
environments (GCE or QEMU, utilizing software-emulated devices like USB gadgets, netdev, tun/tap).
If the modified code is structurally unreachable (see Section 2), it MUST NOT be fuzzed,
regardless of whether it adds assertions or complex logic.
- DO NOT BLINDLY TRUST "NO FUNCTIONAL CHANGE" (NFCI) OR "REFACTORING" CLAIMS:
Patch authors routinely label changes as "cleanups", "refactorings", or state
"No functional change intended". Do NOT take these claims at face value.
Code refactorings that rearrange logic, introduce helper functions, or alter state management
in core subsystems frequently introduce subtle semantic shifts or uncover latent kernel bugs.
If reachable executable code is modified or refactored, it MUST be fuzzed.
- NEW OR MODIFIED ASSERTIONS IN REACHABLE CODE MUST BE FUZZED:
When a patch introduces or modifies runtime checks or assertions (e.g., WARN_ON*, VM_WARN_ON*,
BUG_ON*, lockdep_assert*) in reachable code paths, it enforces new or stricter invariants.
Even if the author believes the invariant always holds, fuzzing is essential to verify whether
an unusual sequence of operations can violate it.
================================================================================
2. WHEN TO RETURN WorthFuzzing=false (NEGATIVE CRITERIA)
================================================================================
Return WorthFuzzing=false ONLY IF all modified code falls strictly into one or more of these categories:
- Non-kernel and non-executable changes:
* Modifications to Documentation/, comments, or spelling fixes.
* User-space directories, self-tests, samples, or scripts (e.g., tools/, samples/, scripts/, usr/)
that do not affect the compiled kernel image (vmlinux) or kernel modules.
* Purely decorative logging (e.g., message strings in pr_err, printk, dev_info) or tracepoints
that do not alter control flow or data structures.
* Build system or Kconfig changes that do not alter compiled C logic.
- Structurally unreachable hardware:
* Vendor-specific PCIe switches, SmartNICs, or GPU drivers (e.g., mlxsw, pds_core, qed,
ionic, amdgpu) requiring physical ASIC/PCIe cards not emulated in standard QEMU.
- Unreachable execution paths:
* Driver teardown callbacks (.remove, .shutdown, pci_unregister_driver) executed only during
physical PCI hot-unplug or manual sysfs driver unbinding.
* Code paths exclusive to architectures other than the target architecture.
================================================================================
3. WHEN TO RETURN WorthFuzzing=true (POSITIVE CRITERIA)
================================================================================
Return WorthFuzzing=true whenever the patch touches reachable executable code, including:
- Core Subsystems:
* Any logic modifications in memory management (mm/), synchronization/locking (kernel/locking/),
BPF, scheduler, core networking, VFS, or syscall handling.
- Refactorings and Code Cleanups:
* Any restructuring of reachable data structures, helper abstractions, or algorithm flows.
- Runtime Assertions and Defensive Checks:
* Any introduction or alteration of assertions (WARN_ON*, VM_WARN_ON*, BUG_ON*, etc.) in reachable paths.
- Reachable Drivers and Protocols:
* Drivers accessible via virtual buses (virtio, USB gadget, loopback, netlink, binder, sockets, etc.).
================================================================================
4. EXTRACTING FocusSymbols (PREVENTING DILUTION)
================================================================================
When WorthFuzzing=true, you must extract specific kernel functions into FocusSymbols to guide the fuzzer:
- AVOID UBIQUITOUS LIFECYCLE HOT-PATHS:
Do NOT list generic, ubiquitous functions called by almost every program in the corpus
(including, but not limited to: general memory allocators and deallocators, page fault
and trap handlers, or core synchronization primitives; this is not an exhaustive list).
Listing ubiquitous functions causes the fuzzer to classify thousands of unrelated tests as "focused",
which severely dilutes fuzzing effort away from the actual changes.
- TARGET SPECIFIC FEATURE LOGIC AND ENTRYPOINTS:
List functions that specifically implement the logic being added or altered, or direct API entrypoints
for the subsystem feature under review.
- HANDLING STATIC INLINE FUNCTIONS IN HEADERS (.h):
Compiler-inlined static functions (such as static inlines in mm/*.h or include/linux/*.h) lack
distinct symbol addresses in vmlinux and cannot be targeted directly by symbol coverage filters.
If the changes are primarily in static inline helpers, identify non-static, feature-specific caller
functions in .c files that exercise them (avoiding ubiquitous lifecycle wrappers).
================================================================================
5. IDENTIFYING EnableConfigs
================================================================================
Identify any specific CONFIG_ options required to properly compile and reach the modified code:
- Inspect Kconfig files and #ifdef guards; do not make assumptions.
- Check "depends on" lines in Kconfig to include any non-standard parent subsystem configs needed.
- Strip any 'CONFIG_' prefix (e.g., return "NET_IPV4" instead of "CONFIG_NET_IPV4").
Prefer calling several tools at the same time to save round-trips.
Use set-results tool to provide results of the analysis.
It must be called exactly once before the final reply.
Ignore results of this tool.
Prompt: Target architecture: amd64
For your convenience, here is the diff of the changes:
commit 0b6e000f211d41c0ddec43751848309380949d38
Author: syz-cluster <triage@syzkaller.com>
Date: Wed Sep 23 07:53:12 2026 +0000
syz-cluster: applied patch under review
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c
index 7a18a469961db..467fbe43b89e9 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c
@@ -241,9 +241,16 @@ static bool mlx5e_tc_tun_encap_info_equal_vxlan(struct mlx5e_encap_key *a,
static int mlx5e_tc_tun_get_remote_ifindex(struct net_device *mirred_dev)
{
const struct vxlan_dev *vxlan = netdev_priv(mirred_dev);
- const struct vxlan_rdst *dst = &vxlan->default_dst;
+ const struct vxlan_config *cfg;
+ int ifindex = 0;
- return dst->remote_ifindex;
+ rcu_read_lock();
+ cfg = rcu_dereference(vxlan->cfg);
+ if (cfg)
+ ifindex = cfg->remote_ifindex;
+ rcu_read_unlock();
+
+ return ifindex;
}
struct mlx5e_tc_tunnel vxlan_tunnel = {
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c
index 52c2fe3644d4b..21e7b499f3879 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c
@@ -59,8 +59,11 @@ static bool mlxsw_sp_nve_vxlan_can_offload(const struct mlxsw_sp_nve *nve,
const struct mlxsw_sp_nve_params *params,
struct netlink_ext_ack *extack)
{
- struct vxlan_dev *vxlan = netdev_priv(params->dev);
- struct vxlan_config *cfg = &vxlan->cfg;
+ const struct vxlan_config *cfg;
+ struct vxlan_dev *vxlan;
+
+ vxlan = netdev_priv(params->dev);
+ cfg = rtnl_dereference(vxlan->cfg);
if (vxlan_addr_multicast(&cfg->remote_ip)) {
NL_SET_ERR_MSG_MOD(extack, "VxLAN: Multicast destination IP is not supported");
@@ -92,6 +95,11 @@ static bool mlxsw_sp_nve_vxlan_can_offload(const struct mlxsw_sp_nve *nve,
return false;
}
+ if (test_bit(VXLAN_DEV_F_MDB, &vxlan->flags)) {
+ NL_SET_ERR_MSG_MOD(extack, "VxLAN: MDB entries are not supported");
+ return false;
+ }
+
switch (cfg->saddr.sa.sa_family) {
case AF_INET:
if (!mlxsw_sp_nve_vxlan_ipv4_flags_check(cfg, extack))
@@ -148,8 +156,11 @@ static void mlxsw_sp_nve_vxlan_config(const struct mlxsw_sp_nve *nve,
const struct mlxsw_sp_nve_params *params,
struct mlxsw_sp_nve_config *config)
{
- struct vxlan_dev *vxlan = netdev_priv(params->dev);
- struct vxlan_config *cfg = &vxlan->cfg;
+ const struct vxlan_config *cfg;
+ struct vxlan_dev *vxlan;
+
+ vxlan = netdev_priv(params->dev);
+ cfg = rtnl_dereference(vxlan->cfg);
config->type = MLXSW_SP_NVE_TYPE_VXLAN;
config->ttl = cfg->ttl;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index fe45e533a4b2e..de60b698bea98 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -2513,15 +2513,17 @@ mlxsw_sp_bridge_vlan_aware_vxlan_join(struct mlxsw_sp_bridge_device *bridge_devi
{
struct mlxsw_sp *mlxsw_sp = mlxsw_sp_lower_get(bridge_device->dev);
struct vxlan_dev *vxlan = netdev_priv(vxlan_dev);
- struct mlxsw_sp_nve_params params = {
- .type = MLXSW_SP_NVE_TYPE_VXLAN,
- .vni = vxlan->cfg.vni,
- .dev = vxlan_dev,
- .ethertype = ethertype,
- };
+ struct mlxsw_sp_nve_params params;
+ const struct vxlan_config *cfg;
struct mlxsw_sp_fid *fid;
int err;
+ cfg = rtnl_dereference(vxlan->cfg);
+ params.type = MLXSW_SP_NVE_TYPE_VXLAN;
+ params.vni = cfg->vni;
+ params.dev = vxlan_dev;
+ params.ethertype = ethertype;
+
/* If the VLAN is 0, we need to find the VLAN that is configured as
* PVID and egress untagged on the bridge port of the VxLAN device.
* It is possible no such VLAN exists
@@ -2704,15 +2706,17 @@ mlxsw_sp_bridge_8021d_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,
{
struct mlxsw_sp *mlxsw_sp = mlxsw_sp_lower_get(bridge_device->dev);
struct vxlan_dev *vxlan = netdev_priv(vxlan_dev);
- struct mlxsw_sp_nve_params params = {
- .type = MLXSW_SP_NVE_TYPE_VXLAN,
- .vni = vxlan->cfg.vni,
- .dev = vxlan_dev,
- .ethertype = ETH_P_8021Q,
- };
+ struct mlxsw_sp_nve_params params;
+ const struct vxlan_config *cfg;
struct mlxsw_sp_fid *fid;
int err;
+ cfg = rtnl_dereference(vxlan->cfg);
+ params.type = MLXSW_SP_NVE_TYPE_VXLAN;
+ params.vni = cfg->vni;
+ params.dev = vxlan_dev;
+ params.ethertype = ETH_P_8021Q;
+
fid = mlxsw_sp_fid_8021d_get(mlxsw_sp, bridge_device->dev->ifindex);
if (IS_ERR(fid)) {
NL_SET_ERR_MSG_MOD(extack, "Failed to create 802.1D FID");
@@ -2933,10 +2937,13 @@ static void __mlxsw_sp_bridge_vxlan_leave(struct mlxsw_sp *mlxsw_sp,
const struct net_device *vxlan_dev)
{
struct vxlan_dev *vxlan = netdev_priv(vxlan_dev);
+ const struct vxlan_config *cfg;
struct mlxsw_sp_fid *fid;
+ cfg = rtnl_dereference(vxlan->cfg);
+
/* If the VxLAN device is down, then the FID does not have a VNI */
- fid = mlxsw_sp_fid_lookup_by_vni(mlxsw_sp, vxlan->cfg.vni);
+ fid = mlxsw_sp_fid_lookup_by_vni(mlxsw_sp, cfg->vni);
if (!fid)
return;
@@ -3029,11 +3036,13 @@ static void mlxsw_sp_fdb_vxlan_call_notifiers(struct net_device *dev,
struct switchdev_notifier_vxlan_fdb_info info;
struct vxlan_dev *vxlan = netdev_priv(dev);
enum switchdev_notifier_type type;
+ const struct vxlan_config *cfg;
+ cfg = rtnl_dereference(vxlan->cfg);
type = adding ? SWITCHDEV_VXLAN_FDB_ADD_TO_BRIDGE :
SWITCHDEV_VXLAN_FDB_DEL_TO_BRIDGE;
mlxsw_sp_switchdev_addr_vxlan_convert(proto, addr, &info.remote_ip);
- info.remote_port = vxlan->cfg.dst_port;
+ info.remote_port = cfg->dst_port;
info.remote_vni = vni;
info.remote_ifindex = 0;
ether_addr_copy(info.eth_addr, mac);
@@ -3236,8 +3245,10 @@ __mlxsw_sp_fdb_notify_mac_uc_tunnel_process(struct mlxsw_sp *mlxsw_sp,
if (adding && netif_is_vxlan(dev)) {
struct vxlan_dev *vxlan = netdev_priv(dev);
+ const struct vxlan_config *cfg;
- if (!(vxlan->cfg.flags & VXLAN_F_LEARN))
+ cfg = rtnl_dereference(vxlan->cfg);
+ if (!(cfg->flags & VXLAN_F_LEARN))
return -EINVAL;
}
@@ -3722,9 +3733,11 @@ mlxsw_sp_switchdev_vxlan_work_prepare(struct mlxsw_sp_switchdev_event_work *
{
struct vxlan_dev *vxlan = netdev_priv(switchdev_work->dev);
struct switchdev_notifier_vxlan_fdb_info *vxlan_fdb_info;
- struct vxlan_config *cfg = &vxlan->cfg;
+ const struct vxlan_config *cfg;
struct netlink_ext_ack *extack;
+ cfg = rcu_dereference_rtnl(vxlan->cfg);
+
extack = switchdev_notifier_info_to_extack(info);
vxlan_fdb_info = container_of(info,
struct switchdev_notifier_vxlan_fdb_info,
@@ -3851,11 +3864,15 @@ mlxsw_sp_switchdev_vxlan_vlan_add(struct mlxsw_sp *mlxsw_sp,
struct netlink_ext_ack *extack)
{
struct vxlan_dev *vxlan = netdev_priv(vxlan_dev);
- __be32 vni = vxlan->cfg.vni;
+ const struct vxlan_config *cfg;
struct mlxsw_sp_fid *fid;
u16 old_vid;
+ __be32 vni;
int err;
+ cfg = rtnl_dereference(vxlan->cfg);
+ vni = cfg->vni;
+
/* We cannot have the same VLAN as PVID and egress untagged on multiple
* VxLAN devices. Note that we get this notification before the VLAN is
* actually added to the bridge's database, so it is not possible for
@@ -3935,12 +3952,16 @@ mlxsw_sp_switchdev_vxlan_vlan_del(struct mlxsw_sp *mlxsw_sp,
const struct net_device *vxlan_dev, u16 vid)
{
struct vxlan_dev *vxlan = netdev_priv(vxlan_dev);
- __be32 vni = vxlan->cfg.vni;
+ const struct vxlan_config *cfg;
struct mlxsw_sp_fid *fid;
+ __be32 vni;
if (!netif_running(vxlan_dev))
return;
+ cfg = rtnl_dereference(vxlan->cfg);
+ vni = cfg->vni;
+
fid = mlxsw_sp_fid_lookup_by_vni(mlxsw_sp, vni);
if (!fid)
return;
diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
index 347245cc1de4e..2e975294c69ec 100644
--- a/drivers/net/vxlan/vxlan_core.c
+++ b/drivers/net/vxlan/vxlan_core.c
@@ -110,20 +110,23 @@ static struct vxlan_dev *vxlan_vs_find_vni(struct vxlan_sock *vs,
vni = 0;
hlist_for_each_entry_rcu(node, vni_head(vs, vni), hlist) {
+ const struct vxlan_config *cfg;
+
if (!node->vxlan)
continue;
+
+ cfg = rcu_dereference(node->vxlan->cfg);
+
vnode = NULL;
- if (node->vxlan->cfg.flags & VXLAN_F_VNIFILTER) {
+ if (cfg->flags & VXLAN_F_VNIFILTER) {
vnode = vxlan_vnifilter_lookup(node->vxlan, vni);
if (!vnode)
continue;
- } else if (node->vxlan->default_dst.remote_vni != vni) {
+ } else if (cfg->vni != vni) {
continue;
}
if (IS_ENABLED(CONFIG_IPV6)) {
- const struct vxlan_config *cfg = &node->vxlan->cfg;
-
if ((cfg->flags & VXLAN_F_IPV6_LINKLOCAL) &&
cfg->remote_ifindex != ifindex)
continue;
@@ -157,6 +160,7 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,
u32 portid, u32 seq, int type, unsigned int flags,
const struct vxlan_rdst *rdst)
{
+ const struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan->cfg);
unsigned long now = jiffies;
struct nda_cacheinfo ci;
bool send_ip, send_eth;
@@ -216,10 +220,10 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,
goto nla_put_failure;
if (rdst->remote_port &&
- rdst->remote_port != vxlan->cfg.dst_port &&
+ rdst->remote_port != cfg->dst_port &&
nla_put_be16(skb, NDA_PORT, rdst->remote_port))
goto nla_put_failure;
- if (rdst->remote_vni != vxlan->default_dst.remote_vni &&
+ if (rdst->remote_vni != cfg->vni &&
nla_put_u32(skb, NDA_VNI, be32_to_cpu(rdst->remote_vni)))
goto nla_put_failure;
if (rdst->remote_ifindex &&
@@ -227,7 +231,7 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,
goto nla_put_failure;
}
- if ((vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA) && fdb->key.vni &&
+ if ((cfg->flags & VXLAN_F_COLLECT_METADATA) && fdb->key.vni &&
nla_put_u32(skb, NDA_SRC_VNI,
be32_to_cpu(fdb->key.vni)))
goto nla_put_failure;
@@ -377,14 +381,15 @@ static void vxlan_fdb_miss(struct vxlan_dev *vxlan, const u8 eth_addr[ETH_ALEN])
/* Look up Ethernet address in forwarding table */
static struct vxlan_fdb *vxlan_find_mac_rcu(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
const u8 *mac, __be32 vni)
{
struct vxlan_fdb_key key;
memset(&key, 0, sizeof(key));
memcpy(key.eth_addr, mac, sizeof(key.eth_addr));
- if (!(vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA))
- key.vni = vxlan->default_dst.remote_vni;
+ if (!(cfg->flags & VXLAN_F_COLLECT_METADATA))
+ key.vni = cfg->vni;
else
key.vni = vni;
@@ -393,11 +398,12 @@ static struct vxlan_fdb *vxlan_find_mac_rcu(struct vxlan_dev *vxlan,
}
static struct vxlan_fdb *vxlan_find_mac_tx(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
const u8 *mac, __be32 vni)
{
struct vxlan_fdb *f;
- f = vxlan_find_mac_rcu(vxlan, mac, vni);
+ f = vxlan_find_mac_rcu(vxlan, cfg, mac, vni);
if (f) {
unsigned long now = jiffies;
@@ -416,7 +422,7 @@ static struct vxlan_fdb *vxlan_find_mac(struct vxlan_dev *vxlan,
lockdep_assert_held_once(&vxlan->hash_lock);
rcu_read_lock();
- f = vxlan_find_mac_rcu(vxlan, mac, vni);
+ f = vxlan_find_mac_rcu(vxlan, rcu_dereference(vxlan->cfg), mac, vni);
rcu_read_unlock();
return f;
@@ -457,7 +463,7 @@ int vxlan_fdb_find_uc(struct net_device *dev, const u8 *mac, __be32 vni,
rcu_read_lock();
- f = vxlan_find_mac_rcu(vxlan, eth_addr, vni);
+ f = vxlan_find_mac_rcu(vxlan, rcu_dereference(vxlan->cfg), eth_addr, vni);
if (f)
rdst = first_remote_rcu(f);
if (!rdst) {
@@ -798,6 +804,7 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
u32 nhid, struct netlink_ext_ack *extack)
{
struct nexthop *old_nh = rtnl_dereference(fdb->nh);
+ const struct vxlan_config *cfg;
struct nexthop *nh;
int err = -EINVAL;
@@ -826,7 +833,8 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
}
/* check nexthop group family */
- switch (vxlan->default_dst.remote_ip.sa.sa_family) {
+ cfg = rtnl_dereference(vxlan->cfg);
+ switch (cfg->remote_ip.sa.sa_family) {
case AF_INET:
if (!nexthop_has_v4(nh)) {
err = -EAFNOSUPPORT;
@@ -863,12 +871,13 @@ int vxlan_fdb_create(struct vxlan_dev *vxlan,
u32 nhid, struct vxlan_fdb **fdb,
struct netlink_ext_ack *extack)
{
+ const struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan->cfg);
struct vxlan_rdst *rd = NULL;
struct vxlan_fdb *f;
int rc;
- if (vxlan->cfg.addrmax &&
- vxlan->addrcnt >= vxlan->cfg.addrmax)
+ if (cfg->addrmax &&
+ vxlan->addrcnt >= cfg->addrmax)
return -ENOSPC;
netdev_dbg(vxlan->dev, "add %pM -> %pIS\n", mac, ip);
@@ -1154,6 +1163,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,
__be32 *vni, u32 *ifindex, u32 *nhid,
struct netlink_ext_ack *extack)
{
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
struct net *net = dev_net(vxlan->dev);
int err;
@@ -1170,7 +1180,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,
return err;
}
} else {
- union vxlan_addr *remote = &vxlan->default_dst.remote_ip;
+ const union vxlan_addr *remote = &cfg->remote_ip;
if (remote->sa.sa_family == AF_INET) {
ip->sin.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -1190,7 +1200,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,
}
*port = nla_get_be16(tb[NDA_PORT]);
} else {
- *port = vxlan->cfg.dst_port;
+ *port = cfg->dst_port;
}
if (tb[NDA_VNI]) {
@@ -1200,7 +1210,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,
}
*vni = cpu_to_be32(nla_get_u32(tb[NDA_VNI]));
} else {
- *vni = vxlan->default_dst.remote_vni;
+ *vni = cfg->vni;
}
if (tb[NDA_SRC_VNI]) {
@@ -1210,7 +1220,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,
}
*src_vni = cpu_to_be32(nla_get_u32(tb[NDA_SRC_VNI]));
} else {
- *src_vni = vxlan->default_dst.remote_vni;
+ *src_vni = cfg->vni;
}
if (tb[NDA_IFINDEX]) {
@@ -1241,6 +1251,7 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
const unsigned char *addr, u16 vid, u16 flags,
bool *notified, struct netlink_ext_ack *extack)
{
+ const struct vxlan_config *cfg;
struct vxlan_dev *vxlan = netdev_priv(dev);
/* struct net *net = dev_net(vxlan->dev); */
union vxlan_addr ip;
@@ -1268,7 +1279,8 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
return -EINVAL;
}
- if (vxlan->default_dst.remote_ip.sa.sa_family != ip.sa.sa_family)
+ cfg = rtnl_dereference(vxlan->cfg);
+ if (cfg->remote_ip.sa.sa_family != ip.sa.sa_family)
return -EAFNOSUPPORT;
spin_lock_bh(&vxlan->hash_lock);
@@ -1405,18 +1417,21 @@ static int vxlan_fdb_get(struct sk_buff *skb,
struct netlink_ext_ack *extack)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
+ const struct vxlan_config *cfg;
struct vxlan_fdb *f;
__be32 vni;
int err;
+ cfg = rcu_dereference_rtnl(vxlan->cfg);
+
if (tb[NDA_VNI])
vni = cpu_to_be32(nla_get_u32(tb[NDA_VNI]));
else
- vni = vxlan->default_dst.remote_vni;
+ vni = cfg->vni;
rcu_read_lock();
- f = vxlan_find_mac_rcu(vxlan, addr, vni);
+ f = vxlan_find_mac_rcu(vxlan, cfg, addr, vni);
if (!f) {
NL_SET_ERR_MSG(extack, "Fdb entry not found");
err = -ENOENT;
@@ -1434,6 +1449,7 @@ static int vxlan_fdb_get(struct sk_buff *skb,
* and Tunnel endpoint.
*/
static enum skb_drop_reason vxlan_snoop(struct net_device *dev,
+ const struct vxlan_config *cfg,
union vxlan_addr *src_ip,
const u8 *src_mac, u32 src_ifindex,
__be32 vni)
@@ -1452,7 +1468,7 @@ static enum skb_drop_reason vxlan_snoop(struct net_device *dev,
ifindex = src_ifindex;
#endif
- f = vxlan_find_mac_rcu(vxlan, src_mac, vni);
+ f = vxlan_find_mac_rcu(vxlan, cfg, src_mac, vni);
if (likely(f)) {
struct vxlan_rdst *rdst = first_remote_rcu(f);
unsigned long now = jiffies;
@@ -1488,9 +1504,9 @@ static enum skb_drop_reason vxlan_snoop(struct net_device *dev,
vxlan_fdb_update(vxlan, src_mac, src_ip,
NUD_REACHABLE,
NLM_F_EXCL|NLM_F_CREATE,
- vxlan->cfg.dst_port,
+ cfg->dst_port,
vni,
- vxlan->default_dst.remote_vni,
+ cfg->vni,
ifindex, NTF_SELF, 0, true, NULL);
spin_unlock(&vxlan->hash_lock);
}
@@ -1518,6 +1534,7 @@ static bool __vxlan_sock_release_prep(struct vxlan_sock *vs)
static void vxlan_sock_release(struct vxlan_dev *vxlan)
{
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
struct vxlan_sock *sock4 = rtnl_dereference(vxlan->vn4_sock);
#if IS_ENABLED(CONFIG_IPV6)
struct vxlan_sock *sock6 = rtnl_dereference(vxlan->vn6_sock);
@@ -1527,7 +1544,7 @@ static void vxlan_sock_release(struct vxlan_dev *vxlan)
RCU_INIT_POINTER(vxlan->vn4_sock, NULL);
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER)
+ if (cfg->flags & VXLAN_F_VNIFILTER)
vxlan_vs_del_vnigrp(vxlan);
else
vxlan_vs_del_dev(vxlan);
@@ -1598,6 +1615,7 @@ static void vxlan_parse_gbp_hdr(struct sk_buff *skb, u32 vxflags,
}
static enum skb_drop_reason vxlan_set_mac(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
struct vxlan_sock *vs,
struct sk_buff *skb, __be32 vni)
{
@@ -1623,10 +1641,10 @@ static enum skb_drop_reason vxlan_set_mac(struct vxlan_dev *vxlan,
#endif
}
- if (!(vxlan->cfg.flags & VXLAN_F_LEARN))
+ if (!(cfg->flags & VXLAN_F_LEARN))
return SKB_NOT_DROPPED_YET;
- return vxlan_snoop(skb->dev, &saddr, eth_hdr(skb)->h_source,
+ return vxlan_snoop(skb->dev, cfg, &saddr, eth_hdr(skb)->h_source,
ifindex, vni);
}
@@ -1657,18 +1675,21 @@ static bool vxlan_ecn_decapsulate(struct vxlan_sock *vs, void *oiph,
static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
{
struct vxlan_vni_node *vninode = NULL;
- const struct vxlanhdr *vh;
- struct vxlan_dev *vxlan;
- struct vxlan_sock *vs;
- struct vxlan_metadata _md;
- struct vxlan_metadata *md = &_md;
__be16 protocol = htons(ETH_P_TEB);
+ const struct vxlan_config *cfg;
enum skb_drop_reason reason;
+ const struct vxlanhdr *vh;
+ struct vxlan_metadata *md;
+ struct vxlan_metadata _md;
+ struct vxlan_dev *vxlan;
bool raw_proto = false;
- void *oiph;
+ struct vxlan_sock *vs;
__be32 vni = 0;
+ void *oiph;
int nh;
+ md = &_md;
+
/* Need UDP and VXLAN header to be present */
reason = pskb_may_pull_reason(skb, VXLAN_HLEN);
if (reason)
@@ -1696,8 +1717,10 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
goto drop;
}
- if (vh->vx_flags & vxlan->cfg.reserved_bits.vx_flags ||
- vh->vx_vni & vxlan->cfg.reserved_bits.vx_vni) {
+ cfg = rcu_dereference(vxlan->cfg);
+
+ if (vh->vx_flags & cfg->reserved_bits.vx_flags ||
+ vh->vx_vni & cfg->reserved_bits.vx_vni) {
/* If the header uses bits besides those enabled by the
* netdevice configuration, treat this as a malformed packet.
* This behavior diverges from VXLAN RFC (RFC7348) which
@@ -1709,12 +1732,12 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
reason = SKB_DROP_REASON_VXLAN_INVALID_HDR;
DEV_STATS_INC(vxlan->dev, rx_frame_errors);
DEV_STATS_INC(vxlan->dev, rx_errors);
- vxlan_vnifilter_count(vxlan, vni, vninode,
+ vxlan_vnifilter_count(vxlan, cfg, vni, vninode,
VXLAN_VNI_STATS_RX_ERRORS, 0);
goto drop;
}
- if (vxlan->cfg.flags & VXLAN_F_GPE) {
+ if (cfg->flags & VXLAN_F_GPE) {
if (!vxlan_parse_gpe_proto(vh, &protocol))
goto drop;
raw_proto = true;
@@ -1726,8 +1749,8 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
goto drop;
}
- if (vxlan->cfg.flags & VXLAN_F_REMCSUM_RX) {
- reason = vxlan_remcsum(skb, vxlan->cfg.flags);
+ if (cfg->flags & VXLAN_F_REMCSUM_RX) {
+ reason = vxlan_remcsum(skb, cfg->flags);
if (unlikely(reason))
goto drop;
}
@@ -1752,14 +1775,14 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
memset(md, 0, sizeof(*md));
}
- if (vxlan->cfg.flags & VXLAN_F_GBP)
- vxlan_parse_gbp_hdr(skb, vxlan->cfg.flags, md);
+ if (cfg->flags & VXLAN_F_GBP)
+ vxlan_parse_gbp_hdr(skb, cfg->flags, md);
/* Note that GBP and GPE can never be active together. This is
* ensured in vxlan_dev_configure.
*/
if (!raw_proto) {
- reason = vxlan_set_mac(vxlan, vs, skb, vni);
+ reason = vxlan_set_mac(vxlan, cfg, vs, skb, vni);
if (reason)
goto drop;
} else {
@@ -1780,7 +1803,7 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
if (reason) {
DEV_STATS_INC(vxlan->dev, rx_length_errors);
DEV_STATS_INC(vxlan->dev, rx_errors);
- vxlan_vnifilter_count(vxlan, vni, vninode,
+ vxlan_vnifilter_count(vxlan, cfg, vni, vninode,
VXLAN_VNI_STATS_RX_ERRORS, 0);
goto drop;
}
@@ -1792,7 +1815,7 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
reason = SKB_DROP_REASON_IP_TUNNEL_ECN;
DEV_STATS_INC(vxlan->dev, rx_frame_errors);
DEV_STATS_INC(vxlan->dev, rx_errors);
- vxlan_vnifilter_count(vxlan, vni, vninode,
+ vxlan_vnifilter_count(vxlan, cfg, vni, vninode,
VXLAN_VNI_STATS_RX_ERRORS, 0);
goto drop;
}
@@ -1802,14 +1825,15 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
if (unlikely(!(vxlan->dev->flags & IFF_UP))) {
rcu_read_unlock();
dev_dstats_rx_dropped(vxlan->dev);
- vxlan_vnifilter_count(vxlan, vni, vninode,
+ vxlan_vnifilter_count(vxlan, cfg, vni, vninode,
VXLAN_VNI_STATS_RX_DROPS, 0);
reason = SKB_DROP_REASON_DEV_READY;
goto drop;
}
dev_dstats_rx_add(vxlan->dev, skb->len);
- vxlan_vnifilter_count(vxlan, vni, vninode, VXLAN_VNI_STATS_RX, skb->len);
+ vxlan_vnifilter_count(vxlan, cfg, vni, vninode, VXLAN_VNI_STATS_RX,
+ skb->len);
gro_cells_receive(&vxlan->gro_cells, skb);
rcu_read_unlock();
@@ -1850,7 +1874,8 @@ static int vxlan_err_lookup(struct sock *sk, struct sk_buff *skb)
return 0;
}
-static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
+static int arp_reduce(struct net_device *dev, struct sk_buff *skb,
+ const struct vxlan_config *cfg, __be32 vni)
{
struct neigh_table *tbl = arp_table(dev_net(dev));
struct vxlan_dev *vxlan = netdev_priv(dev);
@@ -1864,7 +1889,7 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
if (!pskb_network_may_pull(skb, arp_hdr_len(dev))) {
dev_dstats_tx_dropped(dev);
- vxlan_vnifilter_count(vxlan, vni, NULL,
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL,
VXLAN_VNI_STATS_TX_DROPS, 0);
goto out;
}
@@ -1905,7 +1930,7 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
neigh_ha_snapshot(ha, n, n->dev);
rcu_read_lock();
- f = vxlan_find_mac_tx(vxlan, ha, vni);
+ f = vxlan_find_mac_tx(vxlan, cfg, ha, vni);
if (f)
rdst = first_remote_rcu(f);
if (rdst && vxlan_addr_any(&rdst->remote_ip)) {
@@ -1931,11 +1956,11 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
if (netif_rx(reply) == NET_RX_DROP) {
dev_dstats_rx_dropped(dev);
- vxlan_vnifilter_count(vxlan, vni, NULL,
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL,
VXLAN_VNI_STATS_RX_DROPS, 0);
}
- } else if (vxlan->cfg.flags & VXLAN_F_L3MISS) {
+ } else if (cfg->flags & VXLAN_F_L3MISS) {
union vxlan_addr ipa = {
.sin.sin_addr.s_addr = tip,
.sin.sin_family = AF_INET,
@@ -2043,7 +2068,8 @@ static struct sk_buff *vxlan_na_create(struct sk_buff *request,
return reply;
}
-static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
+static int neigh_reduce(struct net_device *dev, struct sk_buff *skb,
+ const struct vxlan_config *cfg, __be32 vni)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
const struct in6_addr *daddr;
@@ -2077,7 +2103,7 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
}
neigh_ha_snapshot(ha, n, n->dev);
- f = vxlan_find_mac_tx(vxlan, ha, vni);
+ f = vxlan_find_mac_tx(vxlan, cfg, ha, vni);
if (f)
rdst = first_remote_rcu(f);
if (rdst && vxlan_addr_any(&rdst->remote_ip)) {
@@ -2096,10 +2122,10 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
if (netif_rx(reply) == NET_RX_DROP) {
dev_dstats_rx_dropped(dev);
- vxlan_vnifilter_count(vxlan, vni, NULL,
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL,
VXLAN_VNI_STATS_RX_DROPS, 0);
}
- } else if (vxlan->cfg.flags & VXLAN_F_L3MISS) {
+ } else if (cfg->flags & VXLAN_F_L3MISS) {
union vxlan_addr ipa = {
.sin6.sin6_addr = msg->target,
.sin6.sin6_family = AF_INET6,
@@ -2115,9 +2141,9 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
}
#endif
-static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)
+static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb,
+ const struct vxlan_config *cfg)
{
- struct vxlan_dev *vxlan = netdev_priv(dev);
struct neigh_table *tbl;
struct neighbour *n;
@@ -2136,7 +2162,7 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)
tbl = arp_table(dev_net(dev));
pip = ip_hdr(skb);
n = neigh_lookup(tbl, &pip->daddr, dev);
- if (!n && (vxlan->cfg.flags & VXLAN_F_L3MISS)) {
+ if (!n && (cfg->flags & VXLAN_F_L3MISS)) {
union vxlan_addr ipa = {
.sin.sin_addr.s_addr = pip->daddr,
.sin.sin_family = AF_INET,
@@ -2164,7 +2190,7 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)
tbl = nd_table(dev_net(dev));
pip6 = ipv6_hdr(skb);
n = neigh_lookup(tbl, &pip6->daddr, dev);
- if (!n && (vxlan->cfg.flags & VXLAN_F_L3MISS)) {
+ if (!n && (cfg->flags & VXLAN_F_L3MISS)) {
union vxlan_addr ipa = {
.sin6.sin6_addr = pip6->daddr,
.sin6.sin6_family = AF_INET6,
@@ -2282,20 +2308,28 @@ static int vxlan_build_skb(struct sk_buff *skb, struct dst_entry *dst,
/* Bypass encapsulation if the destination is local */
static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
- struct vxlan_dev *dst_vxlan, __be32 vni,
- bool snoop)
+ struct vxlan_dev *dst_vxlan,
+ const struct vxlan_config *src_cfg,
+ __be32 vni, bool snoop)
{
+ const struct vxlan_config *dst_cfg;
union vxlan_addr loopback;
- union vxlan_addr *remote_ip = &dst_vxlan->default_dst.remote_ip;
unsigned int len = skb->len;
- struct net_device *dev;
+ struct net_device *dev = dst_vxlan->dev;
skb->pkt_type = PACKET_HOST;
skb->encapsulation = 0;
- skb->dev = dst_vxlan->dev;
+ skb->dev = dev;
__skb_pull(skb, skb_network_offset(skb));
- if (remote_ip->sa.sa_family == AF_INET) {
+ rcu_read_lock();
+ dst_cfg = rcu_dereference(dst_vxlan->cfg);
+ if (unlikely(!(dev->flags & IFF_UP))) {
+ kfree_skb_reason(skb, SKB_DROP_REASON_DEV_READY);
+ goto drop;
+ }
+
+ if (dst_cfg->remote_ip.sa.sa_family == AF_INET) {
loopback.sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
loopback.sa.sa_family = AF_INET;
#if IS_ENABLED(CONFIG_IPV6)
@@ -2305,27 +2339,20 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
#endif
}
- rcu_read_lock();
- dev = skb->dev;
- if (unlikely(!(dev->flags & IFF_UP))) {
- kfree_skb_reason(skb, SKB_DROP_REASON_DEV_READY);
- goto drop;
- }
-
- if ((dst_vxlan->cfg.flags & VXLAN_F_LEARN) && snoop)
- vxlan_snoop(dev, &loopback, eth_hdr(skb)->h_source, 0, vni);
+ if ((dst_cfg->flags & VXLAN_F_LEARN) && snoop)
+ vxlan_snoop(dev, dst_cfg, &loopback, eth_hdr(skb)->h_source, 0, vni);
dev_dstats_tx_add(src_vxlan->dev, len);
- vxlan_vnifilter_count(src_vxlan, vni, NULL, VXLAN_VNI_STATS_TX, len);
+ vxlan_vnifilter_count(src_vxlan, src_cfg, vni, NULL, VXLAN_VNI_STATS_TX, len);
if (__netif_rx(skb) == NET_RX_SUCCESS) {
dev_dstats_rx_add(dst_vxlan->dev, len);
- vxlan_vnifilter_count(dst_vxlan, vni, NULL, VXLAN_VNI_STATS_RX,
+ vxlan_vnifilter_count(dst_vxlan, dst_cfg, vni, NULL, VXLAN_VNI_STATS_RX,
len);
} else {
drop:
dev_dstats_rx_dropped(dev);
- vxlan_vnifilter_count(dst_vxlan, vni, NULL,
+ vxlan_vnifilter_count(dst_vxlan, dst_cfg, vni, NULL,
VXLAN_VNI_STATS_RX_DROPS, 0);
}
rcu_read_unlock();
@@ -2333,6 +2360,7 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
static int encap_bypass_if_local(struct sk_buff *skb, struct net_device *dev,
struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
int addr_family,
__be16 dst_port, int dst_ifindex, __be32 vni,
struct dst_entry *dst,
@@ -2348,22 +2376,22 @@ static int encap_bypass_if_local(struct sk_buff *skb, struct net_device *dev,
/* Bypass encapsulation if the destination is local */
if (rt_flags & RTCF_LOCAL &&
!(rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) &&
- vxlan->cfg.flags & VXLAN_F_LOCALBYPASS) {
+ cfg->flags & VXLAN_F_LOCALBYPASS) {
struct vxlan_dev *dst_vxlan;
dst_release(dst);
dst_vxlan = vxlan_find_vni(vxlan->net, dst_ifindex, vni,
addr_family, dst_port,
- vxlan->cfg.flags);
+ cfg->flags);
if (!dst_vxlan) {
DEV_STATS_INC(dev, tx_errors);
- vxlan_vnifilter_count(vxlan, vni, NULL,
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL,
VXLAN_VNI_STATS_TX_ERRORS, 0);
kfree_skb_reason(skb, SKB_DROP_REASON_VXLAN_VNI_NOT_FOUND);
return -ENOENT;
}
- vxlan_encap_bypass(skb, vxlan, dst_vxlan, vni, true);
+ vxlan_encap_bypass(skb, vxlan, dst_vxlan, cfg, vni, true);
return 1;
}
@@ -2371,30 +2399,35 @@ static int encap_bypass_if_local(struct sk_buff *skb, struct net_device *dev,
}
void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
+ const struct vxlan_config *cfg,
__be32 default_vni, struct vxlan_rdst *rdst, bool did_rsc)
{
+ unsigned int pkt_len = skb->len;
+ struct vxlan_metadata _md = {};
+ __be16 src_port = 0, dst_port;
+ struct dst_entry *ndst = NULL;
+ enum skb_drop_reason reason;
struct dst_cache *dst_cache;
+ const struct iphdr *old_iph;
struct ip_tunnel_info *info;
struct ip_tunnel_key *pkey;
+ struct vxlan_metadata *md;
struct ip_tunnel_key key;
- struct vxlan_dev *vxlan = netdev_priv(dev);
- const struct iphdr *old_iph;
- struct vxlan_metadata _md = {};
- struct vxlan_metadata *md = &_md;
- unsigned int pkt_len = skb->len;
- __be16 src_port = 0, dst_port;
- struct dst_entry *ndst = NULL;
+ struct vxlan_dev *vxlan;
+ u32 flags = cfg->flags;
+ bool udp_sum = false;
+ bool no_eth_encap;
int addr_family;
+ bool use_cache;
+ __be32 vni = 0;
__u8 tos, ttl;
int ifindex;
int err = 0;
- u32 flags = vxlan->cfg.flags;
- bool use_cache;
- bool udp_sum = false;
- bool xnet = !net_eq(vxlan->net, dev_net(vxlan->dev));
- enum skb_drop_reason reason;
- bool no_eth_encap;
- __be32 vni = 0;
+ bool xnet;
+
+ vxlan = netdev_priv(dev);
+ xnet = !net_eq(vxlan->net, dev_net(vxlan->dev));
+ md = &_md;
no_eth_encap = flags & VXLAN_F_GPE && skb->protocol != htons(ETH_P_TEB);
reason = skb_vlan_inet_prepare(skb, no_eth_encap);
@@ -2414,23 +2447,23 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
if (vxlan_addr_any(&rdst->remote_ip)) {
if (did_rsc) {
/* short-circuited back to local bridge */
- vxlan_encap_bypass(skb, vxlan, vxlan,
+ vxlan_encap_bypass(skb, vxlan, vxlan, cfg,
default_vni, true);
return;
}
goto drop;
}
- addr_family = vxlan->cfg.saddr.sa.sa_family;
- dst_port = rdst->remote_port ? rdst->remote_port : vxlan->cfg.dst_port;
+ addr_family = cfg->saddr.sa.sa_family;
+ dst_port = rdst->remote_port ? rdst->remote_port : cfg->dst_port;
vni = (rdst->remote_vni) ? : default_vni;
ifindex = rdst->remote_ifindex;
if (addr_family == AF_INET) {
- key.u.ipv4.src = vxlan->cfg.saddr.sin.sin_addr.s_addr;
+ key.u.ipv4.src = cfg->saddr.sin.sin_addr.s_addr;
key.u.ipv4.dst = rdst->remote_ip.sin.sin_addr.s_addr;
} else {
- key.u.ipv6.src = vxlan->cfg.saddr.sin6.sin6_addr;
+ key.u.ipv6.src = cfg->saddr.sin6.sin6_addr;
key.u.ipv6.dst = rdst->remote_ip.sin6.sin6_addr;
}
@@ -2439,11 +2472,11 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
if (flags & VXLAN_F_TTL_INHERIT) {
ttl = ip_tunnel_get_ttl(old_iph, skb);
} else {
- ttl = vxlan->cfg.ttl;
+ ttl = cfg->ttl;
if (!ttl && vxlan_addr_multicast(&rdst->remote_ip))
ttl = 1;
}
- tos = vxlan->cfg.tos;
+ tos = cfg->tos;
if (tos == 1)
tos = ip_tunnel_get_dsfield(old_iph, skb);
if (tos && !info)
@@ -2454,9 +2487,9 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
else
udp_sum = !(flags & VXLAN_F_UDP_ZERO_CSUM6_TX);
#if IS_ENABLED(CONFIG_IPV6)
- switch (vxlan->cfg.label_policy) {
+ switch (cfg->label_policy) {
case VXLAN_LABEL_FIXED:
- key.label = vxlan->cfg.label;
+ key.label = cfg->label;
break;
case VXLAN_LABEL_INHERIT:
key.label = ip_tunnel_get_flowlabel(old_iph, skb);
@@ -2474,7 +2507,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
}
pkey = &info->key;
addr_family = ip_tunnel_info_af(info);
- dst_port = info->key.tp_dst ? : vxlan->cfg.dst_port;
+ dst_port = info->key.tp_dst ? : cfg->dst_port;
vni = tunnel_id_to_key32(info->key.tun_id);
ifindex = 0;
dst_cache = &info->dst_cache;
@@ -2487,8 +2520,8 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
tos = info->key.tos;
udp_sum = test_bit(IP_TUNNEL_CSUM_BIT, info->key.tun_flags);
}
- src_port = udp_flow_src_port(dev_net(dev), skb, vxlan->cfg.port_min,
- vxlan->cfg.port_max, true);
+ src_port = udp_flow_src_port(dev_net(dev), skb, cfg->port_min,
+ cfg->port_max, true);
rcu_read_lock();
if (addr_family == AF_INET) {
@@ -2521,15 +2554,15 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
if (!info) {
/* Bypass encapsulation if the destination is local */
- err = encap_bypass_if_local(skb, dev, vxlan, AF_INET,
+ err = encap_bypass_if_local(skb, dev, vxlan, cfg, AF_INET,
dst_port, ifindex, vni,
&rt->dst, rt->rt_flags);
if (err)
goto out_unlock;
- if (vxlan->cfg.df == VXLAN_DF_SET) {
+ if (cfg->df == VXLAN_DF_SET) {
df = htons(IP_DF);
- } else if (vxlan->cfg.df == VXLAN_DF_INHERIT) {
+ } else if (cfg->df == VXLAN_DF_INHERIT) {
struct ethhdr *eth = eth_hdr(skb);
if (ntohs(eth->h_proto) == ETH_P_IPV6 ||
@@ -2558,7 +2591,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
unclone->key.u.ipv4.src = pkey->u.ipv4.dst;
unclone->key.u.ipv4.dst = saddr;
}
- vxlan_encap_bypass(skb, vxlan, vxlan, vni, false);
+ vxlan_encap_bypass(skb, vxlan, vxlan, cfg, vni, false);
dst_release(ndst);
goto out_unlock;
}
@@ -2608,7 +2641,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
if (!info) {
u32 rt6i_flags = dst_rt6_info(ndst)->rt6i_flags;
- err = encap_bypass_if_local(skb, dev, vxlan, AF_INET6,
+ err = encap_bypass_if_local(skb, dev, vxlan, cfg, AF_INET6,
dst_port, ifindex, vni,
ndst, rt6i_flags);
if (err)
@@ -2632,7 +2665,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
unclone->key.u.ipv6.dst = saddr;
}
- vxlan_encap_bypass(skb, vxlan, vxlan, vni, false);
+ vxlan_encap_bypass(skb, vxlan, vxlan, cfg, vni, false);
dst_release(ndst);
goto out_unlock;
}
@@ -2653,14 +2686,14 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
ip6cb_flags);
#endif
}
- vxlan_vnifilter_count(vxlan, vni, NULL, VXLAN_VNI_STATS_TX, pkt_len);
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL, VXLAN_VNI_STATS_TX, pkt_len);
out_unlock:
rcu_read_unlock();
return;
drop:
dev_dstats_tx_dropped(dev);
- vxlan_vnifilter_count(vxlan, vni, NULL, VXLAN_VNI_STATS_TX_DROPS, 0);
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL, VXLAN_VNI_STATS_TX_DROPS, 0);
kfree_skb_reason(skb, reason);
return;
@@ -2672,11 +2705,12 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
DEV_STATS_INC(dev, tx_carrier_errors);
dst_release(ndst);
DEV_STATS_INC(dev, tx_errors);
- vxlan_vnifilter_count(vxlan, vni, NULL, VXLAN_VNI_STATS_TX_ERRORS, 0);
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL, VXLAN_VNI_STATS_TX_ERRORS, 0);
kfree_skb_reason(skb, reason);
}
static void vxlan_xmit_nh(struct sk_buff *skb, struct net_device *dev,
+ const struct vxlan_config *cfg,
struct vxlan_fdb *f, __be32 vni, bool did_rsc)
{
struct vxlan_rdst nh_rdst;
@@ -2693,7 +2727,7 @@ static void vxlan_xmit_nh(struct sk_buff *skb, struct net_device *dev,
do_xmit = vxlan_fdb_nh_path_select(nh, hash, &nh_rdst);
if (likely(do_xmit))
- vxlan_xmit_one(skb, dev, vni, &nh_rdst, did_rsc);
+ vxlan_xmit_one(skb, dev, cfg, vni, &nh_rdst, did_rsc);
else
goto drop;
@@ -2701,15 +2735,15 @@ static void vxlan_xmit_nh(struct sk_buff *skb, struct net_device *dev,
drop:
dev_dstats_tx_dropped(dev);
- vxlan_vnifilter_count(netdev_priv(dev), vni, NULL,
+ vxlan_vnifilter_count(netdev_priv(dev), cfg, vni, NULL,
VXLAN_VNI_STATS_TX_DROPS, 0);
dev_kfree_skb(skb);
}
static netdev_tx_t vxlan_xmit_nhid(struct sk_buff *skb, struct net_device *dev,
- u32 nhid, __be32 vni)
+ u32 nhid, __be32 vni,
+ const struct vxlan_config *cfg)
{
- struct vxlan_dev *vxlan = netdev_priv(dev);
struct vxlan_rdst nh_rdst;
struct nexthop *nh;
bool do_xmit;
@@ -2727,11 +2761,11 @@ static netdev_tx_t vxlan_xmit_nhid(struct sk_buff *skb, struct net_device *dev,
do_xmit = vxlan_fdb_nh_path_select(nh, hash, &nh_rdst);
rcu_read_unlock();
- if (vxlan->cfg.saddr.sa.sa_family != nh_rdst.remote_ip.sa.sa_family)
+ if (cfg->saddr.sa.sa_family != nh_rdst.remote_ip.sa.sa_family)
goto drop;
if (likely(do_xmit))
- vxlan_xmit_one(skb, dev, vni, &nh_rdst, false);
+ vxlan_xmit_one(skb, dev, cfg, vni, &nh_rdst, false);
else
goto drop;
@@ -2739,7 +2773,7 @@ static netdev_tx_t vxlan_xmit_nhid(struct sk_buff *skb, struct net_device *dev,
drop:
dev_dstats_tx_dropped(dev);
- vxlan_vnifilter_count(netdev_priv(dev), vni, NULL,
+ vxlan_vnifilter_count(netdev_priv(dev), cfg, vni, NULL,
VXLAN_VNI_STATS_TX_DROPS, 0);
dev_kfree_skb(skb);
return NETDEV_TX_OK;
@@ -2756,34 +2790,47 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
struct vxlan_dev *vxlan = netdev_priv(dev);
struct vxlan_rdst *rdst, *fdst = NULL;
const struct ip_tunnel_info *info;
+ const struct vxlan_config *cfg;
+ __be32 default_vni;
struct vxlan_fdb *f;
struct ethhdr *eth;
__be32 vni = 0;
- u32 nhid = 0;
bool did_rsc;
+ u32 nhid = 0;
+ u32 flags;
+
+ rcu_read_lock();
+ cfg = rcu_dereference(vxlan->cfg);
+ flags = cfg->flags;
+ default_vni = cfg->vni;
info = skb_tunnel_info(skb);
skb_reset_mac_header(skb);
- if (vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA) {
+ if (flags & VXLAN_F_COLLECT_METADATA) {
if (info && info->mode & IP_TUNNEL_INFO_BRIDGE &&
info->mode & IP_TUNNEL_INFO_TX) {
vni = tunnel_id_to_key32(info->key.tun_id);
nhid = info->key.nhid;
} else {
if (info && info->mode & IP_TUNNEL_INFO_TX)
- vxlan_xmit_one(skb, dev, vni, NULL, false);
+ vxlan_xmit_one(skb, dev, cfg, vni, NULL, false);
else
kfree_skb_reason(skb, SKB_DROP_REASON_TUNNEL_TXINFO);
+ rcu_read_unlock();
return NETDEV_TX_OK;
}
}
- if (vxlan->cfg.flags & VXLAN_F_PROXY) {
+ if (flags & VXLAN_F_PROXY) {
eth = eth_hdr(skb);
- if (ntohs(eth->h_proto) == ETH_P_ARP)
- return arp_reduce(dev, skb, vni);
+ if (ntohs(eth->h_proto) == ETH_P_ARP) {
+ netdev_tx_t res = arp_reduce(dev, skb, cfg, vni);
+
+ rcu_read_unlock();
+ return res;
+ }
#if IS_ENABLED(CONFIG_IPV6)
else if (ntohs(eth->h_proto) == ETH_P_IPV6 &&
pskb_network_may_pull(skb, sizeof(struct ipv6hdr) +
@@ -2792,53 +2839,57 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
struct nd_msg *m = (struct nd_msg *)(ipv6_hdr(skb) + 1);
if (m->icmph.icmp6_code == 0 &&
- m->icmph.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION)
- return neigh_reduce(dev, skb, vni);
+ m->icmph.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION) {
+ netdev_tx_t res = neigh_reduce(dev, skb, cfg, vni);
+
+ rcu_read_unlock();
+ return res;
+ }
}
#endif
}
- if (nhid)
- return vxlan_xmit_nhid(skb, dev, nhid, vni);
+ if (nhid) {
+ netdev_tx_t res = vxlan_xmit_nhid(skb, dev, nhid, vni, cfg);
+
+ rcu_read_unlock();
+ return res;
+ }
- if (vxlan->cfg.flags & VXLAN_F_MDB) {
+ if (test_bit(VXLAN_DEV_F_MDB, &vxlan->flags)) {
struct vxlan_mdb_entry *mdb_entry;
- rcu_read_lock();
- mdb_entry = vxlan_mdb_entry_skb_get(vxlan, skb, vni);
+ mdb_entry = vxlan_mdb_entry_skb_get(vxlan, cfg, skb, vni);
if (mdb_entry) {
- netdev_tx_t ret;
+ netdev_tx_t ret = vxlan_mdb_xmit(vxlan, cfg, mdb_entry, skb);
- ret = vxlan_mdb_xmit(vxlan, mdb_entry, skb);
rcu_read_unlock();
return ret;
}
- rcu_read_unlock();
}
eth = eth_hdr(skb);
- rcu_read_lock();
- f = vxlan_find_mac_tx(vxlan, eth->h_dest, vni);
+ f = vxlan_find_mac_tx(vxlan, cfg, eth->h_dest, vni);
did_rsc = false;
- if (f && (f->flags & NTF_ROUTER) && (vxlan->cfg.flags & VXLAN_F_RSC) &&
+ if (f && (f->flags & NTF_ROUTER) && (flags & VXLAN_F_RSC) &&
(ntohs(eth->h_proto) == ETH_P_IP ||
ntohs(eth->h_proto) == ETH_P_IPV6)) {
- did_rsc = route_shortcircuit(dev, skb);
+ did_rsc = route_shortcircuit(dev, skb, cfg);
eth = eth_hdr(skb);
if (did_rsc)
- f = vxlan_find_mac_tx(vxlan, eth->h_dest, vni);
+ f = vxlan_find_mac_tx(vxlan, cfg, eth->h_dest, vni);
}
if (f == NULL) {
- f = vxlan_find_mac_tx(vxlan, all_zeros_mac, vni);
+ f = vxlan_find_mac_tx(vxlan, cfg, all_zeros_mac, vni);
if (f == NULL) {
- if ((vxlan->cfg.flags & VXLAN_F_L2MISS) &&
+ if ((flags & VXLAN_F_L2MISS) &&
!is_multicast_ether_addr(eth->h_dest))
vxlan_fdb_miss(vxlan, eth->h_dest);
dev_dstats_tx_dropped(dev);
- vxlan_vnifilter_count(vxlan, vni, NULL,
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL,
VXLAN_VNI_STATS_TX_DROPS, 0);
kfree_skb_reason(skb, SKB_DROP_REASON_NO_TX_TARGET);
goto out;
@@ -2846,8 +2897,8 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
}
if (rcu_access_pointer(f->nh)) {
- vxlan_xmit_nh(skb, dev, f,
- (vni ? : vxlan->default_dst.remote_vni), did_rsc);
+ vxlan_xmit_nh(skb, dev, cfg, f,
+ (vni ? : default_vni), did_rsc);
} else {
list_for_each_entry_rcu(rdst, &f->remotes, list) {
struct sk_buff *skb1;
@@ -2858,10 +2909,10 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
}
skb1 = skb_clone(skb, GFP_ATOMIC);
if (skb1)
- vxlan_xmit_one(skb1, dev, vni, rdst, did_rsc);
+ vxlan_xmit_one(skb1, dev, cfg, vni, rdst, did_rsc);
}
if (fdst)
- vxlan_xmit_one(skb, dev, vni, fdst, did_rsc);
+ vxlan_xmit_one(skb, dev, cfg, vni, fdst, did_rsc);
else
kfree_skb_reason(skb, SKB_DROP_REASON_NO_TX_TARGET);
}
@@ -2876,12 +2927,15 @@ static void vxlan_cleanup(struct timer_list *t)
{
struct vxlan_dev *vxlan = timer_container_of(vxlan, t, age_timer);
unsigned long next_timer = jiffies + FDB_AGE_INTERVAL;
+ const struct vxlan_config *cfg;
struct vxlan_fdb *f;
if (!netif_running(vxlan->dev))
return;
rcu_read_lock();
+ cfg = rcu_dereference(vxlan->cfg);
+
hlist_for_each_entry_rcu(f, &vxlan->fdb_list, fdb_node) {
unsigned long timeout;
@@ -2891,7 +2945,7 @@ static void vxlan_cleanup(struct timer_list *t)
if (f->flags & NTF_EXT_LEARNED)
continue;
- timeout = READ_ONCE(f->updated) + vxlan->cfg.age_interval * HZ;
+ timeout = READ_ONCE(f->updated) + cfg->age_interval * HZ;
if (time_before_eq(timeout, jiffies)) {
spin_lock(&vxlan->hash_lock);
if (!hlist_unhashed(&f->fdb_node)) {
@@ -2923,10 +2977,14 @@ static void vxlan_vs_del_dev(struct vxlan_dev *vxlan)
static void vxlan_vs_add_dev(struct vxlan_sock *vs, struct vxlan_dev *vxlan,
struct vxlan_dev_node *node)
{
- __be32 vni = vxlan->default_dst.remote_vni;
+ const struct vxlan_config *cfg;
+ __be32 vni;
ASSERT_RTNL();
+ cfg = rtnl_dereference(vxlan->cfg);
+ vni = cfg->vni;
+
node->vxlan = vxlan;
hlist_add_head_rcu(&node->hlist, vni_head(vs, vni));
}
@@ -2935,13 +2993,16 @@ static void vxlan_vs_add_dev(struct vxlan_sock *vs, struct vxlan_dev *vxlan,
static int vxlan_init(struct net_device *dev)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
+ const struct vxlan_config *cfg;
int err;
+ cfg = rtnl_dereference(vxlan->cfg);
+
err = rhashtable_init(&vxlan->fdb_hash_tbl, &vxlan_fdb_rht_params);
if (err)
return err;
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER) {
+ if (cfg->flags & VXLAN_F_VNIFILTER) {
err = vxlan_vnigroup_init(vxlan);
if (err)
goto err_rhashtable_destroy;
@@ -2961,7 +3022,7 @@ static int vxlan_init(struct net_device *dev)
err_gro_cells_destroy:
gro_cells_destroy(&vxlan->gro_cells);
err_vnigroup_uninit:
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER)
+ if (cfg->flags & VXLAN_F_VNIFILTER)
vxlan_vnigroup_uninit(vxlan);
err_rhashtable_destroy:
rhashtable_destroy(&vxlan->fdb_hash_tbl);
@@ -2971,10 +3032,13 @@ static int vxlan_init(struct net_device *dev)
static void vxlan_uninit(struct net_device *dev)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
+ const struct vxlan_config *cfg;
+
+ cfg = rtnl_dereference(vxlan->cfg);
vxlan_mdb_fini(vxlan);
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER)
+ if (cfg->flags & VXLAN_F_VNIFILTER)
vxlan_vnigroup_uninit(vxlan);
gro_cells_destroy(&vxlan->gro_cells);
@@ -2986,6 +3050,7 @@ static void vxlan_uninit(struct net_device *dev)
static int vxlan_open(struct net_device *dev)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
+ const struct vxlan_config *cfg;
int ret;
ret = vxlan_sock_add(vxlan);
@@ -2998,7 +3063,8 @@ static int vxlan_open(struct net_device *dev)
return ret;
}
- if (vxlan->cfg.age_interval)
+ cfg = rtnl_dereference(vxlan->cfg);
+ if (cfg->age_interval)
mod_timer(&vxlan->age_timer, jiffies + FDB_AGE_INTERVAL);
return ret;
@@ -3020,8 +3086,10 @@ struct vxlan_fdb_flush_desc {
static bool vxlan_fdb_is_default_entry(const struct vxlan_fdb *f,
const struct vxlan_dev *vxlan)
{
+ const struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan->cfg);
+
return is_zero_ether_addr(f->key.eth_addr) &&
- f->key.vni == vxlan->cfg.vni;
+ f->key.vni == cfg->vni;
}
static bool vxlan_fdb_nhid_matches(const struct vxlan_fdb *f, u32 nhid)
@@ -3238,15 +3306,18 @@ static void vxlan_set_multicast_list(struct net_device *dev)
static int vxlan_change_mtu(struct net_device *dev, int new_mtu)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
- struct vxlan_rdst *dst = &vxlan->default_dst;
- struct net_device *lowerdev = __dev_get_by_index(vxlan->net,
- dst->remote_ifindex);
+ const struct vxlan_config *cfg;
+ struct net_device *lowerdev;
+
+ cfg = rtnl_dereference(vxlan->cfg);
+
+ lowerdev = __dev_get_by_index(vxlan->net, cfg->remote_ifindex);
/* This check is different than dev->max_mtu, because it looks at
* the lowerdev->mtu, rather than the static dev->max_mtu
*/
if (lowerdev) {
- int max_mtu = lowerdev->mtu - vxlan_headroom(vxlan->cfg.flags);
+ int max_mtu = lowerdev->mtu - vxlan_headroom(cfg->flags);
if (new_mtu > max_mtu)
return -EINVAL;
}
@@ -3259,11 +3330,14 @@ static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
struct ip_tunnel_info *info = skb_tunnel_info(skb);
+ const struct vxlan_config *cfg;
__be16 sport, dport;
- sport = udp_flow_src_port(dev_net(dev), skb, vxlan->cfg.port_min,
- vxlan->cfg.port_max, true);
- dport = info->key.tp_dst ? : vxlan->cfg.dst_port;
+ cfg = rcu_dereference(vxlan->cfg);
+
+ sport = udp_flow_src_port(dev_net(dev), skb, cfg->port_min,
+ cfg->port_max, true);
+ dport = info->key.tp_dst ? : cfg->dst_port;
if (ip_tunnel_info_af(info) == AF_INET) {
struct vxlan_sock *sock4 = rcu_dereference(vxlan->vn4_sock);
@@ -3373,6 +3447,15 @@ static void vxlan_offload_rx_ports(struct net_device *dev, bool push)
}
}
+static void vxlan_free_dev(struct net_device *dev)
+{
+ struct vxlan_dev *vxlan = netdev_priv(dev);
+ struct vxlan_config *cfg = rcu_dereference_protected(vxlan->cfg, 1);
+
+ RCU_INIT_POINTER(vxlan->cfg, NULL);
+ kfree(cfg);
+}
+
/* Initialize the device structure. */
static void vxlan_setup(struct net_device *dev)
{
@@ -3381,6 +3464,8 @@ static void vxlan_setup(struct net_device *dev)
eth_hw_addr_random(dev);
ether_setup(dev);
+ dev->priv_destructor = vxlan_free_dev;
+
dev->needs_free_netdev = true;
SET_NETDEV_DEVTYPE(dev, &vxlan_type);
@@ -3555,9 +3640,11 @@ static int vxlan_get_link_ksettings(struct net_device *dev,
struct ethtool_link_ksettings *cmd)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
- struct vxlan_rdst *dst = &vxlan->default_dst;
- struct net_device *lowerdev = __dev_get_by_index(vxlan->net,
- dst->remote_ifindex);
+ const struct vxlan_config *cfg;
+ struct net_device *lowerdev;
+
+ cfg = rtnl_dereference(vxlan->cfg);
+ lowerdev = __dev_get_by_index(vxlan->net, cfg->remote_ifindex);
if (!lowerdev) {
cmd->base.duplex = DUPLEX_UNKNOWN;
@@ -3663,21 +3750,22 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, bool ipv6,
static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)
{
- bool metadata = vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA;
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
+ bool metadata = cfg->flags & VXLAN_F_COLLECT_METADATA;
struct vxlan_sock *vs = NULL;
struct vxlan_dev_node *node;
int l3mdev_index = 0;
ASSERT_RTNL();
- if (vxlan->cfg.remote_ifindex)
+ if (cfg->remote_ifindex)
l3mdev_index = l3mdev_master_upper_ifindex_by_index(
- vxlan->net, vxlan->cfg.remote_ifindex);
+ vxlan->net, cfg->remote_ifindex);
- if (!vxlan->cfg.no_share) {
+ if (!cfg->no_share) {
rcu_read_lock();
vs = vxlan_find_sock(vxlan->net, ipv6 ? AF_INET6 : AF_INET,
- vxlan->cfg.dst_port, vxlan->cfg.flags,
+ cfg->dst_port, cfg->flags,
l3mdev_index);
if (vs && !refcount_inc_not_zero(&vs->refcnt)) {
rcu_read_unlock();
@@ -3687,7 +3775,7 @@ static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)
}
if (!vs)
vs = vxlan_socket_create(vxlan->net, ipv6,
- vxlan->cfg.dst_port, vxlan->cfg.flags,
+ cfg->dst_port, cfg->flags,
l3mdev_index);
if (IS_ERR(vs))
return PTR_ERR(vs);
@@ -3702,7 +3790,7 @@ static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)
node = &vxlan->hlist4;
}
- if (metadata && (vxlan->cfg.flags & VXLAN_F_VNIFILTER))
+ if (metadata && (cfg->flags & VXLAN_F_VNIFILTER))
vxlan_vs_add_vnigrp(vxlan, vs, ipv6);
else
vxlan_vs_add_dev(vs, vxlan, node);
@@ -3712,11 +3800,14 @@ static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)
static int vxlan_sock_add(struct vxlan_dev *vxlan)
{
- bool metadata = vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA;
- bool ipv6 = vxlan->cfg.flags & VXLAN_F_IPV6 || metadata;
- bool ipv4 = !ipv6 || metadata;
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
+ bool metadata, ipv6, ipv4;
int ret = 0;
+ metadata = cfg->flags & VXLAN_F_COLLECT_METADATA;
+ ipv6 = (cfg->flags & VXLAN_F_IPV6) || metadata;
+ ipv4 = !ipv6 || metadata;
+
RCU_INIT_POINTER(vxlan->vn4_sock, NULL);
#if IS_ENABLED(CONFIG_IPV6)
RCU_INIT_POINTER(vxlan->vn6_sock, NULL);
@@ -3734,28 +3825,33 @@ static int vxlan_sock_add(struct vxlan_dev *vxlan)
}
int vxlan_vni_in_use(struct net *src_net, struct vxlan_dev *vxlan,
- struct vxlan_config *conf, __be32 vni)
+ const struct vxlan_config *conf, __be32 vni)
{
struct vxlan_net *vn = net_generic(src_net, vxlan_net_id);
struct vxlan_dev *tmp;
list_for_each_entry(tmp, &vn->vxlan_list, next) {
+ const struct vxlan_config *tmp_cfg;
+
if (tmp == vxlan)
continue;
- if (tmp->cfg.flags & VXLAN_F_VNIFILTER) {
+
+ tmp_cfg = rtnl_dereference(tmp->cfg);
+
+ if (tmp_cfg->flags & VXLAN_F_VNIFILTER) {
if (!vxlan_vnifilter_lookup(tmp, vni))
continue;
- } else if (tmp->cfg.vni != vni) {
+ } else if (tmp_cfg->vni != vni) {
continue;
}
- if (tmp->cfg.dst_port != conf->dst_port)
+ if (tmp_cfg->dst_port != conf->dst_port)
continue;
- if ((tmp->cfg.flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)) !=
+ if ((tmp_cfg->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)) !=
(conf->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)))
continue;
if ((conf->flags & VXLAN_F_IPV6_LINKLOCAL) &&
- tmp->cfg.remote_ifindex != conf->remote_ifindex)
+ tmp_cfg->remote_ifindex != conf->remote_ifindex)
continue;
return -EEXIST;
@@ -3886,6 +3982,13 @@ static int vxlan_config_validate(struct net *src_net, struct vxlan_config *conf,
return -EINVAL;
}
+ if ((conf->flags & VXLAN_F_VNIFILTER) && old &&
+ vxlan_vnifilter_has_multicast(old)) {
+ NL_SET_ERR_MSG(extack,
+ "Local interface required for multicast remote group");
+ return -EINVAL;
+ }
+
#if IS_ENABLED(CONFIG_IPV6)
if (conf->flags & VXLAN_F_IPV6_LINKLOCAL) {
NL_SET_ERR_MSG(extack,
@@ -3917,16 +4020,16 @@ static int vxlan_config_validate(struct net *src_net, struct vxlan_config *conf,
}
static void vxlan_config_apply(struct net_device *dev,
- struct vxlan_config *conf,
+ struct vxlan_config *new_cfg,
struct net_device *lowerdev,
struct net *src_net,
- bool changelink)
+ bool changelink, bool lowerdev_changed)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
- struct vxlan_rdst *dst = &vxlan->default_dst;
unsigned short needed_headroom = ETH_HLEN;
+ struct vxlan_config *old_cfg;
int max_mtu = ETH_MAX_MTU;
- u32 flags = conf->flags;
+ u32 flags = new_cfg->flags;
if (!changelink) {
if (flags & VXLAN_F_GPE)
@@ -3934,19 +4037,14 @@ static void vxlan_config_apply(struct net_device *dev,
else
vxlan_ether_setup(dev);
- if (conf->mtu)
- dev->mtu = conf->mtu;
+ if (new_cfg->mtu)
+ WRITE_ONCE(dev->mtu, new_cfg->mtu);
vxlan->net = src_net;
}
- dst->remote_vni = conf->vni;
-
- memcpy(&dst->remote_ip, &conf->remote_ip, sizeof(conf->remote_ip));
-
+ dev->needed_tailroom = 0;
if (lowerdev) {
- dst->remote_ifindex = conf->remote_ifindex;
-
netif_inherit_tso_max(dev, lowerdev);
needed_headroom = lowerdev->hard_header_len;
@@ -3954,23 +4052,27 @@ static void vxlan_config_apply(struct net_device *dev,
dev->needed_tailroom = lowerdev->needed_tailroom;
- max_mtu = lowerdev->mtu - vxlan_headroom(flags);
+ max_mtu = READ_ONCE(lowerdev->mtu) - vxlan_headroom(flags);
if (max_mtu < ETH_MIN_MTU)
max_mtu = ETH_MIN_MTU;
- if (!changelink && !conf->mtu)
- dev->mtu = max_mtu;
+ if (!changelink && !new_cfg->mtu)
+ WRITE_ONCE(dev->mtu, max_mtu);
}
- if (dev->mtu > max_mtu)
- dev->mtu = max_mtu;
+ /* A changelink leaving the lower device alone must not shrink the mtu */
+ if (lowerdev_changed && READ_ONCE(dev->mtu) > max_mtu)
+ WRITE_ONCE(dev->mtu, max_mtu);
if (flags & VXLAN_F_COLLECT_METADATA)
flags |= VXLAN_F_IPV6;
needed_headroom += vxlan_headroom(flags);
dev->needed_headroom = needed_headroom;
- memcpy(&vxlan->cfg, conf, sizeof(*conf));
+ old_cfg = rtnl_dereference(vxlan->cfg);
+ rcu_assign_pointer(vxlan->cfg, new_cfg);
+ if (old_cfg)
+ kfree_rcu(old_cfg, rcu);
}
static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,
@@ -3979,13 +4081,18 @@ static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,
{
struct vxlan_dev *vxlan = netdev_priv(dev);
struct net_device *lowerdev;
+ struct vxlan_config *new_cfg;
int ret;
ret = vxlan_config_validate(src_net, conf, &lowerdev, vxlan, extack);
if (ret)
return ret;
- vxlan_config_apply(dev, conf, lowerdev, src_net, false);
+ new_cfg = kmemdup(conf, sizeof(*conf), GFP_KERNEL);
+ if (!new_cfg)
+ return -ENOMEM;
+
+ vxlan_config_apply(dev, new_cfg, lowerdev, src_net, false, true);
return 0;
}
@@ -3997,22 +4104,25 @@ static int vxlan_dev_create(struct net *net, struct net_device *dev,
struct vxlan_net *vn = net_generic(net, vxlan_net_id);
struct vxlan_dev *vxlan = netdev_priv(dev);
struct net_device *remote_dev = NULL;
- struct vxlan_rdst *dst;
+ const struct vxlan_config *cfg;
int err;
- dst = &vxlan->default_dst;
err = vxlan_dev_configure(net, dev, conf, extack);
if (err)
return err;
+ cfg = rtnl_dereference(vxlan->cfg);
+
dev->ethtool_ops = &vxlan_ethtool_ops;
err = register_netdevice(dev);
- if (err)
+ if (err) {
+ vxlan_free_dev(dev);
return err;
+ }
- if (dst->remote_ifindex) {
- remote_dev = __dev_get_by_index(net, dst->remote_ifindex);
+ if (cfg->remote_ifindex) {
+ remote_dev = __dev_get_by_index(net, cfg->remote_ifindex);
if (!remote_dev) {
err = -ENODEV;
goto unregister;
@@ -4022,7 +4132,7 @@ static int vxlan_dev_create(struct net *net, struct net_device *dev,
if (err)
goto unregister;
- dst->remote_dev = remote_dev;
+ vxlan->lowerdev = remote_dev;
}
err = rtnl_configure_link(dev, NULL, 0, NULL);
@@ -4030,16 +4140,18 @@ static int vxlan_dev_create(struct net *net, struct net_device *dev,
goto unlink;
/* create an fdb entry for a valid default destination */
- if (!vxlan_addr_any(&dst->remote_ip)) {
+ if (!vxlan_addr_any(&cfg->remote_ip)) {
+ union vxlan_addr rip = cfg->remote_ip;
+
spin_lock_bh(&vxlan->hash_lock);
err = vxlan_fdb_update(vxlan, all_zeros_mac,
- &dst->remote_ip,
+ &rip,
NUD_REACHABLE | NUD_PERMANENT,
NLM_F_EXCL | NLM_F_CREATE,
- vxlan->cfg.dst_port,
- dst->remote_vni,
- dst->remote_vni,
- dst->remote_ifindex,
+ cfg->dst_port,
+ cfg->vni,
+ cfg->vni,
+ cfg->remote_ifindex,
NTF_SELF, 0, true, extack);
spin_unlock_bh(&vxlan->hash_lock);
if (err)
@@ -4100,8 +4212,12 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],
memset(conf, 0, sizeof(*conf));
/* if changelink operation, start with old existing cfg */
- if (changelink)
- memcpy(conf, &vxlan->cfg, sizeof(*conf));
+ if (changelink) {
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
+
+ if (cfg)
+ memcpy(conf, cfg, sizeof(*conf));
+ }
if (data[IFLA_VXLAN_ID]) {
__be32 vni = cpu_to_be32(nla_get_u32(data[IFLA_VXLAN_ID]));
@@ -4447,17 +4563,19 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *data[],
struct netlink_ext_ack *extack)
{
+ bool lowerdev_changed, rem_ip_changed, change_igmp;
struct vxlan_dev *vxlan = netdev_priv(dev);
- bool rem_ip_changed, change_igmp;
+ const struct vxlan_config *cfg;
+ struct vxlan_config *new_cfg;
struct net_device *lowerdev;
struct vxlan_config conf;
- struct vxlan_rdst *dst;
int err;
+ cfg = rtnl_dereference(vxlan->cfg);
+
if (!rtnl_dev_link_net_capable(dev, vxlan->net))
return -EPERM;
- dst = &vxlan->default_dst;
err = vxlan_nl2conf(tb, data, dev, &conf, true, extack);
if (err)
return err;
@@ -4467,75 +4585,103 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
if (err)
return err;
- if (dst->remote_dev == lowerdev)
- lowerdev = NULL;
+ new_cfg = kmemdup(&conf, sizeof(conf), GFP_KERNEL);
+ if (!new_cfg)
+ return -ENOMEM;
- err = netdev_adjacent_change_prepare(dst->remote_dev, lowerdev, dev,
- extack);
- if (err)
- return err;
+ lowerdev_changed = vxlan->lowerdev != lowerdev;
+ if (lowerdev_changed) {
+ err = netdev_adjacent_change_prepare(vxlan->lowerdev, lowerdev,
+ dev, extack);
+ if (err) {
+ kfree(new_cfg);
+ return err;
+ }
+ }
- rem_ip_changed = !vxlan_addr_equal(&conf.remote_ip, &dst->remote_ip);
+ rem_ip_changed = !vxlan_addr_equal(&conf.remote_ip, &cfg->remote_ip);
change_igmp = vxlan->dev->flags & IFF_UP &&
(rem_ip_changed ||
- dst->remote_ifindex != conf.remote_ifindex);
+ cfg->remote_ifindex != conf.remote_ifindex);
/* handle default dst entry */
- if (rem_ip_changed) {
+ if (rem_ip_changed || cfg->remote_ifindex != conf.remote_ifindex) {
spin_lock_bh(&vxlan->hash_lock);
if (!vxlan_addr_any(&conf.remote_ip)) {
err = vxlan_fdb_update(vxlan, all_zeros_mac,
&conf.remote_ip,
NUD_REACHABLE | NUD_PERMANENT,
NLM_F_APPEND | NLM_F_CREATE,
- vxlan->cfg.dst_port,
+ cfg->dst_port,
conf.vni, conf.vni,
conf.remote_ifindex,
NTF_SELF, 0, true, extack);
if (err) {
spin_unlock_bh(&vxlan->hash_lock);
- netdev_adjacent_change_abort(dst->remote_dev,
- lowerdev, dev);
+ if (lowerdev_changed)
+ netdev_adjacent_change_abort(vxlan->lowerdev,
+ lowerdev, dev);
+ kfree(new_cfg);
return err;
}
}
- if (!vxlan_addr_any(&dst->remote_ip))
+ if (!vxlan_addr_any(&cfg->remote_ip))
__vxlan_fdb_delete(vxlan, all_zeros_mac,
- dst->remote_ip,
- vxlan->cfg.dst_port,
- dst->remote_vni,
- dst->remote_vni,
- dst->remote_ifindex,
+ cfg->remote_ip,
+ cfg->dst_port,
+ cfg->vni,
+ cfg->vni,
+ cfg->remote_ifindex,
true);
spin_unlock_bh(&vxlan->hash_lock);
- /* If vni filtering device, also update fdb entries of
- * all vnis that were using default remote ip
+ /* If vni filtering device, also update default fdb entries of
+ * all vnis
*/
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER) {
- err = vxlan_vnilist_update_group(vxlan, &dst->remote_ip,
- &conf.remote_ip, extack);
+ if (cfg->flags & VXLAN_F_VNIFILTER) {
+ err = vxlan_vnilist_update_group(vxlan, &cfg->remote_ip,
+ &conf.remote_ip,
+ cfg->remote_ifindex,
+ conf.remote_ifindex,
+ extack);
if (err) {
- netdev_adjacent_change_abort(dst->remote_dev,
- lowerdev, dev);
+ vxlan_update_default_fdb_entry(vxlan, conf.vni,
+ &conf.remote_ip,
+ &cfg->remote_ip,
+ conf.remote_ifindex,
+ cfg->remote_ifindex,
+ NULL);
+ if (lowerdev_changed)
+ netdev_adjacent_change_abort(vxlan->lowerdev,
+ lowerdev, dev);
+ kfree(new_cfg);
return err;
}
}
}
- if (change_igmp && vxlan_addr_multicast(&dst->remote_ip))
+ if (change_igmp &&
+ (vxlan_addr_multicast(&cfg->remote_ip) ||
+ (cfg->flags & VXLAN_F_VNIFILTER)))
err = vxlan_multicast_leave(vxlan);
- if (netif_running(dev) && conf.age_interval != vxlan->cfg.age_interval)
+ if (netif_running(dev) && conf.age_interval != cfg->age_interval)
mod_timer(&vxlan->age_timer, jiffies);
- netdev_adjacent_change_commit(dst->remote_dev, lowerdev, dev);
- if (lowerdev && lowerdev != dst->remote_dev)
- dst->remote_dev = lowerdev;
- vxlan_config_apply(dev, &conf, lowerdev, vxlan->net, true);
+ if (lowerdev_changed) {
+ if (lowerdev)
+ netdev_adjacent_change_commit(vxlan->lowerdev, lowerdev,
+ dev);
+ else
+ netdev_upper_dev_unlink(vxlan->lowerdev, dev);
+ vxlan->lowerdev = lowerdev;
+ }
+ vxlan_config_apply(dev, new_cfg, lowerdev, vxlan->net, true,
+ lowerdev_changed);
if (!err && change_igmp &&
- vxlan_addr_multicast(&dst->remote_ip))
+ (vxlan_addr_multicast(&new_cfg->remote_ip) ||
+ (new_cfg->flags & VXLAN_F_VNIFILTER)))
err = vxlan_multicast_join(vxlan);
return err;
@@ -4550,8 +4696,8 @@ static void vxlan_dellink(struct net_device *dev, struct list_head *head)
list_del(&vxlan->next);
unregister_netdevice_queue(dev, head);
- if (vxlan->default_dst.remote_dev)
- netdev_upper_dev_unlink(vxlan->default_dst.remote_dev, dev);
+ if (vxlan->lowerdev)
+ netdev_upper_dev_unlink(vxlan->lowerdev, dev);
}
static size_t vxlan_get_size(const struct net_device *dev)
@@ -4595,110 +4741,114 @@ static size_t vxlan_get_size(const struct net_device *dev)
static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev)
{
const struct vxlan_dev *vxlan = netdev_priv(dev);
- const struct vxlan_rdst *dst = &vxlan->default_dst;
- struct ifla_vxlan_port_range ports = {
- .low = htons(vxlan->cfg.port_min),
- .high = htons(vxlan->cfg.port_max),
- };
+ struct ifla_vxlan_port_range ports;
+ const struct vxlan_config *cfg;
+
+ rcu_read_lock();
+ cfg = rcu_dereference(vxlan->cfg);
- if (nla_put_u32(skb, IFLA_VXLAN_ID, be32_to_cpu(dst->remote_vni)))
+ if (nla_put_u32(skb, IFLA_VXLAN_ID, be32_to_cpu(cfg->vni)))
goto nla_put_failure;
- if (!vxlan_addr_any(&dst->remote_ip)) {
- if (dst->remote_ip.sa.sa_family == AF_INET) {
+ if (!vxlan_addr_any(&cfg->remote_ip)) {
+ if (cfg->remote_ip.sa.sa_family == AF_INET) {
if (nla_put_in_addr(skb, IFLA_VXLAN_GROUP,
- dst->remote_ip.sin.sin_addr.s_addr))
+ cfg->remote_ip.sin.sin_addr.s_addr))
goto nla_put_failure;
#if IS_ENABLED(CONFIG_IPV6)
} else {
if (nla_put_in6_addr(skb, IFLA_VXLAN_GROUP6,
- &dst->remote_ip.sin6.sin6_addr))
+ &cfg->remote_ip.sin6.sin6_addr))
goto nla_put_failure;
#endif
}
}
- if (dst->remote_ifindex && nla_put_u32(skb, IFLA_VXLAN_LINK, dst->remote_ifindex))
+ if (cfg->remote_ifindex && nla_put_u32(skb, IFLA_VXLAN_LINK, cfg->remote_ifindex))
goto nla_put_failure;
- if (!vxlan_addr_any(&vxlan->cfg.saddr)) {
- if (vxlan->cfg.saddr.sa.sa_family == AF_INET) {
+ if (!vxlan_addr_any(&cfg->saddr)) {
+ if (cfg->saddr.sa.sa_family == AF_INET) {
if (nla_put_in_addr(skb, IFLA_VXLAN_LOCAL,
- vxlan->cfg.saddr.sin.sin_addr.s_addr))
+ cfg->saddr.sin.sin_addr.s_addr))
goto nla_put_failure;
#if IS_ENABLED(CONFIG_IPV6)
} else {
if (nla_put_in6_addr(skb, IFLA_VXLAN_LOCAL6,
- &vxlan->cfg.saddr.sin6.sin6_addr))
+ &cfg->saddr.sin6.sin6_addr))
goto nla_put_failure;
#endif
}
}
- if (nla_put_u8(skb, IFLA_VXLAN_TTL, vxlan->cfg.ttl) ||
+ if (nla_put_u8(skb, IFLA_VXLAN_TTL, cfg->ttl) ||
nla_put_u8(skb, IFLA_VXLAN_TTL_INHERIT,
- !!(vxlan->cfg.flags & VXLAN_F_TTL_INHERIT)) ||
- nla_put_u8(skb, IFLA_VXLAN_TOS, vxlan->cfg.tos) ||
- nla_put_u8(skb, IFLA_VXLAN_DF, vxlan->cfg.df) ||
- nla_put_be32(skb, IFLA_VXLAN_LABEL, vxlan->cfg.label) ||
- nla_put_u32(skb, IFLA_VXLAN_LABEL_POLICY, vxlan->cfg.label_policy) ||
+ !!(cfg->flags & VXLAN_F_TTL_INHERIT)) ||
+ nla_put_u8(skb, IFLA_VXLAN_TOS, cfg->tos) ||
+ nla_put_u8(skb, IFLA_VXLAN_DF, cfg->df) ||
+ nla_put_be32(skb, IFLA_VXLAN_LABEL, cfg->label) ||
+ nla_put_u32(skb, IFLA_VXLAN_LABEL_POLICY, cfg->label_policy) ||
nla_put_u8(skb, IFLA_VXLAN_LEARNING,
- !!(vxlan->cfg.flags & VXLAN_F_LEARN)) ||
+ !!(cfg->flags & VXLAN_F_LEARN)) ||
nla_put_u8(skb, IFLA_VXLAN_PROXY,
- !!(vxlan->cfg.flags & VXLAN_F_PROXY)) ||
+ !!(cfg->flags & VXLAN_F_PROXY)) ||
nla_put_u8(skb, IFLA_VXLAN_RSC,
- !!(vxlan->cfg.flags & VXLAN_F_RSC)) ||
+ !!(cfg->flags & VXLAN_F_RSC)) ||
nla_put_u8(skb, IFLA_VXLAN_L2MISS,
- !!(vxlan->cfg.flags & VXLAN_F_L2MISS)) ||
+ !!(cfg->flags & VXLAN_F_L2MISS)) ||
nla_put_u8(skb, IFLA_VXLAN_L3MISS,
- !!(vxlan->cfg.flags & VXLAN_F_L3MISS)) ||
+ !!(cfg->flags & VXLAN_F_L3MISS)) ||
nla_put_u8(skb, IFLA_VXLAN_COLLECT_METADATA,
- !!(vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA)) ||
- nla_put_u32(skb, IFLA_VXLAN_AGEING, vxlan->cfg.age_interval) ||
- nla_put_u32(skb, IFLA_VXLAN_LIMIT, vxlan->cfg.addrmax) ||
- nla_put_be16(skb, IFLA_VXLAN_PORT, vxlan->cfg.dst_port) ||
+ !!(cfg->flags & VXLAN_F_COLLECT_METADATA)) ||
+ nla_put_u32(skb, IFLA_VXLAN_AGEING, cfg->age_interval) ||
+ nla_put_u32(skb, IFLA_VXLAN_LIMIT, cfg->addrmax) ||
+ nla_put_be16(skb, IFLA_VXLAN_PORT, cfg->dst_port) ||
nla_put_u8(skb, IFLA_VXLAN_UDP_CSUM,
- !(vxlan->cfg.flags & VXLAN_F_UDP_ZERO_CSUM_TX)) ||
+ !(cfg->flags & VXLAN_F_UDP_ZERO_CSUM_TX)) ||
nla_put_u8(skb, IFLA_VXLAN_UDP_ZERO_CSUM6_TX,
- !!(vxlan->cfg.flags & VXLAN_F_UDP_ZERO_CSUM6_TX)) ||
+ !!(cfg->flags & VXLAN_F_UDP_ZERO_CSUM6_TX)) ||
nla_put_u8(skb, IFLA_VXLAN_UDP_ZERO_CSUM6_RX,
- !!(vxlan->cfg.flags & VXLAN_F_UDP_ZERO_CSUM6_RX)) ||
+ !!(cfg->flags & VXLAN_F_UDP_ZERO_CSUM6_RX)) ||
nla_put_u8(skb, IFLA_VXLAN_REMCSUM_TX,
- !!(vxlan->cfg.flags & VXLAN_F_REMCSUM_TX)) ||
+ !!(cfg->flags & VXLAN_F_REMCSUM_TX)) ||
nla_put_u8(skb, IFLA_VXLAN_REMCSUM_RX,
- !!(vxlan->cfg.flags & VXLAN_F_REMCSUM_RX)) ||
+ !!(cfg->flags & VXLAN_F_REMCSUM_RX)) ||
nla_put_u8(skb, IFLA_VXLAN_LOCALBYPASS,
- !!(vxlan->cfg.flags & VXLAN_F_LOCALBYPASS)))
+ !!(cfg->flags & VXLAN_F_LOCALBYPASS)))
goto nla_put_failure;
+ ports.low = htons(cfg->port_min);
+ ports.high = htons(cfg->port_max);
if (nla_put(skb, IFLA_VXLAN_PORT_RANGE, sizeof(ports), &ports))
goto nla_put_failure;
- if (vxlan->cfg.flags & VXLAN_F_GBP &&
+ if (cfg->flags & VXLAN_F_GBP &&
nla_put_flag(skb, IFLA_VXLAN_GBP))
goto nla_put_failure;
- if (vxlan->cfg.flags & VXLAN_F_GPE &&
+ if (cfg->flags & VXLAN_F_GPE &&
nla_put_flag(skb, IFLA_VXLAN_GPE))
goto nla_put_failure;
- if (vxlan->cfg.flags & VXLAN_F_REMCSUM_NOPARTIAL &&
+ if (cfg->flags & VXLAN_F_REMCSUM_NOPARTIAL &&
nla_put_flag(skb, IFLA_VXLAN_REMCSUM_NOPARTIAL))
goto nla_put_failure;
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER &&
+ if (cfg->flags & VXLAN_F_VNIFILTER &&
nla_put_u8(skb, IFLA_VXLAN_VNIFILTER,
- !!(vxlan->cfg.flags & VXLAN_F_VNIFILTER)))
+ !!(cfg->flags & VXLAN_F_VNIFILTER)))
goto nla_put_failure;
if (nla_put(skb, IFLA_VXLAN_RESERVED_BITS,
- sizeof(vxlan->cfg.reserved_bits),
- &vxlan->cfg.reserved_bits))
+ sizeof(cfg->reserved_bits),
+ &cfg->reserved_bits))
goto nla_put_failure;
+ rcu_read_unlock();
return 0;
nla_put_failure:
+ rcu_read_unlock();
return -EMSGSIZE;
}
@@ -4731,7 +4881,7 @@ static void vxlan_handle_lowerdev_unregister(struct vxlan_net *vn,
LIST_HEAD(list_kill);
list_for_each_entry_safe(vxlan, next, &vn->vxlan_list, next) {
- struct vxlan_rdst *dst = &vxlan->default_dst;
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
/* In case we created vxlan device with carrier
* and we loose the carrier due to module unload
@@ -4739,7 +4889,7 @@ static void vxlan_handle_lowerdev_unregister(struct vxlan_net *vn,
* cases, it's not necessary and remote_ifindex
* is 0 here, so no matches.
*/
- if (dst->remote_ifindex == dev->ifindex)
+ if (cfg->remote_ifindex == dev->ifindex)
vxlan_dellink(vxlan->dev, &list_kill);
}
@@ -4752,6 +4902,10 @@ static int vxlan_netdevice_event(struct notifier_block *unused,
struct net_device *dev = netdev_notifier_info_to_dev(ptr);
struct vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id);
+ if ((event == NETDEV_REGISTER || event == NETDEV_UNREGISTER) &&
+ netif_is_vxlan(dev))
+ vxlan_vnifilter_seq_inc(dev_net(dev));
+
if (event == NETDEV_UNREGISTER)
vxlan_handle_lowerdev_unregister(vn, dev);
else if (event == NETDEV_UDP_TUNNEL_PUSH_INFO)
diff --git a/drivers/net/vxlan/vxlan_mdb.c b/drivers/net/vxlan/vxlan_mdb.c
index 841f42ffecb9a..c1a0551990555 100644
--- a/drivers/net/vxlan/vxlan_mdb.c
+++ b/drivers/net/vxlan/vxlan_mdb.c
@@ -165,6 +165,7 @@ static int vxlan_mdb_entry_info_fill(const struct vxlan_dev *vxlan,
const struct vxlan_mdb_entry *mdb_entry,
const struct vxlan_mdb_remote *remote)
{
+ const struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan->cfg);
struct vxlan_rdst *rd = rtnl_dereference(remote->rd);
struct br_mdb_entry e;
struct nlattr *nest;
@@ -189,12 +190,12 @@ static int vxlan_mdb_entry_info_fill(const struct vxlan_dev *vxlan,
vxlan_nla_put_addr(skb, MDBA_MDB_EATTR_DST, &rd->remote_ip))
goto nest_err;
- if (rd->remote_port && rd->remote_port != vxlan->cfg.dst_port &&
+ if (rd->remote_port && rd->remote_port != cfg->dst_port &&
nla_put_u16(skb, MDBA_MDB_EATTR_DST_PORT,
be16_to_cpu(rd->remote_port)))
goto nest_err;
- if (rd->remote_vni != vxlan->default_dst.remote_vni &&
+ if (rd->remote_vni != cfg->vni &&
nla_put_u32(skb, MDBA_MDB_EATTR_VNI, be32_to_cpu(rd->remote_vni)))
goto nest_err;
@@ -202,7 +203,7 @@ static int vxlan_mdb_entry_info_fill(const struct vxlan_dev *vxlan,
nla_put_u32(skb, MDBA_MDB_EATTR_IFINDEX, rd->remote_ifindex))
goto nest_err;
- if ((vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA) &&
+ if ((cfg->flags & VXLAN_F_COLLECT_METADATA) &&
mdb_entry->key.vni && nla_put_u32(skb, MDBA_MDB_EATTR_SRC_VNI,
be32_to_cpu(mdb_entry->key.vni)))
goto nest_err;
@@ -613,16 +614,19 @@ static int vxlan_mdb_config_init(struct vxlan_mdb_config *cfg,
{
struct br_mdb_entry *entry = nla_data(tb[MDBA_SET_ENTRY]);
struct vxlan_dev *vxlan = netdev_priv(dev);
+ const struct vxlan_config *vcfg;
+
+ vcfg = rtnl_dereference(vxlan->cfg);
memset(cfg, 0, sizeof(*cfg));
cfg->vxlan = vxlan;
- cfg->group.vni = vxlan->default_dst.remote_vni;
+ cfg->group.vni = vcfg->vni;
INIT_LIST_HEAD(&cfg->src_list);
cfg->nlflags = nlmsg_flags;
cfg->filter_mode = MCAST_EXCLUDE;
cfg->rt_protocol = RTPROT_STATIC;
- cfg->remote_vni = vxlan->default_dst.remote_vni;
- cfg->remote_port = vxlan->cfg.dst_port;
+ cfg->remote_vni = vcfg->vni;
+ cfg->remote_port = vcfg->dst_port;
if (entry->ifindex != dev->ifindex) {
NL_SET_ERR_MSG_MOD(extack, "Port net device must be the VXLAN net device");
@@ -957,11 +961,12 @@ vxlan_mdb_nlmsg_remote_size(const struct vxlan_dev *vxlan,
const struct vxlan_mdb_entry *mdb_entry,
const struct vxlan_mdb_remote *remote)
{
+ const struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan->cfg);
const struct vxlan_mdb_entry_key *group = &mdb_entry->key;
struct vxlan_rdst *rd = rtnl_dereference(remote->rd);
size_t nlmsg_size;
- /* MDBA_MDB_ENTRY_INFO */
+ /* MDBA_MDB_ENTRY_INFO */
nlmsg_size = nla_total_size(sizeof(struct br_mdb_entry)) +
/* MDBA_MDB_EATTR_TIMER */
nla_total_size(sizeof(u32));
@@ -978,16 +983,16 @@ vxlan_mdb_nlmsg_remote_size(const struct vxlan_dev *vxlan,
/* MDBA_MDB_EATTR_DST */
nlmsg_size += nla_total_size(vxlan_addr_size(&rd->remote_ip));
/* MDBA_MDB_EATTR_DST_PORT */
- if (rd->remote_port && rd->remote_port != vxlan->cfg.dst_port)
+ if (rd->remote_port && rd->remote_port != cfg->dst_port)
nlmsg_size += nla_total_size(sizeof(u16));
/* MDBA_MDB_EATTR_VNI */
- if (rd->remote_vni != vxlan->default_dst.remote_vni)
+ if (rd->remote_vni != cfg->vni)
nlmsg_size += nla_total_size(sizeof(u32));
/* MDBA_MDB_EATTR_IFINDEX */
if (rd->remote_ifindex)
nlmsg_size += nla_total_size(sizeof(u32));
/* MDBA_MDB_EATTR_SRC_VNI */
- if ((vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA) && group->vni)
+ if ((cfg->flags & VXLAN_F_COLLECT_METADATA) && group->vni)
nlmsg_size += nla_total_size(sizeof(u32));
return nlmsg_size;
@@ -1216,7 +1221,7 @@ vxlan_mdb_entry_get(struct vxlan_dev *vxlan,
goto err_free_entry;
if (hlist_is_singular_node(&mdb_entry->mdb_node, &vxlan->mdb_list))
- vxlan->cfg.flags |= VXLAN_F_MDB;
+ set_bit(VXLAN_DEV_F_MDB, &vxlan->flags);
return mdb_entry;
@@ -1233,7 +1238,7 @@ static void vxlan_mdb_entry_put(struct vxlan_dev *vxlan,
return;
if (hlist_is_singular_node(&mdb_entry->mdb_node, &vxlan->mdb_list))
- vxlan->cfg.flags &= ~VXLAN_F_MDB;
+ clear_bit(VXLAN_DEV_F_MDB, &vxlan->flags);
rhashtable_remove_fast(&vxlan->mdb_tbl, &mdb_entry->rhnode,
vxlan_mdb_rht_params);
@@ -1483,11 +1488,13 @@ static int vxlan_mdb_get_parse(struct net_device *dev, struct nlattr *tb[],
{
struct br_mdb_entry *entry = nla_data(tb[MDBA_GET_ENTRY]);
struct nlattr *mdbe_attrs[MDBE_ATTR_MAX + 1];
+ const struct vxlan_config *cfg;
struct vxlan_dev *vxlan = netdev_priv(dev);
int err;
+ cfg = rtnl_dereference(vxlan->cfg);
memset(group, 0, sizeof(*group));
- group->vni = vxlan->default_dst.remote_vni;
+ group->vni = cfg->vni;
if (!tb[MDBA_GET_ENTRY_ATTRS]) {
vxlan_mdb_group_set(group, entry, NULL);
@@ -1621,6 +1628,7 @@ int vxlan_mdb_get(struct net_device *dev, struct nlattr *tb[], u32 portid,
}
struct vxlan_mdb_entry *vxlan_mdb_entry_skb_get(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
struct sk_buff *skb,
__be32 src_vni)
{
@@ -1634,8 +1642,8 @@ struct vxlan_mdb_entry *vxlan_mdb_entry_skb_get(struct vxlan_dev *vxlan,
/* When not in collect metadata mode, 'src_vni' is zero, but MDB
* entries are stored with the VNI of the VXLAN device.
*/
- if (!(vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA))
- src_vni = vxlan->default_dst.remote_vni;
+ if (!(cfg->flags & VXLAN_F_COLLECT_METADATA))
+ src_vni = cfg->vni;
memset(&group, 0, sizeof(group));
group.vni = src_vni;
@@ -1700,6 +1708,7 @@ struct vxlan_mdb_entry *vxlan_mdb_entry_skb_get(struct vxlan_dev *vxlan,
}
netdev_tx_t vxlan_mdb_xmit(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
const struct vxlan_mdb_entry *mdb_entry,
struct sk_buff *skb)
{
@@ -1721,12 +1730,12 @@ netdev_tx_t vxlan_mdb_xmit(struct vxlan_dev *vxlan,
skb1 = skb_clone(skb, GFP_ATOMIC);
if (skb1)
- vxlan_xmit_one(skb1, vxlan->dev, src_vni,
+ vxlan_xmit_one(skb1, vxlan->dev, cfg, src_vni,
rcu_dereference(remote->rd), false);
}
if (fremote)
- vxlan_xmit_one(skb, vxlan->dev, src_vni,
+ vxlan_xmit_one(skb, vxlan->dev, cfg, src_vni,
rcu_dereference(fremote->rd), false);
else
kfree_skb_reason(skb, SKB_DROP_REASON_NO_TX_TARGET);
@@ -1757,7 +1766,7 @@ void vxlan_mdb_fini(struct vxlan_dev *vxlan)
struct vxlan_mdb_flush_desc desc = {};
vxlan_mdb_flush(vxlan, &desc);
- WARN_ON_ONCE(vxlan->cfg.flags & VXLAN_F_MDB);
+ WARN_ON_ONCE(test_bit(VXLAN_DEV_F_MDB, &vxlan->flags));
rhashtable_free_and_destroy(&vxlan->mdb_tbl, vxlan_mdb_check_empty,
NULL);
}
diff --git a/drivers/net/vxlan/vxlan_multicast.c b/drivers/net/vxlan/vxlan_multicast.c
index 3b75b48dc726d..6fcc4a3673436 100644
--- a/drivers/net/vxlan/vxlan_multicast.c
+++ b/drivers/net/vxlan/vxlan_multicast.c
@@ -14,11 +14,12 @@
/* Update multicast group membership when first VNI on
* multicast address is brought up
*/
-int vxlan_igmp_join(struct vxlan_dev *vxlan, union vxlan_addr *rip,
+int vxlan_igmp_join(struct vxlan_dev *vxlan, const union vxlan_addr *rip,
int rifindex)
{
- union vxlan_addr *ip = (rip ? : &vxlan->default_dst.remote_ip);
- int ifindex = (rifindex ? : vxlan->default_dst.remote_ifindex);
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
+ const union vxlan_addr *ip = (rip ? : &cfg->remote_ip);
+ int ifindex = (rifindex ? : cfg->remote_ifindex);
int ret = -EINVAL;
struct sock *sk;
@@ -47,11 +48,12 @@ int vxlan_igmp_join(struct vxlan_dev *vxlan, union vxlan_addr *rip,
return ret;
}
-int vxlan_igmp_leave(struct vxlan_dev *vxlan, union vxlan_addr *rip,
+int vxlan_igmp_leave(struct vxlan_dev *vxlan, const union vxlan_addr *rip,
int rifindex)
{
- union vxlan_addr *ip = (rip ? : &vxlan->default_dst.remote_ip);
- int ifindex = (rifindex ? : vxlan->default_dst.remote_ifindex);
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
+ const union vxlan_addr *ip = (rip ? : &cfg->remote_ip);
+ int ifindex = (rifindex ? : cfg->remote_ifindex);
int ret = -EINVAL;
struct sock *sk;
@@ -80,8 +82,8 @@ int vxlan_igmp_leave(struct vxlan_dev *vxlan, union vxlan_addr *rip,
return ret;
}
-static bool vxlan_group_used_match(union vxlan_addr *ip, int ifindex,
- union vxlan_addr *rip, int rifindex)
+static bool vxlan_group_used_match(const union vxlan_addr *ip, int ifindex,
+ const union vxlan_addr *rip, int rifindex)
{
if (!vxlan_addr_multicast(rip))
return false;
@@ -96,14 +98,16 @@ static bool vxlan_group_used_match(union vxlan_addr *ip, int ifindex,
}
static bool vxlan_group_used_by_vnifilter(struct vxlan_dev *vxlan,
- union vxlan_addr *ip, int ifindex)
+ const struct vxlan_config *cfg,
+ const union vxlan_addr *ip,
+ int ifindex)
{
struct vxlan_vni_group *vg = rtnl_dereference(vxlan->vnigrp);
struct vxlan_vni_node *v, *tmp;
if (vxlan_group_used_match(ip, ifindex,
- &vxlan->default_dst.remote_ip,
- vxlan->default_dst.remote_ifindex))
+ &cfg->remote_ip,
+ cfg->remote_ifindex))
return true;
list_for_each_entry_safe(v, tmp, &vg->vni_list, vlist) {
@@ -112,7 +116,7 @@ static bool vxlan_group_used_by_vnifilter(struct vxlan_dev *vxlan,
if (vxlan_group_used_match(ip, ifindex,
&v->remote_ip,
- vxlan->default_dst.remote_ifindex))
+ cfg->remote_ifindex))
return true;
}
@@ -121,16 +125,17 @@ static bool vxlan_group_used_by_vnifilter(struct vxlan_dev *vxlan,
/* See if multicast group is already in use by other ID */
bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,
- __be32 vni, union vxlan_addr *rip, int rifindex)
+ __be32 vni, const union vxlan_addr *rip, int rifindex)
{
- union vxlan_addr *ip = (rip ? : &dev->default_dst.remote_ip);
- int ifindex = (rifindex ? : dev->default_dst.remote_ifindex);
+ const struct vxlan_config *dev_cfg = rtnl_dereference(dev->cfg);
+ const union vxlan_addr *ip = (rip ? : &dev_cfg->remote_ip);
+ int ifindex = (rifindex ? : dev_cfg->remote_ifindex);
struct vxlan_dev *vxlan;
struct vxlan_sock *sock4;
#if IS_ENABLED(CONFIG_IPV6)
struct vxlan_sock *sock6;
#endif
- unsigned short family = dev->default_dst.remote_ip.sa.sa_family;
+ unsigned short family = dev_cfg->remote_ip.sa.sa_family;
sock4 = rtnl_dereference(dev->vn4_sock);
@@ -147,6 +152,8 @@ bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,
#endif
list_for_each_entry(vxlan, &vn->vxlan_list, next) {
+ const struct vxlan_config *cfg;
+
if (!netif_running(vxlan->dev) || vxlan == dev)
continue;
@@ -158,13 +165,15 @@ bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,
rtnl_dereference(vxlan->vn6_sock) != sock6)
continue;
#endif
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER) {
- if (!vxlan_group_used_by_vnifilter(vxlan, ip, ifindex))
+ cfg = rtnl_dereference(vxlan->cfg);
+
+ if (cfg->flags & VXLAN_F_VNIFILTER) {
+ if (!vxlan_group_used_by_vnifilter(vxlan, cfg, ip, ifindex))
continue;
} else {
if (!vxlan_group_used_match(ip, ifindex,
- &vxlan->default_dst.remote_ip,
- vxlan->default_dst.remote_ifindex))
+ &cfg->remote_ip,
+ cfg->remote_ifindex))
continue;
}
@@ -174,7 +183,8 @@ bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,
return false;
}
-static int vxlan_multicast_join_vnigrp(struct vxlan_dev *vxlan)
+static int vxlan_multicast_join_vnigrp(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg)
{
struct vxlan_vni_group *vg = rtnl_dereference(vxlan->vnigrp);
struct vxlan_vni_node *v, *tmp, *vgood = NULL;
@@ -185,7 +195,7 @@ static int vxlan_multicast_join_vnigrp(struct vxlan_dev *vxlan)
continue;
/* skip if address is same as default address */
if (vxlan_addr_equal(&v->remote_ip,
- &vxlan->default_dst.remote_ip))
+ &cfg->remote_ip))
continue;
ret = vxlan_igmp_join(vxlan, &v->remote_ip, 0);
if (ret == -EADDRINUSE)
@@ -200,7 +210,7 @@ static int vxlan_multicast_join_vnigrp(struct vxlan_dev *vxlan)
if (!vxlan_addr_multicast(&v->remote_ip))
continue;
if (vxlan_addr_equal(&v->remote_ip,
- &vxlan->default_dst.remote_ip))
+ &cfg->remote_ip))
continue;
vxlan_igmp_leave(vxlan, &v->remote_ip, 0);
if (v == vgood)
@@ -233,37 +243,39 @@ static int vxlan_multicast_leave_vnigrp(struct vxlan_dev *vxlan)
int vxlan_multicast_join(struct vxlan_dev *vxlan)
{
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
int ret = 0;
- if (vxlan_addr_multicast(&vxlan->default_dst.remote_ip)) {
- ret = vxlan_igmp_join(vxlan, &vxlan->default_dst.remote_ip,
- vxlan->default_dst.remote_ifindex);
+ if (vxlan_addr_multicast(&cfg->remote_ip)) {
+ ret = vxlan_igmp_join(vxlan, &cfg->remote_ip,
+ cfg->remote_ifindex);
if (ret == -EADDRINUSE)
ret = 0;
if (ret)
return ret;
}
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER)
- return vxlan_multicast_join_vnigrp(vxlan);
+ if (cfg->flags & VXLAN_F_VNIFILTER)
+ return vxlan_multicast_join_vnigrp(vxlan, cfg);
return 0;
}
int vxlan_multicast_leave(struct vxlan_dev *vxlan)
{
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id);
int ret = 0;
- if (vxlan_addr_multicast(&vxlan->default_dst.remote_ip) &&
+ if (vxlan_addr_multicast(&cfg->remote_ip) &&
!vxlan_group_used(vn, vxlan, 0, NULL, 0)) {
- ret = vxlan_igmp_leave(vxlan, &vxlan->default_dst.remote_ip,
- vxlan->default_dst.remote_ifindex);
+ ret = vxlan_igmp_leave(vxlan, &cfg->remote_ip,
+ cfg->remote_ifindex);
if (ret)
return ret;
}
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER)
+ if (cfg->flags & VXLAN_F_VNIFILTER)
return vxlan_multicast_leave_vnigrp(vxlan);
return 0;
diff --git a/drivers/net/vxlan/vxlan_private.h b/drivers/net/vxlan/vxlan_private.h
index b1eec22163608..f0ee85f83732a 100644
--- a/drivers/net/vxlan/vxlan_private.h
+++ b/drivers/net/vxlan/vxlan_private.h
@@ -22,6 +22,8 @@ struct vxlan_net {
/* sock_list is protected by rtnl lock */
struct hlist_head sock_list[PORT_HASH_SIZE];
struct notifier_block nexthop_notifier_block;
+ /* Generation counter for RTM_GETTUNNEL dumps */
+ atomic_t vnifilter_seq;
};
struct vxlan_fdb_key {
@@ -177,6 +179,13 @@ vxlan_vnifilter_lookup(struct vxlan_dev *vxlan, __be32 vni)
vxlan_vni_rht_params);
}
+static inline void vxlan_vnifilter_seq_inc(const struct net *net)
+{
+ struct vxlan_net *vn = net_generic(net, vxlan_net_id);
+
+ atomic_inc(&vn->vnifilter_seq);
+}
+
/* vxlan_core.c */
int vxlan_fdb_create(struct vxlan_dev *vxlan,
const u8 *mac, union vxlan_addr *ip,
@@ -195,9 +204,10 @@ int vxlan_fdb_update(struct vxlan_dev *vxlan,
__u32 ifindex, __u16 ndm_flags, u32 nhid,
bool swdev_notify, struct netlink_ext_ack *extack);
void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
+ const struct vxlan_config *cfg,
__be32 default_vni, struct vxlan_rdst *rdst, bool did_rsc);
int vxlan_vni_in_use(struct net *src_net, struct vxlan_dev *vxlan,
- struct vxlan_config *conf, __be32 vni);
+ const struct vxlan_config *conf, __be32 vni);
/* vxlan_vnifilter.c */
int vxlan_vnigroup_init(struct vxlan_dev *vxlan);
@@ -205,7 +215,8 @@ void vxlan_vnigroup_uninit(struct vxlan_dev *vxlan);
int vxlan_vnifilter_init(void);
void vxlan_vnifilter_uninit(void);
-void vxlan_vnifilter_count(struct vxlan_dev *vxlan, __be32 vni,
+void vxlan_vnifilter_count(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg, __be32 vni,
struct vxlan_vni_node *vninode,
int type, unsigned int len);
@@ -213,9 +224,16 @@ void vxlan_vs_add_vnigrp(struct vxlan_dev *vxlan,
struct vxlan_sock *vs,
bool ipv6);
void vxlan_vs_del_vnigrp(struct vxlan_dev *vxlan);
+bool vxlan_vnifilter_has_multicast(const struct vxlan_dev *vxlan);
+int vxlan_update_default_fdb_entry(struct vxlan_dev *vxlan, __be32 vni,
+ const union vxlan_addr *old_remote_ip,
+ const union vxlan_addr *remote_ip,
+ u32 old_ifindex, u32 new_ifindex,
+ struct netlink_ext_ack *extack);
int vxlan_vnilist_update_group(struct vxlan_dev *vxlan,
- union vxlan_addr *old_remote_ip,
- union vxlan_addr *new_remote_ip,
+ const union vxlan_addr *old_remote_ip,
+ const union vxlan_addr *new_remote_ip,
+ u32 old_ifindex, u32 new_ifindex,
struct netlink_ext_ack *extack);
@@ -223,10 +241,10 @@ int vxlan_vnilist_update_group(struct vxlan_dev *vxlan,
int vxlan_multicast_join(struct vxlan_dev *vxlan);
int vxlan_multicast_leave(struct vxlan_dev *vxlan);
bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,
- __be32 vni, union vxlan_addr *rip, int rifindex);
-int vxlan_igmp_join(struct vxlan_dev *vxlan, union vxlan_addr *rip,
+ __be32 vni, const union vxlan_addr *rip, int rifindex);
+int vxlan_igmp_join(struct vxlan_dev *vxlan, const union vxlan_addr *rip,
int rifindex);
-int vxlan_igmp_leave(struct vxlan_dev *vxlan, union vxlan_addr *rip,
+int vxlan_igmp_leave(struct vxlan_dev *vxlan, const union vxlan_addr *rip,
int rifindex);
/* vxlan_mdb.c */
@@ -241,9 +259,11 @@ int vxlan_mdb_del_bulk(struct net_device *dev, struct nlattr *tb[],
int vxlan_mdb_get(struct net_device *dev, struct nlattr *tb[], u32 portid,
u32 seq, struct netlink_ext_ack *extack);
struct vxlan_mdb_entry *vxlan_mdb_entry_skb_get(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
struct sk_buff *skb,
__be32 src_vni);
netdev_tx_t vxlan_mdb_xmit(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
const struct vxlan_mdb_entry *mdb_entry,
struct sk_buff *skb);
int vxlan_mdb_init(struct vxlan_dev *vxlan);
diff --git a/drivers/net/vxlan/vxlan_vnifilter.c b/drivers/net/vxlan/vxlan_vnifilter.c
index dd94085e08865..48135ff9b95a1 100644
--- a/drivers/net/vxlan/vxlan_vnifilter.c
+++ b/drivers/net/vxlan/vxlan_vnifilter.c
@@ -171,13 +171,14 @@ static void vxlan_vnifilter_stats_add(struct vxlan_vni_node *vninode,
u64_stats_update_end(&pstats->syncp);
}
-void vxlan_vnifilter_count(struct vxlan_dev *vxlan, __be32 vni,
+void vxlan_vnifilter_count(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg, __be32 vni,
struct vxlan_vni_node *vninode,
int type, unsigned int len)
{
struct vxlan_vni_node *vnode;
- if (!(vxlan->cfg.flags & VXLAN_F_VNIFILTER))
+ if (!(cfg->flags & VXLAN_F_VNIFILTER))
return;
if (vninode) {
@@ -333,22 +334,36 @@ static int vxlan_vnifilter_dump_dev(const struct net_device *dev,
struct sk_buff *skb,
struct netlink_callback *cb)
{
- struct vxlan_vni_node *tmp, *v, *vbegin = NULL, *vend = NULL;
+ struct vxlan_vni_node *v, *vbegin = NULL, *vend = NULL;
struct vxlan_dev *vxlan = netdev_priv(dev);
struct tunnel_msg *new_tmsg, *tmsg;
- int idx = 0, s_idx = cb->args[1];
+ const struct vxlan_config *cfg;
struct vxlan_vni_group *vg;
struct nlmsghdr *nlh;
+ int idx = 0, s_idx;
bool dump_stats;
int err = 0;
- if (!(vxlan->cfg.flags & VXLAN_F_VNIFILTER))
+ if (cb->args[2] != dev->ifindex) {
+ cb->args[1] = 0;
+ cb->args[2] = dev->ifindex;
+ }
+ s_idx = cb->args[1];
+
+ cfg = rcu_dereference(vxlan->cfg);
+ if (!(cfg->flags & VXLAN_F_VNIFILTER)) {
+ cb->args[1] = 0;
+ cb->args[2] = 0;
return -EINVAL;
+ }
/* RCU needed because of the vni locking rules (rcu || rtnl) */
vg = rcu_dereference(vxlan->vnigrp);
- if (!vg || !vg->num_vnis)
+ if (!vg || !vg->num_vnis) {
+ cb->args[1] = 0;
+ cb->args[2] = 0;
return 0;
+ }
tmsg = nlmsg_data(cb->nlh);
dump_stats = !!(tmsg->flags & TUNNEL_MSG_FLAG_STATS);
@@ -362,7 +377,7 @@ static int vxlan_vnifilter_dump_dev(const struct net_device *dev,
new_tmsg->family = PF_BRIDGE;
new_tmsg->ifindex = dev->ifindex;
- list_for_each_entry_safe(v, tmp, &vg->vni_list, vlist) {
+ list_for_each_entry_rcu(v, &vg->vni_list, vlist) {
if (idx < s_idx) {
idx++;
continue;
@@ -394,12 +409,26 @@ static int vxlan_vnifilter_dump_dev(const struct net_device *dev,
}
cb->args[1] = err ? idx : 0;
+ cb->args[2] = err ? dev->ifindex : 0;
nlmsg_end(skb, nlh);
+ nl_dump_check_consistent(cb, nlh);
+
return err;
}
+static u32 vxlan_vnifilter_base_seq(const struct net *net)
+{
+ const struct vxlan_net *vn = net_generic(net, vxlan_net_id);
+ u32 res = atomic_read(&vn->vnifilter_seq);
+
+ /* Must not return 0 (see nl_dump_check_consistent()) */
+ if (!res)
+ res = 0x80000000;
+ return res;
+}
+
static int vxlan_vnifilter_dump(struct sk_buff *skb, struct netlink_callback *cb)
{
int idx = 0, err = 0, s_idx = cb->args[0];
@@ -419,6 +448,9 @@ static int vxlan_vnifilter_dump(struct sk_buff *skb, struct netlink_callback *cb
}
rcu_read_lock();
+
+ cb->seq = vxlan_vnifilter_base_seq(net);
+
if (tmsg->ifindex) {
dev = dev_get_by_index_rcu(net, tmsg->ifindex);
if (!dev) {
@@ -470,24 +502,48 @@ static const struct nla_policy vni_filter_policy[VXLAN_VNIFILTER_MAX + 1] = {
[VXLAN_VNIFILTER_ENTRY] = { .type = NLA_NESTED },
};
-static int vxlan_update_default_fdb_entry(struct vxlan_dev *vxlan, __be32 vni,
- union vxlan_addr *old_remote_ip,
- union vxlan_addr *remote_ip,
- struct netlink_ext_ack *extack)
+bool vxlan_vnifilter_has_multicast(const struct vxlan_dev *vxlan)
+{
+ struct vxlan_vni_group *vg = rtnl_dereference(vxlan->vnigrp);
+ struct vxlan_vni_node *v;
+
+ if (!vg)
+ return false;
+
+ list_for_each_entry(v, &vg->vni_list, vlist) {
+ if (vxlan_addr_multicast(&v->remote_ip))
+ return true;
+ }
+
+ return false;
+}
+
+int vxlan_update_default_fdb_entry(struct vxlan_dev *vxlan, __be32 vni,
+ const union vxlan_addr *old_remote_ip,
+ const union vxlan_addr *remote_ip,
+ u32 old_ifindex, u32 new_ifindex,
+ struct netlink_ext_ack *extack)
{
- struct vxlan_rdst *dst = &vxlan->default_dst;
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
int err = 0;
+ if (old_remote_ip && remote_ip &&
+ vxlan_addr_equal(old_remote_ip, remote_ip) &&
+ old_ifindex == new_ifindex)
+ return 0;
+
spin_lock_bh(&vxlan->hash_lock);
if (remote_ip && !vxlan_addr_any(remote_ip)) {
+ union vxlan_addr rip = *remote_ip;
+
err = vxlan_fdb_update(vxlan, all_zeros_mac,
- remote_ip,
+ &rip,
NUD_REACHABLE | NUD_PERMANENT,
NLM_F_APPEND | NLM_F_CREATE,
- vxlan->cfg.dst_port,
+ cfg->dst_port,
vni,
vni,
- dst->remote_ifindex,
+ new_ifindex,
NTF_SELF, 0, true, extack);
if (err) {
spin_unlock_bh(&vxlan->hash_lock);
@@ -498,9 +554,9 @@ static int vxlan_update_default_fdb_entry(struct vxlan_dev *vxlan, __be32 vni,
if (old_remote_ip && !vxlan_addr_any(old_remote_ip)) {
__vxlan_fdb_delete(vxlan, all_zeros_mac,
*old_remote_ip,
- vxlan->cfg.dst_port,
+ cfg->dst_port,
vni, vni,
- dst->remote_ifindex,
+ old_ifindex,
true);
}
spin_unlock_bh(&vxlan->hash_lock);
@@ -515,8 +571,8 @@ static int vxlan_vni_update_group(struct vxlan_dev *vxlan,
struct netlink_ext_ack *extack)
{
struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id);
- struct vxlan_rdst *dst = &vxlan->default_dst;
- union vxlan_addr *newrip = NULL, *oldrip = NULL;
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
+ const union vxlan_addr *newrip = NULL, *oldrip = NULL;
union vxlan_addr old_remote_ip;
int ret = 0;
@@ -528,8 +584,8 @@ static int vxlan_vni_update_group(struct vxlan_dev *vxlan,
if (group && !vxlan_addr_any(group)) {
newrip = group;
} else {
- if (!vxlan_addr_any(&dst->remote_ip))
- newrip = &dst->remote_ip;
+ if (!vxlan_addr_any(&cfg->remote_ip))
+ newrip = &cfg->remote_ip;
}
/* if old rip exists, and no newrip,
@@ -546,18 +602,23 @@ static int vxlan_vni_update_group(struct vxlan_dev *vxlan,
ret = vxlan_update_default_fdb_entry(vxlan, vninode->vni,
oldrip, newrip,
+ cfg->remote_ifindex,
+ cfg->remote_ifindex,
extack);
if (ret)
goto out;
- if (group)
+ if (group) {
memcpy(&vninode->remote_ip, group, sizeof(vninode->remote_ip));
+ if (!create)
+ vxlan_vnifilter_seq_inc(dev_net(vxlan->dev));
+ }
if (vxlan->dev->flags & IFF_UP) {
if (vxlan_addr_multicast(&old_remote_ip) &&
!vxlan_group_used(vn, vxlan, vninode->vni,
&old_remote_ip,
- vxlan->default_dst.remote_ifindex)) {
+ cfg->remote_ifindex)) {
ret = vxlan_igmp_leave(vxlan, &old_remote_ip,
0);
if (ret)
@@ -581,10 +642,12 @@ static int vxlan_vni_update_group(struct vxlan_dev *vxlan,
}
int vxlan_vnilist_update_group(struct vxlan_dev *vxlan,
- union vxlan_addr *old_remote_ip,
- union vxlan_addr *new_remote_ip,
+ const union vxlan_addr *old_remote_ip,
+ const union vxlan_addr *new_remote_ip,
+ u32 old_ifindex, u32 new_ifindex,
struct netlink_ext_ack *extack)
{
+ const union vxlan_addr *oldrip, *newrip;
struct list_head *headp, *hpos;
struct vxlan_vni_group *vg;
struct vxlan_vni_node *vent;
@@ -595,37 +658,66 @@ int vxlan_vnilist_update_group(struct vxlan_dev *vxlan,
headp = &vg->vni_list;
list_for_each_prev(hpos, headp) {
vent = list_entry(hpos, struct vxlan_vni_node, vlist);
+
if (vxlan_addr_any(&vent->remote_ip)) {
- ret = vxlan_update_default_fdb_entry(vxlan, vent->vni,
- old_remote_ip,
- new_remote_ip,
- extack);
- if (ret)
- return ret;
+ oldrip = old_remote_ip;
+ newrip = new_remote_ip;
+ } else {
+ /* A vni with its own group keeps it, but its fdb entry
+ * is still keyed on the device remote_ifindex.
+ */
+ oldrip = &vent->remote_ip;
+ newrip = &vent->remote_ip;
}
+
+ ret = vxlan_update_default_fdb_entry(vxlan, vent->vni,
+ oldrip, newrip,
+ old_ifindex, new_ifindex,
+ extack);
+ if (ret)
+ goto err_unwind;
}
return 0;
+
+err_unwind:
+ list_for_each_continue(hpos, headp) {
+ vent = list_entry(hpos, struct vxlan_vni_node, vlist);
+
+ if (vxlan_addr_any(&vent->remote_ip)) {
+ oldrip = old_remote_ip;
+ newrip = new_remote_ip;
+ } else {
+ oldrip = &vent->remote_ip;
+ newrip = &vent->remote_ip;
+ }
+
+ vxlan_update_default_fdb_entry(vxlan, vent->vni,
+ newrip, oldrip,
+ new_ifindex, old_ifindex,
+ NULL);
+ }
+ return ret;
}
static void vxlan_vni_delete_group(struct vxlan_dev *vxlan,
struct vxlan_vni_node *vninode)
{
struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id);
- struct vxlan_rdst *dst = &vxlan->default_dst;
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
/* if per vni remote_ip not present, delete the
* default dst remote_ip previously added for this vni
*/
if (!vxlan_addr_any(&vninode->remote_ip) ||
- !vxlan_addr_any(&dst->remote_ip)) {
+ !vxlan_addr_any(&cfg->remote_ip)) {
spin_lock_bh(&vxlan->hash_lock);
__vxlan_fdb_delete(vxlan, all_zeros_mac,
(vxlan_addr_any(&vninode->remote_ip) ?
- dst->remote_ip : vninode->remote_ip),
- vxlan->cfg.dst_port,
+ cfg->remote_ip : vninode->remote_ip),
+ cfg->dst_port,
vninode->vni, vninode->vni,
- dst->remote_ifindex,
+ cfg->remote_ifindex,
true);
spin_unlock_bh(&vxlan->hash_lock);
}
@@ -634,7 +726,7 @@ static void vxlan_vni_delete_group(struct vxlan_dev *vxlan,
if (vxlan_addr_multicast(&vninode->remote_ip) &&
!vxlan_group_used(vn, vxlan, vninode->vni,
&vninode->remote_ip,
- dst->remote_ifindex)) {
+ cfg->remote_ifindex)) {
vxlan_igmp_leave(vxlan, &vninode->remote_ip, 0);
}
}
@@ -665,7 +757,8 @@ static int vxlan_vni_update(struct vxlan_dev *vxlan,
return 0;
}
-static void __vxlan_vni_add_list(struct vxlan_vni_group *vg,
+static void __vxlan_vni_add_list(struct vxlan_dev *vxlan,
+ struct vxlan_vni_group *vg,
struct vxlan_vni_node *v)
{
struct list_head *headp, *hpos;
@@ -681,13 +774,16 @@ static void __vxlan_vni_add_list(struct vxlan_vni_group *vg,
}
list_add_rcu(&v->vlist, hpos);
vg->num_vnis++;
+ vxlan_vnifilter_seq_inc(dev_net(vxlan->dev));
}
-static void __vxlan_vni_del_list(struct vxlan_vni_group *vg,
+static void __vxlan_vni_del_list(struct vxlan_dev *vxlan,
+ struct vxlan_vni_group *vg,
struct vxlan_vni_node *v)
{
list_del_rcu(&v->vlist);
vg->num_vnis--;
+ vxlan_vnifilter_seq_inc(dev_net(vxlan->dev));
}
static struct vxlan_vni_node *vxlan_vni_alloc(struct vxlan_dev *vxlan,
@@ -723,6 +819,7 @@ static int vxlan_vni_add(struct vxlan_dev *vxlan,
u32 vni, union vxlan_addr *group,
struct netlink_ext_ack *extack)
{
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
struct vxlan_vni_node *vninode;
__be32 v = cpu_to_be32(vni);
bool changed = false;
@@ -731,7 +828,7 @@ static int vxlan_vni_add(struct vxlan_dev *vxlan,
if (vxlan_vnifilter_lookup(vxlan, v))
return vxlan_vni_update(vxlan, vg, v, group, &changed, extack);
- err = vxlan_vni_in_use(vxlan->net, vxlan, &vxlan->cfg, v);
+ err = vxlan_vni_in_use(vxlan->net, vxlan, cfg, v);
if (err) {
NL_SET_ERR_MSG(extack, "VNI in use");
return err;
@@ -749,7 +846,7 @@ static int vxlan_vni_add(struct vxlan_dev *vxlan,
return err;
}
- __vxlan_vni_add_list(vg, vninode);
+ __vxlan_vni_add_list(vxlan, vg, vninode);
if (vxlan->dev->flags & IFF_UP)
vxlan_vs_add_del_vninode(vxlan, vninode, false);
@@ -795,7 +892,7 @@ static int vxlan_vni_del(struct vxlan_dev *vxlan,
if (err)
goto out;
- __vxlan_vni_del_list(vg, vninode);
+ __vxlan_vni_del_list(vxlan, vg, vninode);
vxlan_vnifilter_notify(vxlan, vninode, RTM_DELTUNNEL);
@@ -844,6 +941,7 @@ static int vxlan_process_vni_filter(struct vxlan_dev *vxlan,
int cmd, struct netlink_ext_ack *extack)
{
struct nlattr *vattrs[VXLAN_VNIFILTER_ENTRY_MAX + 1];
+ const struct vxlan_config *cfg;
u32 vni_start = 0, vni_end = 0;
union vxlan_addr group;
int err;
@@ -881,7 +979,8 @@ static int vxlan_process_vni_filter(struct vxlan_dev *vxlan,
memset(&group, 0, sizeof(group));
}
- if (vxlan_addr_multicast(&group) && !vxlan->default_dst.remote_ifindex) {
+ cfg = rtnl_dereference(vxlan->cfg);
+ if (vxlan_addr_multicast(&group) && !cfg->remote_ifindex) {
NL_SET_ERR_MSG(extack,
"Local interface required for multicast remote group");
@@ -909,7 +1008,7 @@ void vxlan_vnigroup_uninit(struct vxlan_dev *vxlan)
#if IS_ENABLED(CONFIG_IPV6)
hlist_del_init_rcu(&v->hlist6.hlist);
#endif
- __vxlan_vni_del_list(vg, v);
+ __vxlan_vni_del_list(vxlan, vg, v);
vxlan_vnifilter_notify(vxlan, v, RTM_DELTUNNEL);
call_rcu(&v->rcu, vxlan_vni_node_rcu_free);
}
@@ -940,6 +1039,7 @@ static int vxlan_vnifilter_process(struct sk_buff *skb, struct nlmsghdr *nlh,
struct netlink_ext_ack *extack)
{
struct net *net = sock_net(skb->sk);
+ const struct vxlan_config *cfg;
struct tunnel_msg *tmsg;
struct vxlan_dev *vxlan;
struct net_device *dev;
@@ -964,8 +1064,9 @@ static int vxlan_vnifilter_process(struct sk_buff *skb, struct nlmsghdr *nlh,
}
vxlan = netdev_priv(dev);
+ cfg = rtnl_dereference(vxlan->cfg);
- if (!(vxlan->cfg.flags & VXLAN_F_VNIFILTER))
+ if (!(cfg->flags & VXLAN_F_VNIFILTER))
return -EOPNOTSUPP;
nlmsg_for_each_attr_type(attr, VXLAN_VNIFILTER_ENTRY, nlh,
diff --git a/include/net/vxlan.h b/include/net/vxlan.h
index 7b82075055237..c3c9f2ccc3d1b 100644
--- a/include/net/vxlan.h
+++ b/include/net/vxlan.h
@@ -204,7 +204,6 @@ struct vxlan_rdst {
u8 offloaded:1;
__be32 remote_vni;
u32 remote_ifindex;
- struct net_device *remote_dev;
struct list_head list;
struct rcu_head rcu;
struct dst_cache dst_cache;
@@ -229,6 +228,7 @@ struct vxlan_config {
bool no_share;
enum ifla_vxlan_df df;
struct vxlanhdr reserved_bits;
+ struct rcu_head rcu;
};
enum {
@@ -294,14 +294,15 @@ struct vxlan_dev {
#endif
struct net_device *dev;
struct net *net; /* netns for packet i/o */
- struct vxlan_rdst default_dst; /* default destination */
+ struct net_device *lowerdev;
struct timer_list age_timer;
spinlock_t hash_lock;
unsigned int addrcnt;
struct gro_cells gro_cells;
+ unsigned long flags;
- struct vxlan_config cfg;
+ struct vxlan_config __rcu *cfg;
struct vxlan_vni_group __rcu *vnigrp;
@@ -313,6 +314,10 @@ struct vxlan_dev {
unsigned int mdb_seq;
};
+enum vxlan_dev_flags {
+ VXLAN_DEV_F_MDB,
+};
+
#define VXLAN_F_LEARN 0x01
#define VXLAN_F_PROXY 0x02
#define VXLAN_F_RSC 0x04
@@ -331,7 +336,6 @@ struct vxlan_dev {
#define VXLAN_F_IPV6_LINKLOCAL 0x8000
#define VXLAN_F_TTL_INHERIT 0x10000
#define VXLAN_F_VNIFILTER 0x20000
-#define VXLAN_F_MDB 0x40000
#define VXLAN_F_LOCALBYPASS 0x80000
#define VXLAN_F_MC_ROUTE 0x100000
|
| 3/2 | 2026/09/23 07:53 | llm | patch-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 49475 output: 26 thoughts: 894 Thoughts: **VXLAN Patch Analysis for Fuzzing Suitability** Okay, let's break this down. The task is to evaluate a patch and determine if it justifies fuzzing with syzkaller. First, I need to see what's changed. The patch touches several files: `drivers/net/ethernet/mellanox/...`, and especially the `drivers/net/vxlan/` directory. This immediately flags my attention because that's the VXLAN implementation, a critical virtual network device within the Linux kernel. VXLAN is absolutely reachable in standard virtualized environments like QEMU and GCE, as it's a standard virtual tunnel netdev managed through netlink (`ip link add ... type vxlan ...`), and syzkaller *loves* fuzzing netlink and VXLAN. So, that's a check in the "reachable" box. Now, let's get into the nitty-gritty. The patch is primarily a refactoring. It's moving `struct vxlan_config` around within `struct vxlan_dev`, changing it from an embedded structure to an `__rcu *cfg`, and moving some flags. It's using RCU dereference for `vxlan->cfg`, updating the associated functions like `vxlan_changelink`, `vxlan_config_apply`, and so on. There's also some work on sequence numbers and list iteration under RCU in `vxlan_vnifilter_dump_dev`. Crucially, this patch modifies the RCU lifetimes, concurrency, error paths, memory allocation using `kmemdup`, changelink, FDB updates... This all points to modifications to the core networking virtual driver `vxlan`! This is where things get interesting. Now for the crucial question: Is it worth fuzzing? Let's check the rules. VXLAN is definitely reachable via netlink. The rules state we should return `WorthFuzzing=true` when the patch touches reachable executable code, including: refactorings, code cleanups of reachable data structures, helper abstractions, or algorithm flows; runtime assertions or defensive checks; and reachable drivers. Considering this, I believe this patch qualifies as "worth fuzzing". This patch is touching core vxlan code which is a netlink managed virtual netdev, which falls in line with the described categories for fuzzing. As a final check, I will quickly verify VXLAN's Kconfig definition using `grepper` or `drivers/net/vxlan/Kconfig` to ensure it's properly configured. |
| 4/2 | 2026/09/23 07:53 | tool | grepper |
0mArgs:{
"Expression": "config VXLAN",
"PathPrefix": "drivers/net"
}Results: {
"Output": "drivers/net/Kconfig=216=config IPVTAP\n--\ndrivers/net/Kconfig-229-\ndrivers/net/Kconfig:230:config VXLAN\ndrivers/net/Kconfig-231-\ttristate \"Virtual eXtensible Local Area Network (VXLAN)\"\n"
} |
| 5/2 | 2026/09/23 07:53 | llm | patch-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 51016 output: 34 thoughts: 29 Thoughts: Okay, here's my take on those thoughts, tailored for an expert audience: **Investigating the VXLAN Configuration Dependencies** Alright, let's dive straight in. My immediate thought is to pinpoint the exact dependencies of `CONFIG_VXLAN` within the kernel configuration system. I'm going to head directly to `drivers/net/Kconfig`, and I'm guessing around line 230 is a good place to start. That's usually where these sorts of networking configurations reside. I want to quickly understand what other features or modules need to be enabled before `VXLAN` becomes available. Knowing this will allow me to track down the root cause if I encounter any build or runtime issues. I also expect this should be the point where the `CONFIG_VXLAN` options and their dependencies are declared. |
| 6/2 | 2026/09/23 07:53 | tool | read-file |
0mArgs:{
"File": "drivers/net/Kconfig",
"FirstLine": 228,
"LineCount": 30
}Results: {
"Contents": " 228:\t\t will be called ipvtap.\n 229:\t\n 230:\tconfig VXLAN\n 231:\t\ttristate \"Virtual eXtensible Local Area Network (VXLAN)\"\n 232:\t\tdepends on INET\n 233:\t\tselect NET_UDP_TUNNEL\n 234:\t\tselect GRO_CELLS\n 235:\t\thelp\n 236:\t\t This allows one to create vxlan virtual interfaces that provide\n 237:\t\t Layer 2 Networks over Layer 3 Networks. VXLAN is often used\n 238:\t\t to tunnel virtual network infrastructure in virtualized environments.\n 239:\t\t For more information see:\n 240:\t\t http://tools.ietf.org/html/draft-mahalingam-dutt-dcops-vxlan-02\n 241:\t\n 242:\t\t To compile this driver as a module, choose M here: the module\n 243:\t\t will be called vxlan.\n 244:\t\n 245:\tconfig GENEVE\n 246:\t\ttristate \"Generic Network Virtualization Encapsulation\"\n 247:\t\tdepends on INET\n 248:\t\tselect NET_UDP_TUNNEL\n 249:\t\tselect GRO_CELLS\n 250:\t\thelp\n 251:\t\t This allows one to create geneve virtual interfaces that provide\n 252:\t\t Layer 2 Networks over Layer 3 Networks. GENEVE is often used\n 253:\t\t to tunnel virtual network infrastructure in virtualized environments.\n 254:\t\t For more information see:\n 255:\t\t http://tools.ietf.org/html/draft-gross-geneve-02\n 256:\t\n 257:\t\t To compile this driver as a module, choose M here: the module\n"
} |
| 7/2 | 2026/09/23 07:53 | llm | patch-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 51727 output: 28 thoughts: 34 Thoughts: Okay, here's my summary, tailored as requested: **Checking VXLAN Configuration Dependencies** Alright, so `CONFIG_VXLAN` hinges on `INET`, that much is clear. But I'm a stickler for detail, and I'm pretty sure there might be other configurations that play a role, perhaps even indirectly. I need to be absolutely sure I understand the complete dependency tree. This is vital for debugging or porting, or even just for understanding the impact of disabling a feature. Therefore, let's dive into `drivers/net/vxlan/Makefile`. The makefile is usually the best place to find all the relationships between the modules, libraries, and necessary options. It'll give me a granular view and possibly reveal any hidden dependencies, build-time configurations, or linking requirements related to `CONFIG_VXLAN` that I might be overlooking. It will be the most authoritative source for this information. Let's see what gems are hidden in there. |
| 8/2 | 2026/09/23 07:53 | tool | grepper |
0mArgs:{
"Expression": "vxlan",
"PathPrefix": "drivers/net/vxlan"
}Results: {
"Output": "\nFull output is too long, showing 500 out of 4623 lines.\nUse more precise expression if possible.\n\ndrivers/net/vxlan/Makefile-1-#\ndrivers/net/vxlan/Makefile:2:# Makefile for the vxlan driver\ndrivers/net/vxlan/Makefile-3-#\ndrivers/net/vxlan/Makefile-4-\ndrivers/net/vxlan/Makefile:5:obj-$(CONFIG_VXLAN) += vxlan.o\ndrivers/net/vxlan/Makefile-6-\ndrivers/net/vxlan/Makefile:7:vxlan-objs := vxlan_core.o vxlan_multicast.o vxlan_vnifilter.o vxlan_mdb.o\n--\ndrivers/net/vxlan/vxlan_core.c-29-#include \u003cnet/tun_proto.h\u003e\ndrivers/net/vxlan/vxlan_core.c:30:#include \u003cnet/vxlan.h\u003e\ndrivers/net/vxlan/vxlan_core.c-31-#include \u003cnet/nexthop.h\u003e\n--\ndrivers/net/vxlan/vxlan_core.c-37-\ndrivers/net/vxlan/vxlan_core.c:38:#include \"vxlan_private.h\"\ndrivers/net/vxlan/vxlan_core.c-39-\n--\ndrivers/net/vxlan/vxlan_core.c-48- */\ndrivers/net/vxlan/vxlan_core.c:49:static unsigned short vxlan_port __read_mostly = 8472;\ndrivers/net/vxlan/vxlan_core.c:50:module_param_named(udp_port, vxlan_port, ushort, 0444);\ndrivers/net/vxlan/vxlan_core.c-51-MODULE_PARM_DESC(udp_port, \"Destination UDP port\");\n--\ndrivers/net/vxlan/vxlan_core.c=55=MODULE_PARM_DESC(log_ecn_error, \"Log packets received with corrupted ECN\");\ndrivers/net/vxlan/vxlan_core.c-56-\ndrivers/net/vxlan/vxlan_core.c:57:unsigned int vxlan_net_id;\ndrivers/net/vxlan/vxlan_core.c-58-\ndrivers/net/vxlan/vxlan_core.c=59=const u8 all_zeros_mac[ETH_ALEN + 2];\ndrivers/net/vxlan/vxlan_core.c:60:static struct rtnl_link_ops vxlan_link_ops;\ndrivers/net/vxlan/vxlan_core.c-61-\ndrivers/net/vxlan/vxlan_core.c:62:static int vxlan_sock_add(struct vxlan_dev *vxlan);\ndrivers/net/vxlan/vxlan_core.c-63-\ndrivers/net/vxlan/vxlan_core.c:64:static void vxlan_vs_del_dev(struct vxlan_dev *vxlan);\ndrivers/net/vxlan/vxlan_core.c-65-\ndrivers/net/vxlan/vxlan_core.c:66:static const struct rhashtable_params vxlan_fdb_rht_params = {\ndrivers/net/vxlan/vxlan_core.c:67:\t.head_offset = offsetof(struct vxlan_fdb, rhnode),\ndrivers/net/vxlan/vxlan_core.c:68:\t.key_offset = offsetof(struct vxlan_fdb, key),\ndrivers/net/vxlan/vxlan_core.c:69:\t.key_len = sizeof(struct vxlan_fdb_key),\ndrivers/net/vxlan/vxlan_core.c-70-\t.automatic_shrinking = true,\n--\ndrivers/net/vxlan/vxlan_core.c-72-\ndrivers/net/vxlan/vxlan_core.c:73:static inline bool vxlan_collect_metadata(struct vxlan_sock *vs)\ndrivers/net/vxlan/vxlan_core.c-74-{\n--\ndrivers/net/vxlan/vxlan_core.c-82- */\ndrivers/net/vxlan/vxlan_core.c:83:static struct vxlan_sock *vxlan_find_sock(struct net *net, sa_family_t family,\ndrivers/net/vxlan/vxlan_core.c-84-\t\t\t\t\t __be16 port, u32 flags, int ifindex)\ndrivers/net/vxlan/vxlan_core.c-85-{\ndrivers/net/vxlan/vxlan_core.c:86:\tstruct vxlan_sock *vs;\ndrivers/net/vxlan/vxlan_core.c-87-\n--\ndrivers/net/vxlan/vxlan_core.c-91-\t\tif (inet_sk(vs-\u003esk)-\u003einet_sport == port \u0026\u0026\ndrivers/net/vxlan/vxlan_core.c:92:\t\t vxlan_get_sk_family(vs) == family \u0026\u0026\ndrivers/net/vxlan/vxlan_core.c-93-\t\t vs-\u003eflags == flags \u0026\u0026\n--\ndrivers/net/vxlan/vxlan_core.c-99-\ndrivers/net/vxlan/vxlan_core.c:100:static struct vxlan_dev *vxlan_vs_find_vni(struct vxlan_sock *vs,\ndrivers/net/vxlan/vxlan_core.c-101-\t\t\t\t\t int ifindex, __be32 vni,\ndrivers/net/vxlan/vxlan_core.c:102:\t\t\t\t\t struct vxlan_vni_node **vninode)\ndrivers/net/vxlan/vxlan_core.c-103-{\ndrivers/net/vxlan/vxlan_core.c:104:\tstruct vxlan_vni_node *vnode;\ndrivers/net/vxlan/vxlan_core.c:105:\tstruct vxlan_dev_node *node;\ndrivers/net/vxlan/vxlan_core.c-106-\n--\ndrivers/net/vxlan/vxlan_core.c-112-\thlist_for_each_entry_rcu(node, vni_head(vs, vni), hlist) {\ndrivers/net/vxlan/vxlan_core.c:113:\t\tconst struct vxlan_config *cfg;\ndrivers/net/vxlan/vxlan_core.c-114-\ndrivers/net/vxlan/vxlan_core.c:115:\t\tif (!node-\u003evxlan)\ndrivers/net/vxlan/vxlan_core.c-116-\t\t\tcontinue;\ndrivers/net/vxlan/vxlan_core.c-117-\ndrivers/net/vxlan/vxlan_core.c:118:\t\tcfg = rcu_dereference(node-\u003evxlan-\u003ecfg);\ndrivers/net/vxlan/vxlan_core.c-119-\n--\ndrivers/net/vxlan/vxlan_core.c-121-\t\tif (cfg-\u003eflags \u0026 VXLAN_F_VNIFILTER) {\ndrivers/net/vxlan/vxlan_core.c:122:\t\t\tvnode = vxlan_vnifilter_lookup(node-\u003evxlan, vni);\ndrivers/net/vxlan/vxlan_core.c-123-\t\t\tif (!vnode)\n--\ndrivers/net/vxlan/vxlan_core.c-136-\t\t\t*vninode = vnode;\ndrivers/net/vxlan/vxlan_core.c:137:\t\treturn node-\u003evxlan;\ndrivers/net/vxlan/vxlan_core.c-138-\t}\n--\ndrivers/net/vxlan/vxlan_core.c-143-/* Look up VNI in a per net namespace table */\ndrivers/net/vxlan/vxlan_core.c:144:static struct vxlan_dev *vxlan_find_vni(struct net *net, int ifindex,\ndrivers/net/vxlan/vxlan_core.c-145-\t\t\t\t\t__be32 vni, sa_family_t family,\n--\ndrivers/net/vxlan/vxlan_core.c-147-{\ndrivers/net/vxlan/vxlan_core.c:148:\tstruct vxlan_sock *vs;\ndrivers/net/vxlan/vxlan_core.c-149-\ndrivers/net/vxlan/vxlan_core.c:150:\tvs = vxlan_find_sock(net, family, port, flags, ifindex);\ndrivers/net/vxlan/vxlan_core.c-151-\tif (!vs)\n--\ndrivers/net/vxlan/vxlan_core.c-153-\ndrivers/net/vxlan/vxlan_core.c:154:\treturn vxlan_vs_find_vni(vs, ifindex, vni, NULL);\ndrivers/net/vxlan/vxlan_core.c-155-}\n--\ndrivers/net/vxlan/vxlan_core.c-157-/* Fill in neighbour message in skbuff. */\ndrivers/net/vxlan/vxlan_core.c:158:static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,\ndrivers/net/vxlan/vxlan_core.c:159:\t\t\t const struct vxlan_fdb *fdb,\ndrivers/net/vxlan/vxlan_core.c-160-\t\t\t u32 portid, u32 seq, int type, unsigned int flags,\ndrivers/net/vxlan/vxlan_core.c:161:\t\t\t const struct vxlan_rdst *rdst)\ndrivers/net/vxlan/vxlan_core.c-162-{\ndrivers/net/vxlan/vxlan_core.c:163:\tconst struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan-\u003ecfg);\ndrivers/net/vxlan/vxlan_core.c-164-\tunsigned long now = jiffies;\n--\ndrivers/net/vxlan/vxlan_core.c-191-\t\tif (rdst) {\ndrivers/net/vxlan/vxlan_core.c:192:\t\t\tsend_ip = !vxlan_addr_any(\u0026rdst-\u003eremote_ip);\ndrivers/net/vxlan/vxlan_core.c-193-\t\t\tndm-\u003endm_family = send_ip ? rdst-\u003eremote_ip.sa.sa_family : AF_INET;\n--\ndrivers/net/vxlan/vxlan_core.c-200-\tndm-\u003endm_state = fdb-\u003estate;\ndrivers/net/vxlan/vxlan_core.c:201:\tndm-\u003endm_ifindex = vxlan-\u003edev-\u003eifindex;\ndrivers/net/vxlan/vxlan_core.c-202-\tndm-\u003endm_flags = fdb-\u003eflags;\n--\ndrivers/net/vxlan/vxlan_core.c-206-\ndrivers/net/vxlan/vxlan_core.c:207:\tif (!net_eq(dev_net(vxlan-\u003edev), vxlan-\u003enet) \u0026\u0026\ndrivers/net/vxlan/vxlan_core.c-208-\t nla_put_s32(skb, NDA_LINK_NETNSID,\ndrivers/net/vxlan/vxlan_core.c:209:\t\t\tpeernet2id(dev_net(vxlan-\u003edev), vxlan-\u003enet)))\ndrivers/net/vxlan/vxlan_core.c-210-\t\tgoto nla_put_failure;\n--\ndrivers/net/vxlan/vxlan_core.c-217-\t} else if (rdst) {\ndrivers/net/vxlan/vxlan_core.c:218:\t\tif (send_ip \u0026\u0026 vxlan_nla_put_addr(skb, NDA_DST,\ndrivers/net/vxlan/vxlan_core.c-219-\t\t\t\t\t\t \u0026rdst-\u003eremote_ip))\n--\ndrivers/net/vxlan/vxlan_core.c-254-\ndrivers/net/vxlan/vxlan_core.c:255:static inline size_t vxlan_nlmsg_size(void)\ndrivers/net/vxlan/vxlan_core.c-256-{\n--\ndrivers/net/vxlan/vxlan_core.c-266-\ndrivers/net/vxlan/vxlan_core.c:267:static void __vxlan_fdb_notify(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,\ndrivers/net/vxlan/vxlan_core.c:268:\t\t\t struct vxlan_rdst *rd, int type)\ndrivers/net/vxlan/vxlan_core.c-269-{\ndrivers/net/vxlan/vxlan_core.c:270:\tstruct net *net = dev_net(vxlan-\u003edev);\ndrivers/net/vxlan/vxlan_core.c-271-\tstruct sk_buff *skb;\n--\ndrivers/net/vxlan/vxlan_core.c-273-\ndrivers/net/vxlan/vxlan_core.c:274:\tskb = nlmsg_new(vxlan_nlmsg_size(), GFP_ATOMIC);\ndrivers/net/vxlan/vxlan_core.c-275-\tif (skb == NULL)\n--\ndrivers/net/vxlan/vxlan_core.c-277-\ndrivers/net/vxlan/vxlan_core.c:278:\terr = vxlan_fdb_info(skb, vxlan, fdb, 0, 0, type, 0, rd);\ndrivers/net/vxlan/vxlan_core.c-279-\tif (err \u003c 0) {\ndrivers/net/vxlan/vxlan_core.c:280:\t\t/* -EMSGSIZE implies BUG in vxlan_nlmsg_size() */\ndrivers/net/vxlan/vxlan_core.c-281-\t\tWARN_ON(err == -EMSGSIZE);\n--\ndrivers/net/vxlan/vxlan_core.c-291-\ndrivers/net/vxlan/vxlan_core.c:292:static void vxlan_fdb_switchdev_notifier_info(const struct vxlan_dev *vxlan,\ndrivers/net/vxlan/vxlan_core.c:293:\t\t\t const struct vxlan_fdb *fdb,\ndrivers/net/vxlan/vxlan_core.c:294:\t\t\t const struct vxlan_rdst *rd,\ndrivers/net/vxlan/vxlan_core.c-295-\t\t\t struct netlink_ext_ack *extack,\ndrivers/net/vxlan/vxlan_core.c:296:\t\t\t struct switchdev_notifier_vxlan_fdb_info *fdb_info)\ndrivers/net/vxlan/vxlan_core.c-297-{\ndrivers/net/vxlan/vxlan_core.c:298:\tfdb_info-\u003einfo.dev = vxlan-\u003edev;\ndrivers/net/vxlan/vxlan_core.c-299-\tfdb_info-\u003einfo.extack = extack;\n--\ndrivers/net/vxlan/vxlan_core.c-309-\ndrivers/net/vxlan/vxlan_core.c:310:static int vxlan_fdb_switchdev_call_notifiers(struct vxlan_dev *vxlan,\ndrivers/net/vxlan/vxlan_core.c:311:\t\t\t\t\t struct vxlan_fdb *fdb,\ndrivers/net/vxlan/vxlan_core.c:312:\t\t\t\t\t struct vxlan_rdst *rd,\ndrivers/net/vxlan/vxlan_core.c-313-\t\t\t\t\t bool adding,\n--\ndrivers/net/vxlan/vxlan_core.c-315-{\ndrivers/net/vxlan/vxlan_core.c:316:\tstruct switchdev_notifier_vxlan_fdb_info info;\ndrivers/net/vxlan/vxlan_core.c-317-\tenum switchdev_notifier_type notifier_type;\n--\ndrivers/net/vxlan/vxlan_core.c-324-\t\t\t : SWITCHDEV_VXLAN_FDB_DEL_TO_DEVICE;\ndrivers/net/vxlan/vxlan_core.c:325:\tvxlan_fdb_switchdev_notifier_info(vxlan, fdb, rd, NULL, \u0026info);\ndrivers/net/vxlan/vxlan_core.c:326:\tret = call_switchdev_notifiers(notifier_type, vxlan-\u003edev,\ndrivers/net/vxlan/vxlan_core.c-327-\t\t\t\t \u0026info.info, extack);\n--\ndrivers/net/vxlan/vxlan_core.c-330-\ndrivers/net/vxlan/vxlan_core.c:331:static int vxlan_fdb_notify(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,\ndrivers/net/vxlan/vxlan_core.c:332:\t\t\t struct vxlan_rdst *rd, int type, bool swdev_notify,\ndrivers/net/vxlan/vxlan_core.c-333-\t\t\t struct netlink_ext_ack *extack)\n--\ndrivers/net/vxlan/vxlan_core.c-339-\t\tcase RTM_NEWNEIGH:\ndrivers/net/vxlan/vxlan_core.c:340:\t\t\terr = vxlan_fdb_switchdev_call_notifiers(vxlan, fdb, rd,\ndrivers/net/vxlan/vxlan_core.c-341-\t\t\t\t\t\t\t\t true, extack);\n--\ndrivers/net/vxlan/vxlan_core.c-345-\t\tcase RTM_DELNEIGH:\ndrivers/net/vxlan/vxlan_core.c:346:\t\t\tvxlan_fdb_switchdev_call_notifiers(vxlan, fdb, rd,\ndrivers/net/vxlan/vxlan_core.c-347-\t\t\t\t\t\t\t false, extack);\n--\ndrivers/net/vxlan/vxlan_core.c-351-\ndrivers/net/vxlan/vxlan_core.c:352:\t__vxlan_fdb_notify(vxlan, fdb, rd, type);\ndrivers/net/vxlan/vxlan_core.c-353-\treturn 0;\n--\ndrivers/net/vxlan/vxlan_core.c-355-\ndrivers/net/vxlan/vxlan_core.c:356:static void vxlan_ip_miss(struct net_device *dev, union vxlan_addr *ipa)\ndrivers/net/vxlan/vxlan_core.c-357-{\ndrivers/net/vxlan/vxlan_core.c:358:\tstruct vxlan_dev *vxlan = netdev_priv(dev);\ndrivers/net/vxlan/vxlan_core.c:359:\tstruct vxlan_fdb f = {\ndrivers/net/vxlan/vxlan_core.c-360-\t\t.state = NUD_STALE,\ndrivers/net/vxlan/vxlan_core.c-361-\t};\ndrivers/net/vxlan/vxlan_core.c:362:\tstruct vxlan_rdst remote = {\ndrivers/net/vxlan/vxlan_core.c-363-\t\t.remote_ip = *ipa, /* goes to NDA_DST */\n--\ndrivers/net/vxlan/vxlan_core.c-366-\ndrivers/net/vxlan/vxlan_core.c:367:\tvxlan_fdb_notify(vxlan, \u0026f, \u0026remote, RTM_GETNEIGH, true, NULL);\ndrivers/net/vxlan/vxlan_core.c-368-}\ndrivers/net/vxlan/vxlan_core.c-369-\ndrivers/net/vxlan/vxlan_core.c:370:static void vxlan_fdb_miss(struct vxlan_dev *vxlan, const u8 eth_addr[ETH_ALEN])\ndrivers/net/vxlan/vxlan_core.c-371-{\ndrivers/net/vxlan/vxlan_core.c:372:\tstruct vxlan_fdb f = {\ndrivers/net/vxlan/vxlan_core.c-373-\t\t.state = NUD_STALE,\ndrivers/net/vxlan/vxlan_core.c-374-\t};\ndrivers/net/vxlan/vxlan_core.c:375:\tstruct vxlan_rdst remote = { };\ndrivers/net/vxlan/vxlan_core.c-376-\n--\ndrivers/net/vxlan/vxlan_core.c-378-\ndrivers/net/vxlan/vxlan_core.c:379:\tvxlan_fdb_notify(vxlan, \u0026f, \u0026remote, RTM_GETNEIGH, true, NULL);\ndrivers/net/vxlan/vxlan_core.c-380-}\n--\ndrivers/net/vxlan/vxlan_core.c-382-/* Look up Ethernet address in forwarding table */\ndrivers/net/vxlan/vxlan_core.c:383:static struct vxlan_fdb *vxlan_find_mac_rcu(struct vxlan_dev *vxlan,\ndrivers/net/vxlan/vxlan_core.c:384:\t\t\t\t\t const struct vxlan_config *cfg,\ndrivers/net/vxlan/vxlan_core.c-385-\t\t\t\t\t const u8 *mac, __be32 vni)\ndrivers/net/vxlan/vxlan_core.c-386-{\ndrivers/net/vxlan/vxlan_core.c:387:\tstruct vxlan_fdb_key key;\ndrivers/net/vxlan/vxlan_core.c-388-\n--\ndrivers/net/vxlan/vxlan_core.c-395-\ndrivers/net/vxlan/vxlan_core.c:396:\treturn rhashtable_lookup(\u0026vxlan-\u003efdb_hash_tbl, \u0026key,\ndrivers/net/vxlan/vxlan_core.c:397:\t\t\t\t vxlan_fdb_rht_params);\ndrivers/net/vxlan/vxlan_core.c-398-}\ndrivers/net/vxlan/vxlan_core.c-399-\ndrivers/net/vxlan/vxlan_core.c:400:static struct vxlan_fdb *vxlan_find_mac_tx(struct vxlan_dev *vxlan,\ndrivers/net/vxlan/vxlan_core.c:401:\t\t\t\t\t const struct vxlan_config *cfg,\ndrivers/net/vxlan/vxlan_core.c-402-\t\t\t\t\t const u8 *mac, __be32 vni)\ndrivers/net/vxlan/vxlan_core.c-403-{\ndrivers/net/vxlan/vxlan_core.c:404:\tstruct vxlan_fdb *f;\ndrivers/net/vxlan/vxlan_core.c-405-\ndrivers/net/vxlan/vxlan_core.c:406:\tf = vxlan_find_mac_rcu(vxlan, cfg, mac, vni);\ndrivers/net/vxlan/vxlan_core.c-407-\tif (f) {\n--\ndrivers/net/vxlan/vxlan_core.c-416-\ndrivers/net/vxlan/vxlan_core.c:417:static struct vxlan_fdb *vxlan_find_mac(struct vxlan_dev *vxlan,\ndrivers/net/vxlan/vxlan_core.c-418-\t\t\t\t\tconst u8 *mac, __be32 vni)\ndrivers/net/vxlan/vxlan_core.c-419-{\ndrivers/net/vxlan/vxlan_core.c:420:\tstruct vxlan_fdb *f;\ndrivers/net/vxlan/vxlan_core.c-421-\ndrivers/net/vxlan/vxlan_core.c:422:\tlockdep_assert_held_once(\u0026vxlan-\u003ehash_lock);\ndrivers/net/vxlan/vxlan_core.c-423-\ndrivers/net/vxlan/vxlan_core.c-424-\trcu_read_lock();\ndrivers/net/vxlan/vxlan_core.c:425:\tf = vxlan_find_mac_rcu(vxlan, rcu_dereference(vxlan-\u003ecfg), mac, vni);\ndrivers/net/vxlan/vxlan_core.c-426-\trcu_read_unlock();\n--\ndrivers/net/vxlan/vxlan_core.c-430-\ndrivers/net/vxlan/vxlan_core.c:431:/* caller should hold vxlan-\u003ehash_lock */\ndrivers/net/vxlan/vxlan_core.c:432:static struct vxlan_rdst *vxlan_fdb_find_rdst(struct vxlan_fdb *f,\ndrivers/net/vxlan/vxlan_core.c:433:\t\t\t\t\t union vxlan_addr *ip, __be16 port,\ndrivers/net/vxlan/vxlan_core.c-434-\t\t\t\t\t __be32 vni, __u32 ifindex)\ndrivers/net/vxlan/vxlan_core.c-435-{\ndrivers/net/vxlan/vxlan_core.c:436:\tstruct vxlan_rdst *rd;\ndrivers/net/vxlan/vxlan_core.c-437-\ndrivers/net/vxlan/vxlan_core.c-438-\tlist_for_each_entry(rd, \u0026f-\u003eremotes, list) {\ndrivers/net/vxlan/vxlan_core.c:439:\t\tif (vxlan_addr_equal(\u0026rd-\u003eremote_ip, ip) \u0026\u0026\ndrivers/net/vxlan/vxlan_core.c-440-\t\t rd-\u003eremote_port == port \u0026\u0026\n--\ndrivers/net/vxlan/vxlan_core.c-448-\ndrivers/net/vxlan/vxlan_core.c:449:int vxlan_fdb_find_uc(struct net_device *dev, const u8 *mac, __be32 vni,\ndrivers/net/vxlan/vxlan_core.c:450:\t\t struct switchdev_notifier_vxlan_fdb_info *fdb_info)\ndrivers/net/vxlan/vxlan_core.c-451-{\ndrivers/net/vxlan/vxlan_core.c:452:\tstruct vxlan_dev *vxlan = netdev_priv(dev);\ndrivers/net/vxlan/vxlan_core.c-453-\tu8 eth_addr[ETH_ALEN + 2] = { 0 };\ndrivers/net/vxlan/vxlan_core.c:454:\tstruct vxlan_rdst *rdst = NULL;\ndrivers/net/vxlan/vxlan_core.c:455:\tstruct vxlan_fdb *f;\ndrivers/net/vxlan/vxlan_core.c-456-\tint rc = 0;\n--\ndrivers/net/vxlan/vxlan_core.c-465-\ndrivers/net/vxlan/vxlan_core.c:466:\tf = vxlan_find_mac_rcu(vxlan, rcu_dereference(vxlan-\u003ecfg), eth_addr, vni);\ndrivers/net/vxlan/vxlan_core.c-467-\tif (f)\n--\ndrivers/net/vxlan/vxlan_core.c-473-\ndrivers/net/vxlan/vxlan_core.c:474:\tvxlan_fdb_switchdev_notifier_info(vxlan, f, rdst, NULL, fdb_info);\ndrivers/net/vxlan/vxlan_core.c-475-\n--\ndrivers/net/vxlan/vxlan_core.c-479-}\ndrivers/net/vxlan/vxlan_core.c:480:EXPORT_SYMBOL_GPL(vxlan_fdb_find_uc);\ndrivers/net/vxlan/vxlan_core.c-481-\ndrivers/net/vxlan/vxlan_core.c:482:static int vxlan_fdb_notify_one(struct notifier_block *nb,\ndrivers/net/vxlan/vxlan_core.c:483:\t\t\t\tconst struct vxlan_dev *vxlan,\ndrivers/net/vxlan/vxlan_core.c:484:\t\t\t\tconst struct vxlan_fdb *f,\ndrivers/net/vxlan/vxlan_core.c:485:\t\t\t\tconst struct vxlan_rdst *rdst,\ndrivers/net/vxlan/vxlan_core.c-486-\t\t\t\tstruct netlink_ext_ack *extack)\ndrivers/net/vxlan/vxlan_core.c-487-{\ndrivers/net/vxlan/vxlan_core.c:488:\tstruct switchdev_notifier_vxlan_fdb_info fdb_info;\ndrivers/net/vxlan/vxlan_core.c-489-\tint rc;\ndrivers/net/vxlan/vxlan_core.c-490-\ndrivers/net/vxlan/vxlan_core.c:491:\tvxlan_fdb_switchdev_notifier_info(vxlan, f, rdst, extack, \u0026fdb_info);\ndrivers/net/vxlan/vxlan_core.c-492-\trc = nb-\u003enotifier_call(nb, SWITCHDEV_VXLAN_FDB_ADD_TO_DEVICE,\n--\ndrivers/net/vxlan/vxlan_core.c-496-\ndrivers/net/vxlan/vxlan_core.c:497:int vxlan_fdb_replay(const struct net_device *dev, __be32 vni,\ndrivers/net/vxlan/vxlan_core.c-498-\t\t struct notifier_block *nb,\n--\ndrivers/net/vxlan/vxlan_core.c-500-{\ndrivers/net/vxlan/vxlan_core.c:501:\tstruct vxlan_dev *vxlan;\ndrivers/net/vxlan/vxlan_core.c:502:\tstruct vxlan_rdst *rdst;\ndrivers/net/vxlan/vxlan_core.c:503:\tstruct vxlan_fdb *f;\ndrivers/net/vxlan/vxlan_core.c-504-\tint rc = 0;\ndrivers/net/vxlan/vxlan_core.c-505-\ndrivers/net/vxlan/vxlan_core.c:506:\tif (!netif_is_vxlan(dev))\ndrivers/net/vxlan/vxlan_core.c-507-\t\treturn -EINVAL;\ndrivers/net/vxlan/vxlan_core.c:508:\tvxlan = netdev_priv(dev);\ndrivers/net/vxlan/vxlan_core.c-509-\ndrivers/net/vxlan/vxlan_core.c:510:\tspin_lock_bh(\u0026vxlan-\u003ehash_lock);\ndrivers/net/vxlan/vxlan_core.c:511:\thlist_for_each_entry(f, \u0026vxlan-\u003efdb_list, fdb_node) {\ndrivers/net/vxlan/vxlan_core.c-512-\t\tif (f-\u003ekey.vni == vni) {\ndrivers/net/vxlan/vxlan_core.c-513-\t\t\tlist_for_each_entry(rdst, \u0026f-\u003eremotes, list) {\ndrivers/net/vxlan/vxlan_core.c:514:\t\t\t\trc = vxlan_fdb_notify_one(nb, vxlan, f, rdst,\ndrivers/net/vxlan/vxlan_core.c-515-\t\t\t\t\t\t\t extack);\n--\ndrivers/net/vxlan/vxlan_core.c-520-\t}\ndrivers/net/vxlan/vxlan_core.c:521:\tspin_unlock_bh(\u0026vxlan-\u003ehash_lock);\ndrivers/net/vxlan/vxlan_core.c-522-\treturn 0;\n--\ndrivers/net/vxlan/vxlan_core.c-524-unlock:\ndrivers/net/vxlan/vxlan_core.c:525:\tspin_unlock_bh(\u0026vxlan-\u003ehash_lock);\ndrivers/net/vxlan/vxlan_core.c-526-\treturn rc;\ndrivers/net/vxlan/vxlan_core.c-527-}\ndrivers/net/vxlan/vxlan_core.c:528:EXPORT_SYMBOL_GPL(vxlan_fdb_replay);\ndrivers/net/vxlan/vxlan_core.c-529-\ndrivers/net/vxlan/vxlan_core.c:530:void vxlan_fdb_clear_offload(const struct net_device *dev, __be32 vni)\ndrivers/net/vxlan/vxlan_core.c-531-{\ndrivers/net/vxlan/vxlan_core.c:532:\tstruct vxlan_dev *vxlan;\ndrivers/net/vxlan/vxlan_core.c:533:\tstruct vxlan_rdst *rdst;\ndrivers/net/vxlan/vxlan_core.c:534:\tstruct vxlan_fdb *f;\ndrivers/net/vxlan/vxlan_core.c-535-\ndrivers/net/vxlan/vxlan_core.c:536:\tif (!netif_is_vxlan(dev))\ndrivers/net/vxlan/vxlan_core.c-537-\t\treturn;\ndrivers/net/vxlan/vxlan_core.c:538:\tvxlan = netdev_priv(dev);\ndrivers/net/vxlan/vxlan_core.c-539-\ndrivers/net/vxlan/vxlan_core.c:540:\tspin_lock_bh(\u0026vxlan-\u003ehash_lock);\ndrivers/net/vxlan/vxlan_core.c:541:\thlist_for_each_entry(f, \u0026vxlan-\u003efdb_list, fdb_node) {\ndrivers/net/vxlan/vxlan_core.c-542-\t\tif (f-\u003ekey.vni == vni) {\n--\ndrivers/net/vxlan/vxlan_core.c-546-\t}\ndrivers/net/vxlan/vxlan_core.c:547:\tspin_unlock_bh(\u0026vxlan-\u003ehash_lock);\ndrivers/net/vxlan/vxlan_core.c-548-\ndrivers/net/vxlan/vxlan_core.c-549-}\ndrivers/net/vxlan/vxlan_core.c:550:EXPORT_SYMBOL_GPL(vxlan_fdb_clear_offload);\ndrivers/net/vxlan/vxlan_core.c-551-\ndrivers/net/vxlan/vxlan_core.c-552-/* Replace destination of unicast mac */\ndrivers/net/vxlan/vxlan_core.c:553:static int vxlan_fdb_replace(struct vxlan_fdb *f,\ndrivers/net/vxlan/vxlan_core.c:554:\t\t\t union vxlan_addr *ip, __be16 port, __be32 vni,\ndrivers/net/vxlan/vxlan_core.c:555:\t\t\t __u32 ifindex, struct vxlan_rdst *oldrd)\ndrivers/net/vxlan/vxlan_core.c-556-{\ndrivers/net/vxlan/vxlan_core.c:557:\tstruct vxlan_rdst *rd;\ndrivers/net/vxlan/vxlan_core.c-558-\ndrivers/net/vxlan/vxlan_core.c:559:\trd = vxlan_fdb_find_rdst(f, ip, port, vni, ifindex);\ndrivers/net/vxlan/vxlan_core.c-560-\tif (rd)\n--\ndrivers/net/vxlan/vxlan_core.c-562-\ndrivers/net/vxlan/vxlan_core.c:563:\trd = list_first_entry_or_null(\u0026f-\u003eremotes, struct vxlan_rdst, list);\ndrivers/net/vxlan/vxlan_core.c-564-\tif (!rd)\n--\ndrivers/net/vxlan/vxlan_core.c-577-/* Add/update destinations for multicast */\ndrivers/net/vxlan/vxlan_core.c:578:static int vxlan_fdb_append(struct vxlan_fdb *f,\ndrivers/net/vxlan/vxlan_core.c:579:\t\t\t union vxlan_addr *ip, __be16 port, __be32 vni,\ndrivers/net/vxlan/vxlan_core.c:580:\t\t\t __u32 ifindex, struct vxlan_rdst **rdp)\ndrivers/net/vxlan/vxlan_core.c-581-{\ndrivers/net/vxlan/vxlan_core.c:582:\tstruct vxlan_rdst *rd;\ndrivers/net/vxlan/vxlan_core.c-583-\ndrivers/net/vxlan/vxlan_core.c:584:\trd = vxlan_fdb_find_rdst(f, ip, port, vni, ifindex);\ndrivers/net/vxlan/vxlan_core.c-585-\tif (rd)\n--\ndrivers/net/vxlan/vxlan_core.c-608-\ndrivers/net/vxlan/vxlan_core.c:609:static bool vxlan_parse_gpe_proto(const struct vxlanhdr *hdr, __be16 *protocol)\ndrivers/net/vxlan/vxlan_core.c-610-{\ndrivers/net/vxlan/vxlan_core.c:611:\tconst struct vxlanhdr_gpe *gpe = (const struct vxlanhdr_gpe *)hdr;\ndrivers/net/vxlan/vxlan_core.c-612-\n--\ndrivers/net/vxlan/vxlan_core.c-634-\ndrivers/net/vxlan/vxlan_core.c:635:static struct vxlanhdr *vxlan_gro_remcsum(struct sk_buff *skb,\ndrivers/net/vxlan/vxlan_core.c-636-\t\t\t\t\t unsigned int off,\ndrivers/net/vxlan/vxlan_core.c:637:\t\t\t\t\t struct vxlanhdr *vh, size_t hdrlen,\ndrivers/net/vxlan/vxlan_core.c-638-\t\t\t\t\t __be32 vni_field,\n--\ndrivers/net/vxlan/vxlan_core.c-649-\ndrivers/net/vxlan/vxlan_core.c:650:\tstart = vxlan_rco_start(vni_field);\ndrivers/net/vxlan/vxlan_core.c:651:\toffset = start + vxlan_rco_offset(vni_field);\ndrivers/net/vxlan/vxlan_core.c-652-\n--\ndrivers/net/vxlan/vxlan_core.c-660-\ndrivers/net/vxlan/vxlan_core.c:661:static struct vxlanhdr *vxlan_gro_prepare_receive(struct sock *sk,\ndrivers/net/vxlan/vxlan_core.c-662-\t\t\t\t\t\t struct list_head *head,\n--\ndrivers/net/vxlan/vxlan_core.c-665-{\ndrivers/net/vxlan/vxlan_core.c:666:\tstruct vxlanhdr *vh, *vh2;\ndrivers/net/vxlan/vxlan_core.c-667-\tunsigned int hlen, off_vx;\ndrivers/net/vxlan/vxlan_core.c:668:\tstruct vxlan_sock *vs;\ndrivers/net/vxlan/vxlan_core.c-669-\tstruct sk_buff *p;\n--\ndrivers/net/vxlan/vxlan_core.c-683-\ndrivers/net/vxlan/vxlan_core.c:684:\tskb_gro_postpull_rcsum(skb, vh, sizeof(struct vxlanhdr));\ndrivers/net/vxlan/vxlan_core.c-685-\n--\ndrivers/net/vxlan/vxlan_core.c-688-\tif ((flags \u0026 VXLAN_HF_RCO) \u0026\u0026 (vs-\u003eflags \u0026 VXLAN_F_REMCSUM_RX)) {\ndrivers/net/vxlan/vxlan_core.c:689:\t\tvh = vxlan_gro_remcsum(skb, off_vx, vh, sizeof(struct vxlanhdr),\ndrivers/net/vxlan/vxlan_core.c-690-\t\t\t\t vh-\u003evx_vni, grc,\n--\ndrivers/net/vxlan/vxlan_core.c-697-\ndrivers/net/vxlan/vxlan_core.c:698:\tskb_gro_pull(skb, sizeof(struct vxlanhdr)); /* pull vxlan header */\ndrivers/net/vxlan/vxlan_core.c-699-\n--\ndrivers/net/vxlan/vxlan_core.c-703-\ndrivers/net/vxlan/vxlan_core.c:704:\t\tvh2 = (struct vxlanhdr *)(p-\u003edata + off_vx);\ndrivers/net/vxlan/vxlan_core.c-705-\t\tif (vh-\u003evx_flags != vh2-\u003evx_flags ||\n--\ndrivers/net/vxlan/vxlan_core.c-714-\ndrivers/net/vxlan/vxlan_core.c:715:static struct sk_buff *vxlan_gro_receive(struct sock *sk,\ndrivers/net/vxlan/vxlan_core.c-716-\t\t\t\t\t struct list_head *head,\n--\ndrivers/net/vxlan/vxlan_core.c-722-\ndrivers/net/vxlan/vxlan_core.c:723:\tif (vxlan_gro_prepare_receive(sk, head, skb, \u0026grc)) {\ndrivers/net/vxlan/vxlan_core.c-724-\t\tpp = call_gro_receive(eth_gro_receive, head, skb);\n--\ndrivers/net/vxlan/vxlan_core.c-730-\ndrivers/net/vxlan/vxlan_core.c:731:static struct sk_buff *vxlan_gpe_gro_receive(struct sock *sk,\ndrivers/net/vxlan/vxlan_core.c-732-\t\t\t\t\t struct list_head *head,\n--\ndrivers/net/vxlan/vxlan_core.c-737-\tstruct gro_remcsum grc;\ndrivers/net/vxlan/vxlan_core.c:738:\tstruct vxlanhdr *vh;\ndrivers/net/vxlan/vxlan_core.c-739-\t__be16 protocol;\n--\ndrivers/net/vxlan/vxlan_core.c-741-\ndrivers/net/vxlan/vxlan_core.c:742:\tvh = vxlan_gro_prepare_receive(sk, head, skb, \u0026grc);\ndrivers/net/vxlan/vxlan_core.c-743-\tif (vh) {\ndrivers/net/vxlan/vxlan_core.c:744:\t\tif (!vxlan_parse_gpe_proto(vh, \u0026protocol))\ndrivers/net/vxlan/vxlan_core.c-745-\t\t\tgoto out;\n--\ndrivers/net/vxlan/vxlan_core.c-756-\ndrivers/net/vxlan/vxlan_core.c:757:static int vxlan_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff)\ndrivers/net/vxlan/vxlan_core.c-758-{\n--\ndrivers/net/vxlan/vxlan_core.c-761-\t */\ndrivers/net/vxlan/vxlan_core.c:762:\treturn eth_gro_complete(skb, nhoff + sizeof(struct vxlanhdr));\ndrivers/net/vxlan/vxlan_core.c-763-}\ndrivers/net/vxlan/vxlan_core.c-764-\ndrivers/net/vxlan/vxlan_core.c:765:static int vxlan_gpe_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff)\ndrivers/net/vxlan/vxlan_core.c-766-{\ndrivers/net/vxlan/vxlan_core.c:767:\tstruct vxlanhdr *vh = (struct vxlanhdr *)(skb-\u003edata + nhoff);\ndrivers/net/vxlan/vxlan_core.c-768-\tconst struct packet_offload *ptype;\n--\ndrivers/net/vxlan/vxlan_core.c-771-\ndrivers/net/vxlan/vxlan_core.c:772:\tif (!vxlan_parse_gpe_proto(vh, \u0026protocol))\ndrivers/net/vxlan/vxlan_core.c-773-\t\treturn err;\n--\ndrivers/net/vxlan/vxlan_core.c-775-\tif (ptype)\ndrivers/net/vxlan/vxlan_core.c:776:\t\terr = ptype-\u003ecallbacks.gro_complete(skb, nhoff + sizeof(struct vxlanhdr));\ndrivers/net/vxlan/vxlan_core.c-777-\treturn err;\n--\ndrivers/net/vxlan/vxlan_core.c-779-\ndrivers/net/vxlan/vxlan_core.c:780:static struct vxlan_fdb *vxlan_fdb_alloc(struct vxlan_dev *vxlan, const u8 *mac,\ndrivers/net/vxlan/vxlan_core.c-781-\t\t\t\t\t __u16 state, __be32 src_vni,\n--\ndrivers/net/vxlan/vxlan_core.c-783-{\ndrivers/net/vxlan/vxlan_core.c:784:\tstruct vxlan_fdb *f;\ndrivers/net/vxlan/vxlan_core.c-785-\n--\ndrivers/net/vxlan/vxlan_core.c-794-\tf-\u003enh = NULL;\ndrivers/net/vxlan/vxlan_core.c:795:\tRCU_INIT_POINTER(f-\u003evdev, vxlan);\ndrivers/net/vxlan/vxlan_core.c-796-\tINIT_LIST_HEAD(\u0026f-\u003enh_list);\n--\ndrivers/net/vxlan/vxlan_core.c-802-\ndrivers/net/vxlan/vxlan_core.c:803:static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,\ndrivers/net/vxlan/vxlan_core.c-804-\t\t\t u32 nhid, struct netlink_ext_ack *extack)\n--\ndrivers/net/vxlan/vxlan_core.c-806-\tstruct nexthop *old_nh = rtnl_dereference(fdb-\u003enh);\ndrivers/net/vxlan/vxlan_core.c:807:\tconst struct vxlan_config *cfg;\ndrivers/net/vxlan/vxlan_core.c-808-\tstruct nexthop *nh;\n--\ndrivers/net/vxlan/vxlan_core.c-813-\ndrivers/net/vxlan/vxlan_core.c:814:\tnh = nexthop_find_by_id(vxlan-\u003enet, nhid);\ndrivers/net/vxlan/vxlan_core.c-815-\tif (!nh) {\n--\ndrivers/net/vxlan/vxlan_core.c-835-\t/* check nexthop group family */\ndrivers/net/vxlan/vxlan_core.c:836:\tcfg = rtnl_dereference(vxlan-\u003ecfg);\ndrivers/net/vxlan/vxlan_core.c-837-\tswitch (cfg-\u003eremote_ip.sa.sa_family) {\n--\ndrivers/net/vxlan/vxlan_core.c-866-\ndrivers/net/vxlan/vxlan_core.c:867:int vxlan_fdb_create(struct vxlan_dev *vxlan,\ndrivers/net/vxlan/vxlan_core.c:868:\t\t const u8 *mac, union vxlan_addr *ip,\ndrivers/net/vxlan/vxlan_core.c-869-\t\t __u16 state, __be16 port, __be32 src_vni,\ndrivers/net/vxlan/vxlan_core.c-870-\t\t __be32 vni, __u32 ifindex, __u16 ndm_flags,\ndrivers/net/vxlan/vxlan_core.c:871:\t\t u32 nhid, struct vxlan_fdb **fdb,\ndrivers/net/vxlan/vxlan_core.c-872-\t\t struct netlink_ext_ack *extack)\ndrivers/net/vxlan/vxlan_core.c-873-{\ndrivers/net/vxlan/vxlan_core.c:874:\tconst struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan-\u003ecfg);\ndrivers/net/vxlan/vxlan_core.c:875:\tstruct vxlan_rdst *rd = NULL;\ndrivers/net/vxlan/vxlan_core.c:876:\tstruct vxlan_fdb *f;\ndrivers/net/vxlan/vxlan_core.c-877-\tint rc;\n--\ndrivers/net/vxlan/vxlan_core.c-879-\tif (cfg-\u003eaddrmax \u0026\u0026\ndrivers/net/vxlan/vxlan_core.c:880:\t vxlan-\u003eaddrcnt \u003e= cfg-\u003eaddrmax)\ndrivers/net/vxlan/vxlan_core.c-881-\t\treturn -ENOSPC;\ndrivers/net/vxlan/vxlan_core.c-882-\ndrivers/net/vxlan/vxlan_core.c:883:\tnetdev_dbg(vxlan-\u003edev, \"add %pM -\u003e %pIS\\n\", mac, ip);\ndrivers/net/vxlan/vxlan_core.c:884:\tf = vxlan_fdb_alloc(vxlan, mac, state, src_vni, ndm_flags);\ndrivers/net/vxlan/vxlan_core.c-885-\tif (!f)\n--\ndrivers/net/vxlan/vxlan_core.c-888-\tif (nhid)\ndrivers/net/vxlan/vxlan_core.c:889:\t\trc = vxlan_fdb_nh_update(vxlan, f, nhid, extack);\n\n"
} |
| 9/2 | 2026/09/23 07:53 | llm | patch-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 64788 output: 32 thoughts: 2164 Thoughts: **VXLAN Configuration Refactoring - Worthy of Fuzzing** Alright, let's break this down. My initial thought was to dig into the Git history for context, but since the diff is right here, that's what we'll use. I can see a significant architectural shift happening in the VXLAN driver. It looks like the core configuration (`vxlan->cfg`) is being moved from an in-place struct to a dynamically allocated struct, managed with RCU. This is a big deal; it means concurrent access to the VXLAN configuration is now safe, and we can update the config without blocking packet processing or Netlink operations. I'm seeing changes across a bunch of files: `mlx5`, `mlxsw`, and the core VXLAN driver itself. The `mlx5` and `mlxsw` changes seem to be adapting to the new `vxlan->cfg` pointer and `VXLAN_DEV_F_MDB` flag handling. But the heart of the change is in `drivers/net/vxlan/`. It's everywhere – `vxlan_vs_find_vni`, `vxlan_fdb_info`, you name it – all of these functions are now reading the configuration via `rcu_dereference` or passing it directly. The code's updating the way default FDB entries and lower devices are handled. Also moving device flags, like `VXLAN_DEV_F_MDB` to `vxlan->flags`. It's even adding sequence tracking for dump operations. Looks like this is all about enhancing the VXLAN driver's concurrency and making it more robust. Now, the real question is, is this worth fuzzing? The criteria state we should *only* mark something as *not* worth fuzzing if the code falls into a couple of categories, namely, non-kernel and non-executable stuff, or structurally unreachable hardware, like vendor-specific PCIe switches or SmartNICs not emulated in QEMU. Here, despite touching `mlx5` and `mlxsw` code (which are parts of the vendor-specific hardware drivers, though not directly related to VXLAN core logic), this patch is mostly centered around `drivers/net/vxlan/`. This code is purely software, it's not tied to any specific vendor's hardware. It runs on standard Linux virtual machines, which are easily reachable via QEMU. That means it absolutely *doesn't* fall into any of the negative criteria. So, *yes*, this is definitely something we should be fuzzing. VXLAN is very easy to interact with via common tools like `ip link`, and we can manipulate it with raw sockets, tun/tap, netlink commands (like `RTM_NEWLINK`, `RTM_DELLINK`, `RTM_SETLINK`, etc.) to generate inputs and probe for issues. What do we need to build and run this? Looks like, from the Kconfig, we need `CONFIG_VXLAN`, obviously, which depends on `INET`, `NET_UDP_TUNNEL`, and `GRO_CELLS`. And since VXLAN uses IPv6 heavily, `CONFIG_IPV6` is also required. Looks like there aren't any specific dependencies on bridge, switchdev, or other networking related configs. |
| 10/2 | 2026/09/23 07:53 | tool | grepper |
0mArgs:{
"Expression": "IS_ENABLED|CONFIG_",
"PathPrefix": "drivers/net/vxlan"
}Results: {
"Output": "drivers/net/vxlan/Makefile-4-\ndrivers/net/vxlan/Makefile:5:obj-$(CONFIG_VXLAN) += vxlan.o\ndrivers/net/vxlan/Makefile-6-\n--\ndrivers/net/vxlan/vxlan_core.c-32-\ndrivers/net/vxlan/vxlan_core.c:33:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-34-#include \u003cnet/ip6_tunnel.h\u003e\n--\ndrivers/net/vxlan/vxlan_core.c=100=static struct vxlan_dev *vxlan_vs_find_vni(struct vxlan_sock *vs,\n--\ndrivers/net/vxlan/vxlan_core.c-128-\ndrivers/net/vxlan/vxlan_core.c:129:\t\tif (IS_ENABLED(CONFIG_IPV6)) {\ndrivers/net/vxlan/vxlan_core.c-130-\t\t\tif ((cfg-\u003eflags \u0026 VXLAN_F_IPV6_LINKLOCAL) \u0026\u0026\n--\ndrivers/net/vxlan/vxlan_core.c=1161=static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,\n--\ndrivers/net/vxlan/vxlan_core.c-1187-\t\t\tip-\u003esa.sa_family = AF_INET;\ndrivers/net/vxlan/vxlan_core.c:1188:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-1189-\t\t} else {\n--\ndrivers/net/vxlan/vxlan_core.c=1451=static enum skb_drop_reason vxlan_snoop(struct net_device *dev,\n--\ndrivers/net/vxlan/vxlan_core.c-1464-\ndrivers/net/vxlan/vxlan_core.c:1465:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-1466-\tif (src_ip-\u003esa.sa_family == AF_INET6 \u0026\u0026\n--\ndrivers/net/vxlan/vxlan_core.c=1535=static void vxlan_sock_release(struct vxlan_dev *vxlan)\n--\ndrivers/net/vxlan/vxlan_core.c-1538-\tstruct vxlan_sock *sock4 = rtnl_dereference(vxlan-\u003evn4_sock);\ndrivers/net/vxlan/vxlan_core.c:1539:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-1540-\tstruct vxlan_sock *sock6 = rtnl_dereference(vxlan-\u003evn6_sock);\n--\ndrivers/net/vxlan/vxlan_core.c-1556-\ndrivers/net/vxlan/vxlan_core.c:1557:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-1558-\tif (__vxlan_sock_release_prep(sock6)) {\n--\ndrivers/net/vxlan/vxlan_core.c=1617=static enum skb_drop_reason vxlan_set_mac(struct vxlan_dev *vxlan,\n--\ndrivers/net/vxlan/vxlan_core.c-1636-\t\tsaddr.sa.sa_family = AF_INET;\ndrivers/net/vxlan/vxlan_core.c:1637:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-1638-\t} else {\n--\ndrivers/net/vxlan/vxlan_core.c=1651=static bool vxlan_ecn_decapsulate(struct vxlan_sock *vs, void *oiph,\n--\ndrivers/net/vxlan/vxlan_core.c-1657-\t\terr = IP_ECN_decapsulate(oiph, skb);\ndrivers/net/vxlan/vxlan_core.c:1658:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-1659-\telse\n--\ndrivers/net/vxlan/vxlan_core.c=1877=static int arp_reduce(struct net_device *dev, struct sk_buff *skb,\n--\ndrivers/net/vxlan/vxlan_core.c-1975-\ndrivers/net/vxlan/vxlan_core.c:1976:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-1977-static struct sk_buff *vxlan_na_create(struct sk_buff *request,\n--\ndrivers/net/vxlan/vxlan_core.c=2144=static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb,\n--\ndrivers/net/vxlan/vxlan_core.c-2176-\t}\ndrivers/net/vxlan/vxlan_core.c:2177:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-2178-\tcase ETH_P_IPV6:\n--\ndrivers/net/vxlan/vxlan_core.c=2310=static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,\n--\ndrivers/net/vxlan/vxlan_core.c-2334-\t\tloopback.sa.sa_family = AF_INET;\ndrivers/net/vxlan/vxlan_core.c:2335:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-2336-\t} else {\n--\ndrivers/net/vxlan/vxlan_core.c=2361=static int encap_bypass_if_local(struct sk_buff *skb, struct net_device *dev,\n--\ndrivers/net/vxlan/vxlan_core.c-2368-{\ndrivers/net/vxlan/vxlan_core.c:2369:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-2370-\t/* IPv6 rt-flags are checked against RTF_LOCAL, but the value of\n--\ndrivers/net/vxlan/vxlan_core.c=2401=void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,\n--\ndrivers/net/vxlan/vxlan_core.c-2488-\t\t\tudp_sum = !(flags \u0026 VXLAN_F_UDP_ZERO_CSUM6_TX);\ndrivers/net/vxlan/vxlan_core.c:2489:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-2490-\t\tswitch (cfg-\u003elabel_policy) {\n--\ndrivers/net/vxlan/vxlan_core.c-2611-\t\t\t\t ipcb_flags);\ndrivers/net/vxlan/vxlan_core.c:2612:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-2613-\t} else {\n--\ndrivers/net/vxlan/vxlan_core.c=2788=static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)\n--\ndrivers/net/vxlan/vxlan_core.c-2833-\t\t}\ndrivers/net/vxlan/vxlan_core.c:2834:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-2835-\t\telse if (ntohs(eth-\u003eh_proto) == ETH_P_IPV6 \u0026\u0026\n--\ndrivers/net/vxlan/vxlan_core.c=2967=static void vxlan_vs_del_dev(struct vxlan_dev *vxlan)\n--\ndrivers/net/vxlan/vxlan_core.c-2971-\thlist_del_init_rcu(\u0026vxlan-\u003ehlist4.hlist);\ndrivers/net/vxlan/vxlan_core.c:2972:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-2973-\thlist_del_init_rcu(\u0026vxlan-\u003ehlist6.hlist);\n--\ndrivers/net/vxlan/vxlan_core.c=3329=static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)\n--\ndrivers/net/vxlan/vxlan_core.c-3357-\t} else {\ndrivers/net/vxlan/vxlan_core.c:3358:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-3359-\t\tstruct vxlan_sock *sock6 = rcu_dereference(vxlan-\u003evn6_sock);\n--\ndrivers/net/vxlan/vxlan_core.c-3372-\t\tdst_release(ndst);\ndrivers/net/vxlan/vxlan_core.c:3373:#else /* !CONFIG_IPV6 */\ndrivers/net/vxlan/vxlan_core.c-3374-\t\treturn -EPFNOSUPPORT;\n--\ndrivers/net/vxlan/vxlan_core.c=3751=static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)\n--\ndrivers/net/vxlan/vxlan_core.c-3781-\t\treturn PTR_ERR(vs);\ndrivers/net/vxlan/vxlan_core.c:3782:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-3783-\tif (ipv6) {\n--\ndrivers/net/vxlan/vxlan_core.c=3801=static int vxlan_sock_add(struct vxlan_dev *vxlan)\n--\ndrivers/net/vxlan/vxlan_core.c-3811-\tRCU_INIT_POINTER(vxlan-\u003evn4_sock, NULL);\ndrivers/net/vxlan/vxlan_core.c:3812:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-3813-\tRCU_INIT_POINTER(vxlan-\u003evn6_sock, NULL);\n--\ndrivers/net/vxlan/vxlan_core.c=3863=static int vxlan_config_validate(struct net *src_net, struct vxlan_config *conf,\n--\ndrivers/net/vxlan/vxlan_core.c-3905-\tif (conf-\u003esaddr.sa.sa_family == AF_INET6) {\ndrivers/net/vxlan/vxlan_core.c:3906:\t\tif (!IS_ENABLED(CONFIG_IPV6)) {\ndrivers/net/vxlan/vxlan_core.c-3907-\t\t\tNL_SET_ERR_MSG(extack,\n--\ndrivers/net/vxlan/vxlan_core.c-3963-\ndrivers/net/vxlan/vxlan_core.c:3964:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-3965-\t\tif (use_ipv6) {\n--\ndrivers/net/vxlan/vxlan_core.c-3991-\ndrivers/net/vxlan/vxlan_core.c:3992:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-3993-\t\tif (conf-\u003eflags \u0026 VXLAN_F_IPV6_LINKLOCAL) {\n--\ndrivers/net/vxlan/vxlan_core.c=4201=static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],\n--\ndrivers/net/vxlan/vxlan_core.c-4240-\t} else if (data[IFLA_VXLAN_GROUP6]) {\ndrivers/net/vxlan/vxlan_core.c:4241:\t\tif (!IS_ENABLED(CONFIG_IPV6)) {\ndrivers/net/vxlan/vxlan_core.c-4242-\t\t\tNL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_GROUP6], \"IPv6 support not enabled in the kernel\");\n--\ndrivers/net/vxlan/vxlan_core.c-4263-\t} else if (data[IFLA_VXLAN_LOCAL6]) {\ndrivers/net/vxlan/vxlan_core.c:4264:\t\tif (!IS_ENABLED(CONFIG_IPV6)) {\ndrivers/net/vxlan/vxlan_core.c-4265-\t\t\tNL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_LOCAL6], \"IPv6 support not enabled in the kernel\");\n--\ndrivers/net/vxlan/vxlan_core.c=4741=static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev)\n--\ndrivers/net/vxlan/vxlan_core.c-4757-\t\t\t\tgoto nla_put_failure;\ndrivers/net/vxlan/vxlan_core.c:4758:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-4759-\t\t} else {\n--\ndrivers/net/vxlan/vxlan_core.c-4774-\t\t\t\tgoto nla_put_failure;\ndrivers/net/vxlan/vxlan_core.c:4775:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_core.c-4776-\t\t} else {\n--\ndrivers/net/vxlan/vxlan_mdb.c=98=static void vxlan_br_mdb_entry_fill(const struct vxlan_dev *vxlan,\n--\ndrivers/net/vxlan/vxlan_mdb.c-116-\t\tbreak;\ndrivers/net/vxlan/vxlan_mdb.c:117:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_mdb.c-118-\tcase AF_INET6:\n--\ndrivers/net/vxlan/vxlan_mdb.c=345=static bool vxlan_mdb_is_valid_source(const struct nlattr *attr, __be16 proto,\n--\ndrivers/net/vxlan/vxlan_mdb.c-362-\t\tbreak;\ndrivers/net/vxlan/vxlan_mdb.c:363:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_mdb.c-364-\tcase htons(ETH_P_IPV6): {\n--\ndrivers/net/vxlan/vxlan_mdb.c=391=static void vxlan_mdb_group_set(struct vxlan_mdb_entry_key *group,\n--\ndrivers/net/vxlan/vxlan_mdb.c-399-\t\tbreak;\ndrivers/net/vxlan/vxlan_mdb.c:400:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_mdb.c-401-\tcase htons(ETH_P_IPV6):\n--\ndrivers/net/vxlan/vxlan_mdb.c=1630=struct vxlan_mdb_entry *vxlan_mdb_entry_skb_get(struct vxlan_dev *vxlan,\n--\ndrivers/net/vxlan/vxlan_mdb.c-1659-\t\tbreak;\ndrivers/net/vxlan/vxlan_mdb.c:1660:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_mdb.c-1661-\tcase htons(ETH_P_IPV6):\n--\ndrivers/net/vxlan/vxlan_mdb.c-1693-\t\tbreak;\ndrivers/net/vxlan/vxlan_mdb.c:1694:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_mdb.c-1695-\tcase htons(ETH_P_IPV6):\n--\ndrivers/net/vxlan/vxlan_multicast.c=17=int vxlan_igmp_join(struct vxlan_dev *vxlan, const union vxlan_addr *rip,\n--\ndrivers/net/vxlan/vxlan_multicast.c-36-\t\trelease_sock(sk);\ndrivers/net/vxlan/vxlan_multicast.c:37:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_multicast.c-38-\t} else {\n--\ndrivers/net/vxlan/vxlan_multicast.c=51=int vxlan_igmp_leave(struct vxlan_dev *vxlan, const union vxlan_addr *rip,\n--\ndrivers/net/vxlan/vxlan_multicast.c-70-\t\trelease_sock(sk);\ndrivers/net/vxlan/vxlan_multicast.c:71:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_multicast.c-72-\t} else {\n--\ndrivers/net/vxlan/vxlan_multicast.c=127=bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,\n--\ndrivers/net/vxlan/vxlan_multicast.c-134-\tstruct vxlan_sock *sock4;\ndrivers/net/vxlan/vxlan_multicast.c:135:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_multicast.c-136-\tstruct vxlan_sock *sock6;\n--\ndrivers/net/vxlan/vxlan_multicast.c-147-\ndrivers/net/vxlan/vxlan_multicast.c:148:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_multicast.c-149-\tsock6 = rtnl_dereference(dev-\u003evn6_sock);\n--\ndrivers/net/vxlan/vxlan_multicast.c-162-\t\t\tcontinue;\ndrivers/net/vxlan/vxlan_multicast.c:163:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_multicast.c-164-\t\tif (family == AF_INET6 \u0026\u0026\n--\ndrivers/net/vxlan/vxlan_private.h=74=static inline struct vxlan_rdst *first_remote_rtnl(struct vxlan_fdb *fdb)\n--\ndrivers/net/vxlan/vxlan_private.h-80-\ndrivers/net/vxlan/vxlan_private.h:81:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_private.h-82-static inline\n--\ndrivers/net/vxlan/vxlan_private.h=118=static inline bool vxlan_addr_is_multicast(const union vxlan_addr *ip)\n--\ndrivers/net/vxlan/vxlan_private.h-125-\ndrivers/net/vxlan/vxlan_private.h:126:#else /* !CONFIG_IPV6 */\ndrivers/net/vxlan/vxlan_private.h-127-\n--\ndrivers/net/vxlan/vxlan_vnifilter.c=39=static void vxlan_vs_add_del_vninode(struct vxlan_dev *vxlan,\n--\ndrivers/net/vxlan/vxlan_vnifilter.c-50-\t\t\thlist_del_init_rcu(\u0026v-\u003ehlist4.hlist);\ndrivers/net/vxlan/vxlan_vnifilter.c:51:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_vnifilter.c-52-\t\tif (!hlist_unhashed(\u0026v-\u003ehlist6.hlist))\n--\ndrivers/net/vxlan/vxlan_vnifilter.c-57-\ndrivers/net/vxlan/vxlan_vnifilter.c:58:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_vnifilter.c-59-\tvs = rtnl_dereference(vxlan-\u003evn6_sock);\n--\ndrivers/net/vxlan/vxlan_vnifilter.c=72=void vxlan_vs_add_vnigrp(struct vxlan_dev *vxlan,\n--\ndrivers/net/vxlan/vxlan_vnifilter.c-85-\tlist_for_each_entry_safe(v, tmp, \u0026vg-\u003evni_list, vlist) {\ndrivers/net/vxlan/vxlan_vnifilter.c:86:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_vnifilter.c-87-\t\tif (ipv6)\n--\ndrivers/net/vxlan/vxlan_vnifilter.c=97=void vxlan_vs_del_vnigrp(struct vxlan_dev *vxlan)\n--\ndrivers/net/vxlan/vxlan_vnifilter.c-108-\t\thlist_del_init_rcu(\u0026v-\u003ehlist4.hlist);\ndrivers/net/vxlan/vxlan_vnifilter.c:109:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_vnifilter.c-110-\t\thlist_del_init_rcu(\u0026v-\u003ehlist6.hlist);\n--\ndrivers/net/vxlan/vxlan_vnifilter.c=248=static bool vxlan_fill_vni_filter_entry(struct sk_buff *skb,\n--\ndrivers/net/vxlan/vxlan_vnifilter.c-274-\t\t\t\tgoto out_err;\ndrivers/net/vxlan/vxlan_vnifilter.c:275:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_vnifilter.c-276-\t\t} else {\n--\ndrivers/net/vxlan/vxlan_vnifilter.c=789=static struct vxlan_vni_node *vxlan_vni_alloc(struct vxlan_dev *vxlan,\n--\ndrivers/net/vxlan/vxlan_vnifilter.c-803-\tvninode-\u003ehlist4.vxlan = vxlan;\ndrivers/net/vxlan/vxlan_vnifilter.c:804:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_vnifilter.c-805-\tvninode-\u003ehlist6.vxlan = vxlan;\n--\ndrivers/net/vxlan/vxlan_vnifilter.c=998=void vxlan_vnigroup_uninit(struct vxlan_dev *vxlan)\n--\ndrivers/net/vxlan/vxlan_vnifilter.c-1007-\t\thlist_del_init_rcu(\u0026v-\u003ehlist4.hlist);\ndrivers/net/vxlan/vxlan_vnifilter.c:1008:#if IS_ENABLED(CONFIG_IPV6)\ndrivers/net/vxlan/vxlan_vnifilter.c-1009-\t\thlist_del_init_rcu(\u0026v-\u003ehlist6.hlist);\n"
} |
| 11/2 | 2026/09/23 07:53 | llm | patch-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 73600 output: 31 thoughts: 718 Thoughts: **Focusing My Fuzzing Efforts for VXLAN** Okay, so I've got `CONFIG_VXLAN`, `CONFIG_IPV6`, and `CONFIG_INET` to keep in mind, those are my base configurations. Now, I need to pinpoint the *right* focus symbols to guide the fuzzer. I need to avoid the common pitfalls, according to Section 4: no ubiquitous hot-paths! No general memory management, no generic synchronization primitives. That just dilutes the effort. Instead, I need *specific* feature logic, the key entrypoints, the functions *directly* involved in the changes. And if the changes are deep in static inlines, I need to find the non-static callers that *exercise* them. Right, so let's dig into the functions modified or added in this VXLAN patch, within the `drivers/net/vxlan/` directory: I see a long list: `vxlan_dev_configure`, `vxlan_config_apply`, and `vxlan_config_validate` look promising, as do `vxlan_changelink`, `vxlan_xmit` and `vxlan_xmit_one`, and `vxlan_rcv`, and quite a few others. The focus needs to be on entrypoints so `vxlan_multicast_join` and `vxlan_multicast_leave` seem interesting, for example. Now I need to sort these functions into viable fuzzing targets. I need to figure out which are static, which are inlined, and which are visible and non-inlined functions. I need to check the files: `vxlan_core.c`, `vxlan_vnifilter.c`, and `vxlan_mdb.c`. Let's see... `vxlan_changelink` is static, which is a problem as it is a rtnl_link_ops callback within `vxlan_core.c`. OK, that's out, even though it sounds important. `vxlan_xmit_one` is a non-static void in `vxlan_core.c` and is exported and used across VXLAN. Good. Now, what about `vxlan_rcv`? I need to check its declaration... and consider all the files. |
| 12/2 | 2026/09/23 07:53 | tool | grepper |
0mArgs:{
"Expression": "vxlan_rcv",
"PathPrefix": "drivers/net/vxlan"
}Results: {
"Output": "drivers/net/vxlan/vxlan_core.c=1651=static bool vxlan_ecn_decapsulate(struct vxlan_sock *vs, void *oiph,\n--\ndrivers/net/vxlan/vxlan_core.c-1674-\ndrivers/net/vxlan/vxlan_core.c:1675:static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)\ndrivers/net/vxlan/vxlan_core.c-1676-{\n--\ndrivers/net/vxlan/vxlan_core.c=3697=static struct vxlan_sock *vxlan_socket_create(struct net *net, bool ipv6,\n--\ndrivers/net/vxlan/vxlan_core.c-3734-\ttunnel_cfg.encap_type = 1;\ndrivers/net/vxlan/vxlan_core.c:3735:\ttunnel_cfg.encap_rcv = vxlan_rcv;\ndrivers/net/vxlan/vxlan_core.c-3736-\ttunnel_cfg.encap_err_lookup = vxlan_err_lookup;\n"
} |
| 13/2 | 2026/09/23 07:53 | llm | patch-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 75129 output: 42 thoughts: 497 Thoughts: **Analyzing VXLAN Symbol Visibility** Okay, so I'm thinking about how `vxlan_rcv` is used. It's a static function, but it's referenced as a function pointer (`encap_rcv = vxlan_rcv`). That means its address is likely going to be in the symbol table, unless the whole-program LTO merges it somehow. We can probably find it with `kallsyms`. Now, I need to figure out which symbols are going to be most important for, say, a FocusSymbols analysis or something. Let me go through the exported and important functions that seem like they've seen some recent modifications. I'm thinking: * `vxlan_changelink`: That's where a lot of the core changelink logic changes happened, right? Allocating `new_cfg`, unwinding, updating the default FDB entry... That's got to be interesting. * `vxlan_dev_configure`: This one's important; allocating `new_cfg` with `kmemdup` and configuring VXLAN. * `vxlan_config_apply`: That's the one that assigns the RCU pointer and calls `kfree_rcu`. * `vxlan_free_dev`: Destructor, freeing the configuration. * `vxlan_vnilist_update_group`: Prototype updated, with the FDB unwinding on error. * `vxlan_update_default_fdb_entry`: This one is exported in `vxlan_private.h`, and had some updated implementation. * `vxlan_vnifilter_dump_dev`: RCU list iteration, sequence consistency check during the dev dump. * `vxlan_xmit` and `vxlan_xmit_one`: Core transmit path. We'll be dereferencing the config there. * `vxlan_rcv`: Receive path, also dereferencing the config. * `vxlan_mdb_xmit`: MDB transmit. So, let's see, can I confirm that all of those – specifically `vxlan_changelink`, `vxlan_dev_configure`, `vxlan_xmit`, `vxlan_rcv`, `vxlan_update_default_fdb_entry`, `vxlan_vnilist_update_group`, and `vxlan_vnifilter_dump_dev` – are actually in `vmlinux` as symbols? Yeah, that's right, `kallsyms` includes static functions like these, as well as global functions. I think I'll go check out `vxlan_dev_create` and `vxlan_dev_configure` real quick... okay, looks like the main logic is in `vxlan_core.c` around `vxlan_dev_create` and `vxlan_changelink`. |
| 14/2 | 2026/09/23 07:54 | tool | read-file |
0mArgs:{
"File": "drivers/net/vxlan/vxlan_core.c",
"FirstLine": 4080,
"LineCount": 40
}Results: {
"Contents": "4080:\t\t\t\t struct netlink_ext_ack *extack)\n4081:\t{\n4082:\t\tstruct vxlan_dev *vxlan = netdev_priv(dev);\n4083:\t\tstruct net_device *lowerdev;\n4084:\t\tstruct vxlan_config *new_cfg;\n4085:\t\tint ret;\n4086:\t\n4087:\t\tret = vxlan_config_validate(src_net, conf, \u0026lowerdev, vxlan, extack);\n4088:\t\tif (ret)\n4089:\t\t\treturn ret;\n4090:\t\n4091:\t\tnew_cfg = kmemdup(conf, sizeof(*conf), GFP_KERNEL);\n4092:\t\tif (!new_cfg)\n4093:\t\t\treturn -ENOMEM;\n4094:\t\n4095:\t\tvxlan_config_apply(dev, new_cfg, lowerdev, src_net, false, true);\n4096:\t\n4097:\t\treturn 0;\n4098:\t}\n4099:\t\n4100:\tstatic int vxlan_dev_create(struct net *net, struct net_device *dev,\n4101:\t\t\t\t struct vxlan_config *conf,\n4102:\t\t\t\t struct netlink_ext_ack *extack)\n4103:\t{\n4104:\t\tstruct vxlan_net *vn = net_generic(net, vxlan_net_id);\n4105:\t\tstruct vxlan_dev *vxlan = netdev_priv(dev);\n4106:\t\tstruct net_device *remote_dev = NULL;\n4107:\t\tconst struct vxlan_config *cfg;\n4108:\t\tint err;\n4109:\t\n4110:\t\terr = vxlan_dev_configure(net, dev, conf, extack);\n4111:\t\tif (err)\n4112:\t\t\treturn err;\n4113:\t\n4114:\t\tcfg = rtnl_dereference(vxlan-\u003ecfg);\n4115:\t\n4116:\t\tdev-\u003eethtool_ops = \u0026vxlan_ethtool_ops;\n4117:\t\n4118:\t\terr = register_netdevice(dev);\n4119:\t\tif (err) {\n"
} |
| 15/2 | 2026/09/23 07:54 | llm | patch-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 76904 output: 40 thoughts: 119 Thoughts: **Analyzing VXLAN Device Creation and Modification** Okay, let's break this down. My goal here is to understand the interplay between the functions involved in creating and modifying VXLAN devices. I need to trace the calls, so let's start with `vxlan_dev_create` and `vxlan_changelink`. I'm starting in `vxlan_core.c` as that's usually where the core logic resides. Aha! `vxlan_newlink` calls `vxlan_dev_create`. That makes sense; creating the new link requires creating the associated VXLAN device. That confirms the dependency. Now, let's quickly cross-reference that with `vxlan_link_ops`. I see that the `vxlan_link_ops` structure has pointers to the various link operations. This structure contains the `.newlink` and `.changelink` elements, specifically. Right: `.newlink` is assigned `vxlan_newlink`, and `.changelink` is assigned `vxlan_changelink`. That makes the connection explicit. I now need to check this struct more closely. |
| 16/2 | 2026/09/23 07:54 | tool | grepper |
0mArgs:{
"Expression": "static struct rtnl_link_ops vxlan_link_ops",
"PathPrefix": "drivers/net/vxlan"
}Results: {
"Output": "drivers/net/vxlan/vxlan_core.c=59=const u8 all_zeros_mac[ETH_ALEN + 2];\ndrivers/net/vxlan/vxlan_core.c:60:static struct rtnl_link_ops vxlan_link_ops;\ndrivers/net/vxlan/vxlan_core.c-61-\n--\ndrivers/net/vxlan/vxlan_core.c=4855=static struct net *vxlan_get_link_net(const struct net_device *dev)\n--\ndrivers/net/vxlan/vxlan_core.c-4861-\ndrivers/net/vxlan/vxlan_core.c:4862:static struct rtnl_link_ops vxlan_link_ops __read_mostly = {\ndrivers/net/vxlan/vxlan_core.c-4863-\t.kind\t\t= \"vxlan\",\n"
} |
| 17/2 | 2026/09/23 07:54 | llm | patch-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 77533 output: 42 thoughts: 35 Thoughts: Here's a summary of my thought process, as requested: **Diving into the VXLAN Core** Okay, time to get my hands dirty. I need to understand this VXLAN code better. Let's start with `vxlan_link_ops`. Given my familiarity with the kernel's networking stack, I suspect this will be where the basic link-level operations are defined. Now, that likely includes the usual suspects: setup, teardown, address handling, and possibly some basic MTU considerations. I'll zero in on line 4862 in `drivers/net/vxlan/vxlan_core.c` as the likely entry point. Let's see what we've got! I'm expecting to see function pointers to the core implementation. Let's explore. |
| 18/2 | 2026/09/23 07:54 | tool | read-file |
0mArgs:{
"File": "drivers/net/vxlan/vxlan_core.c",
"FirstLine": 4860,
"LineCount": 25
}Results: {
"Contents": "4860:\t}\n4861:\t\n4862:\tstatic struct rtnl_link_ops vxlan_link_ops __read_mostly = {\n4863:\t\t.kind\t\t= \"vxlan\",\n4864:\t\t.maxtype\t= IFLA_VXLAN_MAX,\n4865:\t\t.policy\t\t= vxlan_policy,\n4866:\t\t.priv_size\t= sizeof(struct vxlan_dev),\n4867:\t\t.setup\t\t= vxlan_setup,\n4868:\t\t.validate\t= vxlan_validate,\n4869:\t\t.newlink\t= vxlan_newlink,\n4870:\t\t.changelink\t= vxlan_changelink,\n4871:\t\t.dellink\t= vxlan_dellink,\n4872:\t\t.get_size\t= vxlan_get_size,\n4873:\t\t.fill_info\t= vxlan_fill_info,\n4874:\t\t.get_link_net\t= vxlan_get_link_net,\n4875:\t};\n4876:\t\n4877:\tstatic void vxlan_handle_lowerdev_unregister(struct vxlan_net *vn,\n4878:\t\t\t\t\t\t struct net_device *dev)\n4879:\t{\n4880:\t\tstruct vxlan_dev *vxlan, *next;\n4881:\t\tLIST_HEAD(list_kill);\n4882:\t\n4883:\t\tlist_for_each_entry_safe(vxlan, next, \u0026vn-\u003evxlan_list, next) {\n4884:\t\t\tconst struct vxlan_config *cfg = rtnl_dereference(vxlan-\u003ecfg);\n"
} |
| 19/2 | 2026/09/23 07:54 | llm | patch-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 78225 output: 240 thoughts: 1051 Thoughts: **VXLAN Subsystem Analysis for Fuzzing Focus** Okay, let's break this down. My primary focus here is to identify the most relevant areas within the VXLAN tunnel driver for fuzzing. I've been running through the code, looking at the call graphs and function signatures to pinpoint the key entry points and data paths. Initially, I looked at the core functions: `vxlan_setup`, `vxlan_changelink`, `vxlan_fill_info`, `vxlan_dev_configure`, `vxlan_free_dev`, `vxlan_xmit`, `vxlan_rcv`, `vxlan_update_default_fdb_entry`, `vxlan_vnilist_update_group`, and `vxlan_vnifilter_dump_dev`. I needed to confirm that `vxlan_config_apply` is static, which is the case, and called by both `vxlan_dev_configure` and `vxlan_changelink`. I followed the call paths, noting that `vxlan_dev_configure` is reached through `vxlan_dev_create` which is called from `vxlan_newlink`. I then turned to the modified functions in `vxlan_vnifilter.c`, specifically `vxlan_vnifilter_dump_dev`, `vxlan_update_default_fdb_entry`, `vxlan_vnilist_update_group`, and `vxlan_vnifilter_has_multicast`. I also looked at `vxlan_multicast.c` and identified `vxlan_multicast_join`, `vxlan_multicast_leave`, `vxlan_igmp_join`, `vxlan_igmp_leave`, and `vxlan_group_used` as relevant. And in `vxlan_mdb.c`, `vxlan_mdb_xmit`, `vxlan_mdb_entry_skb_get`, `vxlan_mdb_entry_info_fill`, and `vxlan_mdb_config_init` are important. After this initial sweep, I honed in on a more focused set of symbols for fuzzing: `vxlan_changelink`, `vxlan_dev_configure`, `vxlan_free_dev`, `vxlan_xmit`, `vxlan_rcv`, `vxlan_update_default_fdb_entry`, `vxlan_vnilist_update_group`, and `vxlan_vnifilter_dump_dev`. These functions are directly involved in device configuration, data transmission/reception, resource cleanup, and filter updates. The fact that they are all specific to the VXLAN driver is crucial; this makes them the most efficient targets. I also considered if `vxlan_config_apply` could be inlined, but the function's size makes it a less likely candidate than `vxlan_changelink` and `vxlan_dev_configure`. I confirmed that `vxlan_xmit` and `vxlan_rcv` are the core data path functions, while `vxlan_free_dev` is the destructor. Finally, I validated the required configurations (`VXLAN`, `INET`, and `IPV6`) by cross-referencing `drivers/net/Kconfig` and `net/ipv6/Kconfig`. Based on this analysis, I've confirmed that the best set of options for fuzzing are: * `WorthFuzzing`: true * `Reasoning`: Focus on device configuration, data path, and filter update functions within the VXLAN subsystem. * `EnableConfigs`: \["VXLAN", "INET", "IPV6"] * `FocusSymbols`: \["vxlan_changelink", "vxlan_dev_configure", "vxlan_free_dev", "vxlan_xmit", "vxlan_rcv", "vxlan_update_default_fdb_entry", "vxlan_vnilist_update_group", "vxlan_vnifilter_dump_dev"] I'm confident in calling `set-results` now. This should cover the critical areas for efficient and targeted fuzzing. |
| 20/2 | 2026/09/23 07:54 | tool | set-results |
0mArgs:{
"EnableConfigs": [
"VXLAN",
"INET",
"IPV6"
],
"FocusSymbols": [
"vxlan_changelink",
"vxlan_dev_configure",
"vxlan_free_dev",
"vxlan_xmit",
"vxlan_rcv",
"vxlan_update_default_fdb_entry",
"vxlan_vnilist_update_group",
"vxlan_vnifilter_dump_dev"
],
"Reasoning": "The patch refactors the VXLAN driver's configuration management by turning vxlan-\u003ecfg into an RCU-managed dynamically allocated object (struct vxlan_config __rcu *cfg), removing default_dst, adding RCU grace periods via kfree_rcu, updating changelink/error unwind logic, and altering lockless RCU walks for VNIFILTER dumping. VXLAN is a standard virtual netdevice reachable in virtualized QEMU environments through netlink and packet sockets, making this series an ideal target for syzkaller fuzzing.",
"WorthFuzzing": true
}Results: {
"EnableConfigs": [
"VXLAN",
"INET",
"IPV6"
],
"FocusSymbols": [
"vxlan_changelink",
"vxlan_dev_configure",
"vxlan_free_dev",
"vxlan_xmit",
"vxlan_rcv",
"vxlan_update_default_fdb_entry",
"vxlan_vnilist_update_group",
"vxlan_vnifilter_dump_dev"
],
"Reasoning": "The patch refactors the VXLAN driver's configuration management by turning vxlan-\u003ecfg into an RCU-managed dynamically allocated object (struct vxlan_config __rcu *cfg), removing default_dst, adding RCU grace periods via kfree_rcu, updating changelink/error unwind logic, and altering lockless RCU walks for VNIFILTER dumping. VXLAN is a standard virtual netdevice reachable in virtualized QEMU environments through netlink and packet sockets, making this series an ideal target for syzkaller fuzzing.",
"WorthFuzzing": true
} |
| 21/1 | 2026/09/23 07:54 | action | If |
1mArgs:{
"WorthFuzzing": true
}Results: null |
| 22/2 | 2026/09/23 07:54 | agent | kmsan-evaluator |
1mModel:core Args: null Results: {
"KMSANReasoning": "The patch refactors the VXLAN subsystem to make the device configuration RCU-protected (`vxlan-\u003ecfg` dynamically allocated and managed via RCU rather than embedded in `struct vxlan_dev`), removes the legacy `default_dst` struct in favor of direct config lookups and a `lowerdev` pointer, and moves dynamic flags like `VXLAN_DEV_F_MDB` to `vxlan-\u003eflags`.\n\nAnalysis of memory initialization and leak risks:\n1. Heap structures: Newly allocated config structures (`new_cfg`) are created via `kmemdup()` from `conf`, which is fully cleared with `memset(conf, 0, sizeof(*conf))` in `vxlan_nl2conf()`. There are no uninitialized padding bytes or fields in the allocated config.\n2. Netlink / user space copies: In `vxlan_fill_info()`, `struct ifla_vxlan_port_range ports` has its initialization changed from aggregate to member assignments (`ports.low = ...; ports.high = ...;`). The UAPI `struct ifla_vxlan_port_range` consists strictly of two `__be16` fields (4 bytes total) with zero padding. Both fields are initialized prior to `nla_put()`. All other attributes emitted to userspace are scalars or copied from the zero-initialized config.\n3. Driver-internal structs: In `mlxsw_sp_bridge_vlan_aware_vxlan_join()`, `struct mlxsw_sp_nve_params` has all member fields explicitly assigned, and it is strictly driver-internal without being copied to userspace or read via memcmp.\n\nApplicability of KASAN vs KMSAN:\nThe potential risks of these changes lie in RCU lifetime correctness, use-after-free across grace periods, NULL pointer dereferences, and locking during configuration updates. These are effectively detected by KASAN, PROVE_RCU, and LOCKDEP. There are no uninitialized memory reads or kernel-to-user info-leak risks, so a dedicated KMSAN fuzzing session is not warranted.",
"NeedsKMSAN": false
}Instruction: You are an expert Linux kernel security engineer specializing in kernel memory
error detectors (KASAN and KMSAN). Your job is to review the provided patch series and
determine if the code changes justify spawning a dedicated KMSAN (KernelMemorySanitizer)
fuzzing session in addition to standard KASAN fuzzing.
CRITICAL DISTINCTION BETWEEN KASAN AND KMSAN:
- Standard KASAN kernel builds (upstream-apparmor-kasan.config) already enable
a comprehensive suite of debugging tools and sanitizers, including KASAN
(out-of-bounds accesses, use-after-free, double free, invalid free), LOCKDEP
(locking bugs and deadlocks), UB-sanitizers, and memory corruption checks.
- KMSAN (KernelMemorySanitizer) detects reads of UNINITIALIZED memory (stack, heap,
or page allocations) and kernel-to-user memory info-leaks.
Rule: THERE IS NO SENSE IN RUNNING A KMSAN SESSION IF A BUG CAN BE CAUGHT BY KASAN,
LOCKDEP, OR OTHER STANDARD BUG DETECTORS.
A dedicated KMSAN fuzzing session incurs significant resource costs. You must ONLY
set NeedsKMSAN=true if the code changes introduce or expose UNINITIALIZED MEMORY risks
that are detected ONLY by KMSAN.
Look holistically at the patch series and surrounding code. Even if no direct
uninitialized field accesses or new buffer allocations are added in the diff itself,
a patch may alter control flow, bounds checking, or data length calculations in ways
that change how the rest of the code operates on existing buffers (e.g. allowing
uninitialized stack/heap memory to be read, copied to user space, or used in control
flow). Do not hesitate to use your code access tools to inspect the surrounding code,
called functions, and callers.
Set NeedsKMSAN=true ONLY IF the patch introduces or modifies:
1. Kernel structures sent to user space (via copy_to_user, put_user, netlink skb
attributes, ioctl output arguments, socket options, or BPF buffers) where fields
or structure padding might not be fully initialized/zeroed.
2. Conditional logic or branching that depends on potentially uninitialized variables
or struct fields.
3. Allocation or initialization of complex data structures where uninitialized fields
could be read later in reachable code paths.
4. Bounds checks, lengths, or logic in a way that allows surrounding code to access
uninitialized bytes of existing buffers.
Set NeedsKMSAN=false IF:
- The code changes primarily risk out-of-bounds access, array overflows, NULL pointer
dereferences, locking deadlocks, or use-after-free bugs (these are already caught
by KASAN, LOCKDEP, or standard bug detectors).
- All stack/heap structures touched or introduced by the patch are fully zeroed
or initialized (e.g. using = {0}, memset, kzalloc) before being read or copied.
- The patch does not introduce any risk of uninitialized memory usage or info-leaks.
Use your code access tools to inspect the surrounding code if necessary, then provide
detailed KMSANReasoning contrasting KASAN vs KMSAN applicability for this patch.
Prefer calling several tools at the same time to save round-trips.
Use set-results tool to provide results of the analysis.
It must be called exactly once before the final reply.
Ignore results of this tool.
Prompt: Target architecture: amd64
For your convenience, here is the diff of the changes:
commit 0b6e000f211d41c0ddec43751848309380949d38
Author: syz-cluster <triage@syzkaller.com>
Date: Wed Sep 23 07:53:12 2026 +0000
syz-cluster: applied patch under review
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c
index 7a18a469961db..467fbe43b89e9 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c
@@ -241,9 +241,16 @@ static bool mlx5e_tc_tun_encap_info_equal_vxlan(struct mlx5e_encap_key *a,
static int mlx5e_tc_tun_get_remote_ifindex(struct net_device *mirred_dev)
{
const struct vxlan_dev *vxlan = netdev_priv(mirred_dev);
- const struct vxlan_rdst *dst = &vxlan->default_dst;
+ const struct vxlan_config *cfg;
+ int ifindex = 0;
- return dst->remote_ifindex;
+ rcu_read_lock();
+ cfg = rcu_dereference(vxlan->cfg);
+ if (cfg)
+ ifindex = cfg->remote_ifindex;
+ rcu_read_unlock();
+
+ return ifindex;
}
struct mlx5e_tc_tunnel vxlan_tunnel = {
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c
index 52c2fe3644d4b..21e7b499f3879 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c
@@ -59,8 +59,11 @@ static bool mlxsw_sp_nve_vxlan_can_offload(const struct mlxsw_sp_nve *nve,
const struct mlxsw_sp_nve_params *params,
struct netlink_ext_ack *extack)
{
- struct vxlan_dev *vxlan = netdev_priv(params->dev);
- struct vxlan_config *cfg = &vxlan->cfg;
+ const struct vxlan_config *cfg;
+ struct vxlan_dev *vxlan;
+
+ vxlan = netdev_priv(params->dev);
+ cfg = rtnl_dereference(vxlan->cfg);
if (vxlan_addr_multicast(&cfg->remote_ip)) {
NL_SET_ERR_MSG_MOD(extack, "VxLAN: Multicast destination IP is not supported");
@@ -92,6 +95,11 @@ static bool mlxsw_sp_nve_vxlan_can_offload(const struct mlxsw_sp_nve *nve,
return false;
}
+ if (test_bit(VXLAN_DEV_F_MDB, &vxlan->flags)) {
+ NL_SET_ERR_MSG_MOD(extack, "VxLAN: MDB entries are not supported");
+ return false;
+ }
+
switch (cfg->saddr.sa.sa_family) {
case AF_INET:
if (!mlxsw_sp_nve_vxlan_ipv4_flags_check(cfg, extack))
@@ -148,8 +156,11 @@ static void mlxsw_sp_nve_vxlan_config(const struct mlxsw_sp_nve *nve,
const struct mlxsw_sp_nve_params *params,
struct mlxsw_sp_nve_config *config)
{
- struct vxlan_dev *vxlan = netdev_priv(params->dev);
- struct vxlan_config *cfg = &vxlan->cfg;
+ const struct vxlan_config *cfg;
+ struct vxlan_dev *vxlan;
+
+ vxlan = netdev_priv(params->dev);
+ cfg = rtnl_dereference(vxlan->cfg);
config->type = MLXSW_SP_NVE_TYPE_VXLAN;
config->ttl = cfg->ttl;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index fe45e533a4b2e..de60b698bea98 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -2513,15 +2513,17 @@ mlxsw_sp_bridge_vlan_aware_vxlan_join(struct mlxsw_sp_bridge_device *bridge_devi
{
struct mlxsw_sp *mlxsw_sp = mlxsw_sp_lower_get(bridge_device->dev);
struct vxlan_dev *vxlan = netdev_priv(vxlan_dev);
- struct mlxsw_sp_nve_params params = {
- .type = MLXSW_SP_NVE_TYPE_VXLAN,
- .vni = vxlan->cfg.vni,
- .dev = vxlan_dev,
- .ethertype = ethertype,
- };
+ struct mlxsw_sp_nve_params params;
+ const struct vxlan_config *cfg;
struct mlxsw_sp_fid *fid;
int err;
+ cfg = rtnl_dereference(vxlan->cfg);
+ params.type = MLXSW_SP_NVE_TYPE_VXLAN;
+ params.vni = cfg->vni;
+ params.dev = vxlan_dev;
+ params.ethertype = ethertype;
+
/* If the VLAN is 0, we need to find the VLAN that is configured as
* PVID and egress untagged on the bridge port of the VxLAN device.
* It is possible no such VLAN exists
@@ -2704,15 +2706,17 @@ mlxsw_sp_bridge_8021d_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,
{
struct mlxsw_sp *mlxsw_sp = mlxsw_sp_lower_get(bridge_device->dev);
struct vxlan_dev *vxlan = netdev_priv(vxlan_dev);
- struct mlxsw_sp_nve_params params = {
- .type = MLXSW_SP_NVE_TYPE_VXLAN,
- .vni = vxlan->cfg.vni,
- .dev = vxlan_dev,
- .ethertype = ETH_P_8021Q,
- };
+ struct mlxsw_sp_nve_params params;
+ const struct vxlan_config *cfg;
struct mlxsw_sp_fid *fid;
int err;
+ cfg = rtnl_dereference(vxlan->cfg);
+ params.type = MLXSW_SP_NVE_TYPE_VXLAN;
+ params.vni = cfg->vni;
+ params.dev = vxlan_dev;
+ params.ethertype = ETH_P_8021Q;
+
fid = mlxsw_sp_fid_8021d_get(mlxsw_sp, bridge_device->dev->ifindex);
if (IS_ERR(fid)) {
NL_SET_ERR_MSG_MOD(extack, "Failed to create 802.1D FID");
@@ -2933,10 +2937,13 @@ static void __mlxsw_sp_bridge_vxlan_leave(struct mlxsw_sp *mlxsw_sp,
const struct net_device *vxlan_dev)
{
struct vxlan_dev *vxlan = netdev_priv(vxlan_dev);
+ const struct vxlan_config *cfg;
struct mlxsw_sp_fid *fid;
+ cfg = rtnl_dereference(vxlan->cfg);
+
/* If the VxLAN device is down, then the FID does not have a VNI */
- fid = mlxsw_sp_fid_lookup_by_vni(mlxsw_sp, vxlan->cfg.vni);
+ fid = mlxsw_sp_fid_lookup_by_vni(mlxsw_sp, cfg->vni);
if (!fid)
return;
@@ -3029,11 +3036,13 @@ static void mlxsw_sp_fdb_vxlan_call_notifiers(struct net_device *dev,
struct switchdev_notifier_vxlan_fdb_info info;
struct vxlan_dev *vxlan = netdev_priv(dev);
enum switchdev_notifier_type type;
+ const struct vxlan_config *cfg;
+ cfg = rtnl_dereference(vxlan->cfg);
type = adding ? SWITCHDEV_VXLAN_FDB_ADD_TO_BRIDGE :
SWITCHDEV_VXLAN_FDB_DEL_TO_BRIDGE;
mlxsw_sp_switchdev_addr_vxlan_convert(proto, addr, &info.remote_ip);
- info.remote_port = vxlan->cfg.dst_port;
+ info.remote_port = cfg->dst_port;
info.remote_vni = vni;
info.remote_ifindex = 0;
ether_addr_copy(info.eth_addr, mac);
@@ -3236,8 +3245,10 @@ __mlxsw_sp_fdb_notify_mac_uc_tunnel_process(struct mlxsw_sp *mlxsw_sp,
if (adding && netif_is_vxlan(dev)) {
struct vxlan_dev *vxlan = netdev_priv(dev);
+ const struct vxlan_config *cfg;
- if (!(vxlan->cfg.flags & VXLAN_F_LEARN))
+ cfg = rtnl_dereference(vxlan->cfg);
+ if (!(cfg->flags & VXLAN_F_LEARN))
return -EINVAL;
}
@@ -3722,9 +3733,11 @@ mlxsw_sp_switchdev_vxlan_work_prepare(struct mlxsw_sp_switchdev_event_work *
{
struct vxlan_dev *vxlan = netdev_priv(switchdev_work->dev);
struct switchdev_notifier_vxlan_fdb_info *vxlan_fdb_info;
- struct vxlan_config *cfg = &vxlan->cfg;
+ const struct vxlan_config *cfg;
struct netlink_ext_ack *extack;
+ cfg = rcu_dereference_rtnl(vxlan->cfg);
+
extack = switchdev_notifier_info_to_extack(info);
vxlan_fdb_info = container_of(info,
struct switchdev_notifier_vxlan_fdb_info,
@@ -3851,11 +3864,15 @@ mlxsw_sp_switchdev_vxlan_vlan_add(struct mlxsw_sp *mlxsw_sp,
struct netlink_ext_ack *extack)
{
struct vxlan_dev *vxlan = netdev_priv(vxlan_dev);
- __be32 vni = vxlan->cfg.vni;
+ const struct vxlan_config *cfg;
struct mlxsw_sp_fid *fid;
u16 old_vid;
+ __be32 vni;
int err;
+ cfg = rtnl_dereference(vxlan->cfg);
+ vni = cfg->vni;
+
/* We cannot have the same VLAN as PVID and egress untagged on multiple
* VxLAN devices. Note that we get this notification before the VLAN is
* actually added to the bridge's database, so it is not possible for
@@ -3935,12 +3952,16 @@ mlxsw_sp_switchdev_vxlan_vlan_del(struct mlxsw_sp *mlxsw_sp,
const struct net_device *vxlan_dev, u16 vid)
{
struct vxlan_dev *vxlan = netdev_priv(vxlan_dev);
- __be32 vni = vxlan->cfg.vni;
+ const struct vxlan_config *cfg;
struct mlxsw_sp_fid *fid;
+ __be32 vni;
if (!netif_running(vxlan_dev))
return;
+ cfg = rtnl_dereference(vxlan->cfg);
+ vni = cfg->vni;
+
fid = mlxsw_sp_fid_lookup_by_vni(mlxsw_sp, vni);
if (!fid)
return;
diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
index 347245cc1de4e..2e975294c69ec 100644
--- a/drivers/net/vxlan/vxlan_core.c
+++ b/drivers/net/vxlan/vxlan_core.c
@@ -110,20 +110,23 @@ static struct vxlan_dev *vxlan_vs_find_vni(struct vxlan_sock *vs,
vni = 0;
hlist_for_each_entry_rcu(node, vni_head(vs, vni), hlist) {
+ const struct vxlan_config *cfg;
+
if (!node->vxlan)
continue;
+
+ cfg = rcu_dereference(node->vxlan->cfg);
+
vnode = NULL;
- if (node->vxlan->cfg.flags & VXLAN_F_VNIFILTER) {
+ if (cfg->flags & VXLAN_F_VNIFILTER) {
vnode = vxlan_vnifilter_lookup(node->vxlan, vni);
if (!vnode)
continue;
- } else if (node->vxlan->default_dst.remote_vni != vni) {
+ } else if (cfg->vni != vni) {
continue;
}
if (IS_ENABLED(CONFIG_IPV6)) {
- const struct vxlan_config *cfg = &node->vxlan->cfg;
-
if ((cfg->flags & VXLAN_F_IPV6_LINKLOCAL) &&
cfg->remote_ifindex != ifindex)
continue;
@@ -157,6 +160,7 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,
u32 portid, u32 seq, int type, unsigned int flags,
const struct vxlan_rdst *rdst)
{
+ const struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan->cfg);
unsigned long now = jiffies;
struct nda_cacheinfo ci;
bool send_ip, send_eth;
@@ -216,10 +220,10 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,
goto nla_put_failure;
if (rdst->remote_port &&
- rdst->remote_port != vxlan->cfg.dst_port &&
+ rdst->remote_port != cfg->dst_port &&
nla_put_be16(skb, NDA_PORT, rdst->remote_port))
goto nla_put_failure;
- if (rdst->remote_vni != vxlan->default_dst.remote_vni &&
+ if (rdst->remote_vni != cfg->vni &&
nla_put_u32(skb, NDA_VNI, be32_to_cpu(rdst->remote_vni)))
goto nla_put_failure;
if (rdst->remote_ifindex &&
@@ -227,7 +231,7 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,
goto nla_put_failure;
}
- if ((vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA) && fdb->key.vni &&
+ if ((cfg->flags & VXLAN_F_COLLECT_METADATA) && fdb->key.vni &&
nla_put_u32(skb, NDA_SRC_VNI,
be32_to_cpu(fdb->key.vni)))
goto nla_put_failure;
@@ -377,14 +381,15 @@ static void vxlan_fdb_miss(struct vxlan_dev *vxlan, const u8 eth_addr[ETH_ALEN])
/* Look up Ethernet address in forwarding table */
static struct vxlan_fdb *vxlan_find_mac_rcu(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
const u8 *mac, __be32 vni)
{
struct vxlan_fdb_key key;
memset(&key, 0, sizeof(key));
memcpy(key.eth_addr, mac, sizeof(key.eth_addr));
- if (!(vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA))
- key.vni = vxlan->default_dst.remote_vni;
+ if (!(cfg->flags & VXLAN_F_COLLECT_METADATA))
+ key.vni = cfg->vni;
else
key.vni = vni;
@@ -393,11 +398,12 @@ static struct vxlan_fdb *vxlan_find_mac_rcu(struct vxlan_dev *vxlan,
}
static struct vxlan_fdb *vxlan_find_mac_tx(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
const u8 *mac, __be32 vni)
{
struct vxlan_fdb *f;
- f = vxlan_find_mac_rcu(vxlan, mac, vni);
+ f = vxlan_find_mac_rcu(vxlan, cfg, mac, vni);
if (f) {
unsigned long now = jiffies;
@@ -416,7 +422,7 @@ static struct vxlan_fdb *vxlan_find_mac(struct vxlan_dev *vxlan,
lockdep_assert_held_once(&vxlan->hash_lock);
rcu_read_lock();
- f = vxlan_find_mac_rcu(vxlan, mac, vni);
+ f = vxlan_find_mac_rcu(vxlan, rcu_dereference(vxlan->cfg), mac, vni);
rcu_read_unlock();
return f;
@@ -457,7 +463,7 @@ int vxlan_fdb_find_uc(struct net_device *dev, const u8 *mac, __be32 vni,
rcu_read_lock();
- f = vxlan_find_mac_rcu(vxlan, eth_addr, vni);
+ f = vxlan_find_mac_rcu(vxlan, rcu_dereference(vxlan->cfg), eth_addr, vni);
if (f)
rdst = first_remote_rcu(f);
if (!rdst) {
@@ -798,6 +804,7 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
u32 nhid, struct netlink_ext_ack *extack)
{
struct nexthop *old_nh = rtnl_dereference(fdb->nh);
+ const struct vxlan_config *cfg;
struct nexthop *nh;
int err = -EINVAL;
@@ -826,7 +833,8 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
}
/* check nexthop group family */
- switch (vxlan->default_dst.remote_ip.sa.sa_family) {
+ cfg = rtnl_dereference(vxlan->cfg);
+ switch (cfg->remote_ip.sa.sa_family) {
case AF_INET:
if (!nexthop_has_v4(nh)) {
err = -EAFNOSUPPORT;
@@ -863,12 +871,13 @@ int vxlan_fdb_create(struct vxlan_dev *vxlan,
u32 nhid, struct vxlan_fdb **fdb,
struct netlink_ext_ack *extack)
{
+ const struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan->cfg);
struct vxlan_rdst *rd = NULL;
struct vxlan_fdb *f;
int rc;
- if (vxlan->cfg.addrmax &&
- vxlan->addrcnt >= vxlan->cfg.addrmax)
+ if (cfg->addrmax &&
+ vxlan->addrcnt >= cfg->addrmax)
return -ENOSPC;
netdev_dbg(vxlan->dev, "add %pM -> %pIS\n", mac, ip);
@@ -1154,6 +1163,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,
__be32 *vni, u32 *ifindex, u32 *nhid,
struct netlink_ext_ack *extack)
{
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
struct net *net = dev_net(vxlan->dev);
int err;
@@ -1170,7 +1180,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,
return err;
}
} else {
- union vxlan_addr *remote = &vxlan->default_dst.remote_ip;
+ const union vxlan_addr *remote = &cfg->remote_ip;
if (remote->sa.sa_family == AF_INET) {
ip->sin.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -1190,7 +1200,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,
}
*port = nla_get_be16(tb[NDA_PORT]);
} else {
- *port = vxlan->cfg.dst_port;
+ *port = cfg->dst_port;
}
if (tb[NDA_VNI]) {
@@ -1200,7 +1210,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,
}
*vni = cpu_to_be32(nla_get_u32(tb[NDA_VNI]));
} else {
- *vni = vxlan->default_dst.remote_vni;
+ *vni = cfg->vni;
}
if (tb[NDA_SRC_VNI]) {
@@ -1210,7 +1220,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,
}
*src_vni = cpu_to_be32(nla_get_u32(tb[NDA_SRC_VNI]));
} else {
- *src_vni = vxlan->default_dst.remote_vni;
+ *src_vni = cfg->vni;
}
if (tb[NDA_IFINDEX]) {
@@ -1241,6 +1251,7 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
const unsigned char *addr, u16 vid, u16 flags,
bool *notified, struct netlink_ext_ack *extack)
{
+ const struct vxlan_config *cfg;
struct vxlan_dev *vxlan = netdev_priv(dev);
/* struct net *net = dev_net(vxlan->dev); */
union vxlan_addr ip;
@@ -1268,7 +1279,8 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
return -EINVAL;
}
- if (vxlan->default_dst.remote_ip.sa.sa_family != ip.sa.sa_family)
+ cfg = rtnl_dereference(vxlan->cfg);
+ if (cfg->remote_ip.sa.sa_family != ip.sa.sa_family)
return -EAFNOSUPPORT;
spin_lock_bh(&vxlan->hash_lock);
@@ -1405,18 +1417,21 @@ static int vxlan_fdb_get(struct sk_buff *skb,
struct netlink_ext_ack *extack)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
+ const struct vxlan_config *cfg;
struct vxlan_fdb *f;
__be32 vni;
int err;
+ cfg = rcu_dereference_rtnl(vxlan->cfg);
+
if (tb[NDA_VNI])
vni = cpu_to_be32(nla_get_u32(tb[NDA_VNI]));
else
- vni = vxlan->default_dst.remote_vni;
+ vni = cfg->vni;
rcu_read_lock();
- f = vxlan_find_mac_rcu(vxlan, addr, vni);
+ f = vxlan_find_mac_rcu(vxlan, cfg, addr, vni);
if (!f) {
NL_SET_ERR_MSG(extack, "Fdb entry not found");
err = -ENOENT;
@@ -1434,6 +1449,7 @@ static int vxlan_fdb_get(struct sk_buff *skb,
* and Tunnel endpoint.
*/
static enum skb_drop_reason vxlan_snoop(struct net_device *dev,
+ const struct vxlan_config *cfg,
union vxlan_addr *src_ip,
const u8 *src_mac, u32 src_ifindex,
__be32 vni)
@@ -1452,7 +1468,7 @@ static enum skb_drop_reason vxlan_snoop(struct net_device *dev,
ifindex = src_ifindex;
#endif
- f = vxlan_find_mac_rcu(vxlan, src_mac, vni);
+ f = vxlan_find_mac_rcu(vxlan, cfg, src_mac, vni);
if (likely(f)) {
struct vxlan_rdst *rdst = first_remote_rcu(f);
unsigned long now = jiffies;
@@ -1488,9 +1504,9 @@ static enum skb_drop_reason vxlan_snoop(struct net_device *dev,
vxlan_fdb_update(vxlan, src_mac, src_ip,
NUD_REACHABLE,
NLM_F_EXCL|NLM_F_CREATE,
- vxlan->cfg.dst_port,
+ cfg->dst_port,
vni,
- vxlan->default_dst.remote_vni,
+ cfg->vni,
ifindex, NTF_SELF, 0, true, NULL);
spin_unlock(&vxlan->hash_lock);
}
@@ -1518,6 +1534,7 @@ static bool __vxlan_sock_release_prep(struct vxlan_sock *vs)
static void vxlan_sock_release(struct vxlan_dev *vxlan)
{
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
struct vxlan_sock *sock4 = rtnl_dereference(vxlan->vn4_sock);
#if IS_ENABLED(CONFIG_IPV6)
struct vxlan_sock *sock6 = rtnl_dereference(vxlan->vn6_sock);
@@ -1527,7 +1544,7 @@ static void vxlan_sock_release(struct vxlan_dev *vxlan)
RCU_INIT_POINTER(vxlan->vn4_sock, NULL);
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER)
+ if (cfg->flags & VXLAN_F_VNIFILTER)
vxlan_vs_del_vnigrp(vxlan);
else
vxlan_vs_del_dev(vxlan);
@@ -1598,6 +1615,7 @@ static void vxlan_parse_gbp_hdr(struct sk_buff *skb, u32 vxflags,
}
static enum skb_drop_reason vxlan_set_mac(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
struct vxlan_sock *vs,
struct sk_buff *skb, __be32 vni)
{
@@ -1623,10 +1641,10 @@ static enum skb_drop_reason vxlan_set_mac(struct vxlan_dev *vxlan,
#endif
}
- if (!(vxlan->cfg.flags & VXLAN_F_LEARN))
+ if (!(cfg->flags & VXLAN_F_LEARN))
return SKB_NOT_DROPPED_YET;
- return vxlan_snoop(skb->dev, &saddr, eth_hdr(skb)->h_source,
+ return vxlan_snoop(skb->dev, cfg, &saddr, eth_hdr(skb)->h_source,
ifindex, vni);
}
@@ -1657,18 +1675,21 @@ static bool vxlan_ecn_decapsulate(struct vxlan_sock *vs, void *oiph,
static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
{
struct vxlan_vni_node *vninode = NULL;
- const struct vxlanhdr *vh;
- struct vxlan_dev *vxlan;
- struct vxlan_sock *vs;
- struct vxlan_metadata _md;
- struct vxlan_metadata *md = &_md;
__be16 protocol = htons(ETH_P_TEB);
+ const struct vxlan_config *cfg;
enum skb_drop_reason reason;
+ const struct vxlanhdr *vh;
+ struct vxlan_metadata *md;
+ struct vxlan_metadata _md;
+ struct vxlan_dev *vxlan;
bool raw_proto = false;
- void *oiph;
+ struct vxlan_sock *vs;
__be32 vni = 0;
+ void *oiph;
int nh;
+ md = &_md;
+
/* Need UDP and VXLAN header to be present */
reason = pskb_may_pull_reason(skb, VXLAN_HLEN);
if (reason)
@@ -1696,8 +1717,10 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
goto drop;
}
- if (vh->vx_flags & vxlan->cfg.reserved_bits.vx_flags ||
- vh->vx_vni & vxlan->cfg.reserved_bits.vx_vni) {
+ cfg = rcu_dereference(vxlan->cfg);
+
+ if (vh->vx_flags & cfg->reserved_bits.vx_flags ||
+ vh->vx_vni & cfg->reserved_bits.vx_vni) {
/* If the header uses bits besides those enabled by the
* netdevice configuration, treat this as a malformed packet.
* This behavior diverges from VXLAN RFC (RFC7348) which
@@ -1709,12 +1732,12 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
reason = SKB_DROP_REASON_VXLAN_INVALID_HDR;
DEV_STATS_INC(vxlan->dev, rx_frame_errors);
DEV_STATS_INC(vxlan->dev, rx_errors);
- vxlan_vnifilter_count(vxlan, vni, vninode,
+ vxlan_vnifilter_count(vxlan, cfg, vni, vninode,
VXLAN_VNI_STATS_RX_ERRORS, 0);
goto drop;
}
- if (vxlan->cfg.flags & VXLAN_F_GPE) {
+ if (cfg->flags & VXLAN_F_GPE) {
if (!vxlan_parse_gpe_proto(vh, &protocol))
goto drop;
raw_proto = true;
@@ -1726,8 +1749,8 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
goto drop;
}
- if (vxlan->cfg.flags & VXLAN_F_REMCSUM_RX) {
- reason = vxlan_remcsum(skb, vxlan->cfg.flags);
+ if (cfg->flags & VXLAN_F_REMCSUM_RX) {
+ reason = vxlan_remcsum(skb, cfg->flags);
if (unlikely(reason))
goto drop;
}
@@ -1752,14 +1775,14 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
memset(md, 0, sizeof(*md));
}
- if (vxlan->cfg.flags & VXLAN_F_GBP)
- vxlan_parse_gbp_hdr(skb, vxlan->cfg.flags, md);
+ if (cfg->flags & VXLAN_F_GBP)
+ vxlan_parse_gbp_hdr(skb, cfg->flags, md);
/* Note that GBP and GPE can never be active together. This is
* ensured in vxlan_dev_configure.
*/
if (!raw_proto) {
- reason = vxlan_set_mac(vxlan, vs, skb, vni);
+ reason = vxlan_set_mac(vxlan, cfg, vs, skb, vni);
if (reason)
goto drop;
} else {
@@ -1780,7 +1803,7 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
if (reason) {
DEV_STATS_INC(vxlan->dev, rx_length_errors);
DEV_STATS_INC(vxlan->dev, rx_errors);
- vxlan_vnifilter_count(vxlan, vni, vninode,
+ vxlan_vnifilter_count(vxlan, cfg, vni, vninode,
VXLAN_VNI_STATS_RX_ERRORS, 0);
goto drop;
}
@@ -1792,7 +1815,7 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
reason = SKB_DROP_REASON_IP_TUNNEL_ECN;
DEV_STATS_INC(vxlan->dev, rx_frame_errors);
DEV_STATS_INC(vxlan->dev, rx_errors);
- vxlan_vnifilter_count(vxlan, vni, vninode,
+ vxlan_vnifilter_count(vxlan, cfg, vni, vninode,
VXLAN_VNI_STATS_RX_ERRORS, 0);
goto drop;
}
@@ -1802,14 +1825,15 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
if (unlikely(!(vxlan->dev->flags & IFF_UP))) {
rcu_read_unlock();
dev_dstats_rx_dropped(vxlan->dev);
- vxlan_vnifilter_count(vxlan, vni, vninode,
+ vxlan_vnifilter_count(vxlan, cfg, vni, vninode,
VXLAN_VNI_STATS_RX_DROPS, 0);
reason = SKB_DROP_REASON_DEV_READY;
goto drop;
}
dev_dstats_rx_add(vxlan->dev, skb->len);
- vxlan_vnifilter_count(vxlan, vni, vninode, VXLAN_VNI_STATS_RX, skb->len);
+ vxlan_vnifilter_count(vxlan, cfg, vni, vninode, VXLAN_VNI_STATS_RX,
+ skb->len);
gro_cells_receive(&vxlan->gro_cells, skb);
rcu_read_unlock();
@@ -1850,7 +1874,8 @@ static int vxlan_err_lookup(struct sock *sk, struct sk_buff *skb)
return 0;
}
-static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
+static int arp_reduce(struct net_device *dev, struct sk_buff *skb,
+ const struct vxlan_config *cfg, __be32 vni)
{
struct neigh_table *tbl = arp_table(dev_net(dev));
struct vxlan_dev *vxlan = netdev_priv(dev);
@@ -1864,7 +1889,7 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
if (!pskb_network_may_pull(skb, arp_hdr_len(dev))) {
dev_dstats_tx_dropped(dev);
- vxlan_vnifilter_count(vxlan, vni, NULL,
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL,
VXLAN_VNI_STATS_TX_DROPS, 0);
goto out;
}
@@ -1905,7 +1930,7 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
neigh_ha_snapshot(ha, n, n->dev);
rcu_read_lock();
- f = vxlan_find_mac_tx(vxlan, ha, vni);
+ f = vxlan_find_mac_tx(vxlan, cfg, ha, vni);
if (f)
rdst = first_remote_rcu(f);
if (rdst && vxlan_addr_any(&rdst->remote_ip)) {
@@ -1931,11 +1956,11 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
if (netif_rx(reply) == NET_RX_DROP) {
dev_dstats_rx_dropped(dev);
- vxlan_vnifilter_count(vxlan, vni, NULL,
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL,
VXLAN_VNI_STATS_RX_DROPS, 0);
}
- } else if (vxlan->cfg.flags & VXLAN_F_L3MISS) {
+ } else if (cfg->flags & VXLAN_F_L3MISS) {
union vxlan_addr ipa = {
.sin.sin_addr.s_addr = tip,
.sin.sin_family = AF_INET,
@@ -2043,7 +2068,8 @@ static struct sk_buff *vxlan_na_create(struct sk_buff *request,
return reply;
}
-static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
+static int neigh_reduce(struct net_device *dev, struct sk_buff *skb,
+ const struct vxlan_config *cfg, __be32 vni)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
const struct in6_addr *daddr;
@@ -2077,7 +2103,7 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
}
neigh_ha_snapshot(ha, n, n->dev);
- f = vxlan_find_mac_tx(vxlan, ha, vni);
+ f = vxlan_find_mac_tx(vxlan, cfg, ha, vni);
if (f)
rdst = first_remote_rcu(f);
if (rdst && vxlan_addr_any(&rdst->remote_ip)) {
@@ -2096,10 +2122,10 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
if (netif_rx(reply) == NET_RX_DROP) {
dev_dstats_rx_dropped(dev);
- vxlan_vnifilter_count(vxlan, vni, NULL,
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL,
VXLAN_VNI_STATS_RX_DROPS, 0);
}
- } else if (vxlan->cfg.flags & VXLAN_F_L3MISS) {
+ } else if (cfg->flags & VXLAN_F_L3MISS) {
union vxlan_addr ipa = {
.sin6.sin6_addr = msg->target,
.sin6.sin6_family = AF_INET6,
@@ -2115,9 +2141,9 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
}
#endif
-static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)
+static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb,
+ const struct vxlan_config *cfg)
{
- struct vxlan_dev *vxlan = netdev_priv(dev);
struct neigh_table *tbl;
struct neighbour *n;
@@ -2136,7 +2162,7 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)
tbl = arp_table(dev_net(dev));
pip = ip_hdr(skb);
n = neigh_lookup(tbl, &pip->daddr, dev);
- if (!n && (vxlan->cfg.flags & VXLAN_F_L3MISS)) {
+ if (!n && (cfg->flags & VXLAN_F_L3MISS)) {
union vxlan_addr ipa = {
.sin.sin_addr.s_addr = pip->daddr,
.sin.sin_family = AF_INET,
@@ -2164,7 +2190,7 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)
tbl = nd_table(dev_net(dev));
pip6 = ipv6_hdr(skb);
n = neigh_lookup(tbl, &pip6->daddr, dev);
- if (!n && (vxlan->cfg.flags & VXLAN_F_L3MISS)) {
+ if (!n && (cfg->flags & VXLAN_F_L3MISS)) {
union vxlan_addr ipa = {
.sin6.sin6_addr = pip6->daddr,
.sin6.sin6_family = AF_INET6,
@@ -2282,20 +2308,28 @@ static int vxlan_build_skb(struct sk_buff *skb, struct dst_entry *dst,
/* Bypass encapsulation if the destination is local */
static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
- struct vxlan_dev *dst_vxlan, __be32 vni,
- bool snoop)
+ struct vxlan_dev *dst_vxlan,
+ const struct vxlan_config *src_cfg,
+ __be32 vni, bool snoop)
{
+ const struct vxlan_config *dst_cfg;
union vxlan_addr loopback;
- union vxlan_addr *remote_ip = &dst_vxlan->default_dst.remote_ip;
unsigned int len = skb->len;
- struct net_device *dev;
+ struct net_device *dev = dst_vxlan->dev;
skb->pkt_type = PACKET_HOST;
skb->encapsulation = 0;
- skb->dev = dst_vxlan->dev;
+ skb->dev = dev;
__skb_pull(skb, skb_network_offset(skb));
- if (remote_ip->sa.sa_family == AF_INET) {
+ rcu_read_lock();
+ dst_cfg = rcu_dereference(dst_vxlan->cfg);
+ if (unlikely(!(dev->flags & IFF_UP))) {
+ kfree_skb_reason(skb, SKB_DROP_REASON_DEV_READY);
+ goto drop;
+ }
+
+ if (dst_cfg->remote_ip.sa.sa_family == AF_INET) {
loopback.sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
loopback.sa.sa_family = AF_INET;
#if IS_ENABLED(CONFIG_IPV6)
@@ -2305,27 +2339,20 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
#endif
}
- rcu_read_lock();
- dev = skb->dev;
- if (unlikely(!(dev->flags & IFF_UP))) {
- kfree_skb_reason(skb, SKB_DROP_REASON_DEV_READY);
- goto drop;
- }
-
- if ((dst_vxlan->cfg.flags & VXLAN_F_LEARN) && snoop)
- vxlan_snoop(dev, &loopback, eth_hdr(skb)->h_source, 0, vni);
+ if ((dst_cfg->flags & VXLAN_F_LEARN) && snoop)
+ vxlan_snoop(dev, dst_cfg, &loopback, eth_hdr(skb)->h_source, 0, vni);
dev_dstats_tx_add(src_vxlan->dev, len);
- vxlan_vnifilter_count(src_vxlan, vni, NULL, VXLAN_VNI_STATS_TX, len);
+ vxlan_vnifilter_count(src_vxlan, src_cfg, vni, NULL, VXLAN_VNI_STATS_TX, len);
if (__netif_rx(skb) == NET_RX_SUCCESS) {
dev_dstats_rx_add(dst_vxlan->dev, len);
- vxlan_vnifilter_count(dst_vxlan, vni, NULL, VXLAN_VNI_STATS_RX,
+ vxlan_vnifilter_count(dst_vxlan, dst_cfg, vni, NULL, VXLAN_VNI_STATS_RX,
len);
} else {
drop:
dev_dstats_rx_dropped(dev);
- vxlan_vnifilter_count(dst_vxlan, vni, NULL,
+ vxlan_vnifilter_count(dst_vxlan, dst_cfg, vni, NULL,
VXLAN_VNI_STATS_RX_DROPS, 0);
}
rcu_read_unlock();
@@ -2333,6 +2360,7 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
static int encap_bypass_if_local(struct sk_buff *skb, struct net_device *dev,
struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
int addr_family,
__be16 dst_port, int dst_ifindex, __be32 vni,
struct dst_entry *dst,
@@ -2348,22 +2376,22 @@ static int encap_bypass_if_local(struct sk_buff *skb, struct net_device *dev,
/* Bypass encapsulation if the destination is local */
if (rt_flags & RTCF_LOCAL &&
!(rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) &&
- vxlan->cfg.flags & VXLAN_F_LOCALBYPASS) {
+ cfg->flags & VXLAN_F_LOCALBYPASS) {
struct vxlan_dev *dst_vxlan;
dst_release(dst);
dst_vxlan = vxlan_find_vni(vxlan->net, dst_ifindex, vni,
addr_family, dst_port,
- vxlan->cfg.flags);
+ cfg->flags);
if (!dst_vxlan) {
DEV_STATS_INC(dev, tx_errors);
- vxlan_vnifilter_count(vxlan, vni, NULL,
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL,
VXLAN_VNI_STATS_TX_ERRORS, 0);
kfree_skb_reason(skb, SKB_DROP_REASON_VXLAN_VNI_NOT_FOUND);
return -ENOENT;
}
- vxlan_encap_bypass(skb, vxlan, dst_vxlan, vni, true);
+ vxlan_encap_bypass(skb, vxlan, dst_vxlan, cfg, vni, true);
return 1;
}
@@ -2371,30 +2399,35 @@ static int encap_bypass_if_local(struct sk_buff *skb, struct net_device *dev,
}
void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
+ const struct vxlan_config *cfg,
__be32 default_vni, struct vxlan_rdst *rdst, bool did_rsc)
{
+ unsigned int pkt_len = skb->len;
+ struct vxlan_metadata _md = {};
+ __be16 src_port = 0, dst_port;
+ struct dst_entry *ndst = NULL;
+ enum skb_drop_reason reason;
struct dst_cache *dst_cache;
+ const struct iphdr *old_iph;
struct ip_tunnel_info *info;
struct ip_tunnel_key *pkey;
+ struct vxlan_metadata *md;
struct ip_tunnel_key key;
- struct vxlan_dev *vxlan = netdev_priv(dev);
- const struct iphdr *old_iph;
- struct vxlan_metadata _md = {};
- struct vxlan_metadata *md = &_md;
- unsigned int pkt_len = skb->len;
- __be16 src_port = 0, dst_port;
- struct dst_entry *ndst = NULL;
+ struct vxlan_dev *vxlan;
+ u32 flags = cfg->flags;
+ bool udp_sum = false;
+ bool no_eth_encap;
int addr_family;
+ bool use_cache;
+ __be32 vni = 0;
__u8 tos, ttl;
int ifindex;
int err = 0;
- u32 flags = vxlan->cfg.flags;
- bool use_cache;
- bool udp_sum = false;
- bool xnet = !net_eq(vxlan->net, dev_net(vxlan->dev));
- enum skb_drop_reason reason;
- bool no_eth_encap;
- __be32 vni = 0;
+ bool xnet;
+
+ vxlan = netdev_priv(dev);
+ xnet = !net_eq(vxlan->net, dev_net(vxlan->dev));
+ md = &_md;
no_eth_encap = flags & VXLAN_F_GPE && skb->protocol != htons(ETH_P_TEB);
reason = skb_vlan_inet_prepare(skb, no_eth_encap);
@@ -2414,23 +2447,23 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
if (vxlan_addr_any(&rdst->remote_ip)) {
if (did_rsc) {
/* short-circuited back to local bridge */
- vxlan_encap_bypass(skb, vxlan, vxlan,
+ vxlan_encap_bypass(skb, vxlan, vxlan, cfg,
default_vni, true);
return;
}
goto drop;
}
- addr_family = vxlan->cfg.saddr.sa.sa_family;
- dst_port = rdst->remote_port ? rdst->remote_port : vxlan->cfg.dst_port;
+ addr_family = cfg->saddr.sa.sa_family;
+ dst_port = rdst->remote_port ? rdst->remote_port : cfg->dst_port;
vni = (rdst->remote_vni) ? : default_vni;
ifindex = rdst->remote_ifindex;
if (addr_family == AF_INET) {
- key.u.ipv4.src = vxlan->cfg.saddr.sin.sin_addr.s_addr;
+ key.u.ipv4.src = cfg->saddr.sin.sin_addr.s_addr;
key.u.ipv4.dst = rdst->remote_ip.sin.sin_addr.s_addr;
} else {
- key.u.ipv6.src = vxlan->cfg.saddr.sin6.sin6_addr;
+ key.u.ipv6.src = cfg->saddr.sin6.sin6_addr;
key.u.ipv6.dst = rdst->remote_ip.sin6.sin6_addr;
}
@@ -2439,11 +2472,11 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
if (flags & VXLAN_F_TTL_INHERIT) {
ttl = ip_tunnel_get_ttl(old_iph, skb);
} else {
- ttl = vxlan->cfg.ttl;
+ ttl = cfg->ttl;
if (!ttl && vxlan_addr_multicast(&rdst->remote_ip))
ttl = 1;
}
- tos = vxlan->cfg.tos;
+ tos = cfg->tos;
if (tos == 1)
tos = ip_tunnel_get_dsfield(old_iph, skb);
if (tos && !info)
@@ -2454,9 +2487,9 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
else
udp_sum = !(flags & VXLAN_F_UDP_ZERO_CSUM6_TX);
#if IS_ENABLED(CONFIG_IPV6)
- switch (vxlan->cfg.label_policy) {
+ switch (cfg->label_policy) {
case VXLAN_LABEL_FIXED:
- key.label = vxlan->cfg.label;
+ key.label = cfg->label;
break;
case VXLAN_LABEL_INHERIT:
key.label = ip_tunnel_get_flowlabel(old_iph, skb);
@@ -2474,7 +2507,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
}
pkey = &info->key;
addr_family = ip_tunnel_info_af(info);
- dst_port = info->key.tp_dst ? : vxlan->cfg.dst_port;
+ dst_port = info->key.tp_dst ? : cfg->dst_port;
vni = tunnel_id_to_key32(info->key.tun_id);
ifindex = 0;
dst_cache = &info->dst_cache;
@@ -2487,8 +2520,8 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
tos = info->key.tos;
udp_sum = test_bit(IP_TUNNEL_CSUM_BIT, info->key.tun_flags);
}
- src_port = udp_flow_src_port(dev_net(dev), skb, vxlan->cfg.port_min,
- vxlan->cfg.port_max, true);
+ src_port = udp_flow_src_port(dev_net(dev), skb, cfg->port_min,
+ cfg->port_max, true);
rcu_read_lock();
if (addr_family == AF_INET) {
@@ -2521,15 +2554,15 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
if (!info) {
/* Bypass encapsulation if the destination is local */
- err = encap_bypass_if_local(skb, dev, vxlan, AF_INET,
+ err = encap_bypass_if_local(skb, dev, vxlan, cfg, AF_INET,
dst_port, ifindex, vni,
&rt->dst, rt->rt_flags);
if (err)
goto out_unlock;
- if (vxlan->cfg.df == VXLAN_DF_SET) {
+ if (cfg->df == VXLAN_DF_SET) {
df = htons(IP_DF);
- } else if (vxlan->cfg.df == VXLAN_DF_INHERIT) {
+ } else if (cfg->df == VXLAN_DF_INHERIT) {
struct ethhdr *eth = eth_hdr(skb);
if (ntohs(eth->h_proto) == ETH_P_IPV6 ||
@@ -2558,7 +2591,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
unclone->key.u.ipv4.src = pkey->u.ipv4.dst;
unclone->key.u.ipv4.dst = saddr;
}
- vxlan_encap_bypass(skb, vxlan, vxlan, vni, false);
+ vxlan_encap_bypass(skb, vxlan, vxlan, cfg, vni, false);
dst_release(ndst);
goto out_unlock;
}
@@ -2608,7 +2641,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
if (!info) {
u32 rt6i_flags = dst_rt6_info(ndst)->rt6i_flags;
- err = encap_bypass_if_local(skb, dev, vxlan, AF_INET6,
+ err = encap_bypass_if_local(skb, dev, vxlan, cfg, AF_INET6,
dst_port, ifindex, vni,
ndst, rt6i_flags);
if (err)
@@ -2632,7 +2665,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
unclone->key.u.ipv6.dst = saddr;
}
- vxlan_encap_bypass(skb, vxlan, vxlan, vni, false);
+ vxlan_encap_bypass(skb, vxlan, vxlan, cfg, vni, false);
dst_release(ndst);
goto out_unlock;
}
@@ -2653,14 +2686,14 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
ip6cb_flags);
#endif
}
- vxlan_vnifilter_count(vxlan, vni, NULL, VXLAN_VNI_STATS_TX, pkt_len);
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL, VXLAN_VNI_STATS_TX, pkt_len);
out_unlock:
rcu_read_unlock();
return;
drop:
dev_dstats_tx_dropped(dev);
- vxlan_vnifilter_count(vxlan, vni, NULL, VXLAN_VNI_STATS_TX_DROPS, 0);
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL, VXLAN_VNI_STATS_TX_DROPS, 0);
kfree_skb_reason(skb, reason);
return;
@@ -2672,11 +2705,12 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
DEV_STATS_INC(dev, tx_carrier_errors);
dst_release(ndst);
DEV_STATS_INC(dev, tx_errors);
- vxlan_vnifilter_count(vxlan, vni, NULL, VXLAN_VNI_STATS_TX_ERRORS, 0);
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL, VXLAN_VNI_STATS_TX_ERRORS, 0);
kfree_skb_reason(skb, reason);
}
static void vxlan_xmit_nh(struct sk_buff *skb, struct net_device *dev,
+ const struct vxlan_config *cfg,
struct vxlan_fdb *f, __be32 vni, bool did_rsc)
{
struct vxlan_rdst nh_rdst;
@@ -2693,7 +2727,7 @@ static void vxlan_xmit_nh(struct sk_buff *skb, struct net_device *dev,
do_xmit = vxlan_fdb_nh_path_select(nh, hash, &nh_rdst);
if (likely(do_xmit))
- vxlan_xmit_one(skb, dev, vni, &nh_rdst, did_rsc);
+ vxlan_xmit_one(skb, dev, cfg, vni, &nh_rdst, did_rsc);
else
goto drop;
@@ -2701,15 +2735,15 @@ static void vxlan_xmit_nh(struct sk_buff *skb, struct net_device *dev,
drop:
dev_dstats_tx_dropped(dev);
- vxlan_vnifilter_count(netdev_priv(dev), vni, NULL,
+ vxlan_vnifilter_count(netdev_priv(dev), cfg, vni, NULL,
VXLAN_VNI_STATS_TX_DROPS, 0);
dev_kfree_skb(skb);
}
static netdev_tx_t vxlan_xmit_nhid(struct sk_buff *skb, struct net_device *dev,
- u32 nhid, __be32 vni)
+ u32 nhid, __be32 vni,
+ const struct vxlan_config *cfg)
{
- struct vxlan_dev *vxlan = netdev_priv(dev);
struct vxlan_rdst nh_rdst;
struct nexthop *nh;
bool do_xmit;
@@ -2727,11 +2761,11 @@ static netdev_tx_t vxlan_xmit_nhid(struct sk_buff *skb, struct net_device *dev,
do_xmit = vxlan_fdb_nh_path_select(nh, hash, &nh_rdst);
rcu_read_unlock();
- if (vxlan->cfg.saddr.sa.sa_family != nh_rdst.remote_ip.sa.sa_family)
+ if (cfg->saddr.sa.sa_family != nh_rdst.remote_ip.sa.sa_family)
goto drop;
if (likely(do_xmit))
- vxlan_xmit_one(skb, dev, vni, &nh_rdst, false);
+ vxlan_xmit_one(skb, dev, cfg, vni, &nh_rdst, false);
else
goto drop;
@@ -2739,7 +2773,7 @@ static netdev_tx_t vxlan_xmit_nhid(struct sk_buff *skb, struct net_device *dev,
drop:
dev_dstats_tx_dropped(dev);
- vxlan_vnifilter_count(netdev_priv(dev), vni, NULL,
+ vxlan_vnifilter_count(netdev_priv(dev), cfg, vni, NULL,
VXLAN_VNI_STATS_TX_DROPS, 0);
dev_kfree_skb(skb);
return NETDEV_TX_OK;
@@ -2756,34 +2790,47 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
struct vxlan_dev *vxlan = netdev_priv(dev);
struct vxlan_rdst *rdst, *fdst = NULL;
const struct ip_tunnel_info *info;
+ const struct vxlan_config *cfg;
+ __be32 default_vni;
struct vxlan_fdb *f;
struct ethhdr *eth;
__be32 vni = 0;
- u32 nhid = 0;
bool did_rsc;
+ u32 nhid = 0;
+ u32 flags;
+
+ rcu_read_lock();
+ cfg = rcu_dereference(vxlan->cfg);
+ flags = cfg->flags;
+ default_vni = cfg->vni;
info = skb_tunnel_info(skb);
skb_reset_mac_header(skb);
- if (vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA) {
+ if (flags & VXLAN_F_COLLECT_METADATA) {
if (info && info->mode & IP_TUNNEL_INFO_BRIDGE &&
info->mode & IP_TUNNEL_INFO_TX) {
vni = tunnel_id_to_key32(info->key.tun_id);
nhid = info->key.nhid;
} else {
if (info && info->mode & IP_TUNNEL_INFO_TX)
- vxlan_xmit_one(skb, dev, vni, NULL, false);
+ vxlan_xmit_one(skb, dev, cfg, vni, NULL, false);
else
kfree_skb_reason(skb, SKB_DROP_REASON_TUNNEL_TXINFO);
+ rcu_read_unlock();
return NETDEV_TX_OK;
}
}
- if (vxlan->cfg.flags & VXLAN_F_PROXY) {
+ if (flags & VXLAN_F_PROXY) {
eth = eth_hdr(skb);
- if (ntohs(eth->h_proto) == ETH_P_ARP)
- return arp_reduce(dev, skb, vni);
+ if (ntohs(eth->h_proto) == ETH_P_ARP) {
+ netdev_tx_t res = arp_reduce(dev, skb, cfg, vni);
+
+ rcu_read_unlock();
+ return res;
+ }
#if IS_ENABLED(CONFIG_IPV6)
else if (ntohs(eth->h_proto) == ETH_P_IPV6 &&
pskb_network_may_pull(skb, sizeof(struct ipv6hdr) +
@@ -2792,53 +2839,57 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
struct nd_msg *m = (struct nd_msg *)(ipv6_hdr(skb) + 1);
if (m->icmph.icmp6_code == 0 &&
- m->icmph.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION)
- return neigh_reduce(dev, skb, vni);
+ m->icmph.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION) {
+ netdev_tx_t res = neigh_reduce(dev, skb, cfg, vni);
+
+ rcu_read_unlock();
+ return res;
+ }
}
#endif
}
- if (nhid)
- return vxlan_xmit_nhid(skb, dev, nhid, vni);
+ if (nhid) {
+ netdev_tx_t res = vxlan_xmit_nhid(skb, dev, nhid, vni, cfg);
+
+ rcu_read_unlock();
+ return res;
+ }
- if (vxlan->cfg.flags & VXLAN_F_MDB) {
+ if (test_bit(VXLAN_DEV_F_MDB, &vxlan->flags)) {
struct vxlan_mdb_entry *mdb_entry;
- rcu_read_lock();
- mdb_entry = vxlan_mdb_entry_skb_get(vxlan, skb, vni);
+ mdb_entry = vxlan_mdb_entry_skb_get(vxlan, cfg, skb, vni);
if (mdb_entry) {
- netdev_tx_t ret;
+ netdev_tx_t ret = vxlan_mdb_xmit(vxlan, cfg, mdb_entry, skb);
- ret = vxlan_mdb_xmit(vxlan, mdb_entry, skb);
rcu_read_unlock();
return ret;
}
- rcu_read_unlock();
}
eth = eth_hdr(skb);
- rcu_read_lock();
- f = vxlan_find_mac_tx(vxlan, eth->h_dest, vni);
+ f = vxlan_find_mac_tx(vxlan, cfg, eth->h_dest, vni);
did_rsc = false;
- if (f && (f->flags & NTF_ROUTER) && (vxlan->cfg.flags & VXLAN_F_RSC) &&
+ if (f && (f->flags & NTF_ROUTER) && (flags & VXLAN_F_RSC) &&
(ntohs(eth->h_proto) == ETH_P_IP ||
ntohs(eth->h_proto) == ETH_P_IPV6)) {
- did_rsc = route_shortcircuit(dev, skb);
+ did_rsc = route_shortcircuit(dev, skb, cfg);
eth = eth_hdr(skb);
if (did_rsc)
- f = vxlan_find_mac_tx(vxlan, eth->h_dest, vni);
+ f = vxlan_find_mac_tx(vxlan, cfg, eth->h_dest, vni);
}
if (f == NULL) {
- f = vxlan_find_mac_tx(vxlan, all_zeros_mac, vni);
+ f = vxlan_find_mac_tx(vxlan, cfg, all_zeros_mac, vni);
if (f == NULL) {
- if ((vxlan->cfg.flags & VXLAN_F_L2MISS) &&
+ if ((flags & VXLAN_F_L2MISS) &&
!is_multicast_ether_addr(eth->h_dest))
vxlan_fdb_miss(vxlan, eth->h_dest);
dev_dstats_tx_dropped(dev);
- vxlan_vnifilter_count(vxlan, vni, NULL,
+ vxlan_vnifilter_count(vxlan, cfg, vni, NULL,
VXLAN_VNI_STATS_TX_DROPS, 0);
kfree_skb_reason(skb, SKB_DROP_REASON_NO_TX_TARGET);
goto out;
@@ -2846,8 +2897,8 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
}
if (rcu_access_pointer(f->nh)) {
- vxlan_xmit_nh(skb, dev, f,
- (vni ? : vxlan->default_dst.remote_vni), did_rsc);
+ vxlan_xmit_nh(skb, dev, cfg, f,
+ (vni ? : default_vni), did_rsc);
} else {
list_for_each_entry_rcu(rdst, &f->remotes, list) {
struct sk_buff *skb1;
@@ -2858,10 +2909,10 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
}
skb1 = skb_clone(skb, GFP_ATOMIC);
if (skb1)
- vxlan_xmit_one(skb1, dev, vni, rdst, did_rsc);
+ vxlan_xmit_one(skb1, dev, cfg, vni, rdst, did_rsc);
}
if (fdst)
- vxlan_xmit_one(skb, dev, vni, fdst, did_rsc);
+ vxlan_xmit_one(skb, dev, cfg, vni, fdst, did_rsc);
else
kfree_skb_reason(skb, SKB_DROP_REASON_NO_TX_TARGET);
}
@@ -2876,12 +2927,15 @@ static void vxlan_cleanup(struct timer_list *t)
{
struct vxlan_dev *vxlan = timer_container_of(vxlan, t, age_timer);
unsigned long next_timer = jiffies + FDB_AGE_INTERVAL;
+ const struct vxlan_config *cfg;
struct vxlan_fdb *f;
if (!netif_running(vxlan->dev))
return;
rcu_read_lock();
+ cfg = rcu_dereference(vxlan->cfg);
+
hlist_for_each_entry_rcu(f, &vxlan->fdb_list, fdb_node) {
unsigned long timeout;
@@ -2891,7 +2945,7 @@ static void vxlan_cleanup(struct timer_list *t)
if (f->flags & NTF_EXT_LEARNED)
continue;
- timeout = READ_ONCE(f->updated) + vxlan->cfg.age_interval * HZ;
+ timeout = READ_ONCE(f->updated) + cfg->age_interval * HZ;
if (time_before_eq(timeout, jiffies)) {
spin_lock(&vxlan->hash_lock);
if (!hlist_unhashed(&f->fdb_node)) {
@@ -2923,10 +2977,14 @@ static void vxlan_vs_del_dev(struct vxlan_dev *vxlan)
static void vxlan_vs_add_dev(struct vxlan_sock *vs, struct vxlan_dev *vxlan,
struct vxlan_dev_node *node)
{
- __be32 vni = vxlan->default_dst.remote_vni;
+ const struct vxlan_config *cfg;
+ __be32 vni;
ASSERT_RTNL();
+ cfg = rtnl_dereference(vxlan->cfg);
+ vni = cfg->vni;
+
node->vxlan = vxlan;
hlist_add_head_rcu(&node->hlist, vni_head(vs, vni));
}
@@ -2935,13 +2993,16 @@ static void vxlan_vs_add_dev(struct vxlan_sock *vs, struct vxlan_dev *vxlan,
static int vxlan_init(struct net_device *dev)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
+ const struct vxlan_config *cfg;
int err;
+ cfg = rtnl_dereference(vxlan->cfg);
+
err = rhashtable_init(&vxlan->fdb_hash_tbl, &vxlan_fdb_rht_params);
if (err)
return err;
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER) {
+ if (cfg->flags & VXLAN_F_VNIFILTER) {
err = vxlan_vnigroup_init(vxlan);
if (err)
goto err_rhashtable_destroy;
@@ -2961,7 +3022,7 @@ static int vxlan_init(struct net_device *dev)
err_gro_cells_destroy:
gro_cells_destroy(&vxlan->gro_cells);
err_vnigroup_uninit:
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER)
+ if (cfg->flags & VXLAN_F_VNIFILTER)
vxlan_vnigroup_uninit(vxlan);
err_rhashtable_destroy:
rhashtable_destroy(&vxlan->fdb_hash_tbl);
@@ -2971,10 +3032,13 @@ static int vxlan_init(struct net_device *dev)
static void vxlan_uninit(struct net_device *dev)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
+ const struct vxlan_config *cfg;
+
+ cfg = rtnl_dereference(vxlan->cfg);
vxlan_mdb_fini(vxlan);
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER)
+ if (cfg->flags & VXLAN_F_VNIFILTER)
vxlan_vnigroup_uninit(vxlan);
gro_cells_destroy(&vxlan->gro_cells);
@@ -2986,6 +3050,7 @@ static void vxlan_uninit(struct net_device *dev)
static int vxlan_open(struct net_device *dev)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
+ const struct vxlan_config *cfg;
int ret;
ret = vxlan_sock_add(vxlan);
@@ -2998,7 +3063,8 @@ static int vxlan_open(struct net_device *dev)
return ret;
}
- if (vxlan->cfg.age_interval)
+ cfg = rtnl_dereference(vxlan->cfg);
+ if (cfg->age_interval)
mod_timer(&vxlan->age_timer, jiffies + FDB_AGE_INTERVAL);
return ret;
@@ -3020,8 +3086,10 @@ struct vxlan_fdb_flush_desc {
static bool vxlan_fdb_is_default_entry(const struct vxlan_fdb *f,
const struct vxlan_dev *vxlan)
{
+ const struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan->cfg);
+
return is_zero_ether_addr(f->key.eth_addr) &&
- f->key.vni == vxlan->cfg.vni;
+ f->key.vni == cfg->vni;
}
static bool vxlan_fdb_nhid_matches(const struct vxlan_fdb *f, u32 nhid)
@@ -3238,15 +3306,18 @@ static void vxlan_set_multicast_list(struct net_device *dev)
static int vxlan_change_mtu(struct net_device *dev, int new_mtu)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
- struct vxlan_rdst *dst = &vxlan->default_dst;
- struct net_device *lowerdev = __dev_get_by_index(vxlan->net,
- dst->remote_ifindex);
+ const struct vxlan_config *cfg;
+ struct net_device *lowerdev;
+
+ cfg = rtnl_dereference(vxlan->cfg);
+
+ lowerdev = __dev_get_by_index(vxlan->net, cfg->remote_ifindex);
/* This check is different than dev->max_mtu, because it looks at
* the lowerdev->mtu, rather than the static dev->max_mtu
*/
if (lowerdev) {
- int max_mtu = lowerdev->mtu - vxlan_headroom(vxlan->cfg.flags);
+ int max_mtu = lowerdev->mtu - vxlan_headroom(cfg->flags);
if (new_mtu > max_mtu)
return -EINVAL;
}
@@ -3259,11 +3330,14 @@ static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
struct ip_tunnel_info *info = skb_tunnel_info(skb);
+ const struct vxlan_config *cfg;
__be16 sport, dport;
- sport = udp_flow_src_port(dev_net(dev), skb, vxlan->cfg.port_min,
- vxlan->cfg.port_max, true);
- dport = info->key.tp_dst ? : vxlan->cfg.dst_port;
+ cfg = rcu_dereference(vxlan->cfg);
+
+ sport = udp_flow_src_port(dev_net(dev), skb, cfg->port_min,
+ cfg->port_max, true);
+ dport = info->key.tp_dst ? : cfg->dst_port;
if (ip_tunnel_info_af(info) == AF_INET) {
struct vxlan_sock *sock4 = rcu_dereference(vxlan->vn4_sock);
@@ -3373,6 +3447,15 @@ static void vxlan_offload_rx_ports(struct net_device *dev, bool push)
}
}
+static void vxlan_free_dev(struct net_device *dev)
+{
+ struct vxlan_dev *vxlan = netdev_priv(dev);
+ struct vxlan_config *cfg = rcu_dereference_protected(vxlan->cfg, 1);
+
+ RCU_INIT_POINTER(vxlan->cfg, NULL);
+ kfree(cfg);
+}
+
/* Initialize the device structure. */
static void vxlan_setup(struct net_device *dev)
{
@@ -3381,6 +3464,8 @@ static void vxlan_setup(struct net_device *dev)
eth_hw_addr_random(dev);
ether_setup(dev);
+ dev->priv_destructor = vxlan_free_dev;
+
dev->needs_free_netdev = true;
SET_NETDEV_DEVTYPE(dev, &vxlan_type);
@@ -3555,9 +3640,11 @@ static int vxlan_get_link_ksettings(struct net_device *dev,
struct ethtool_link_ksettings *cmd)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
- struct vxlan_rdst *dst = &vxlan->default_dst;
- struct net_device *lowerdev = __dev_get_by_index(vxlan->net,
- dst->remote_ifindex);
+ const struct vxlan_config *cfg;
+ struct net_device *lowerdev;
+
+ cfg = rtnl_dereference(vxlan->cfg);
+ lowerdev = __dev_get_by_index(vxlan->net, cfg->remote_ifindex);
if (!lowerdev) {
cmd->base.duplex = DUPLEX_UNKNOWN;
@@ -3663,21 +3750,22 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, bool ipv6,
static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)
{
- bool metadata = vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA;
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
+ bool metadata = cfg->flags & VXLAN_F_COLLECT_METADATA;
struct vxlan_sock *vs = NULL;
struct vxlan_dev_node *node;
int l3mdev_index = 0;
ASSERT_RTNL();
- if (vxlan->cfg.remote_ifindex)
+ if (cfg->remote_ifindex)
l3mdev_index = l3mdev_master_upper_ifindex_by_index(
- vxlan->net, vxlan->cfg.remote_ifindex);
+ vxlan->net, cfg->remote_ifindex);
- if (!vxlan->cfg.no_share) {
+ if (!cfg->no_share) {
rcu_read_lock();
vs = vxlan_find_sock(vxlan->net, ipv6 ? AF_INET6 : AF_INET,
- vxlan->cfg.dst_port, vxlan->cfg.flags,
+ cfg->dst_port, cfg->flags,
l3mdev_index);
if (vs && !refcount_inc_not_zero(&vs->refcnt)) {
rcu_read_unlock();
@@ -3687,7 +3775,7 @@ static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)
}
if (!vs)
vs = vxlan_socket_create(vxlan->net, ipv6,
- vxlan->cfg.dst_port, vxlan->cfg.flags,
+ cfg->dst_port, cfg->flags,
l3mdev_index);
if (IS_ERR(vs))
return PTR_ERR(vs);
@@ -3702,7 +3790,7 @@ static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)
node = &vxlan->hlist4;
}
- if (metadata && (vxlan->cfg.flags & VXLAN_F_VNIFILTER))
+ if (metadata && (cfg->flags & VXLAN_F_VNIFILTER))
vxlan_vs_add_vnigrp(vxlan, vs, ipv6);
else
vxlan_vs_add_dev(vs, vxlan, node);
@@ -3712,11 +3800,14 @@ static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)
static int vxlan_sock_add(struct vxlan_dev *vxlan)
{
- bool metadata = vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA;
- bool ipv6 = vxlan->cfg.flags & VXLAN_F_IPV6 || metadata;
- bool ipv4 = !ipv6 || metadata;
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
+ bool metadata, ipv6, ipv4;
int ret = 0;
+ metadata = cfg->flags & VXLAN_F_COLLECT_METADATA;
+ ipv6 = (cfg->flags & VXLAN_F_IPV6) || metadata;
+ ipv4 = !ipv6 || metadata;
+
RCU_INIT_POINTER(vxlan->vn4_sock, NULL);
#if IS_ENABLED(CONFIG_IPV6)
RCU_INIT_POINTER(vxlan->vn6_sock, NULL);
@@ -3734,28 +3825,33 @@ static int vxlan_sock_add(struct vxlan_dev *vxlan)
}
int vxlan_vni_in_use(struct net *src_net, struct vxlan_dev *vxlan,
- struct vxlan_config *conf, __be32 vni)
+ const struct vxlan_config *conf, __be32 vni)
{
struct vxlan_net *vn = net_generic(src_net, vxlan_net_id);
struct vxlan_dev *tmp;
list_for_each_entry(tmp, &vn->vxlan_list, next) {
+ const struct vxlan_config *tmp_cfg;
+
if (tmp == vxlan)
continue;
- if (tmp->cfg.flags & VXLAN_F_VNIFILTER) {
+
+ tmp_cfg = rtnl_dereference(tmp->cfg);
+
+ if (tmp_cfg->flags & VXLAN_F_VNIFILTER) {
if (!vxlan_vnifilter_lookup(tmp, vni))
continue;
- } else if (tmp->cfg.vni != vni) {
+ } else if (tmp_cfg->vni != vni) {
continue;
}
- if (tmp->cfg.dst_port != conf->dst_port)
+ if (tmp_cfg->dst_port != conf->dst_port)
continue;
- if ((tmp->cfg.flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)) !=
+ if ((tmp_cfg->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)) !=
(conf->flags & (VXLAN_F_RCV_FLAGS | VXLAN_F_IPV6)))
continue;
if ((conf->flags & VXLAN_F_IPV6_LINKLOCAL) &&
- tmp->cfg.remote_ifindex != conf->remote_ifindex)
+ tmp_cfg->remote_ifindex != conf->remote_ifindex)
continue;
return -EEXIST;
@@ -3886,6 +3982,13 @@ static int vxlan_config_validate(struct net *src_net, struct vxlan_config *conf,
return -EINVAL;
}
+ if ((conf->flags & VXLAN_F_VNIFILTER) && old &&
+ vxlan_vnifilter_has_multicast(old)) {
+ NL_SET_ERR_MSG(extack,
+ "Local interface required for multicast remote group");
+ return -EINVAL;
+ }
+
#if IS_ENABLED(CONFIG_IPV6)
if (conf->flags & VXLAN_F_IPV6_LINKLOCAL) {
NL_SET_ERR_MSG(extack,
@@ -3917,16 +4020,16 @@ static int vxlan_config_validate(struct net *src_net, struct vxlan_config *conf,
}
static void vxlan_config_apply(struct net_device *dev,
- struct vxlan_config *conf,
+ struct vxlan_config *new_cfg,
struct net_device *lowerdev,
struct net *src_net,
- bool changelink)
+ bool changelink, bool lowerdev_changed)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
- struct vxlan_rdst *dst = &vxlan->default_dst;
unsigned short needed_headroom = ETH_HLEN;
+ struct vxlan_config *old_cfg;
int max_mtu = ETH_MAX_MTU;
- u32 flags = conf->flags;
+ u32 flags = new_cfg->flags;
if (!changelink) {
if (flags & VXLAN_F_GPE)
@@ -3934,19 +4037,14 @@ static void vxlan_config_apply(struct net_device *dev,
else
vxlan_ether_setup(dev);
- if (conf->mtu)
- dev->mtu = conf->mtu;
+ if (new_cfg->mtu)
+ WRITE_ONCE(dev->mtu, new_cfg->mtu);
vxlan->net = src_net;
}
- dst->remote_vni = conf->vni;
-
- memcpy(&dst->remote_ip, &conf->remote_ip, sizeof(conf->remote_ip));
-
+ dev->needed_tailroom = 0;
if (lowerdev) {
- dst->remote_ifindex = conf->remote_ifindex;
-
netif_inherit_tso_max(dev, lowerdev);
needed_headroom = lowerdev->hard_header_len;
@@ -3954,23 +4052,27 @@ static void vxlan_config_apply(struct net_device *dev,
dev->needed_tailroom = lowerdev->needed_tailroom;
- max_mtu = lowerdev->mtu - vxlan_headroom(flags);
+ max_mtu = READ_ONCE(lowerdev->mtu) - vxlan_headroom(flags);
if (max_mtu < ETH_MIN_MTU)
max_mtu = ETH_MIN_MTU;
- if (!changelink && !conf->mtu)
- dev->mtu = max_mtu;
+ if (!changelink && !new_cfg->mtu)
+ WRITE_ONCE(dev->mtu, max_mtu);
}
- if (dev->mtu > max_mtu)
- dev->mtu = max_mtu;
+ /* A changelink leaving the lower device alone must not shrink the mtu */
+ if (lowerdev_changed && READ_ONCE(dev->mtu) > max_mtu)
+ WRITE_ONCE(dev->mtu, max_mtu);
if (flags & VXLAN_F_COLLECT_METADATA)
flags |= VXLAN_F_IPV6;
needed_headroom += vxlan_headroom(flags);
dev->needed_headroom = needed_headroom;
- memcpy(&vxlan->cfg, conf, sizeof(*conf));
+ old_cfg = rtnl_dereference(vxlan->cfg);
+ rcu_assign_pointer(vxlan->cfg, new_cfg);
+ if (old_cfg)
+ kfree_rcu(old_cfg, rcu);
}
static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,
@@ -3979,13 +4081,18 @@ static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,
{
struct vxlan_dev *vxlan = netdev_priv(dev);
struct net_device *lowerdev;
+ struct vxlan_config *new_cfg;
int ret;
ret = vxlan_config_validate(src_net, conf, &lowerdev, vxlan, extack);
if (ret)
return ret;
- vxlan_config_apply(dev, conf, lowerdev, src_net, false);
+ new_cfg = kmemdup(conf, sizeof(*conf), GFP_KERNEL);
+ if (!new_cfg)
+ return -ENOMEM;
+
+ vxlan_config_apply(dev, new_cfg, lowerdev, src_net, false, true);
return 0;
}
@@ -3997,22 +4104,25 @@ static int vxlan_dev_create(struct net *net, struct net_device *dev,
struct vxlan_net *vn = net_generic(net, vxlan_net_id);
struct vxlan_dev *vxlan = netdev_priv(dev);
struct net_device *remote_dev = NULL;
- struct vxlan_rdst *dst;
+ const struct vxlan_config *cfg;
int err;
- dst = &vxlan->default_dst;
err = vxlan_dev_configure(net, dev, conf, extack);
if (err)
return err;
+ cfg = rtnl_dereference(vxlan->cfg);
+
dev->ethtool_ops = &vxlan_ethtool_ops;
err = register_netdevice(dev);
- if (err)
+ if (err) {
+ vxlan_free_dev(dev);
return err;
+ }
- if (dst->remote_ifindex) {
- remote_dev = __dev_get_by_index(net, dst->remote_ifindex);
+ if (cfg->remote_ifindex) {
+ remote_dev = __dev_get_by_index(net, cfg->remote_ifindex);
if (!remote_dev) {
err = -ENODEV;
goto unregister;
@@ -4022,7 +4132,7 @@ static int vxlan_dev_create(struct net *net, struct net_device *dev,
if (err)
goto unregister;
- dst->remote_dev = remote_dev;
+ vxlan->lowerdev = remote_dev;
}
err = rtnl_configure_link(dev, NULL, 0, NULL);
@@ -4030,16 +4140,18 @@ static int vxlan_dev_create(struct net *net, struct net_device *dev,
goto unlink;
/* create an fdb entry for a valid default destination */
- if (!vxlan_addr_any(&dst->remote_ip)) {
+ if (!vxlan_addr_any(&cfg->remote_ip)) {
+ union vxlan_addr rip = cfg->remote_ip;
+
spin_lock_bh(&vxlan->hash_lock);
err = vxlan_fdb_update(vxlan, all_zeros_mac,
- &dst->remote_ip,
+ &rip,
NUD_REACHABLE | NUD_PERMANENT,
NLM_F_EXCL | NLM_F_CREATE,
- vxlan->cfg.dst_port,
- dst->remote_vni,
- dst->remote_vni,
- dst->remote_ifindex,
+ cfg->dst_port,
+ cfg->vni,
+ cfg->vni,
+ cfg->remote_ifindex,
NTF_SELF, 0, true, extack);
spin_unlock_bh(&vxlan->hash_lock);
if (err)
@@ -4100,8 +4212,12 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],
memset(conf, 0, sizeof(*conf));
/* if changelink operation, start with old existing cfg */
- if (changelink)
- memcpy(conf, &vxlan->cfg, sizeof(*conf));
+ if (changelink) {
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
+
+ if (cfg)
+ memcpy(conf, cfg, sizeof(*conf));
+ }
if (data[IFLA_VXLAN_ID]) {
__be32 vni = cpu_to_be32(nla_get_u32(data[IFLA_VXLAN_ID]));
@@ -4447,17 +4563,19 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
struct nlattr *data[],
struct netlink_ext_ack *extack)
{
+ bool lowerdev_changed, rem_ip_changed, change_igmp;
struct vxlan_dev *vxlan = netdev_priv(dev);
- bool rem_ip_changed, change_igmp;
+ const struct vxlan_config *cfg;
+ struct vxlan_config *new_cfg;
struct net_device *lowerdev;
struct vxlan_config conf;
- struct vxlan_rdst *dst;
int err;
+ cfg = rtnl_dereference(vxlan->cfg);
+
if (!rtnl_dev_link_net_capable(dev, vxlan->net))
return -EPERM;
- dst = &vxlan->default_dst;
err = vxlan_nl2conf(tb, data, dev, &conf, true, extack);
if (err)
return err;
@@ -4467,75 +4585,103 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
if (err)
return err;
- if (dst->remote_dev == lowerdev)
- lowerdev = NULL;
+ new_cfg = kmemdup(&conf, sizeof(conf), GFP_KERNEL);
+ if (!new_cfg)
+ return -ENOMEM;
- err = netdev_adjacent_change_prepare(dst->remote_dev, lowerdev, dev,
- extack);
- if (err)
- return err;
+ lowerdev_changed = vxlan->lowerdev != lowerdev;
+ if (lowerdev_changed) {
+ err = netdev_adjacent_change_prepare(vxlan->lowerdev, lowerdev,
+ dev, extack);
+ if (err) {
+ kfree(new_cfg);
+ return err;
+ }
+ }
- rem_ip_changed = !vxlan_addr_equal(&conf.remote_ip, &dst->remote_ip);
+ rem_ip_changed = !vxlan_addr_equal(&conf.remote_ip, &cfg->remote_ip);
change_igmp = vxlan->dev->flags & IFF_UP &&
(rem_ip_changed ||
- dst->remote_ifindex != conf.remote_ifindex);
+ cfg->remote_ifindex != conf.remote_ifindex);
/* handle default dst entry */
- if (rem_ip_changed) {
+ if (rem_ip_changed || cfg->remote_ifindex != conf.remote_ifindex) {
spin_lock_bh(&vxlan->hash_lock);
if (!vxlan_addr_any(&conf.remote_ip)) {
err = vxlan_fdb_update(vxlan, all_zeros_mac,
&conf.remote_ip,
NUD_REACHABLE | NUD_PERMANENT,
NLM_F_APPEND | NLM_F_CREATE,
- vxlan->cfg.dst_port,
+ cfg->dst_port,
conf.vni, conf.vni,
conf.remote_ifindex,
NTF_SELF, 0, true, extack);
if (err) {
spin_unlock_bh(&vxlan->hash_lock);
- netdev_adjacent_change_abort(dst->remote_dev,
- lowerdev, dev);
+ if (lowerdev_changed)
+ netdev_adjacent_change_abort(vxlan->lowerdev,
+ lowerdev, dev);
+ kfree(new_cfg);
return err;
}
}
- if (!vxlan_addr_any(&dst->remote_ip))
+ if (!vxlan_addr_any(&cfg->remote_ip))
__vxlan_fdb_delete(vxlan, all_zeros_mac,
- dst->remote_ip,
- vxlan->cfg.dst_port,
- dst->remote_vni,
- dst->remote_vni,
- dst->remote_ifindex,
+ cfg->remote_ip,
+ cfg->dst_port,
+ cfg->vni,
+ cfg->vni,
+ cfg->remote_ifindex,
true);
spin_unlock_bh(&vxlan->hash_lock);
- /* If vni filtering device, also update fdb entries of
- * all vnis that were using default remote ip
+ /* If vni filtering device, also update default fdb entries of
+ * all vnis
*/
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER) {
- err = vxlan_vnilist_update_group(vxlan, &dst->remote_ip,
- &conf.remote_ip, extack);
+ if (cfg->flags & VXLAN_F_VNIFILTER) {
+ err = vxlan_vnilist_update_group(vxlan, &cfg->remote_ip,
+ &conf.remote_ip,
+ cfg->remote_ifindex,
+ conf.remote_ifindex,
+ extack);
if (err) {
- netdev_adjacent_change_abort(dst->remote_dev,
- lowerdev, dev);
+ vxlan_update_default_fdb_entry(vxlan, conf.vni,
+ &conf.remote_ip,
+ &cfg->remote_ip,
+ conf.remote_ifindex,
+ cfg->remote_ifindex,
+ NULL);
+ if (lowerdev_changed)
+ netdev_adjacent_change_abort(vxlan->lowerdev,
+ lowerdev, dev);
+ kfree(new_cfg);
return err;
}
}
}
- if (change_igmp && vxlan_addr_multicast(&dst->remote_ip))
+ if (change_igmp &&
+ (vxlan_addr_multicast(&cfg->remote_ip) ||
+ (cfg->flags & VXLAN_F_VNIFILTER)))
err = vxlan_multicast_leave(vxlan);
- if (netif_running(dev) && conf.age_interval != vxlan->cfg.age_interval)
+ if (netif_running(dev) && conf.age_interval != cfg->age_interval)
mod_timer(&vxlan->age_timer, jiffies);
- netdev_adjacent_change_commit(dst->remote_dev, lowerdev, dev);
- if (lowerdev && lowerdev != dst->remote_dev)
- dst->remote_dev = lowerdev;
- vxlan_config_apply(dev, &conf, lowerdev, vxlan->net, true);
+ if (lowerdev_changed) {
+ if (lowerdev)
+ netdev_adjacent_change_commit(vxlan->lowerdev, lowerdev,
+ dev);
+ else
+ netdev_upper_dev_unlink(vxlan->lowerdev, dev);
+ vxlan->lowerdev = lowerdev;
+ }
+ vxlan_config_apply(dev, new_cfg, lowerdev, vxlan->net, true,
+ lowerdev_changed);
if (!err && change_igmp &&
- vxlan_addr_multicast(&dst->remote_ip))
+ (vxlan_addr_multicast(&new_cfg->remote_ip) ||
+ (new_cfg->flags & VXLAN_F_VNIFILTER)))
err = vxlan_multicast_join(vxlan);
return err;
@@ -4550,8 +4696,8 @@ static void vxlan_dellink(struct net_device *dev, struct list_head *head)
list_del(&vxlan->next);
unregister_netdevice_queue(dev, head);
- if (vxlan->default_dst.remote_dev)
- netdev_upper_dev_unlink(vxlan->default_dst.remote_dev, dev);
+ if (vxlan->lowerdev)
+ netdev_upper_dev_unlink(vxlan->lowerdev, dev);
}
static size_t vxlan_get_size(const struct net_device *dev)
@@ -4595,110 +4741,114 @@ static size_t vxlan_get_size(const struct net_device *dev)
static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev)
{
const struct vxlan_dev *vxlan = netdev_priv(dev);
- const struct vxlan_rdst *dst = &vxlan->default_dst;
- struct ifla_vxlan_port_range ports = {
- .low = htons(vxlan->cfg.port_min),
- .high = htons(vxlan->cfg.port_max),
- };
+ struct ifla_vxlan_port_range ports;
+ const struct vxlan_config *cfg;
+
+ rcu_read_lock();
+ cfg = rcu_dereference(vxlan->cfg);
- if (nla_put_u32(skb, IFLA_VXLAN_ID, be32_to_cpu(dst->remote_vni)))
+ if (nla_put_u32(skb, IFLA_VXLAN_ID, be32_to_cpu(cfg->vni)))
goto nla_put_failure;
- if (!vxlan_addr_any(&dst->remote_ip)) {
- if (dst->remote_ip.sa.sa_family == AF_INET) {
+ if (!vxlan_addr_any(&cfg->remote_ip)) {
+ if (cfg->remote_ip.sa.sa_family == AF_INET) {
if (nla_put_in_addr(skb, IFLA_VXLAN_GROUP,
- dst->remote_ip.sin.sin_addr.s_addr))
+ cfg->remote_ip.sin.sin_addr.s_addr))
goto nla_put_failure;
#if IS_ENABLED(CONFIG_IPV6)
} else {
if (nla_put_in6_addr(skb, IFLA_VXLAN_GROUP6,
- &dst->remote_ip.sin6.sin6_addr))
+ &cfg->remote_ip.sin6.sin6_addr))
goto nla_put_failure;
#endif
}
}
- if (dst->remote_ifindex && nla_put_u32(skb, IFLA_VXLAN_LINK, dst->remote_ifindex))
+ if (cfg->remote_ifindex && nla_put_u32(skb, IFLA_VXLAN_LINK, cfg->remote_ifindex))
goto nla_put_failure;
- if (!vxlan_addr_any(&vxlan->cfg.saddr)) {
- if (vxlan->cfg.saddr.sa.sa_family == AF_INET) {
+ if (!vxlan_addr_any(&cfg->saddr)) {
+ if (cfg->saddr.sa.sa_family == AF_INET) {
if (nla_put_in_addr(skb, IFLA_VXLAN_LOCAL,
- vxlan->cfg.saddr.sin.sin_addr.s_addr))
+ cfg->saddr.sin.sin_addr.s_addr))
goto nla_put_failure;
#if IS_ENABLED(CONFIG_IPV6)
} else {
if (nla_put_in6_addr(skb, IFLA_VXLAN_LOCAL6,
- &vxlan->cfg.saddr.sin6.sin6_addr))
+ &cfg->saddr.sin6.sin6_addr))
goto nla_put_failure;
#endif
}
}
- if (nla_put_u8(skb, IFLA_VXLAN_TTL, vxlan->cfg.ttl) ||
+ if (nla_put_u8(skb, IFLA_VXLAN_TTL, cfg->ttl) ||
nla_put_u8(skb, IFLA_VXLAN_TTL_INHERIT,
- !!(vxlan->cfg.flags & VXLAN_F_TTL_INHERIT)) ||
- nla_put_u8(skb, IFLA_VXLAN_TOS, vxlan->cfg.tos) ||
- nla_put_u8(skb, IFLA_VXLAN_DF, vxlan->cfg.df) ||
- nla_put_be32(skb, IFLA_VXLAN_LABEL, vxlan->cfg.label) ||
- nla_put_u32(skb, IFLA_VXLAN_LABEL_POLICY, vxlan->cfg.label_policy) ||
+ !!(cfg->flags & VXLAN_F_TTL_INHERIT)) ||
+ nla_put_u8(skb, IFLA_VXLAN_TOS, cfg->tos) ||
+ nla_put_u8(skb, IFLA_VXLAN_DF, cfg->df) ||
+ nla_put_be32(skb, IFLA_VXLAN_LABEL, cfg->label) ||
+ nla_put_u32(skb, IFLA_VXLAN_LABEL_POLICY, cfg->label_policy) ||
nla_put_u8(skb, IFLA_VXLAN_LEARNING,
- !!(vxlan->cfg.flags & VXLAN_F_LEARN)) ||
+ !!(cfg->flags & VXLAN_F_LEARN)) ||
nla_put_u8(skb, IFLA_VXLAN_PROXY,
- !!(vxlan->cfg.flags & VXLAN_F_PROXY)) ||
+ !!(cfg->flags & VXLAN_F_PROXY)) ||
nla_put_u8(skb, IFLA_VXLAN_RSC,
- !!(vxlan->cfg.flags & VXLAN_F_RSC)) ||
+ !!(cfg->flags & VXLAN_F_RSC)) ||
nla_put_u8(skb, IFLA_VXLAN_L2MISS,
- !!(vxlan->cfg.flags & VXLAN_F_L2MISS)) ||
+ !!(cfg->flags & VXLAN_F_L2MISS)) ||
nla_put_u8(skb, IFLA_VXLAN_L3MISS,
- !!(vxlan->cfg.flags & VXLAN_F_L3MISS)) ||
+ !!(cfg->flags & VXLAN_F_L3MISS)) ||
nla_put_u8(skb, IFLA_VXLAN_COLLECT_METADATA,
- !!(vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA)) ||
- nla_put_u32(skb, IFLA_VXLAN_AGEING, vxlan->cfg.age_interval) ||
- nla_put_u32(skb, IFLA_VXLAN_LIMIT, vxlan->cfg.addrmax) ||
- nla_put_be16(skb, IFLA_VXLAN_PORT, vxlan->cfg.dst_port) ||
+ !!(cfg->flags & VXLAN_F_COLLECT_METADATA)) ||
+ nla_put_u32(skb, IFLA_VXLAN_AGEING, cfg->age_interval) ||
+ nla_put_u32(skb, IFLA_VXLAN_LIMIT, cfg->addrmax) ||
+ nla_put_be16(skb, IFLA_VXLAN_PORT, cfg->dst_port) ||
nla_put_u8(skb, IFLA_VXLAN_UDP_CSUM,
- !(vxlan->cfg.flags & VXLAN_F_UDP_ZERO_CSUM_TX)) ||
+ !(cfg->flags & VXLAN_F_UDP_ZERO_CSUM_TX)) ||
nla_put_u8(skb, IFLA_VXLAN_UDP_ZERO_CSUM6_TX,
- !!(vxlan->cfg.flags & VXLAN_F_UDP_ZERO_CSUM6_TX)) ||
+ !!(cfg->flags & VXLAN_F_UDP_ZERO_CSUM6_TX)) ||
nla_put_u8(skb, IFLA_VXLAN_UDP_ZERO_CSUM6_RX,
- !!(vxlan->cfg.flags & VXLAN_F_UDP_ZERO_CSUM6_RX)) ||
+ !!(cfg->flags & VXLAN_F_UDP_ZERO_CSUM6_RX)) ||
nla_put_u8(skb, IFLA_VXLAN_REMCSUM_TX,
- !!(vxlan->cfg.flags & VXLAN_F_REMCSUM_TX)) ||
+ !!(cfg->flags & VXLAN_F_REMCSUM_TX)) ||
nla_put_u8(skb, IFLA_VXLAN_REMCSUM_RX,
- !!(vxlan->cfg.flags & VXLAN_F_REMCSUM_RX)) ||
+ !!(cfg->flags & VXLAN_F_REMCSUM_RX)) ||
nla_put_u8(skb, IFLA_VXLAN_LOCALBYPASS,
- !!(vxlan->cfg.flags & VXLAN_F_LOCALBYPASS)))
+ !!(cfg->flags & VXLAN_F_LOCALBYPASS)))
goto nla_put_failure;
+ ports.low = htons(cfg->port_min);
+ ports.high = htons(cfg->port_max);
if (nla_put(skb, IFLA_VXLAN_PORT_RANGE, sizeof(ports), &ports))
goto nla_put_failure;
- if (vxlan->cfg.flags & VXLAN_F_GBP &&
+ if (cfg->flags & VXLAN_F_GBP &&
nla_put_flag(skb, IFLA_VXLAN_GBP))
goto nla_put_failure;
- if (vxlan->cfg.flags & VXLAN_F_GPE &&
+ if (cfg->flags & VXLAN_F_GPE &&
nla_put_flag(skb, IFLA_VXLAN_GPE))
goto nla_put_failure;
- if (vxlan->cfg.flags & VXLAN_F_REMCSUM_NOPARTIAL &&
+ if (cfg->flags & VXLAN_F_REMCSUM_NOPARTIAL &&
nla_put_flag(skb, IFLA_VXLAN_REMCSUM_NOPARTIAL))
goto nla_put_failure;
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER &&
+ if (cfg->flags & VXLAN_F_VNIFILTER &&
nla_put_u8(skb, IFLA_VXLAN_VNIFILTER,
- !!(vxlan->cfg.flags & VXLAN_F_VNIFILTER)))
+ !!(cfg->flags & VXLAN_F_VNIFILTER)))
goto nla_put_failure;
if (nla_put(skb, IFLA_VXLAN_RESERVED_BITS,
- sizeof(vxlan->cfg.reserved_bits),
- &vxlan->cfg.reserved_bits))
+ sizeof(cfg->reserved_bits),
+ &cfg->reserved_bits))
goto nla_put_failure;
+ rcu_read_unlock();
return 0;
nla_put_failure:
+ rcu_read_unlock();
return -EMSGSIZE;
}
@@ -4731,7 +4881,7 @@ static void vxlan_handle_lowerdev_unregister(struct vxlan_net *vn,
LIST_HEAD(list_kill);
list_for_each_entry_safe(vxlan, next, &vn->vxlan_list, next) {
- struct vxlan_rdst *dst = &vxlan->default_dst;
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
/* In case we created vxlan device with carrier
* and we loose the carrier due to module unload
@@ -4739,7 +4889,7 @@ static void vxlan_handle_lowerdev_unregister(struct vxlan_net *vn,
* cases, it's not necessary and remote_ifindex
* is 0 here, so no matches.
*/
- if (dst->remote_ifindex == dev->ifindex)
+ if (cfg->remote_ifindex == dev->ifindex)
vxlan_dellink(vxlan->dev, &list_kill);
}
@@ -4752,6 +4902,10 @@ static int vxlan_netdevice_event(struct notifier_block *unused,
struct net_device *dev = netdev_notifier_info_to_dev(ptr);
struct vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id);
+ if ((event == NETDEV_REGISTER || event == NETDEV_UNREGISTER) &&
+ netif_is_vxlan(dev))
+ vxlan_vnifilter_seq_inc(dev_net(dev));
+
if (event == NETDEV_UNREGISTER)
vxlan_handle_lowerdev_unregister(vn, dev);
else if (event == NETDEV_UDP_TUNNEL_PUSH_INFO)
diff --git a/drivers/net/vxlan/vxlan_mdb.c b/drivers/net/vxlan/vxlan_mdb.c
index 841f42ffecb9a..c1a0551990555 100644
--- a/drivers/net/vxlan/vxlan_mdb.c
+++ b/drivers/net/vxlan/vxlan_mdb.c
@@ -165,6 +165,7 @@ static int vxlan_mdb_entry_info_fill(const struct vxlan_dev *vxlan,
const struct vxlan_mdb_entry *mdb_entry,
const struct vxlan_mdb_remote *remote)
{
+ const struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan->cfg);
struct vxlan_rdst *rd = rtnl_dereference(remote->rd);
struct br_mdb_entry e;
struct nlattr *nest;
@@ -189,12 +190,12 @@ static int vxlan_mdb_entry_info_fill(const struct vxlan_dev *vxlan,
vxlan_nla_put_addr(skb, MDBA_MDB_EATTR_DST, &rd->remote_ip))
goto nest_err;
- if (rd->remote_port && rd->remote_port != vxlan->cfg.dst_port &&
+ if (rd->remote_port && rd->remote_port != cfg->dst_port &&
nla_put_u16(skb, MDBA_MDB_EATTR_DST_PORT,
be16_to_cpu(rd->remote_port)))
goto nest_err;
- if (rd->remote_vni != vxlan->default_dst.remote_vni &&
+ if (rd->remote_vni != cfg->vni &&
nla_put_u32(skb, MDBA_MDB_EATTR_VNI, be32_to_cpu(rd->remote_vni)))
goto nest_err;
@@ -202,7 +203,7 @@ static int vxlan_mdb_entry_info_fill(const struct vxlan_dev *vxlan,
nla_put_u32(skb, MDBA_MDB_EATTR_IFINDEX, rd->remote_ifindex))
goto nest_err;
- if ((vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA) &&
+ if ((cfg->flags & VXLAN_F_COLLECT_METADATA) &&
mdb_entry->key.vni && nla_put_u32(skb, MDBA_MDB_EATTR_SRC_VNI,
be32_to_cpu(mdb_entry->key.vni)))
goto nest_err;
@@ -613,16 +614,19 @@ static int vxlan_mdb_config_init(struct vxlan_mdb_config *cfg,
{
struct br_mdb_entry *entry = nla_data(tb[MDBA_SET_ENTRY]);
struct vxlan_dev *vxlan = netdev_priv(dev);
+ const struct vxlan_config *vcfg;
+
+ vcfg = rtnl_dereference(vxlan->cfg);
memset(cfg, 0, sizeof(*cfg));
cfg->vxlan = vxlan;
- cfg->group.vni = vxlan->default_dst.remote_vni;
+ cfg->group.vni = vcfg->vni;
INIT_LIST_HEAD(&cfg->src_list);
cfg->nlflags = nlmsg_flags;
cfg->filter_mode = MCAST_EXCLUDE;
cfg->rt_protocol = RTPROT_STATIC;
- cfg->remote_vni = vxlan->default_dst.remote_vni;
- cfg->remote_port = vxlan->cfg.dst_port;
+ cfg->remote_vni = vcfg->vni;
+ cfg->remote_port = vcfg->dst_port;
if (entry->ifindex != dev->ifindex) {
NL_SET_ERR_MSG_MOD(extack, "Port net device must be the VXLAN net device");
@@ -957,11 +961,12 @@ vxlan_mdb_nlmsg_remote_size(const struct vxlan_dev *vxlan,
const struct vxlan_mdb_entry *mdb_entry,
const struct vxlan_mdb_remote *remote)
{
+ const struct vxlan_config *cfg = rcu_dereference_rtnl(vxlan->cfg);
const struct vxlan_mdb_entry_key *group = &mdb_entry->key;
struct vxlan_rdst *rd = rtnl_dereference(remote->rd);
size_t nlmsg_size;
- /* MDBA_MDB_ENTRY_INFO */
+ /* MDBA_MDB_ENTRY_INFO */
nlmsg_size = nla_total_size(sizeof(struct br_mdb_entry)) +
/* MDBA_MDB_EATTR_TIMER */
nla_total_size(sizeof(u32));
@@ -978,16 +983,16 @@ vxlan_mdb_nlmsg_remote_size(const struct vxlan_dev *vxlan,
/* MDBA_MDB_EATTR_DST */
nlmsg_size += nla_total_size(vxlan_addr_size(&rd->remote_ip));
/* MDBA_MDB_EATTR_DST_PORT */
- if (rd->remote_port && rd->remote_port != vxlan->cfg.dst_port)
+ if (rd->remote_port && rd->remote_port != cfg->dst_port)
nlmsg_size += nla_total_size(sizeof(u16));
/* MDBA_MDB_EATTR_VNI */
- if (rd->remote_vni != vxlan->default_dst.remote_vni)
+ if (rd->remote_vni != cfg->vni)
nlmsg_size += nla_total_size(sizeof(u32));
/* MDBA_MDB_EATTR_IFINDEX */
if (rd->remote_ifindex)
nlmsg_size += nla_total_size(sizeof(u32));
/* MDBA_MDB_EATTR_SRC_VNI */
- if ((vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA) && group->vni)
+ if ((cfg->flags & VXLAN_F_COLLECT_METADATA) && group->vni)
nlmsg_size += nla_total_size(sizeof(u32));
return nlmsg_size;
@@ -1216,7 +1221,7 @@ vxlan_mdb_entry_get(struct vxlan_dev *vxlan,
goto err_free_entry;
if (hlist_is_singular_node(&mdb_entry->mdb_node, &vxlan->mdb_list))
- vxlan->cfg.flags |= VXLAN_F_MDB;
+ set_bit(VXLAN_DEV_F_MDB, &vxlan->flags);
return mdb_entry;
@@ -1233,7 +1238,7 @@ static void vxlan_mdb_entry_put(struct vxlan_dev *vxlan,
return;
if (hlist_is_singular_node(&mdb_entry->mdb_node, &vxlan->mdb_list))
- vxlan->cfg.flags &= ~VXLAN_F_MDB;
+ clear_bit(VXLAN_DEV_F_MDB, &vxlan->flags);
rhashtable_remove_fast(&vxlan->mdb_tbl, &mdb_entry->rhnode,
vxlan_mdb_rht_params);
@@ -1483,11 +1488,13 @@ static int vxlan_mdb_get_parse(struct net_device *dev, struct nlattr *tb[],
{
struct br_mdb_entry *entry = nla_data(tb[MDBA_GET_ENTRY]);
struct nlattr *mdbe_attrs[MDBE_ATTR_MAX + 1];
+ const struct vxlan_config *cfg;
struct vxlan_dev *vxlan = netdev_priv(dev);
int err;
+ cfg = rtnl_dereference(vxlan->cfg);
memset(group, 0, sizeof(*group));
- group->vni = vxlan->default_dst.remote_vni;
+ group->vni = cfg->vni;
if (!tb[MDBA_GET_ENTRY_ATTRS]) {
vxlan_mdb_group_set(group, entry, NULL);
@@ -1621,6 +1628,7 @@ int vxlan_mdb_get(struct net_device *dev, struct nlattr *tb[], u32 portid,
}
struct vxlan_mdb_entry *vxlan_mdb_entry_skb_get(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
struct sk_buff *skb,
__be32 src_vni)
{
@@ -1634,8 +1642,8 @@ struct vxlan_mdb_entry *vxlan_mdb_entry_skb_get(struct vxlan_dev *vxlan,
/* When not in collect metadata mode, 'src_vni' is zero, but MDB
* entries are stored with the VNI of the VXLAN device.
*/
- if (!(vxlan->cfg.flags & VXLAN_F_COLLECT_METADATA))
- src_vni = vxlan->default_dst.remote_vni;
+ if (!(cfg->flags & VXLAN_F_COLLECT_METADATA))
+ src_vni = cfg->vni;
memset(&group, 0, sizeof(group));
group.vni = src_vni;
@@ -1700,6 +1708,7 @@ struct vxlan_mdb_entry *vxlan_mdb_entry_skb_get(struct vxlan_dev *vxlan,
}
netdev_tx_t vxlan_mdb_xmit(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
const struct vxlan_mdb_entry *mdb_entry,
struct sk_buff *skb)
{
@@ -1721,12 +1730,12 @@ netdev_tx_t vxlan_mdb_xmit(struct vxlan_dev *vxlan,
skb1 = skb_clone(skb, GFP_ATOMIC);
if (skb1)
- vxlan_xmit_one(skb1, vxlan->dev, src_vni,
+ vxlan_xmit_one(skb1, vxlan->dev, cfg, src_vni,
rcu_dereference(remote->rd), false);
}
if (fremote)
- vxlan_xmit_one(skb, vxlan->dev, src_vni,
+ vxlan_xmit_one(skb, vxlan->dev, cfg, src_vni,
rcu_dereference(fremote->rd), false);
else
kfree_skb_reason(skb, SKB_DROP_REASON_NO_TX_TARGET);
@@ -1757,7 +1766,7 @@ void vxlan_mdb_fini(struct vxlan_dev *vxlan)
struct vxlan_mdb_flush_desc desc = {};
vxlan_mdb_flush(vxlan, &desc);
- WARN_ON_ONCE(vxlan->cfg.flags & VXLAN_F_MDB);
+ WARN_ON_ONCE(test_bit(VXLAN_DEV_F_MDB, &vxlan->flags));
rhashtable_free_and_destroy(&vxlan->mdb_tbl, vxlan_mdb_check_empty,
NULL);
}
diff --git a/drivers/net/vxlan/vxlan_multicast.c b/drivers/net/vxlan/vxlan_multicast.c
index 3b75b48dc726d..6fcc4a3673436 100644
--- a/drivers/net/vxlan/vxlan_multicast.c
+++ b/drivers/net/vxlan/vxlan_multicast.c
@@ -14,11 +14,12 @@
/* Update multicast group membership when first VNI on
* multicast address is brought up
*/
-int vxlan_igmp_join(struct vxlan_dev *vxlan, union vxlan_addr *rip,
+int vxlan_igmp_join(struct vxlan_dev *vxlan, const union vxlan_addr *rip,
int rifindex)
{
- union vxlan_addr *ip = (rip ? : &vxlan->default_dst.remote_ip);
- int ifindex = (rifindex ? : vxlan->default_dst.remote_ifindex);
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
+ const union vxlan_addr *ip = (rip ? : &cfg->remote_ip);
+ int ifindex = (rifindex ? : cfg->remote_ifindex);
int ret = -EINVAL;
struct sock *sk;
@@ -47,11 +48,12 @@ int vxlan_igmp_join(struct vxlan_dev *vxlan, union vxlan_addr *rip,
return ret;
}
-int vxlan_igmp_leave(struct vxlan_dev *vxlan, union vxlan_addr *rip,
+int vxlan_igmp_leave(struct vxlan_dev *vxlan, const union vxlan_addr *rip,
int rifindex)
{
- union vxlan_addr *ip = (rip ? : &vxlan->default_dst.remote_ip);
- int ifindex = (rifindex ? : vxlan->default_dst.remote_ifindex);
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
+ const union vxlan_addr *ip = (rip ? : &cfg->remote_ip);
+ int ifindex = (rifindex ? : cfg->remote_ifindex);
int ret = -EINVAL;
struct sock *sk;
@@ -80,8 +82,8 @@ int vxlan_igmp_leave(struct vxlan_dev *vxlan, union vxlan_addr *rip,
return ret;
}
-static bool vxlan_group_used_match(union vxlan_addr *ip, int ifindex,
- union vxlan_addr *rip, int rifindex)
+static bool vxlan_group_used_match(const union vxlan_addr *ip, int ifindex,
+ const union vxlan_addr *rip, int rifindex)
{
if (!vxlan_addr_multicast(rip))
return false;
@@ -96,14 +98,16 @@ static bool vxlan_group_used_match(union vxlan_addr *ip, int ifindex,
}
static bool vxlan_group_used_by_vnifilter(struct vxlan_dev *vxlan,
- union vxlan_addr *ip, int ifindex)
+ const struct vxlan_config *cfg,
+ const union vxlan_addr *ip,
+ int ifindex)
{
struct vxlan_vni_group *vg = rtnl_dereference(vxlan->vnigrp);
struct vxlan_vni_node *v, *tmp;
if (vxlan_group_used_match(ip, ifindex,
- &vxlan->default_dst.remote_ip,
- vxlan->default_dst.remote_ifindex))
+ &cfg->remote_ip,
+ cfg->remote_ifindex))
return true;
list_for_each_entry_safe(v, tmp, &vg->vni_list, vlist) {
@@ -112,7 +116,7 @@ static bool vxlan_group_used_by_vnifilter(struct vxlan_dev *vxlan,
if (vxlan_group_used_match(ip, ifindex,
&v->remote_ip,
- vxlan->default_dst.remote_ifindex))
+ cfg->remote_ifindex))
return true;
}
@@ -121,16 +125,17 @@ static bool vxlan_group_used_by_vnifilter(struct vxlan_dev *vxlan,
/* See if multicast group is already in use by other ID */
bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,
- __be32 vni, union vxlan_addr *rip, int rifindex)
+ __be32 vni, const union vxlan_addr *rip, int rifindex)
{
- union vxlan_addr *ip = (rip ? : &dev->default_dst.remote_ip);
- int ifindex = (rifindex ? : dev->default_dst.remote_ifindex);
+ const struct vxlan_config *dev_cfg = rtnl_dereference(dev->cfg);
+ const union vxlan_addr *ip = (rip ? : &dev_cfg->remote_ip);
+ int ifindex = (rifindex ? : dev_cfg->remote_ifindex);
struct vxlan_dev *vxlan;
struct vxlan_sock *sock4;
#if IS_ENABLED(CONFIG_IPV6)
struct vxlan_sock *sock6;
#endif
- unsigned short family = dev->default_dst.remote_ip.sa.sa_family;
+ unsigned short family = dev_cfg->remote_ip.sa.sa_family;
sock4 = rtnl_dereference(dev->vn4_sock);
@@ -147,6 +152,8 @@ bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,
#endif
list_for_each_entry(vxlan, &vn->vxlan_list, next) {
+ const struct vxlan_config *cfg;
+
if (!netif_running(vxlan->dev) || vxlan == dev)
continue;
@@ -158,13 +165,15 @@ bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,
rtnl_dereference(vxlan->vn6_sock) != sock6)
continue;
#endif
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER) {
- if (!vxlan_group_used_by_vnifilter(vxlan, ip, ifindex))
+ cfg = rtnl_dereference(vxlan->cfg);
+
+ if (cfg->flags & VXLAN_F_VNIFILTER) {
+ if (!vxlan_group_used_by_vnifilter(vxlan, cfg, ip, ifindex))
continue;
} else {
if (!vxlan_group_used_match(ip, ifindex,
- &vxlan->default_dst.remote_ip,
- vxlan->default_dst.remote_ifindex))
+ &cfg->remote_ip,
+ cfg->remote_ifindex))
continue;
}
@@ -174,7 +183,8 @@ bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,
return false;
}
-static int vxlan_multicast_join_vnigrp(struct vxlan_dev *vxlan)
+static int vxlan_multicast_join_vnigrp(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg)
{
struct vxlan_vni_group *vg = rtnl_dereference(vxlan->vnigrp);
struct vxlan_vni_node *v, *tmp, *vgood = NULL;
@@ -185,7 +195,7 @@ static int vxlan_multicast_join_vnigrp(struct vxlan_dev *vxlan)
continue;
/* skip if address is same as default address */
if (vxlan_addr_equal(&v->remote_ip,
- &vxlan->default_dst.remote_ip))
+ &cfg->remote_ip))
continue;
ret = vxlan_igmp_join(vxlan, &v->remote_ip, 0);
if (ret == -EADDRINUSE)
@@ -200,7 +210,7 @@ static int vxlan_multicast_join_vnigrp(struct vxlan_dev *vxlan)
if (!vxlan_addr_multicast(&v->remote_ip))
continue;
if (vxlan_addr_equal(&v->remote_ip,
- &vxlan->default_dst.remote_ip))
+ &cfg->remote_ip))
continue;
vxlan_igmp_leave(vxlan, &v->remote_ip, 0);
if (v == vgood)
@@ -233,37 +243,39 @@ static int vxlan_multicast_leave_vnigrp(struct vxlan_dev *vxlan)
int vxlan_multicast_join(struct vxlan_dev *vxlan)
{
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
int ret = 0;
- if (vxlan_addr_multicast(&vxlan->default_dst.remote_ip)) {
- ret = vxlan_igmp_join(vxlan, &vxlan->default_dst.remote_ip,
- vxlan->default_dst.remote_ifindex);
+ if (vxlan_addr_multicast(&cfg->remote_ip)) {
+ ret = vxlan_igmp_join(vxlan, &cfg->remote_ip,
+ cfg->remote_ifindex);
if (ret == -EADDRINUSE)
ret = 0;
if (ret)
return ret;
}
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER)
- return vxlan_multicast_join_vnigrp(vxlan);
+ if (cfg->flags & VXLAN_F_VNIFILTER)
+ return vxlan_multicast_join_vnigrp(vxlan, cfg);
return 0;
}
int vxlan_multicast_leave(struct vxlan_dev *vxlan)
{
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id);
int ret = 0;
- if (vxlan_addr_multicast(&vxlan->default_dst.remote_ip) &&
+ if (vxlan_addr_multicast(&cfg->remote_ip) &&
!vxlan_group_used(vn, vxlan, 0, NULL, 0)) {
- ret = vxlan_igmp_leave(vxlan, &vxlan->default_dst.remote_ip,
- vxlan->default_dst.remote_ifindex);
+ ret = vxlan_igmp_leave(vxlan, &cfg->remote_ip,
+ cfg->remote_ifindex);
if (ret)
return ret;
}
- if (vxlan->cfg.flags & VXLAN_F_VNIFILTER)
+ if (cfg->flags & VXLAN_F_VNIFILTER)
return vxlan_multicast_leave_vnigrp(vxlan);
return 0;
diff --git a/drivers/net/vxlan/vxlan_private.h b/drivers/net/vxlan/vxlan_private.h
index b1eec22163608..f0ee85f83732a 100644
--- a/drivers/net/vxlan/vxlan_private.h
+++ b/drivers/net/vxlan/vxlan_private.h
@@ -22,6 +22,8 @@ struct vxlan_net {
/* sock_list is protected by rtnl lock */
struct hlist_head sock_list[PORT_HASH_SIZE];
struct notifier_block nexthop_notifier_block;
+ /* Generation counter for RTM_GETTUNNEL dumps */
+ atomic_t vnifilter_seq;
};
struct vxlan_fdb_key {
@@ -177,6 +179,13 @@ vxlan_vnifilter_lookup(struct vxlan_dev *vxlan, __be32 vni)
vxlan_vni_rht_params);
}
+static inline void vxlan_vnifilter_seq_inc(const struct net *net)
+{
+ struct vxlan_net *vn = net_generic(net, vxlan_net_id);
+
+ atomic_inc(&vn->vnifilter_seq);
+}
+
/* vxlan_core.c */
int vxlan_fdb_create(struct vxlan_dev *vxlan,
const u8 *mac, union vxlan_addr *ip,
@@ -195,9 +204,10 @@ int vxlan_fdb_update(struct vxlan_dev *vxlan,
__u32 ifindex, __u16 ndm_flags, u32 nhid,
bool swdev_notify, struct netlink_ext_ack *extack);
void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
+ const struct vxlan_config *cfg,
__be32 default_vni, struct vxlan_rdst *rdst, bool did_rsc);
int vxlan_vni_in_use(struct net *src_net, struct vxlan_dev *vxlan,
- struct vxlan_config *conf, __be32 vni);
+ const struct vxlan_config *conf, __be32 vni);
/* vxlan_vnifilter.c */
int vxlan_vnigroup_init(struct vxlan_dev *vxlan);
@@ -205,7 +215,8 @@ void vxlan_vnigroup_uninit(struct vxlan_dev *vxlan);
int vxlan_vnifilter_init(void);
void vxlan_vnifilter_uninit(void);
-void vxlan_vnifilter_count(struct vxlan_dev *vxlan, __be32 vni,
+void vxlan_vnifilter_count(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg, __be32 vni,
struct vxlan_vni_node *vninode,
int type, unsigned int len);
@@ -213,9 +224,16 @@ void vxlan_vs_add_vnigrp(struct vxlan_dev *vxlan,
struct vxlan_sock *vs,
bool ipv6);
void vxlan_vs_del_vnigrp(struct vxlan_dev *vxlan);
+bool vxlan_vnifilter_has_multicast(const struct vxlan_dev *vxlan);
+int vxlan_update_default_fdb_entry(struct vxlan_dev *vxlan, __be32 vni,
+ const union vxlan_addr *old_remote_ip,
+ const union vxlan_addr *remote_ip,
+ u32 old_ifindex, u32 new_ifindex,
+ struct netlink_ext_ack *extack);
int vxlan_vnilist_update_group(struct vxlan_dev *vxlan,
- union vxlan_addr *old_remote_ip,
- union vxlan_addr *new_remote_ip,
+ const union vxlan_addr *old_remote_ip,
+ const union vxlan_addr *new_remote_ip,
+ u32 old_ifindex, u32 new_ifindex,
struct netlink_ext_ack *extack);
@@ -223,10 +241,10 @@ int vxlan_vnilist_update_group(struct vxlan_dev *vxlan,
int vxlan_multicast_join(struct vxlan_dev *vxlan);
int vxlan_multicast_leave(struct vxlan_dev *vxlan);
bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev,
- __be32 vni, union vxlan_addr *rip, int rifindex);
-int vxlan_igmp_join(struct vxlan_dev *vxlan, union vxlan_addr *rip,
+ __be32 vni, const union vxlan_addr *rip, int rifindex);
+int vxlan_igmp_join(struct vxlan_dev *vxlan, const union vxlan_addr *rip,
int rifindex);
-int vxlan_igmp_leave(struct vxlan_dev *vxlan, union vxlan_addr *rip,
+int vxlan_igmp_leave(struct vxlan_dev *vxlan, const union vxlan_addr *rip,
int rifindex);
/* vxlan_mdb.c */
@@ -241,9 +259,11 @@ int vxlan_mdb_del_bulk(struct net_device *dev, struct nlattr *tb[],
int vxlan_mdb_get(struct net_device *dev, struct nlattr *tb[], u32 portid,
u32 seq, struct netlink_ext_ack *extack);
struct vxlan_mdb_entry *vxlan_mdb_entry_skb_get(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
struct sk_buff *skb,
__be32 src_vni);
netdev_tx_t vxlan_mdb_xmit(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg,
const struct vxlan_mdb_entry *mdb_entry,
struct sk_buff *skb);
int vxlan_mdb_init(struct vxlan_dev *vxlan);
diff --git a/drivers/net/vxlan/vxlan_vnifilter.c b/drivers/net/vxlan/vxlan_vnifilter.c
index dd94085e08865..48135ff9b95a1 100644
--- a/drivers/net/vxlan/vxlan_vnifilter.c
+++ b/drivers/net/vxlan/vxlan_vnifilter.c
@@ -171,13 +171,14 @@ static void vxlan_vnifilter_stats_add(struct vxlan_vni_node *vninode,
u64_stats_update_end(&pstats->syncp);
}
-void vxlan_vnifilter_count(struct vxlan_dev *vxlan, __be32 vni,
+void vxlan_vnifilter_count(struct vxlan_dev *vxlan,
+ const struct vxlan_config *cfg, __be32 vni,
struct vxlan_vni_node *vninode,
int type, unsigned int len)
{
struct vxlan_vni_node *vnode;
- if (!(vxlan->cfg.flags & VXLAN_F_VNIFILTER))
+ if (!(cfg->flags & VXLAN_F_VNIFILTER))
return;
if (vninode) {
@@ -333,22 +334,36 @@ static int vxlan_vnifilter_dump_dev(const struct net_device *dev,
struct sk_buff *skb,
struct netlink_callback *cb)
{
- struct vxlan_vni_node *tmp, *v, *vbegin = NULL, *vend = NULL;
+ struct vxlan_vni_node *v, *vbegin = NULL, *vend = NULL;
struct vxlan_dev *vxlan = netdev_priv(dev);
struct tunnel_msg *new_tmsg, *tmsg;
- int idx = 0, s_idx = cb->args[1];
+ const struct vxlan_config *cfg;
struct vxlan_vni_group *vg;
struct nlmsghdr *nlh;
+ int idx = 0, s_idx;
bool dump_stats;
int err = 0;
- if (!(vxlan->cfg.flags & VXLAN_F_VNIFILTER))
+ if (cb->args[2] != dev->ifindex) {
+ cb->args[1] = 0;
+ cb->args[2] = dev->ifindex;
+ }
+ s_idx = cb->args[1];
+
+ cfg = rcu_dereference(vxlan->cfg);
+ if (!(cfg->flags & VXLAN_F_VNIFILTER)) {
+ cb->args[1] = 0;
+ cb->args[2] = 0;
return -EINVAL;
+ }
/* RCU needed because of the vni locking rules (rcu || rtnl) */
vg = rcu_dereference(vxlan->vnigrp);
- if (!vg || !vg->num_vnis)
+ if (!vg || !vg->num_vnis) {
+ cb->args[1] = 0;
+ cb->args[2] = 0;
return 0;
+ }
tmsg = nlmsg_data(cb->nlh);
dump_stats = !!(tmsg->flags & TUNNEL_MSG_FLAG_STATS);
@@ -362,7 +377,7 @@ static int vxlan_vnifilter_dump_dev(const struct net_device *dev,
new_tmsg->family = PF_BRIDGE;
new_tmsg->ifindex = dev->ifindex;
- list_for_each_entry_safe(v, tmp, &vg->vni_list, vlist) {
+ list_for_each_entry_rcu(v, &vg->vni_list, vlist) {
if (idx < s_idx) {
idx++;
continue;
@@ -394,12 +409,26 @@ static int vxlan_vnifilter_dump_dev(const struct net_device *dev,
}
cb->args[1] = err ? idx : 0;
+ cb->args[2] = err ? dev->ifindex : 0;
nlmsg_end(skb, nlh);
+ nl_dump_check_consistent(cb, nlh);
+
return err;
}
+static u32 vxlan_vnifilter_base_seq(const struct net *net)
+{
+ const struct vxlan_net *vn = net_generic(net, vxlan_net_id);
+ u32 res = atomic_read(&vn->vnifilter_seq);
+
+ /* Must not return 0 (see nl_dump_check_consistent()) */
+ if (!res)
+ res = 0x80000000;
+ return res;
+}
+
static int vxlan_vnifilter_dump(struct sk_buff *skb, struct netlink_callback *cb)
{
int idx = 0, err = 0, s_idx = cb->args[0];
@@ -419,6 +448,9 @@ static int vxlan_vnifilter_dump(struct sk_buff *skb, struct netlink_callback *cb
}
rcu_read_lock();
+
+ cb->seq = vxlan_vnifilter_base_seq(net);
+
if (tmsg->ifindex) {
dev = dev_get_by_index_rcu(net, tmsg->ifindex);
if (!dev) {
@@ -470,24 +502,48 @@ static const struct nla_policy vni_filter_policy[VXLAN_VNIFILTER_MAX + 1] = {
[VXLAN_VNIFILTER_ENTRY] = { .type = NLA_NESTED },
};
-static int vxlan_update_default_fdb_entry(struct vxlan_dev *vxlan, __be32 vni,
- union vxlan_addr *old_remote_ip,
- union vxlan_addr *remote_ip,
- struct netlink_ext_ack *extack)
+bool vxlan_vnifilter_has_multicast(const struct vxlan_dev *vxlan)
+{
+ struct vxlan_vni_group *vg = rtnl_dereference(vxlan->vnigrp);
+ struct vxlan_vni_node *v;
+
+ if (!vg)
+ return false;
+
+ list_for_each_entry(v, &vg->vni_list, vlist) {
+ if (vxlan_addr_multicast(&v->remote_ip))
+ return true;
+ }
+
+ return false;
+}
+
+int vxlan_update_default_fdb_entry(struct vxlan_dev *vxlan, __be32 vni,
+ const union vxlan_addr *old_remote_ip,
+ const union vxlan_addr *remote_ip,
+ u32 old_ifindex, u32 new_ifindex,
+ struct netlink_ext_ack *extack)
{
- struct vxlan_rdst *dst = &vxlan->default_dst;
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
int err = 0;
+ if (old_remote_ip && remote_ip &&
+ vxlan_addr_equal(old_remote_ip, remote_ip) &&
+ old_ifindex == new_ifindex)
+ return 0;
+
spin_lock_bh(&vxlan->hash_lock);
if (remote_ip && !vxlan_addr_any(remote_ip)) {
+ union vxlan_addr rip = *remote_ip;
+
err = vxlan_fdb_update(vxlan, all_zeros_mac,
- remote_ip,
+ &rip,
NUD_REACHABLE | NUD_PERMANENT,
NLM_F_APPEND | NLM_F_CREATE,
- vxlan->cfg.dst_port,
+ cfg->dst_port,
vni,
vni,
- dst->remote_ifindex,
+ new_ifindex,
NTF_SELF, 0, true, extack);
if (err) {
spin_unlock_bh(&vxlan->hash_lock);
@@ -498,9 +554,9 @@ static int vxlan_update_default_fdb_entry(struct vxlan_dev *vxlan, __be32 vni,
if (old_remote_ip && !vxlan_addr_any(old_remote_ip)) {
__vxlan_fdb_delete(vxlan, all_zeros_mac,
*old_remote_ip,
- vxlan->cfg.dst_port,
+ cfg->dst_port,
vni, vni,
- dst->remote_ifindex,
+ old_ifindex,
true);
}
spin_unlock_bh(&vxlan->hash_lock);
@@ -515,8 +571,8 @@ static int vxlan_vni_update_group(struct vxlan_dev *vxlan,
struct netlink_ext_ack *extack)
{
struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id);
- struct vxlan_rdst *dst = &vxlan->default_dst;
- union vxlan_addr *newrip = NULL, *oldrip = NULL;
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
+ const union vxlan_addr *newrip = NULL, *oldrip = NULL;
union vxlan_addr old_remote_ip;
int ret = 0;
@@ -528,8 +584,8 @@ static int vxlan_vni_update_group(struct vxlan_dev *vxlan,
if (group && !vxlan_addr_any(group)) {
newrip = group;
} else {
- if (!vxlan_addr_any(&dst->remote_ip))
- newrip = &dst->remote_ip;
+ if (!vxlan_addr_any(&cfg->remote_ip))
+ newrip = &cfg->remote_ip;
}
/* if old rip exists, and no newrip,
@@ -546,18 +602,23 @@ static int vxlan_vni_update_group(struct vxlan_dev *vxlan,
ret = vxlan_update_default_fdb_entry(vxlan, vninode->vni,
oldrip, newrip,
+ cfg->remote_ifindex,
+ cfg->remote_ifindex,
extack);
if (ret)
goto out;
- if (group)
+ if (group) {
memcpy(&vninode->remote_ip, group, sizeof(vninode->remote_ip));
+ if (!create)
+ vxlan_vnifilter_seq_inc(dev_net(vxlan->dev));
+ }
if (vxlan->dev->flags & IFF_UP) {
if (vxlan_addr_multicast(&old_remote_ip) &&
!vxlan_group_used(vn, vxlan, vninode->vni,
&old_remote_ip,
- vxlan->default_dst.remote_ifindex)) {
+ cfg->remote_ifindex)) {
ret = vxlan_igmp_leave(vxlan, &old_remote_ip,
0);
if (ret)
@@ -581,10 +642,12 @@ static int vxlan_vni_update_group(struct vxlan_dev *vxlan,
}
int vxlan_vnilist_update_group(struct vxlan_dev *vxlan,
- union vxlan_addr *old_remote_ip,
- union vxlan_addr *new_remote_ip,
+ const union vxlan_addr *old_remote_ip,
+ const union vxlan_addr *new_remote_ip,
+ u32 old_ifindex, u32 new_ifindex,
struct netlink_ext_ack *extack)
{
+ const union vxlan_addr *oldrip, *newrip;
struct list_head *headp, *hpos;
struct vxlan_vni_group *vg;
struct vxlan_vni_node *vent;
@@ -595,37 +658,66 @@ int vxlan_vnilist_update_group(struct vxlan_dev *vxlan,
headp = &vg->vni_list;
list_for_each_prev(hpos, headp) {
vent = list_entry(hpos, struct vxlan_vni_node, vlist);
+
if (vxlan_addr_any(&vent->remote_ip)) {
- ret = vxlan_update_default_fdb_entry(vxlan, vent->vni,
- old_remote_ip,
- new_remote_ip,
- extack);
- if (ret)
- return ret;
+ oldrip = old_remote_ip;
+ newrip = new_remote_ip;
+ } else {
+ /* A vni with its own group keeps it, but its fdb entry
+ * is still keyed on the device remote_ifindex.
+ */
+ oldrip = &vent->remote_ip;
+ newrip = &vent->remote_ip;
}
+
+ ret = vxlan_update_default_fdb_entry(vxlan, vent->vni,
+ oldrip, newrip,
+ old_ifindex, new_ifindex,
+ extack);
+ if (ret)
+ goto err_unwind;
}
return 0;
+
+err_unwind:
+ list_for_each_continue(hpos, headp) {
+ vent = list_entry(hpos, struct vxlan_vni_node, vlist);
+
+ if (vxlan_addr_any(&vent->remote_ip)) {
+ oldrip = old_remote_ip;
+ newrip = new_remote_ip;
+ } else {
+ oldrip = &vent->remote_ip;
+ newrip = &vent->remote_ip;
+ }
+
+ vxlan_update_default_fdb_entry(vxlan, vent->vni,
+ newrip, oldrip,
+ new_ifindex, old_ifindex,
+ NULL);
+ }
+ return ret;
}
static void vxlan_vni_delete_group(struct vxlan_dev *vxlan,
struct vxlan_vni_node *vninode)
{
struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id);
- struct vxlan_rdst *dst = &vxlan->default_dst;
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
/* if per vni remote_ip not present, delete the
* default dst remote_ip previously added for this vni
*/
if (!vxlan_addr_any(&vninode->remote_ip) ||
- !vxlan_addr_any(&dst->remote_ip)) {
+ !vxlan_addr_any(&cfg->remote_ip)) {
spin_lock_bh(&vxlan->hash_lock);
__vxlan_fdb_delete(vxlan, all_zeros_mac,
(vxlan_addr_any(&vninode->remote_ip) ?
- dst->remote_ip : vninode->remote_ip),
- vxlan->cfg.dst_port,
+ cfg->remote_ip : vninode->remote_ip),
+ cfg->dst_port,
vninode->vni, vninode->vni,
- dst->remote_ifindex,
+ cfg->remote_ifindex,
true);
spin_unlock_bh(&vxlan->hash_lock);
}
@@ -634,7 +726,7 @@ static void vxlan_vni_delete_group(struct vxlan_dev *vxlan,
if (vxlan_addr_multicast(&vninode->remote_ip) &&
!vxlan_group_used(vn, vxlan, vninode->vni,
&vninode->remote_ip,
- dst->remote_ifindex)) {
+ cfg->remote_ifindex)) {
vxlan_igmp_leave(vxlan, &vninode->remote_ip, 0);
}
}
@@ -665,7 +757,8 @@ static int vxlan_vni_update(struct vxlan_dev *vxlan,
return 0;
}
-static void __vxlan_vni_add_list(struct vxlan_vni_group *vg,
+static void __vxlan_vni_add_list(struct vxlan_dev *vxlan,
+ struct vxlan_vni_group *vg,
struct vxlan_vni_node *v)
{
struct list_head *headp, *hpos;
@@ -681,13 +774,16 @@ static void __vxlan_vni_add_list(struct vxlan_vni_group *vg,
}
list_add_rcu(&v->vlist, hpos);
vg->num_vnis++;
+ vxlan_vnifilter_seq_inc(dev_net(vxlan->dev));
}
-static void __vxlan_vni_del_list(struct vxlan_vni_group *vg,
+static void __vxlan_vni_del_list(struct vxlan_dev *vxlan,
+ struct vxlan_vni_group *vg,
struct vxlan_vni_node *v)
{
list_del_rcu(&v->vlist);
vg->num_vnis--;
+ vxlan_vnifilter_seq_inc(dev_net(vxlan->dev));
}
static struct vxlan_vni_node *vxlan_vni_alloc(struct vxlan_dev *vxlan,
@@ -723,6 +819,7 @@ static int vxlan_vni_add(struct vxlan_dev *vxlan,
u32 vni, union vxlan_addr *group,
struct netlink_ext_ack *extack)
{
+ const struct vxlan_config *cfg = rtnl_dereference(vxlan->cfg);
struct vxlan_vni_node *vninode;
__be32 v = cpu_to_be32(vni);
bool changed = false;
@@ -731,7 +828,7 @@ static int vxlan_vni_add(struct vxlan_dev *vxlan,
if (vxlan_vnifilter_lookup(vxlan, v))
return vxlan_vni_update(vxlan, vg, v, group, &changed, extack);
- err = vxlan_vni_in_use(vxlan->net, vxlan, &vxlan->cfg, v);
+ err = vxlan_vni_in_use(vxlan->net, vxlan, cfg, v);
if (err) {
NL_SET_ERR_MSG(extack, "VNI in use");
return err;
@@ -749,7 +846,7 @@ static int vxlan_vni_add(struct vxlan_dev *vxlan,
return err;
}
- __vxlan_vni_add_list(vg, vninode);
+ __vxlan_vni_add_list(vxlan, vg, vninode);
if (vxlan->dev->flags & IFF_UP)
vxlan_vs_add_del_vninode(vxlan, vninode, false);
@@ -795,7 +892,7 @@ static int vxlan_vni_del(struct vxlan_dev *vxlan,
if (err)
goto out;
- __vxlan_vni_del_list(vg, vninode);
+ __vxlan_vni_del_list(vxlan, vg, vninode);
vxlan_vnifilter_notify(vxlan, vninode, RTM_DELTUNNEL);
@@ -844,6 +941,7 @@ static int vxlan_process_vni_filter(struct vxlan_dev *vxlan,
int cmd, struct netlink_ext_ack *extack)
{
struct nlattr *vattrs[VXLAN_VNIFILTER_ENTRY_MAX + 1];
+ const struct vxlan_config *cfg;
u32 vni_start = 0, vni_end = 0;
union vxlan_addr group;
int err;
@@ -881,7 +979,8 @@ static int vxlan_process_vni_filter(struct vxlan_dev *vxlan,
memset(&group, 0, sizeof(group));
}
- if (vxlan_addr_multicast(&group) && !vxlan->default_dst.remote_ifindex) {
+ cfg = rtnl_dereference(vxlan->cfg);
+ if (vxlan_addr_multicast(&group) && !cfg->remote_ifindex) {
NL_SET_ERR_MSG(extack,
"Local interface required for multicast remote group");
@@ -909,7 +1008,7 @@ void vxlan_vnigroup_uninit(struct vxlan_dev *vxlan)
#if IS_ENABLED(CONFIG_IPV6)
hlist_del_init_rcu(&v->hlist6.hlist);
#endif
- __vxlan_vni_del_list(vg, v);
+ __vxlan_vni_del_list(vxlan, vg, v);
vxlan_vnifilter_notify(vxlan, v, RTM_DELTUNNEL);
call_rcu(&v->rcu, vxlan_vni_node_rcu_free);
}
@@ -940,6 +1039,7 @@ static int vxlan_vnifilter_process(struct sk_buff *skb, struct nlmsghdr *nlh,
struct netlink_ext_ack *extack)
{
struct net *net = sock_net(skb->sk);
+ const struct vxlan_config *cfg;
struct tunnel_msg *tmsg;
struct vxlan_dev *vxlan;
struct net_device *dev;
@@ -964,8 +1064,9 @@ static int vxlan_vnifilter_process(struct sk_buff *skb, struct nlmsghdr *nlh,
}
vxlan = netdev_priv(dev);
+ cfg = rtnl_dereference(vxlan->cfg);
- if (!(vxlan->cfg.flags & VXLAN_F_VNIFILTER))
+ if (!(cfg->flags & VXLAN_F_VNIFILTER))
return -EOPNOTSUPP;
nlmsg_for_each_attr_type(attr, VXLAN_VNIFILTER_ENTRY, nlh,
diff --git a/include/net/vxlan.h b/include/net/vxlan.h
index 7b82075055237..c3c9f2ccc3d1b 100644
--- a/include/net/vxlan.h
+++ b/include/net/vxlan.h
@@ -204,7 +204,6 @@ struct vxlan_rdst {
u8 offloaded:1;
__be32 remote_vni;
u32 remote_ifindex;
- struct net_device *remote_dev;
struct list_head list;
struct rcu_head rcu;
struct dst_cache dst_cache;
@@ -229,6 +228,7 @@ struct vxlan_config {
bool no_share;
enum ifla_vxlan_df df;
struct vxlanhdr reserved_bits;
+ struct rcu_head rcu;
};
enum {
@@ -294,14 +294,15 @@ struct vxlan_dev {
#endif
struct net_device *dev;
struct net *net; /* netns for packet i/o */
- struct vxlan_rdst default_dst; /* default destination */
+ struct net_device *lowerdev;
struct timer_list age_timer;
spinlock_t hash_lock;
unsigned int addrcnt;
struct gro_cells gro_cells;
+ unsigned long flags;
- struct vxlan_config cfg;
+ struct vxlan_config __rcu *cfg;
struct vxlan_vni_group __rcu *vnigrp;
@@ -313,6 +314,10 @@ struct vxlan_dev {
unsigned int mdb_seq;
};
+enum vxlan_dev_flags {
+ VXLAN_DEV_F_MDB,
+};
+
#define VXLAN_F_LEARN 0x01
#define VXLAN_F_PROXY 0x02
#define VXLAN_F_RSC 0x04
@@ -331,7 +336,6 @@ struct vxlan_dev {
#define VXLAN_F_IPV6_LINKLOCAL 0x8000
#define VXLAN_F_TTL_INHERIT 0x10000
#define VXLAN_F_VNIFILTER 0x20000
-#define VXLAN_F_MDB 0x40000
#define VXLAN_F_LOCALBYPASS 0x80000
#define VXLAN_F_MC_ROUTE 0x100000
|
| 23/3 | 2026/09/23 07:54 | llm | kmsan-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 48687 output: 25 thoughts: 1215 Thoughts: **KMSAN Assessment: VxLAN Config Pointer Transition** Okay, let's break this down. My goal is to determine if this patch necessitates a dedicated KMSAN fuzzing session. The key is whether it introduces *uninitialized memory risks* that are *only* detectable by KMSAN, as opposed to KASAN, LOCKDEP, or other standard detectors. A dedicated KMSAN session is costly, so I want to avoid it if possible. First, I'm reviewing the guidelines. The critical distinction is that KMSAN catches uninitialized reads, which could include memory leaks, while KASAN focuses on out-of-bounds, use-after-free, etc. I need to focus on situations where the patch introduces new code paths or modifications that might leave data uninitialized and readable. The guidelines highlight a few key areas to look at, such as: kernel structures passed to userspace, conditional logic on potentially uninitialized variables, allocation of data structures where fields may remain uninitialized, and bounds checks that expose uninitialized bytes. So, let's analyze the patch's changes. It looks like the patch is transitioning from an embedded `struct vxlan_config cfg;` within `struct vxlan_dev` to an RCU-protected pointer, `struct vxlan_config __rcu *cfg;`. I immediately need to think about what this means for initialization and data access. The patch also removes `vxlan->default_dst` and migrates its fields: `vni`, `remote_dev` and introduces a new `vxlan->flags`. The code changes include `rcu_read_lock()`/`rcu_read_unlock()` and `rcu_dereference()` and `rtnl_dereference()`, so I see that RCU is correctly employed for this change. The `mlx5e_tc_tun_get_remote_ifindex` is an interesting example of this RCU pattern. Then I notice the `mlxsw_sp_bridge_vlan_aware_vxlan_join` function. Here's a key observation: `struct mlxsw_sp_nve_params params;` is now declared locally, and the fields are being populated individually, after obtaining the `cfg` pointer. *Crucially, it is not being initialized explicitly!* I need to check the definition of `struct mlxsw_sp_nve_params` to understand what this means. If there are any fields within that structure that are *not* explicitly assigned before being used, and if those fields are later sent to userspace, there is a strong possibility of an uninitialized memory leak. This is the critical point. If `mlxsw_sp_nve_params` contains a field that isn't zeroed/initialized and is then passed to userspace, then *this* is a potential KMSAN issue. |
| 24/3 | 2026/09/23 07:54 | tool | grepper |
0mArgs:{
"Expression": "struct mlxsw_sp_nve_params"
}Results: {
"Output": "drivers/net/ethernet/mellanox/mlxsw/spectrum.h=1352=extern const struct mlxsw_sp_mr_tcam_ops mlxsw_sp2_mr_tcam_ops;\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum.h-1354-/* spectrum_nve.c */\ndrivers/net/ethernet/mellanox/mlxsw/spectrum.h:1355:struct mlxsw_sp_nve_params {\ndrivers/net/ethernet/mellanox/mlxsw/spectrum.h-1356-\tenum mlxsw_sp_nve_type type;\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum.h=1387=int mlxsw_sp_nve_fid_enable(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *fid,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum.h:1388:\t\t\t struct mlxsw_sp_nve_params *params,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum.h-1389-\t\t\t struct netlink_ext_ack *extack);\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c=935=int mlxsw_sp_nve_fid_enable(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *fid,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c:936:\t\t\t struct mlxsw_sp_nve_params *params,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c-937-\t\t\t struct netlink_ext_ack *extack)\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h=36=struct mlxsw_sp_nve_ops {\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h-38-\tbool (*can_offload)(const struct mlxsw_sp_nve *nve,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h:39:\t\t\t const struct mlxsw_sp_nve_params *params,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h-40-\t\t\t struct netlink_ext_ack *extack);\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h-41-\tvoid (*nve_config)(const struct mlxsw_sp_nve *nve,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h:42:\t\t\t const struct mlxsw_sp_nve_params *params,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h-43-\t\t\t struct mlxsw_sp_nve_config *config);\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c=58=static bool mlxsw_sp_nve_vxlan_can_offload(const struct mlxsw_sp_nve *nve,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c:59:\t\t\t\t\t const struct mlxsw_sp_nve_params *params,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c-60-\t\t\t\t\t struct netlink_ext_ack *extack)\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c=127=static bool mlxsw_sp1_nve_vxlan_can_offload(const struct mlxsw_sp_nve *nve,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c:128:\t\t\t\t\t const struct mlxsw_sp_nve_params *params,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c-129-\t\t\t\t\t struct netlink_ext_ack *extack)\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c=155=static void mlxsw_sp_nve_vxlan_config(const struct mlxsw_sp_nve *nve,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c:156:\t\t\t\t const struct mlxsw_sp_nve_params *params,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c-157-\t\t\t\t struct mlxsw_sp_nve_config *config)\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c=2509=mlxsw_sp_bridge_vlan_aware_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c-2515-\tstruct vxlan_dev *vxlan = netdev_priv(vxlan_dev);\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c:2516:\tstruct mlxsw_sp_nve_params params;\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c-2517-\tconst struct vxlan_config *cfg;\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c=2703=mlxsw_sp_bridge_8021d_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c-2708-\tstruct vxlan_dev *vxlan = netdev_priv(vxlan_dev);\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c:2709:\tstruct mlxsw_sp_nve_params params;\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c-2710-\tconst struct vxlan_config *cfg;\n"
} |
| 25/3 | 2026/09/23 07:54 | llm | kmsan-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 52118 output: 46 thoughts: 52 Thoughts: Okay, let's dive into this. **Inspecting the NVE Parameters Structure** Alright, I need to get a clear picture of the `struct mlxsw_sp_nve_params`. I need to understand its fields in detail. What kind of data is being stored in that structure? How is it structured? That will influence my next move, whatever it is. I need to understand the fundamental building blocks before I can manipulate them. So, I'm going to jump straight into the code. Specifically, the Mellanox driver's header file. I know that the relevant structure should be defined in `drivers/net/ethernet/mellanox/mlxsw/spectrum.h`. And I have a hunch it's around line 1355. That should be the place to start drilling into the definition and the related comments to get a good handle on things. |
| 26/3 | 2026/09/23 07:54 | tool | read-file |
0mArgs:{
"File": "drivers/net/ethernet/mellanox/mlxsw/spectrum.h",
"FirstLine": 1350,
"LineCount": 25
}Results: {
"Contents": "1350:\t\n1351:\t/* spectrum2_mr_tcam.c */\n1352:\textern const struct mlxsw_sp_mr_tcam_ops mlxsw_sp2_mr_tcam_ops;\n1353:\t\n1354:\t/* spectrum_nve.c */\n1355:\tstruct mlxsw_sp_nve_params {\n1356:\t\tenum mlxsw_sp_nve_type type;\n1357:\t\t__be32 vni;\n1358:\t\tconst struct net_device *dev;\n1359:\t\tu16 ethertype;\n1360:\t};\n1361:\t\n1362:\textern const struct mlxsw_sp_nve_ops *mlxsw_sp1_nve_ops_arr[];\n1363:\textern const struct mlxsw_sp_nve_ops *mlxsw_sp2_nve_ops_arr[];\n1364:\t\n1365:\tint mlxsw_sp_nve_learned_ip_resolve(struct mlxsw_sp *mlxsw_sp, u32 uip,\n1366:\t\t\t\t\t enum mlxsw_sp_l3proto proto,\n1367:\t\t\t\t\t union mlxsw_sp_l3addr *addr);\n1368:\tint mlxsw_sp_nve_flood_ip_add(struct mlxsw_sp *mlxsw_sp,\n1369:\t\t\t\t struct mlxsw_sp_fid *fid,\n1370:\t\t\t\t enum mlxsw_sp_l3proto proto,\n1371:\t\t\t\t union mlxsw_sp_l3addr *addr);\n1372:\tvoid mlxsw_sp_nve_flood_ip_del(struct mlxsw_sp *mlxsw_sp,\n1373:\t\t\t\t struct mlxsw_sp_fid *fid,\n1374:\t\t\t\t enum mlxsw_sp_l3proto proto,\n"
} |
| 27/3 | 2026/09/23 07:54 | llm | kmsan-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 52923 output: 45 thoughts: 368 Thoughts: **Analyzing the mlxsw_sp_nve_params Structure** Okay, so I'm looking at this `struct mlxsw_sp_nve_params` and I need to make sure I understand the memory layout. Let's break it down: `enum mlxsw_sp_nve_type type;` is 4 bytes, `__be32 vni;` is another 4 bytes, `const struct net_device *dev;` is an 8-byte pointer (assuming 64-bit architecture, which is highly likely these days), and then we have `u16 ethertype;` which is 2 bytes. That totals 18 bytes, but is that correct? I think there might be padding after `ethertype`! Let me think... yes, there's likely 6 bytes of padding to align the structure. This is important. Now, I need to understand how `params` is being used. Is this structure being copied to user space at any point, or is it exclusively used within kernel functions? I need to check where `params` is actually passed. Okay, so I see it being passed to `mlxsw_sp_bridge_vlan_aware_vxlan_join`. Inside that function, I see calls to `mlxsw_sp_fid_lookup_by_vni` and `mlxsw_sp_nve_fid_enable`. The second call is the key, `mlxsw_sp_nve_fid_enable(mlxsw_sp, fid, ¶ms, extack);`. So I need to go look into `mlxsw_sp_nve_fid_enable` and determine if it makes a copy of the contents of `params` or whether it uses a pointer to `params` which is passed directly. |
| 28/3 | 2026/09/23 07:54 | tool | grepper |
0mArgs:{
"Expression": "mlxsw_sp_nve_fid_enable",
"PathPrefix": "drivers/net/ethernet/mellanox/mlxsw/"
}Results: {
"Output": "drivers/net/ethernet/mellanox/mlxsw/spectrum.h=1385=void mlxsw_sp_nve_ipv6_addr_map_del(struct mlxsw_sp *mlxsw_sp, const char *mac,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum.h-1386-\t\t\t\t u16 fid_index);\ndrivers/net/ethernet/mellanox/mlxsw/spectrum.h:1387:int mlxsw_sp_nve_fid_enable(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *fid,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum.h-1388-\t\t\t struct mlxsw_sp_nve_params *params,\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c=919=static void mlxsw_sp_nve_ipv6_addr_flush_by_fid(struct mlxsw_sp *mlxsw_sp,\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c-934-\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c:935:int mlxsw_sp_nve_fid_enable(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *fid,\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c-936-\t\t\t struct mlxsw_sp_nve_params *params,\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c=2509=mlxsw_sp_bridge_vlan_aware_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c-2548-\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c:2549:\terr = mlxsw_sp_nve_fid_enable(mlxsw_sp, fid, \u0026params, extack);\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c-2550-\tif (err)\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c=2703=mlxsw_sp_bridge_8021d_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,\n--\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c-2731-\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c:2732:\terr = mlxsw_sp_nve_fid_enable(mlxsw_sp, fid, \u0026params, extack);\ndrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c-2733-\tif (err)\n"
} |
| 29/3 | 2026/09/23 07:54 | llm | kmsan-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 54481 output: 48 thoughts: 48 Thoughts: Okay, let's dive into this. Here's how I'd approach that snippet of code, assuming it's part of a larger network driver: **Investigating `mlxsw_sp_nve_fid_enable` and its Use of `params`** Alright, I need to understand how the `mlxsw_sp_nve_fid_enable` function in `drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c` works, specifically how it's interacting with this `params` variable. This is a crucial area to explore when optimizing network functions. My initial instinct is to assess how it’s being used as this function is likely pivotal to the forwarding information database (FID) and network virtualization encapsulation (NVE) management. I'd immediately want to look at the function's definition, examining the `params` argument's type. Is it a structure, a pointer to a structure, an integer representing flags, or something else entirely? The type tells me the *kind* of information being passed into the function. Then, I’ll follow the `params` variable’s usage within the function body. Is it being dereferenced? If so, what members are being accessed? Are these members used in conditional statements? Calculations? Calls to other functions? I’ll mentally trace these data flows. I'd be looking for the crucial bits: * **Initialization:** How is `params` initialized or populated *before* this function is called? Is there an external function responsible? Knowing where `params` originates is just as vital as understanding what happens to it within this function. * **Data Validity:** Are there any checks on the data held within `params`? Are we validating the contents before they're used? Are we going to see potential errors? * **Impact:** What does `params` control? Does it affect the hardware configuration, the software state, the packet forwarding behavior? Determining `params`' role is key to understanding the function's overall functionality. * **Error handling:** Is there an appropriate error handling in place when invalid `params` are received? Is the code resilient to unexpected parameters? From experience, I know that parameters often relate to NVE configuration, such as VXLAN or Geneve IDs, tunnel endpoints, or encapsulation flags. This could relate to how the FID is programmed or modified. The `enable` aspect suggests that it might be toggling a particular feature, virtual network, or forwarding path. The "enable" or "disable" function usually means it would modify the underlying hardware, hence I would be cautious. Ultimately, I want to build a complete mental model of how `mlxsw_sp_nve_fid_enable` works, including a complete picture of its inputs, its internal operations, and its impact on the system. Only then can I truly understand its role in the larger Mellanox NVE architecture and if optimization opportunities exist. |
| 30/3 | 2026/09/23 07:54 | tool | read-file |
0mArgs:{
"File": "drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c",
"FirstLine": 935,
"LineCount": 40
}Results: {
"Contents": " 935:\tint mlxsw_sp_nve_fid_enable(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *fid,\n 936:\t\t\t\t struct mlxsw_sp_nve_params *params,\n 937:\t\t\t\t struct netlink_ext_ack *extack)\n 938:\t{\n 939:\t\tstruct mlxsw_sp_nve *nve = mlxsw_sp-\u003enve;\n 940:\t\tconst struct mlxsw_sp_nve_ops *ops;\n 941:\t\tstruct mlxsw_sp_nve_config config;\n 942:\t\tint err;\n 943:\t\n 944:\t\tops = nve-\u003enve_ops_arr[params-\u003etype];\n 945:\t\n 946:\t\tif (!ops-\u003ecan_offload(nve, params, extack))\n 947:\t\t\treturn -EINVAL;\n 948:\t\n 949:\t\tmemset(\u0026config, 0, sizeof(config));\n 950:\t\tops-\u003enve_config(nve, params, \u0026config);\n 951:\t\tif (nve-\u003enum_nve_tunnels \u0026\u0026\n 952:\t\t memcmp(\u0026config, \u0026nve-\u003econfig, sizeof(config))) {\n 953:\t\t\tNL_SET_ERR_MSG_MOD(extack, \"Conflicting NVE tunnels configuration\");\n 954:\t\t\treturn -EINVAL;\n 955:\t\t}\n 956:\t\n 957:\t\terr = mlxsw_sp_nve_tunnel_init(mlxsw_sp, \u0026config);\n 958:\t\tif (err) {\n 959:\t\t\tNL_SET_ERR_MSG_MOD(extack, \"Failed to initialize NVE tunnel\");\n 960:\t\t\treturn err;\n 961:\t\t}\n 962:\t\n 963:\t\terr = mlxsw_sp_fid_vni_set(fid, params-\u003etype, params-\u003evni,\n 964:\t\t\t\t\t params-\u003edev-\u003eifindex);\n 965:\t\tif (err) {\n 966:\t\t\tNL_SET_ERR_MSG_MOD(extack, \"Failed to set VNI on FID\");\n 967:\t\t\tgoto err_fid_vni_set;\n 968:\t\t}\n 969:\t\n 970:\t\terr = ops-\u003efdb_replay(params-\u003edev, params-\u003evni, extack);\n 971:\t\tif (err)\n 972:\t\t\tgoto err_fdb_replay;\n 973:\t\n 974:\t\treturn 0;\n"
} |
| 31/3 | 2026/09/23 07:54 | llm | kmsan-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 55897 output: 24 thoughts: 606 Thoughts: **VXLAN Configuration Review** Okay, so I've been looking over this VXLAN code, specifically at how configurations are handled. I noticed that all the parameters in `params` are explicitly assigned, which is good. Nothing is being read or copied to user space from padding, and `memcmp` is only used on `config` after a `memset`, so that's all very clean. Now, I shifted my focus to `vxlan_fill_info` in `drivers/net/vxlan/vxlan_core.c`. Initially, it looked like the `ports` variable was being initialized directly with a struct initializer. But hang on, a code change! Now, they've declared `ports` as a plain struct `ifla_vxlan_port_range`, and the members are filled *separately* using `htons`. Okay, so the change appears to have introduced this: ```c struct ifla_vxlan_port_range ports; ... ports.low = htons(cfg->port_min); ports.high = htons(cfg->port_max); if (nla_put(skb, IFLA_VXLAN_PORT_RANGE, sizeof(ports), &ports)) goto nla_put_failure; ``` I *need* to check this new code against the *definition* of `struct ifla_vxlan_port_range`. It's crucial to understand why they changed the initialization method. Could there be a subtle change in memory layout, padding, or alignment that I need to be aware of? I need to know the implications of *this* change. |
| 32/3 | 2026/09/23 07:55 | tool | grepper |
0mArgs:{
"Expression": "struct ifla_vxlan_port_range"
}Results: {
"Output": "drivers/net/vxlan/vxlan_core.c=3527=static const struct nla_policy vxlan_policy[IFLA_VXLAN_MAX + 1] = {\n--\ndrivers/net/vxlan/vxlan_core.c-3540-\t[IFLA_VXLAN_LIMIT]\t= { .type = NLA_U32 },\ndrivers/net/vxlan/vxlan_core.c:3541:\t[IFLA_VXLAN_PORT_RANGE] = { .len = sizeof(struct ifla_vxlan_port_range) },\ndrivers/net/vxlan/vxlan_core.c-3542-\t[IFLA_VXLAN_PROXY]\t= { .type = NLA_U8 },\n--\ndrivers/net/vxlan/vxlan_core.c=3565=static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[],\n--\ndrivers/net/vxlan/vxlan_core.c-3608-\tif (data[IFLA_VXLAN_PORT_RANGE]) {\ndrivers/net/vxlan/vxlan_core.c:3609:\t\tconst struct ifla_vxlan_port_range *p\ndrivers/net/vxlan/vxlan_core.c-3610-\t\t\t= nla_data(data[IFLA_VXLAN_PORT_RANGE]);\n--\ndrivers/net/vxlan/vxlan_core.c=4201=static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],\n--\ndrivers/net/vxlan/vxlan_core.c-4367-\t\tif (!changelink) {\ndrivers/net/vxlan/vxlan_core.c:4368:\t\t\tconst struct ifla_vxlan_port_range *p\ndrivers/net/vxlan/vxlan_core.c-4369-\t\t\t\t= nla_data(data[IFLA_VXLAN_PORT_RANGE]);\n--\ndrivers/net/vxlan/vxlan_core.c=4703=static size_t vxlan_get_size(const struct net_device *dev)\n--\ndrivers/net/vxlan/vxlan_core.c-4730-\t\t/* IFLA_VXLAN_PORT_RANGE */\ndrivers/net/vxlan/vxlan_core.c:4731:\t\tnla_total_size(sizeof(struct ifla_vxlan_port_range)) +\ndrivers/net/vxlan/vxlan_core.c-4732-\t\tnla_total_size(0) + /* IFLA_VXLAN_GBP */\n--\ndrivers/net/vxlan/vxlan_core.c=4741=static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev)\n--\ndrivers/net/vxlan/vxlan_core.c-4743-\tconst struct vxlan_dev *vxlan = netdev_priv(dev);\ndrivers/net/vxlan/vxlan_core.c:4744:\tstruct ifla_vxlan_port_range ports;\ndrivers/net/vxlan/vxlan_core.c-4745-\tconst struct vxlan_config *cfg;\n--\ninclude/uapi/linux/if_link.h=1431=enum {\n--\ninclude/uapi/linux/if_link.h-1470-\ninclude/uapi/linux/if_link.h:1471:struct ifla_vxlan_port_range {\ninclude/uapi/linux/if_link.h-1472-\t__be16\tlow;\n--\ntools/include/uapi/linux/if_link.h=1365=enum {\n--\ntools/include/uapi/linux/if_link.h-1402-\ntools/include/uapi/linux/if_link.h:1403:struct ifla_vxlan_port_range {\ntools/include/uapi/linux/if_link.h-1404-\t__be16\tlow;\n"
} |
| 33/3 | 2026/09/23 07:55 | llm | kmsan-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 57899 output: 41 thoughts: 29 Thoughts: Okay, let's dive into this. Here's my thought process: **Diving into if_link.h** Alright, I need to investigate something related to network interfaces. The instruction suggests looking at `include/uapi/linux/if_link.h` around line 1471. I know that header file well; it's a crucial part of the Linux kernel's networking API, specifically related to the `NETLINK_ROUTE` family and interface configuration. Line 1471... I immediately start to think about what is likely to be there. Most likely that it will be something related to an attribute being defined or declared. Possibly it's the definition of a specific structure or constant, perhaps even a bitmask, that plays a role in configuring network links or extracting information about them, specifically the attributes used within the NETLINK_ROUTE messages. I'm going to quickly pull up the file and see what's going on there. I'll need to interpret the context of that specific line within the broader section of code, considering adjacent lines for relevant structures, enums, or macros, to ensure I understand the meaning of the content. |
| 34/3 | 2026/09/23 07:55 | tool | read-file |
0mArgs:{
"File": "include/uapi/linux/if_link.h",
"FirstLine": 1468,
"LineCount": 10
}Results: {
"Contents": "1468:\t};\n1469:\t#define IFLA_VXLAN_MAX\t(__IFLA_VXLAN_MAX - 1)\n1470:\t\n1471:\tstruct ifla_vxlan_port_range {\n1472:\t\t__be16\tlow;\n1473:\t\t__be16\thigh;\n1474:\t};\n1475:\t\n1476:\tenum ifla_vxlan_df {\n1477:\t\tVXLAN_DF_UNSET = 0,\n"
} |
| 35/3 | 2026/09/23 07:55 | llm | kmsan-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 58369 output: 20 thoughts: 443 Thoughts: **Analyzing VXLAN Port Range and Configuration** Okay, so I'm looking at this `struct ifla_vxlan_port_range`. It's just 4 bytes, right? `__be16 low;` and `__be16 high;`, both 2 bytes each. And looking at the initialization, `ports.low` and `ports.high` are being set using `htons` with the minimum and maximum ports from the config. Good. No surprises there. Wait, hold on a second... no padding, right? Let's verify: `sizeof(__be16) * 2 = 4 bytes`. Alignment is 2 bytes. That checks out. No padding at the end, and nothing in between. Perfect. Now, what else could be relevant? Oh, yes, I need to check `nla_put` with `cfg->reserved_bits`. I see the `nla_put` call: ```c if (nla_put(skb, IFLA_VXLAN_RESERVED_BITS, sizeof(cfg->reserved_bits), &cfg->reserved_bits)) goto nla_put_failure; ``` Okay, so the size of `reserved_bits` is being passed. Now, the bigger question is, where is `cfg` allocated and initialized? Let's track that down. Right, in `vxlan_dev_configure`, I see: ```c new_cfg = kmemdup(conf, sizeof(*conf), GFP_KERNEL); if (!new_cfg) return -ENOMEM; vxlan_config_apply(dev, new_cfg, lowerdev, src_net, false, true); ``` So, `cfg` is a copy from `conf`, allocated with `kmemdup`. Now, where did `conf` come from? Back to the call stack. Ah, in `vxlan_dev_create`, there's a call to `vxlan_dev_configure`: `vxlan_dev_configure(net, dev, conf, extack);`. So `conf` is a direct input. Okay, let's trace `conf` in the callers of `vxlan_dev_create` and `vxlan_dev_configure`, as well as `vxlan_newlink` and `vxlan_nl2conf`. I'll need to grep for these functions to see how the configuration is actually being built up and passed. That should give me the full picture. |
| 36/3 | 2026/09/23 07:55 | tool | grepper |
0mArgs:{
"Expression": "vxlan_nl2conf"
}Results: {
"Output": "drivers/net/vxlan/vxlan_core.c=4174=static int vxlan_nl2flag(struct vxlan_config *conf, struct nlattr *tb[],\n--\ndrivers/net/vxlan/vxlan_core.c-4200-\ndrivers/net/vxlan/vxlan_core.c:4201:static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],\ndrivers/net/vxlan/vxlan_core.c-4202-\t\t\t struct net_device *dev, struct vxlan_config *conf,\n--\ndrivers/net/vxlan/vxlan_core.c=4545=static int vxlan_newlink(struct net_device *dev,\n--\ndrivers/net/vxlan/vxlan_core.c-4554-\ndrivers/net/vxlan/vxlan_core.c:4555:\terr = vxlan_nl2conf(tb, data, dev, \u0026conf, false, extack);\ndrivers/net/vxlan/vxlan_core.c-4556-\tif (err)\n--\ndrivers/net/vxlan/vxlan_core.c=4562=static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],\n--\ndrivers/net/vxlan/vxlan_core.c-4578-\ndrivers/net/vxlan/vxlan_core.c:4579:\terr = vxlan_nl2conf(tb, data, dev, \u0026conf, true, extack);\ndrivers/net/vxlan/vxlan_core.c-4580-\tif (err)\n"
} |
| 37/3 | 2026/09/23 07:55 | llm | kmsan-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 59802 output: 20 thoughts: 196 Thoughts: Here's my analysis of the provided code snippet: **Analyzing the VXLAN Configuration Process** Okay, let's dive into this `vxlan_nl2conf` function. I see that it's responsible for processing the Netlink attributes related to VXLAN configuration. Specifically, I'm focusing on lines 4201 and onward. My initial observation is the line `memset(conf, 0, sizeof(*conf));`. This is crucial. It means that the `conf` structure, which holds the VXLAN configuration data, is being zeroed out completely at the start of the function. This is standard practice to ensure a clean slate, particularly important for dealing with potentially undefined or stale data. However, I've got to consider the `changelink` flag. The conditional block following the `memset` suggests that if we're dealing with a "changelink" operation (likely a modification of an existing VXLAN interface), the code copies the *old* configuration (`vxlan->cfg`) into the new `conf` *before* proceeding. This makes sense to me; we want to retain the existing settings as a baseline for the changes. This copy operation is important as it might overwrite the zero'd out conf. Now I'm getting curious. Is this the only place where the `conf` structure gets populated? I'd better double check where else `vxlan_dev_configure` is being called. Time to fire up grepper and get a list of all call sites to ensure I have a complete picture of the configuration flow. |
| 38/3 | 2026/09/23 07:55 | tool | grepper |
0mArgs:{
"Expression": "vxlan_dev_configure"
}Results: {
"Output": "drivers/net/vxlan/vxlan_core.c=1675=static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)\n--\ndrivers/net/vxlan/vxlan_core.c-1780-\t/* Note that GBP and GPE can never be active together. This is\ndrivers/net/vxlan/vxlan_core.c:1781:\t * ensured in vxlan_dev_configure.\ndrivers/net/vxlan/vxlan_core.c-1782-\t */\n--\ndrivers/net/vxlan/vxlan_core.c=4022=static void vxlan_config_apply(struct net_device *dev,\n--\ndrivers/net/vxlan/vxlan_core.c-4077-\ndrivers/net/vxlan/vxlan_core.c:4078:static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,\ndrivers/net/vxlan/vxlan_core.c-4079-\t\t\t struct vxlan_config *conf,\n--\ndrivers/net/vxlan/vxlan_core.c=4100=static int vxlan_dev_create(struct net *net, struct net_device *dev,\n--\ndrivers/net/vxlan/vxlan_core.c-4109-\ndrivers/net/vxlan/vxlan_core.c:4110:\terr = vxlan_dev_configure(net, dev, conf, extack);\ndrivers/net/vxlan/vxlan_core.c-4111-\tif (err)\n"
} |
| 39/3 | 2026/09/23 07:55 | llm | kmsan-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 60751 output: 20 thoughts: 20 Thoughts: Okay, here's my take on those thoughts, tailored for an expert audience, and delivered as a first-person summary: **Digging into `vxlan_dev_create` Callers** Alright, so I'm thinking about `vxlan_dev_create`. We know it's a critical function, but as with any piece of infrastructure code, I want to be *absolutely* certain I've got a comprehensive understanding of its use cases and potential impact. My immediate concern is this: *where else* is this function being called? I need to be 100% sure I've identified all its entry points and downstream dependencies. I’ve probably got a pretty solid mental model of the relevant modules, but I *must* confirm. Let’s do a quick sweep of the codebase and see what other code paths are calling this function. No assumptions; just solid verification. |
| 40/3 | 2026/09/23 07:55 | tool | grepper |
0mArgs:{
"Expression": "vxlan_dev_create"
}Results: {
"Output": "drivers/net/vxlan/vxlan_core.c=4078=static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,\n--\ndrivers/net/vxlan/vxlan_core.c-4099-\ndrivers/net/vxlan/vxlan_core.c:4100:static int vxlan_dev_create(struct net *net, struct net_device *dev,\ndrivers/net/vxlan/vxlan_core.c-4101-\t\t\t struct vxlan_config *conf,\n--\ndrivers/net/vxlan/vxlan_core.c=4545=static int vxlan_newlink(struct net_device *dev,\n--\ndrivers/net/vxlan/vxlan_core.c-4558-\ndrivers/net/vxlan/vxlan_core.c:4559:\treturn vxlan_dev_create(link_net, dev, \u0026conf, extack);\ndrivers/net/vxlan/vxlan_core.c-4560-}\n"
} |
| 41/3 | 2026/09/23 07:55 | llm | kmsan-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 61248 output: 42 thoughts: 1006 Thoughts: **Unraveling VXLAN Configuration and Data Structures** Okay, let's break this down. My initial concern was about potential uninitialized memory in the VXLAN code, specifically related to the `vxlan_config` structure. I started by looking at `vxlan_newlink` which calls `vxlan_dev_create`. I saw that `vxlan_nl2conf` is responsible for populating the `conf` struct, and it *does* a `memset` before even considering existing configuration. This looked promising. Then I remembered, `vxlan_changelink`! This is where things get interesting. `changelink` also uses a `vxlan_config` structure, and it *also* calls `vxlan_nl2conf`. However, in this case, `vxlan_nl2conf` conditionally copies an existing config into the new `conf` struct *after* the `memset`. So even in the changelink scenario, the `conf` structure should be fully initialized. I'm starting to feel more comfortable. To be thorough, I checked the dump functions. I looked at `vxlan_vnifilter_dump_dev` and `vxlan_vnifilter_dump`. I made sure the Netlink callback argument array (`cb->args`) is properly initialized. I checked how `cb->seq` is set, making sure the base sequence is not zero. Then, the last place to check is `vxlan_rcv`, since it uses a bunch of structures like `vxlan_metadata`. Aha! I found the critical section. I wanted to verify the initialization of `_md`. I read around line 1750 of `vxlan_rcv`, and confirmed that `md` is initialized by `_md = ...`. Okay, I think I've covered the most likely areas for uninitialized memory usage related to `vxlan_config` and associated structures. I'm reasonably confident that these structures are initialized correctly across the key operations I've examined. |
| 42/3 | 2026/09/23 07:55 | tool | read-file |
0mArgs:{
"File": "drivers/net/vxlan/vxlan_core.c",
"FirstLine": 1760,
"LineCount": 35
}Results: {
"Contents": "1760:\t\t\tstruct metadata_dst *tun_dst;\n1761:\t\n1762:\t\t\t__set_bit(IP_TUNNEL_KEY_BIT, flags);\n1763:\t\t\ttun_dst = udp_tun_rx_dst(skb, vxlan_get_sk_family(vs), flags,\n1764:\t\t\t\t\t\t key32_to_tunnel_id(vni), sizeof(*md));\n1765:\t\n1766:\t\t\tif (!tun_dst) {\n1767:\t\t\t\treason = SKB_DROP_REASON_NOMEM;\n1768:\t\t\t\tgoto drop;\n1769:\t\t\t}\n1770:\t\n1771:\t\t\tmd = ip_tunnel_info_opts(\u0026tun_dst-\u003eu.tun_info);\n1772:\t\n1773:\t\t\tskb_dst_set(skb, (struct dst_entry *)tun_dst);\n1774:\t\t} else {\n1775:\t\t\tmemset(md, 0, sizeof(*md));\n1776:\t\t}\n1777:\t\n1778:\t\tif (cfg-\u003eflags \u0026 VXLAN_F_GBP)\n1779:\t\t\tvxlan_parse_gbp_hdr(skb, cfg-\u003eflags, md);\n1780:\t\t/* Note that GBP and GPE can never be active together. This is\n1781:\t\t * ensured in vxlan_dev_configure.\n1782:\t\t */\n1783:\t\n1784:\t\tif (!raw_proto) {\n1785:\t\t\treason = vxlan_set_mac(vxlan, cfg, vs, skb, vni);\n1786:\t\t\tif (reason)\n1787:\t\t\t\tgoto drop;\n1788:\t\t} else {\n1789:\t\t\tskb_reset_mac_header(skb);\n1790:\t\t\tskb-\u003edev = vxlan-\u003edev;\n1791:\t\t\tskb-\u003epkt_type = PACKET_HOST;\n1792:\t\t}\n1793:\t\n1794:\t\t/* Save offset of outer header relative to skb-\u003ehead,\n"
} |
| 43/3 | 2026/09/23 07:55 | llm | kmsan-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 63283 output: 49 thoughts: 1691 Thoughts: **Analyzing Code Changes: A Deep Dive into VXLAN Initialization** Okay, let's break this down. Initially, I saw a seemingly minor code change related to `vxlan_metadata` initialization. It looks like the declaration and assignment of the `md` pointer and the `_md` struct are just reordered, which *should* result in identical behavior. It's really just a minor refactoring. Then, I noticed similar changes in the `vxlan_xmit_one` function: variables were declared near the top. Again, this just looks like a stylistic change, rearranging variable declarations. No real functional impact detected here. My attention was then drawn to `mlxsw_sp_bridge_vlan_aware_vxlan_join` and `mlxsw_sp_bridge_8021d_vxlan_join`. The code now uses a local `params` struct for NVE parameters. Before, the struct was initialized in one go using designated initializers. My concern was about uninitialized memory in the original implementation, but my analysis of `struct mlxsw_sp_nve_params` showed only four fields were present and initialized. The subsequent assignment to each member in the new implementation means it is also fully initialized. Examining the functions where the params were accessed (`can_offload`, `nve_config`, `fdb_replay`, `mlxsw_sp_fid_vni_set`), it's clear the fields used are always explicitly set before use, so no uninitialized data would have been accessed. I confirmed that `can_offload` and `nve_config` access the `vxlan` via `params->dev`, with the configuration obtained from `rtnl_dereference(vxlan->cfg)`. I concluded that there is no risk of reading uninitialized memory. Finally, the `mlxsw_sp_switchdev_vxlan_work_prepare` function was checked. Here, it looks like `vxlan->cfg` is now dereferenced using `rcu_dereference_rtnl` and is now a `const struct vxlan_config *cfg`. Since `cfg` is a `const` pointer to a `vxlan_config` struct, it should have the same meaning and intent. The changes observed appear to be safe. |
| 44/3 | 2026/09/23 07:55 | tool | read-file |
0mArgs:{
"File": "drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c",
"FirstLine": 3730,
"LineCount": 40
}Results: {
"Contents": "3730:\tmlxsw_sp_switchdev_vxlan_work_prepare(struct mlxsw_sp_switchdev_event_work *\n3731:\t\t\t\t\t switchdev_work,\n3732:\t\t\t\t\t struct switchdev_notifier_info *info)\n3733:\t{\n3734:\t\tstruct vxlan_dev *vxlan = netdev_priv(switchdev_work-\u003edev);\n3735:\t\tstruct switchdev_notifier_vxlan_fdb_info *vxlan_fdb_info;\n3736:\t\tconst struct vxlan_config *cfg;\n3737:\t\tstruct netlink_ext_ack *extack;\n3738:\t\n3739:\t\tcfg = rcu_dereference_rtnl(vxlan-\u003ecfg);\n3740:\t\n3741:\t\textack = switchdev_notifier_info_to_extack(info);\n3742:\t\tvxlan_fdb_info = container_of(info,\n3743:\t\t\t\t\t struct switchdev_notifier_vxlan_fdb_info,\n3744:\t\t\t\t\t info);\n3745:\t\n3746:\t\tif (vxlan_fdb_info-\u003eremote_port != cfg-\u003edst_port) {\n3747:\t\t\tNL_SET_ERR_MSG_MOD(extack, \"VxLAN: FDB: Non-default remote port is not supported\");\n3748:\t\t\treturn -EOPNOTSUPP;\n3749:\t\t}\n3750:\t\tif (vxlan_fdb_info-\u003eremote_vni != cfg-\u003evni ||\n3751:\t\t vxlan_fdb_info-\u003evni != cfg-\u003evni) {\n3752:\t\t\tNL_SET_ERR_MSG_MOD(extack, \"VxLAN: FDB: Non-default VNI is not supported\");\n3753:\t\t\treturn -EOPNOTSUPP;\n3754:\t\t}\n3755:\t\tif (vxlan_fdb_info-\u003eremote_ifindex) {\n3756:\t\t\tNL_SET_ERR_MSG_MOD(extack, \"VxLAN: FDB: Local interface is not supported\");\n3757:\t\t\treturn -EOPNOTSUPP;\n3758:\t\t}\n3759:\t\tif (is_multicast_ether_addr(vxlan_fdb_info-\u003eeth_addr)) {\n3760:\t\t\tNL_SET_ERR_MSG_MOD(extack, \"VxLAN: FDB: Multicast MAC addresses not supported\");\n3761:\t\t\treturn -EOPNOTSUPP;\n3762:\t\t}\n3763:\t\tif (vxlan_addr_multicast(\u0026vxlan_fdb_info-\u003eremote_ip)) {\n3764:\t\t\tNL_SET_ERR_MSG_MOD(extack, \"VxLAN: FDB: Multicast destination IP is not supported\");\n3765:\t\t\treturn -EOPNOTSUPP;\n3766:\t\t}\n3767:\t\n3768:\t\tswitchdev_work-\u003evxlan_fdb_info = *vxlan_fdb_info;\n3769:\t\n"
} |
| 45/3 | 2026/09/23 07:55 | llm | kmsan-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 66307 output: 36 thoughts: 1151 Thoughts: **Analyzing VXLAN Configuration and Cleanup** Okay, so I'm digging into this VXLAN code, specifically how configurations are handled. First, I noticed `cfg` is being read in `vxlan_fdb_info`. I need to ensure it's properly initialized before use. Jumping into lines 157-235, I see `cfg` is dereferenced from `vxlan->cfg` with `rcu_dereference_rtnl`. It appears to be used to populate a netlink message with data from `rdst` and `fdb`, comparing values from `rdst` and `fdb` to those in `cfg`. Nothing immediately jumps out as problematic or uninitialized there. It's a read-only access. Next, I shifted my focus to potential error paths in device creation and configuration, particularly around `vxlan_dev_create` and `vxlan_dev_configure`. I checked `vxlan_free_dev` which is the device's private destructor. This is important to ensure resources are cleaned up. Specifically, if `register_netdevice` fails, I see `vxlan_free_dev` is called explicitly to prevent a memory leak because the private destructor is not automatically called in this scenario. This is an important detail for resource management. It frees the configuration associated with the device if registration fails. Now, let's look at `vxlan_config_apply`. Here, the old configuration (`old_cfg`) is dereferenced, the new configuration (`new_cfg`) is assigned, and then the old one is freed using `kfree_rcu`. This is a pretty standard pattern for RCU-protected data. The `new_cfg` is either `kmemdup`'d from an existing configuration, or in the changelink, is `kmemdup`'d from `&conf`. That makes me think: Could the `conf` in `vxlan_changelink` be uninitialized or have padding issues? Now I need to check the definition of `struct vxlan_config` in `include/net/vxlan.h` to see how it's defined. This will help determine if there are any potential uninitialized fields that could be copied into `new_cfg` or padding that could be problematic. I need to know the structure's layout to be certain. |
| 46/3 | 2026/09/23 07:56 | tool | read-file |
0mArgs:{
"File": "include/net/vxlan.h",
"FirstLine": 210,
"LineCount": 35
}Results: {
"Contents": " 210:\t};\n 211:\t\n 212:\tstruct vxlan_config {\n 213:\t\tunion vxlan_addr\t\tremote_ip;\n 214:\t\tunion vxlan_addr\t\tsaddr;\n 215:\t\t__be32\t\t\t\tvni;\n 216:\t\tint\t\t\t\tremote_ifindex;\n 217:\t\tint\t\t\t\tmtu;\n 218:\t\t__be16\t\t\t\tdst_port;\n 219:\t\tu16\t\t\t\tport_min;\n 220:\t\tu16\t\t\t\tport_max;\n 221:\t\tu8\t\t\t\ttos;\n 222:\t\tu8\t\t\t\tttl;\n 223:\t\t__be32\t\t\t\tlabel;\n 224:\t\tenum ifla_vxlan_label_policy\tlabel_policy;\n 225:\t\tu32\t\t\t\tflags;\n 226:\t\tunsigned long\t\t\tage_interval;\n 227:\t\tunsigned int\t\t\taddrmax;\n 228:\t\tbool\t\t\t\tno_share;\n 229:\t\tenum ifla_vxlan_df\t\tdf;\n 230:\t\tstruct vxlanhdr\t\t\treserved_bits;\n 231:\t\tstruct rcu_head\t\t\trcu;\n 232:\t};\n 233:\t\n 234:\tenum {\n 235:\t\tVXLAN_VNI_STATS_RX,\n 236:\t\tVXLAN_VNI_STATS_RX_DROPS,\n 237:\t\tVXLAN_VNI_STATS_RX_ERRORS,\n 238:\t\tVXLAN_VNI_STATS_TX,\n 239:\t\tVXLAN_VNI_STATS_TX_DROPS,\n 240:\t\tVXLAN_VNI_STATS_TX_ERRORS,\n 241:\t};\n 242:\t\n 243:\tstruct vxlan_vni_stats {\n 244:\t\tu64 rx_packets;\n"
} |
| 47/3 | 2026/09/23 07:56 | llm | kmsan-evaluator |
0mModel:gemini-3.8-flash Args: null Results: null Tokens: input: 68504 output: 474 thoughts: 2932 Thoughts: **Analysis of the VXLAN Configuration Patch and KMSAN Applicability** Okay, let's break this down. This patch is fundamentally about making the VXLAN configuration dynamic and safe to access concurrently, which means moving to an RCU-protected configuration structure. It's refactoring how the configuration is stored and accessed, which introduces potential new bugs if not implemented carefully. I need to make sure this doesn't accidentally expose uninitialized memory. First, I examined the core function, `vxlan_nl2conf`. The allocation of the new configuration, `new_cfg`, is key. It's allocated via `kmemdup` from a zeroed buffer `conf`. `memset` ensures that `conf` is initialized to zero before the copy. So any padding in `new_cfg` is definitely zeroed. This looks good. The subsequent calls to `nla_put` use values from the config which should be correctly set. Next, I went through the code path that fills the netlink information. `vxlan_fill_info` is important. I checked `struct ifla_vxlan_port_range ports` specifically. It's critical that there's no padding here, and it looks like there isn't. The structure is just two 16-bit fields, and both are explicitly assigned before being passed to `nla_put`. This is safe. The scalar attributes used elsewhere like `reserved_bits` have already been initialized, or assigned. I had to double check a few more functions. For example, `vxlan_mdb.c` uses values in the config struct. I checked `vxlan_mdb_entry_info_fill` and `vxlan_mdb_config_init` to ensure that data is taken from the config, not from uninitialized areas. `memset` in `vxlan_mdb_config_init` zero-initializes the config, and the subsequent reads from the config look fine. I also looked at `vxlan_update_default_fdb_entry` and saw that it's safe because `remote_ip` is initialized. Then I checked `mlxsw` because that's something I need to keep an eye on. I analyzed the `mlxsw_sp_nve_params` structure. This structure is only used internally by the driver. No part of it is sent to user-space. So, its padding is not a concern, given our assumptions on the hardware. The crucial question is, does this patch introduce any scenarios where uninitialized memory *could* be read and leaked? 1. **Data sent to user-space**: No. Everything is either explicitly initialized or comes from the zeroed configuration structure. I'm satisfied on that count. 2. **Conditional logic based on uninitialized data**: No. All conditions rely on initialized variables. 3. **Complex data structure initialization**: No. Structures are either allocated from zeroed memory, or fields are explicitly initialized. 4. **Bounds checks exposing uninitialized data**: No. This patch's primary risks lie in RCU synchronization (use-after-free, missing locks), and possibly NULL pointer dereferences. These are the kinds of issues that KASAN, PROVE\_RCU, and LOCKDEP are designed to catch. KMSAN's purpose, which is to detect uninitialized memory reads, isn't needed here. All data flows are explicitly initialized or taken from `kmemdup`-allocated zeroed memory. Therefore, `NeedsKMSAN = false`. I'm confident in this. |
| 48/3 | 2026/09/23 07:56 | tool | set-results |
0mArgs:{
"KMSANReasoning": "The patch refactors the VXLAN subsystem to make the device configuration RCU-protected (`vxlan-\u003ecfg` dynamically allocated and managed via RCU rather than embedded in `struct vxlan_dev`), removes the legacy `default_dst` struct in favor of direct config lookups and a `lowerdev` pointer, and moves dynamic flags like `VXLAN_DEV_F_MDB` to `vxlan-\u003eflags`.\n\nAnalysis of memory initialization and leak risks:\n1. Heap structures: Newly allocated config structures (`new_cfg`) are created via `kmemdup()` from `conf`, which is fully cleared with `memset(conf, 0, sizeof(*conf))` in `vxlan_nl2conf()`. There are no uninitialized padding bytes or fields in the allocated config.\n2. Netlink / user space copies: In `vxlan_fill_info()`, `struct ifla_vxlan_port_range ports` has its initialization changed from aggregate to member assignments (`ports.low = ...; ports.high = ...;`). The UAPI `struct ifla_vxlan_port_range` consists strictly of two `__be16` fields (4 bytes total) with zero padding. Both fields are initialized prior to `nla_put()`. All other attributes emitted to userspace are scalars or copied from the zero-initialized config.\n3. Driver-internal structs: In `mlxsw_sp_bridge_vlan_aware_vxlan_join()`, `struct mlxsw_sp_nve_params` has all member fields explicitly assigned, and it is strictly driver-internal without being copied to userspace or read via memcmp.\n\nApplicability of KASAN vs KMSAN:\nThe potential risks of these changes lie in RCU lifetime correctness, use-after-free across grace periods, NULL pointer dereferences, and locking during configuration updates. These are effectively detected by KASAN, PROVE_RCU, and LOCKDEP. There are no uninitialized memory reads or kernel-to-user info-leak risks, so a dedicated KMSAN fuzzing session is not warranted.",
"NeedsKMSAN": false
}Results: {
"KMSANReasoning": "The patch refactors the VXLAN subsystem to make the device configuration RCU-protected (`vxlan-\u003ecfg` dynamically allocated and managed via RCU rather than embedded in `struct vxlan_dev`), removes the legacy `default_dst` struct in favor of direct config lookups and a `lowerdev` pointer, and moves dynamic flags like `VXLAN_DEV_F_MDB` to `vxlan-\u003eflags`.\n\nAnalysis of memory initialization and leak risks:\n1. Heap structures: Newly allocated config structures (`new_cfg`) are created via `kmemdup()` from `conf`, which is fully cleared with `memset(conf, 0, sizeof(*conf))` in `vxlan_nl2conf()`. There are no uninitialized padding bytes or fields in the allocated config.\n2. Netlink / user space copies: In `vxlan_fill_info()`, `struct ifla_vxlan_port_range ports` has its initialization changed from aggregate to member assignments (`ports.low = ...; ports.high = ...;`). The UAPI `struct ifla_vxlan_port_range` consists strictly of two `__be16` fields (4 bytes total) with zero padding. Both fields are initialized prior to `nla_put()`. All other attributes emitted to userspace are scalars or copied from the zero-initialized config.\n3. Driver-internal structs: In `mlxsw_sp_bridge_vlan_aware_vxlan_join()`, `struct mlxsw_sp_nve_params` has all member fields explicitly assigned, and it is strictly driver-internal without being copied to userspace or read via memcmp.\n\nApplicability of KASAN vs KMSAN:\nThe potential risks of these changes lie in RCU lifetime correctness, use-after-free across grace periods, NULL pointer dereferences, and locking during configuration updates. These are effectively detected by KASAN, PROVE_RCU, and LOCKDEP. There are no uninitialized memory reads or kernel-to-user info-leak risks, so a dedicated KMSAN fuzzing session is not warranted.",
"NeedsKMSAN": false
} |
| Total Calls | Total Tokens | Avg Tokens | Total Duration (Seconds) | Avg Duration (Seconds) |
|---|
| Total Calls | Total Duration (Seconds) | Avg Duration (Seconds) |
|---|