lockless version of
Subsystems (5)
cover lockless version of
This series introduce the lockless version of netdev_notify_peers and then apply it to the relevant drivers.
Lijun Pan (3):
net: core: introduce netdev_notify_peers_locked
use netdev_notify_peers_locked in ibmvnic
use netdev_notify_peers_locked in hyperv
drivers/net/ethernet/ibm/ibmvnic.c | 9 +++------ drivers/net/hyperv/netvsc_drv.c | 6 +++--- include/linux/netdevice.h | 1 + net/core/dev.c | 19 +++++++++++++++++++ 4 files changed, 26 insertions(+), 9 deletions(-)
Signature · 1 line
2.23.0
RFC PATCH 1/3 net: core: introduce netdev_notify_peers_locked
There are some use cases for netdev_notify_peers in the context when rtnl lock is already held. Introduce lockless version of netdev_notify_peers call to save the extra code to call
call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, dev); call_netdevice_notifiers(NETDEV_RESEND_IGMP, dev);
--- include/linux/netdevice.h | 1 + net/core/dev.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+)
include/linux/netdevice.h +1 -0
@@ -4492,6 +4492,7 @@ int dev_set_promiscuity(struct net_device *dev, int inc);int dev_set_allmulti (struct net_device *dev,int inc);void netdev_state_change (struct net_device *dev);void netdev_notify_peers (struct net_device *dev); +void netdev_notify_peers_locked (struct net_device *dev);void netdev_features_change (struct net_device *dev);/* Load a device via the kmod */ void dev_load (struct net *net,const char *name);
net/core/dev.c +19 -0
@@ -1488,6 +1488,25 @@ void netdev_notify_peers(struct net_device *dev) }EXPORT_SYMBOL (netdev_notify_peers); +/** +* netdev_notify_peers_locked - notify network peers about existence of @dev, +* to be called in the context when rtnl lock is already held. +* @dev: network device +* +* Generate traffic such that interested network peers are aware of +* @dev, such as by generating a gratuitous ARP. This may be used when +* a device wants to inform the rest of the network about some sort of +* reconfiguration such as a failover event or virtual machine +* migration. +*/ +void netdev_notify_peers_locked (struct net_device *dev) +{ +ASSERT_RTNL (); +call_netdevice_notifiers (NETDEV_NOTIFY_PEERS , dev); +call_netdevice_notifiers (NETDEV_RESEND_IGMP , dev); +} +EXPORT_SYMBOL (netdev_notify_peers_locked); +static int __dev_open (struct net_device *dev,struct netlink_ext_ack *extack) {const struct net_device_ops *ops = dev->netdev_ops;
Signature · 1 line
2.23.0
RFC PATCH 3/3 use netdev_notify_peers_locked in hyperv
In reply to Lijun PanStart to use the lockless version of netdev_notify_peers.
--- drivers/net/hyperv/netvsc_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/hyperv/netvsc_drv.c +3 -3
@@ -2129,10 +2129,10 @@ static void netvsc_link_change(struct work_struct *w)break ; } -rtnl_unlock (); -if (notify) -netdev_notify_peers (net); +netdev_notify_peers_locked (net); + +rtnl_unlock ();/* link_watch only sends one notification with current state per * second, handle next reconfig event in 2 seconds.
Signature · 1 line
2.23.0
RFC PATCH 2/3 use netdev_notify_peers_locked in ibmvnic
In reply to Lijun PanStart to use the lockless version of netdev_notify_peers.
--- drivers/net/ethernet/ibm/ibmvnic.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +3 -6
@@ -2075,10 +2075,8 @@ static int do_reset(struct ibmvnic_adapter *adapter,napi_schedule (&adapter->napi[i]);if (adapter->reset_reason ==VNIC_RESET_FAILOVER || - adapter->reset_reason ==VNIC_RESET_MOBILITY ) { -call_netdevice_notifiers (NETDEV_NOTIFY_PEERS , netdev); -call_netdevice_notifiers (NETDEV_RESEND_IGMP , netdev); - } + adapter->reset_reason ==VNIC_RESET_MOBILITY ) +netdev_notify_peers_locked (netdev); rc =0 ;
@@ -2148,8 +2146,7 @@ static int do_hard_reset(struct ibmvnic_adapter *adapter,if (rc)return IBMVNIC_OPEN_FAILED ; -call_netdevice_notifiers (NETDEV_NOTIFY_PEERS , netdev); -call_netdevice_notifiers (NETDEV_RESEND_IGMP , netdev); +netdev_notify_peers_locked (netdev);return 0 ; }
Signature · 1 line
2.23.0
Jakub Kicinski
maintainerRe: [RFC PATCH net-next 1/3] net: core: introduce netdev_notify_peers_locked
In reply to Lijun PanQuoted 12 lines · On Sat, 5 Dec 2020 23:21:25 -0600 Lijun Pan wrote:
There are some use cases for
netdev_notify_peersin the context when rtnl lock is already held. Introduce lockless version ofnetdev_notify_peerscall to save the extra code to callcall_netdevice_notifiers(NETDEV_NOTIFY_PEERS, dev); call_netdevice_notifiers(NETDEV_RESEND_IGMP, dev);Suggested-by Nathan Lynch <[email protected]>Signed-off-by Lijun Pan <[email protected]>
net/core/dev.c void netdev_notify_peers(struct net_device *dev) · line 1489
Quoted 2 lines
net/core/dev.c +0
-0@@ -1488,6 +1488,25 @@ void netdev_notify_peers(struct net_device *dev) }EXPORT_SYMBOL (netdev_notify_peers);
Why not convert netdev_notify_peers to call the new helper? That way the chance they will get out of sync is way smaller.
net/core/dev.c void netdev_notify_peers(struct net_device *dev) · line 1502
Quoted 12 lines
net/core/dev.c +12
-0+/** +* netdev_notify_peers_locked - notify network peers about existence of @dev, +* to be called in the context when rtnl lock is already held. +* @dev: network device +* +* Generate traffic such that interested network peers are aware of +* @dev, such as by generating a gratuitous ARP. This may be used when +* a device wants to inform the rest of the network about some sort of +* reconfiguration such as a failover event or virtual machine +* migration. +*/ +void netdev_notify_peers_locked (struct net_device *dev)
I think __netdev_notify_peers() would be a more typical name for a core kernel function like this.
net/core/dev.c void netdev_notify_peers(struct net_device *dev) · line 1508
Quoted 6 lines
net/core/dev.c +6
-0+{ +ASSERT_RTNL (); +call_netdevice_notifiers (NETDEV_NOTIFY_PEERS , dev); +call_netdevice_notifiers (NETDEV_RESEND_IGMP , dev); +} +EXPORT_SYMBOL (netdev_notify_peers_locked);
Otherwise LGTM, seems like a good cleanup.