udp_tunnel_nic: post conversion cleanup
Subsystems (19)
Jakub Kicinski
maintainercover udp_tunnel_nic: post conversion cleanup
It has been two releases since we added the common infra for UDP tunnel port offload, and we have not heard of any major issues. Remove the old direct driver NDOs completely, and perform minor simplifications in the tunnel drivers.
Jakub Kicinski (4):
udp_tunnel: hard-wire NDOs to udp_tunnel_nic_*_port() helpers
udp_tunnel: remove REGISTER/UNREGISTER handling from tunnel drivers
net: remove ndo_udp_tunnel_* callbacks
udp_tunnel: reshuffle NETIF_F_RX_UDP_TUNNEL_PORT checks
drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 -- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 -- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 -- .../net/ethernet/cavium/liquidio/lio_main.c | 2 -- .../ethernet/cavium/liquidio/lio_vf_main.c | 2 -- .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 -- drivers/net/ethernet/cisco/enic/enic_main.c | 4 ---- drivers/net/ethernet/emulex/benet/be_main.c | 2 -- .../net/ethernet/intel/fm10k/fm10k_netdev.c | 2 -- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 -- drivers/net/ethernet/intel/ice/ice_main.c | 2 -- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 -- .../net/ethernet/mellanox/mlx4/en_netdev.c | 4 ---- .../net/ethernet/mellanox/mlx5/core/en_main.c | 2 -- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 2 -- .../ethernet/netronome/nfp/nfp_net_common.c | 2 -- drivers/net/ethernet/qlogic/qede/qede_main.c | 6 ----- .../net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 -- drivers/net/ethernet/sfc/efx.c | 2 -- drivers/net/geneve.c | 14 ++++------- drivers/net/netdevsim/netdev.c | 2 -- drivers/net/vxlan.c | 15 ++++-------- include/linux/netdevice.h | 17 ------------- include/net/udp_tunnel.h | 8 +++++++ net/core/dev.c | 2 +- net/ipv4/udp_tunnel_core.c | 24 ++++--------------- 26 files changed, 22 insertions(+), 106 deletions(-)
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH 2/4 udp_tunnel: remove REGISTER/UNREGISTER handling from tunnel drivers
udp_tunnel_nic handles REGISTER and UNREGISTER event, now that all drivers use that infra we can drop the event handling in the tunnel drivers.
--- drivers/net/geneve.c | 14 ++++---------- drivers/net/vxlan.c | 15 +++++---------- 2 files changed, 9 insertions(+), 20 deletions(-)
drivers/net/geneve.c +4 -10
@@ -1851,16 +1851,10 @@ static int geneve_netdevice_event(struct notifier_block *unused, {struct net_device *dev =netdev_notifier_info_to_dev (ptr); -if (event ==NETDEV_UDP_TUNNEL_PUSH_INFO || - event ==NETDEV_UDP_TUNNEL_DROP_INFO ) { -geneve_offload_rx_ports (dev, event ==NETDEV_UDP_TUNNEL_PUSH_INFO ); - }else if (event ==NETDEV_UNREGISTER ) { -if (!dev->udp_tunnel_nic_info) -geneve_offload_rx_ports (dev, false); - }else if (event ==NETDEV_REGISTER ) { -if (!dev->udp_tunnel_nic_info) -geneve_offload_rx_ports (dev, true); - } +if (event ==NETDEV_UDP_TUNNEL_PUSH_INFO ) +geneve_offload_rx_ports (dev, true); +else if (event ==NETDEV_UDP_TUNNEL_DROP_INFO ) +geneve_offload_rx_ports (dev, false);return NOTIFY_DONE ; }
drivers/net/vxlan.c +5 -10
@@ -4521,17 +4521,12 @@ 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_UNREGISTER ) { -if (!dev->udp_tunnel_nic_info) -vxlan_offload_rx_ports (dev, false); +if (event ==NETDEV_UNREGISTER )vxlan_handle_lowerdev_unregister (vn, dev); - }else if (event ==NETDEV_REGISTER ) { -if (!dev->udp_tunnel_nic_info) -vxlan_offload_rx_ports (dev, true); - }else if (event ==NETDEV_UDP_TUNNEL_PUSH_INFO || - event ==NETDEV_UDP_TUNNEL_DROP_INFO ) { -vxlan_offload_rx_ports (dev, event ==NETDEV_UDP_TUNNEL_PUSH_INFO ); - } +else if (event ==NETDEV_UDP_TUNNEL_PUSH_INFO ) +vxlan_offload_rx_ports (dev, true); +else if (event ==NETDEV_UDP_TUNNEL_DROP_INFO ) +vxlan_offload_rx_ports (dev, false);return NOTIFY_DONE ; }
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH 3/4 net: remove ndo_udp_tunnel_* callbacks
In reply to Jakub KicinskiAll UDP tunnel port management is now routed via udp_tunnel_nic infra directly. Remove the old callbacks.
--- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 -- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 -- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 -- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 -- .../net/ethernet/cavium/liquidio/lio_vf_main.c | 2 -- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 -- drivers/net/ethernet/cisco/enic/enic_main.c | 4 ---- drivers/net/ethernet/emulex/benet/be_main.c | 2 -- drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 -- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 -- drivers/net/ethernet/intel/ice/ice_main.c | 2 -- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 -- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 ---- .../net/ethernet/mellanox/mlx5/core/en_main.c | 2 -- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 2 -- .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 -- drivers/net/ethernet/qlogic/qede/qede_main.c | 6 ------ .../net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 -- drivers/net/ethernet/sfc/efx.c | 2 -- drivers/net/netdevsim/netdev.c | 2 -- include/linux/netdevice.h | 17 ----------------- 21 files changed, 65 deletions(-)
drivers/net/ethernet/amd/xgbe/xgbe-drv.c +0 -2
@@ -2295,8 +2295,6 @@ static const struct net_device_ops xgbe_netdev_ops = { .ndo_setup_tc = xgbe_setup_tc, .ndo_fix_features = xgbe_fix_features, .ndo_set_features = xgbe_set_features, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = xgbe_features_check, };
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +0 -2
@@ -13071,8 +13071,6 @@ static const struct net_device_ops bnx2x_netdev_ops = { .ndo_get_phys_port_id = bnx2x_get_phys_port_id, .ndo_set_vf_link_state = bnx2x_set_vf_link_state, .ndo_features_check = bnx2x_features_check, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, };static int bnx2x_set_coherency_mask (struct bnx2x *bp)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +0 -2
@@ -12091,8 +12091,6 @@ static const struct net_device_ops bnxt_netdev_ops = {#ifdef CONFIG_RFS_ACCEL .ndo_rx_flow_steer = bnxt_rx_flow_steer, #endif - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_bpf = bnxt_xdp, .ndo_xdp_xmit = bnxt_xdp_xmit, .ndo_bridge_getlink = bnxt_bridge_getlink,
drivers/net/ethernet/cavium/liquidio/lio_main.c +0 -2
@@ -3219,8 +3219,6 @@ static const struct net_device_ops lionetdevops = { .ndo_do_ioctl = liquidio_ioctl, .ndo_fix_features = liquidio_fix_features, .ndo_set_features = liquidio_set_features, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_set_vf_mac = liquidio_set_vf_mac, .ndo_set_vf_vlan = liquidio_set_vf_vlan, .ndo_get_vf_config = liquidio_get_vf_config,
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +0 -2
@@ -1879,8 +1879,6 @@ static const struct net_device_ops lionetdevops = { .ndo_do_ioctl = liquidio_ioctl, .ndo_fix_features = liquidio_fix_features, .ndo_set_features = liquidio_set_features, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, };static int lio_nic_info (struct octeon_recv_info *recv_info,void *buf)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +0 -2
@@ -3882,8 +3882,6 @@ static const struct net_device_ops cxgb4_netdev_ops = {#endif /* CONFIG_CHELSIO_T4_FCOE */ .ndo_set_tx_maxrate = cxgb_set_tx_maxrate, .ndo_setup_tc = cxgb_setup_tc, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = cxgb_features_check, .ndo_fix_features = cxgb_fix_features, };
drivers/net/ethernet/cisco/enic/enic_main.c +0 -4
@@ -2509,8 +2509,6 @@ static const struct net_device_ops enic_netdev_dynamic_ops = {#ifdef CONFIG_RFS_ACCEL .ndo_rx_flow_steer = enic_rx_flow_steer, #endif - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = enic_features_check, };
@@ -2535,8 +2533,6 @@ static const struct net_device_ops enic_netdev_ops = {#ifdef CONFIG_RFS_ACCEL .ndo_rx_flow_steer = enic_rx_flow_steer, #endif - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = enic_features_check, };
drivers/net/ethernet/emulex/benet/be_main.c +0 -2
@@ -5179,8 +5179,6 @@ static const struct net_device_ops be_netdev_ops = {#endif .ndo_bridge_setlink = be_ndo_bridge_setlink, .ndo_bridge_getlink = be_ndo_bridge_getlink, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = be_features_check, .ndo_get_phys_port_id = be_get_phys_port_id, };
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +0 -2
@@ -1531,8 +1531,6 @@ static const struct net_device_ops fm10k_netdev_ops = { .ndo_set_vf_rate = fm10k_ndo_set_vf_bw, .ndo_get_vf_config = fm10k_ndo_get_vf_config, .ndo_get_vf_stats = fm10k_ndo_get_vf_stats, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_dfwd_add_station = fm10k_dfwd_add_station, .ndo_dfwd_del_station = fm10k_dfwd_del_station, .ndo_features_check = fm10k_features_check,
drivers/net/ethernet/intel/i40e/i40e_main.c +0 -2
@@ -12804,8 +12804,6 @@ static const struct net_device_ops i40e_netdev_ops = { .ndo_set_vf_link_state = i40e_ndo_set_vf_link_state, .ndo_set_vf_spoofchk = i40e_ndo_set_vf_spoofchk, .ndo_set_vf_trust = i40e_ndo_set_vf_trust, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_get_phys_port_id = i40e_get_phys_port_id, .ndo_fdb_add = i40e_ndo_fdb_add, .ndo_features_check = i40e_features_check,
drivers/net/ethernet/intel/ice/ice_main.c +0 -2
@@ -6790,6 +6790,4 @@ static const struct net_device_ops ice_netdev_ops = { .ndo_bpf = ice_xdp, .ndo_xdp_xmit = ice_xdp_xmit, .ndo_xsk_wakeup = ice_xsk_wakeup, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, };
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0 -2
@@ -10278,8 +10278,6 @@ static const struct net_device_ops ixgbe_netdev_ops = { .ndo_bridge_getlink = ixgbe_ndo_bridge_getlink, .ndo_dfwd_add_station = ixgbe_fwd_add, .ndo_dfwd_del_station = ixgbe_fwd_del, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = ixgbe_features_check, .ndo_bpf = ixgbe_xdp, .ndo_xdp_xmit = ixgbe_xdp_xmit,
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +0 -4
@@ -2839,8 +2839,6 @@ static const struct net_device_ops mlx4_netdev_ops = { .ndo_rx_flow_steer = mlx4_en_filter_rfs, #endif .ndo_get_phys_port_id = mlx4_en_get_phys_port_id, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = mlx4_en_features_check, .ndo_set_tx_maxrate = mlx4_en_set_tx_maxrate, .ndo_bpf = mlx4_xdp,
@@ -2873,8 +2871,6 @@ static const struct net_device_ops mlx4_netdev_ops_master = { .ndo_rx_flow_steer = mlx4_en_filter_rfs, #endif .ndo_get_phys_port_id = mlx4_en_get_phys_port_id, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = mlx4_en_features_check, .ndo_set_tx_maxrate = mlx4_en_set_tx_maxrate, .ndo_bpf = mlx4_xdp,
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +0 -2
@@ -4621,8 +4621,6 @@ const struct net_device_ops mlx5e_netdev_ops = { .ndo_change_mtu = mlx5e_change_nic_mtu, .ndo_do_ioctl = mlx5e_ioctl, .ndo_set_tx_maxrate = mlx5e_set_tx_maxrate, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = mlx5e_features_check, .ndo_tx_timeout = mlx5e_tx_timeout, .ndo_bpf = mlx5e_xdp,
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +0 -2
@@ -653,8 +653,6 @@ static const struct net_device_ops mlx5e_netdev_ops_uplink_rep = { .ndo_has_offload_stats = mlx5e_rep_has_offload_stats, .ndo_get_offload_stats = mlx5e_rep_get_offload_stats, .ndo_change_mtu = mlx5e_uplink_rep_change_mtu, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = mlx5e_features_check, .ndo_set_vf_mac = mlx5e_set_vf_mac, .ndo_set_vf_rate = mlx5e_set_vf_rate,
drivers/net/ethernet/netronome/nfp/nfp_net_common.c +0 -2
@@ -3656,8 +3656,6 @@ const struct net_device_ops nfp_net_netdev_ops = { .ndo_set_features = nfp_net_set_features, .ndo_features_check = nfp_net_features_check, .ndo_get_phys_port_name = nfp_net_get_phys_port_name, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_bpf = nfp_net_xdp, .ndo_get_devlink_port = nfp_devlink_get_devlink_port, };
drivers/net/ethernet/qlogic/qede/qede_main.c +0 -6
@@ -663,8 +663,6 @@ static const struct net_device_ops qede_netdev_ops = { .ndo_get_vf_config = qede_get_vf_config, .ndo_set_vf_rate = qede_set_vf_rate, #endif - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = qede_features_check, .ndo_bpf = qede_xdp, #ifdef CONFIG_RFS_ACCEL
@@ -688,8 +686,6 @@ static const struct net_device_ops qede_netdev_vf_ops = { .ndo_fix_features = qede_fix_features, .ndo_set_features = qede_set_features, .ndo_get_stats64 = qede_get_stats64, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = qede_features_check, };
@@ -707,8 +703,6 @@ static const struct net_device_ops qede_netdev_vf_xdp_ops = { .ndo_fix_features = qede_fix_features, .ndo_set_features = qede_set_features, .ndo_get_stats64 = qede_get_stats64, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = qede_features_check, .ndo_bpf = qede_xdp, .ndo_xdp_xmit = qede_xdp_transmit,
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +0 -2
@@ -520,8 +520,6 @@ static const struct net_device_ops qlcnic_netdev_ops = { .ndo_fdb_del = qlcnic_fdb_del, .ndo_fdb_dump = qlcnic_fdb_dump, .ndo_get_phys_port_id = qlcnic_get_phys_port_id, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = qlcnic_features_check, #ifdef CONFIG_QLCNIC_SRIOV .ndo_set_vf_mac = qlcnic_sriov_set_vf_mac,
drivers/net/ethernet/sfc/efx.c +0 -2
@@ -612,8 +612,6 @@ static const struct net_device_ops efx_netdev_ops = {#ifdef CONFIG_RFS_ACCEL .ndo_rx_flow_steer = efx_filter_rfs, #endif - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_xdp_xmit = efx_xdp_xmit, .ndo_bpf = efx_xdp };
drivers/net/netdevsim/netdev.c +0 -2
@@ -258,8 +258,6 @@ static const struct net_device_ops nsim_netdev_ops = { .ndo_setup_tc = nsim_setup_tc, .ndo_set_features = nsim_set_features, .ndo_bpf = nsim_bpf, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_get_devlink_port = nsim_get_devlink_port, };
include/linux/netdevice.h +0 -17
@@ -1213,19 +1213,6 @@ struct netdev_net_notifier {* struct netdev_phys_item_id *ppid) * Called to get the parent ID of the physical port of this device. * -* void (*ndo_udp_tunnel_add)(struct net_device *dev, -* struct udp_tunnel_info *ti); -* Called by UDP tunnel to notify a driver about the UDP port and socket -* address family that a UDP tunnel is listnening to. It is called only -* when a new port starts listening. The operation is protected by the -* RTNL. -* -* void (*ndo_udp_tunnel_del)(struct net_device *dev, -* struct udp_tunnel_info *ti); -* Called by UDP tunnel to notify the driver about a UDP port and socket -* address family that the UDP tunnel is not listening to anymore. The -* operation is protected by the RTNL. -* * void* (*ndo_dfwd_add_station)(struct net_device *pdev, * struct net_device *dev) * Called by upper layer devices to accelerate switching or other
@@ -1464,10 +1451,6 @@ struct net_device_ops { struct netdev_phys_item_id *ppid);int (*ndo_get_phys_port_name)(struct net_device *dev,char *name,size_t len); -void (*ndo_udp_tunnel_add)(struct net_device *dev, -struct udp_tunnel_info *ti); -void (*ndo_udp_tunnel_del)(struct net_device *dev, -struct udp_tunnel_info *ti);void * (*ndo_dfwd_add_station)(struct net_device *pdev,struct net_device *dev); void (*ndo_dfwd_del_station)(struct net_device *pdev,
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH 4/4 udp_tunnel: reshuffle NETIF_F_RX_UDP_TUNNEL_PORT checks
In reply to Jakub KicinskiMove the NETIF_F_RX_UDP_TUNNEL_PORT feature check into udp_tunnel_nic_*_port() helpers, since they're always done right before the call.
Add similar checks before calling the notifier. udp_tunnel_nic invokes the notifier without checking features which could result in some wasted cycles.
--- include/net/udp_tunnel.h | 8 ++++++++ net/ipv4/udp_tunnel_core.c | 10 ---------- 2 files changed, 8 insertions(+), 10 deletions(-)
include/net/udp_tunnel.h +8 -0
@@ -129,12 +129,16 @@ void udp_tunnel_notify_del_rx_port(struct socket *sock, unsigned short type);static inline void udp_tunnel_get_rx_info (struct net_device *dev) {ASSERT_RTNL (); +if (!(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT )) +return ;call_netdevice_notifiers (NETDEV_UDP_TUNNEL_PUSH_INFO , dev); }static inline void udp_tunnel_drop_rx_info (struct net_device *dev) {ASSERT_RTNL (); +if (!(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT )) +return ;call_netdevice_notifiers (NETDEV_UDP_TUNNEL_DROP_INFO , dev); }
@@ -323,6 +327,8 @@ udp_tunnel_nic_set_port_priv(struct net_device *dev, unsigned int table,static inline void udp_tunnel_nic_add_port (struct net_device *dev,struct udp_tunnel_info *ti) { +if (!(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT )) +return ;if (udp_tunnel_nic_ops) udp_tunnel_nic_ops->add_port (dev, ti); }
@@ -330,6 +336,8 @@ udp_tunnel_nic_add_port(struct net_device *dev, struct udp_tunnel_info *ti)static inline void udp_tunnel_nic_del_port (struct net_device *dev,struct udp_tunnel_info *ti) { +if (!(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT )) +return ;if (udp_tunnel_nic_ops) udp_tunnel_nic_ops->del_port (dev, ti); }
net/ipv4/udp_tunnel_core.c +0 -10
@@ -90,9 +90,6 @@ void udp_tunnel_push_rx_port(struct net_device *dev, struct socket *sock,struct sock *sk = sock->sk;struct udp_tunnel_info ti; -if (!(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT )) -return ; - ti.type = type; ti.sa_family = sk->sk_family; ti.port =inet_sk (sk)->inet_sport;
@@ -107,9 +104,6 @@ void udp_tunnel_drop_rx_port(struct net_device *dev, struct socket *sock,struct sock *sk = sock->sk;struct udp_tunnel_info ti; -if (!(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT )) -return ; - ti.type = type; ti.sa_family = sk->sk_family; ti.port =inet_sk (sk)->inet_sport;
@@ -132,8 +126,6 @@ void udp_tunnel_notify_add_rx_port(struct socket *sock, unsigned short type)rcu_read_lock ();for_each_netdev_rcu (net, dev) { -if (!(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT )) -continue ;udp_tunnel_nic_add_port (dev, &ti); }rcu_read_unlock ();
@@ -154,8 +146,6 @@ void udp_tunnel_notify_del_rx_port(struct socket *sock, unsigned short type)rcu_read_lock ();for_each_netdev_rcu (net, dev) { -if (!(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT )) -continue ;udp_tunnel_nic_del_port (dev, &ti); }rcu_read_unlock ();
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH 1/4 udp_tunnel: hard-wire NDOs to udp_tunnel_nic_*_port() helpers
In reply to Jakub KicinskiAll drivers use udp_tunnel_nic_*_port() helpers, prepare for NDO removal by invoking those helpers directly.
The helpers are safe to call on all devices, they check if device has the UDP tunnel state initialized.
--- net/core/dev.c | 2 +- net/ipv4/udp_tunnel_core.c | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-)
net/core/dev.c +1 -1
@@ -10002,7 +10002,7 @@ int register_netdevice(struct net_device *dev) dev->hw_features |= (NETIF_F_SOFT_FEATURES |NETIF_F_SOFT_FEATURES_OFF ); dev->features |=NETIF_F_SOFT_FEATURES ; -if (dev->netdev_ops->ndo_udp_tunnel_add) { +if (dev->udp_tunnel_nic_info) { dev->features |=NETIF_F_RX_UDP_TUNNEL_PORT ; dev->hw_features |=NETIF_F_RX_UDP_TUNNEL_PORT ; }
net/ipv4/udp_tunnel_core.c +6 -12
@@ -90,15 +90,14 @@ void udp_tunnel_push_rx_port(struct net_device *dev, struct socket *sock,struct sock *sk = sock->sk;struct udp_tunnel_info ti; -if (!dev->netdev_ops->ndo_udp_tunnel_add || - !(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT )) +if (!(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT ))return ; ti.type = type; ti.sa_family = sk->sk_family; ti.port =inet_sk (sk)->inet_sport; - dev->netdev_ops->ndo_udp_tunnel_add (dev, &ti); +udp_tunnel_nic_add_port (dev, &ti); }EXPORT_SYMBOL_GPL (udp_tunnel_push_rx_port);
@@ -108,15 +107,14 @@ void udp_tunnel_drop_rx_port(struct net_device *dev, struct socket *sock,struct sock *sk = sock->sk;struct udp_tunnel_info ti; -if (!dev->netdev_ops->ndo_udp_tunnel_del || - !(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT )) +if (!(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT ))return ; ti.type = type; ti.sa_family = sk->sk_family; ti.port =inet_sk (sk)->inet_sport; - dev->netdev_ops->ndo_udp_tunnel_del (dev, &ti); +udp_tunnel_nic_del_port (dev, &ti); }EXPORT_SYMBOL_GPL (udp_tunnel_drop_rx_port);
@@ -134,11 +132,9 @@ void udp_tunnel_notify_add_rx_port(struct socket *sock, unsigned short type)rcu_read_lock ();for_each_netdev_rcu (net, dev) { -if (!dev->netdev_ops->ndo_udp_tunnel_add) -continue ;if (!(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT ))continue ; - dev->netdev_ops->ndo_udp_tunnel_add (dev, &ti); +udp_tunnel_nic_add_port (dev, &ti); }rcu_read_unlock (); }
@@ -158,11 +154,9 @@ void udp_tunnel_notify_del_rx_port(struct socket *sock, unsigned short type)rcu_read_lock ();for_each_netdev_rcu (net, dev) { -if (!dev->netdev_ops->ndo_udp_tunnel_del) -continue ;if (!(dev->features &NETIF_F_RX_UDP_TUNNEL_PORT ))continue ; - dev->netdev_ops->ndo_udp_tunnel_del (dev, &ti); +udp_tunnel_nic_del_port (dev, &ti); }rcu_read_unlock (); }
Signature · 1 line
2.26.2
Quoted 11 lines · Jakub Kicinski
It has been two releases since we added the common infra for UDP tunnel port offload, and we have not heard of any major issues. Remove the old direct driver NDOs completely, and perform minor simplifications in the tunnel drivers.
Jakub Kicinski (4):
udp_tunnel: hard-wire NDOs to udp_tunnel_nic_*_port() helpers
udp_tunnel: remove REGISTER/UNREGISTER handling from tunnel drivers
net: remove ndo_udp_tunnel_* callbacks
udp_tunnel: reshuffleNETIF_F_RX_UDP_TUNNEL_PORTchecks
The patch set looks good to me.
Quoted 5 lines · Jakub Kicinski
It has been two releases since we added the common infra for UDP tunnel port offload, and we have not heard of any major issues. Remove the old direct driver NDOs completely, and perform minor simplifications in the tunnel drivers.
Nice to see this step! Everything seems straight forward to me.
Quoted 34 lines
Jakub Kicinski (4):
udp_tunnel: hard-wire NDOs to udp_tunnel_nic_*_port() helpers
udp_tunnel: remove REGISTER/UNREGISTER handling from tunnel drivers
net: remove ndo_udp_tunnel_* callbacks
udp_tunnel: reshuffleNETIF_F_RX_UDP_TUNNEL_PORTchecksdrivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 -- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 -- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 -- .../net/ethernet/cavium/liquidio/lio_main.c | 2 -- .../ethernet/cavium/liquidio/lio_vf_main.c | 2 -- .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 -- drivers/net/ethernet/cisco/enic/enic_main.c | 4 ---- drivers/net/ethernet/emulex/benet/be_main.c | 2 -- .../net/ethernet/intel/fm10k/fm10k_netdev.c | 2 -- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 -- drivers/net/ethernet/intel/ice/ice_main.c | 2 -- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 -- .../net/ethernet/mellanox/mlx4/en_netdev.c | 4 ---- .../net/ethernet/mellanox/mlx5/core/en_main.c | 2 -- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 2 -- .../ethernet/netronome/nfp/nfp_net_common.c | 2 -- drivers/net/ethernet/qlogic/qede/qede_main.c | 6 ----- .../net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 -- drivers/net/ethernet/sfc/efx.c | 2 -- drivers/net/geneve.c | 14 ++++------- drivers/net/netdevsim/netdev.c | 2 -- drivers/net/vxlan.c | 15 ++++-------- include/linux/netdevice.h | 17 ------------- include/net/udp_tunnel.h | 8 +++++++ net/core/dev.c | 2 +- net/ipv4/udp_tunnel_core.c | 24 ++++--------------- 26 files changed, 22 insertions(+), 106 deletions(-)
Quoted 4 lines · On Wed, 6 Jan 2021 13:06:33 -0800 Jakub Kicinski wrote:
It has been two releases since we added the common infra for UDP tunnel port offload, and we have not heard of any major issues. Remove the old direct driver NDOs completely, and perform minor simplifications in the tunnel drivers.
Applied, thanks for the reviews!