mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	netpoll: add net device refcount tracker to struct netpoll
Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
		
							parent
							
								
									42120a8643
								
							
						
					
					
						commit
						5fa5ae6058
					
				
					 3 changed files with 4 additions and 3 deletions
				
			
		| 
						 | 
					@ -721,7 +721,7 @@ static int netconsole_netdev_event(struct notifier_block *this,
 | 
				
			||||||
				__netpoll_cleanup(&nt->np);
 | 
									__netpoll_cleanup(&nt->np);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
				spin_lock_irqsave(&target_list_lock, flags);
 | 
									spin_lock_irqsave(&target_list_lock, flags);
 | 
				
			||||||
				dev_put(nt->np.dev);
 | 
									dev_put_track(nt->np.dev, &nt->np.dev_tracker);
 | 
				
			||||||
				nt->np.dev = NULL;
 | 
									nt->np.dev = NULL;
 | 
				
			||||||
				nt->enabled = false;
 | 
									nt->enabled = false;
 | 
				
			||||||
				stopped = true;
 | 
									stopped = true;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -24,6 +24,7 @@ union inet_addr {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct netpoll {
 | 
					struct netpoll {
 | 
				
			||||||
	struct net_device *dev;
 | 
						struct net_device *dev;
 | 
				
			||||||
 | 
						netdevice_tracker dev_tracker;
 | 
				
			||||||
	char dev_name[IFNAMSIZ];
 | 
						char dev_name[IFNAMSIZ];
 | 
				
			||||||
	const char *name;
 | 
						const char *name;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -776,7 +776,7 @@ int netpoll_setup(struct netpoll *np)
 | 
				
			||||||
	err = __netpoll_setup(np, ndev);
 | 
						err = __netpoll_setup(np, ndev);
 | 
				
			||||||
	if (err)
 | 
						if (err)
 | 
				
			||||||
		goto put;
 | 
							goto put;
 | 
				
			||||||
 | 
						netdev_tracker_alloc(ndev, &np->dev_tracker, GFP_KERNEL);
 | 
				
			||||||
	rtnl_unlock();
 | 
						rtnl_unlock();
 | 
				
			||||||
	return 0;
 | 
						return 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -853,7 +853,7 @@ void netpoll_cleanup(struct netpoll *np)
 | 
				
			||||||
	if (!np->dev)
 | 
						if (!np->dev)
 | 
				
			||||||
		goto out;
 | 
							goto out;
 | 
				
			||||||
	__netpoll_cleanup(np);
 | 
						__netpoll_cleanup(np);
 | 
				
			||||||
	dev_put(np->dev);
 | 
						dev_put_track(np->dev, &np->dev_tracker);
 | 
				
			||||||
	np->dev = NULL;
 | 
						np->dev = NULL;
 | 
				
			||||||
out:
 | 
					out:
 | 
				
			||||||
	rtnl_unlock();
 | 
						rtnl_unlock();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue