[NET]: Do sysfs registration as part of register_netdevice. (b17a7c17) · Commits · 戴 / test

include/linux/netdevice.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -433,8 +433,7 @@ struct net_device

		/* register/unregister state machine */
		enum { NETREG_UNINITIALIZED=0,
		NETREG_REGISTERING, /* called register_netdevice */
		NETREG_REGISTERED, /* completed register todo */
		NETREG_REGISTERED, /* completed register_netdevice */
		NETREG_UNREGISTERING, /* called unregister_netdevice */
		NETREG_UNREGISTERED, /* completed unregister todo */
		NETREG_RELEASED, /* called free_netdev */

net/core/dev.c

+27 −36

Original line number	Diff line number	Diff line
		@@ -2777,6 +2777,8 @@ int register_netdevice(struct net_device *dev)
		BUG_ON(dev_boot_phase);
		ASSERT_RTNL();

		might_sleep();

		/* When net_device's are persistent, this will be fatal. */
		BUG_ON(dev->reg_state != NETREG_UNINITIALIZED);

		@@ -2863,6 +2865,11 @@ int register_netdevice(struct net_device *dev)
		if (!dev->rebuild_header)
		dev->rebuild_header = default_rebuild_header;

		ret = netdev_register_sysfs(dev);
		if (ret)
		goto out_err;
		dev->reg_state = NETREG_REGISTERED;

		/*
		* Default initial state at registry is that the
		* device is present.
		@@ -2878,14 +2885,11 @@ int register_netdevice(struct net_device *dev)
		hlist_add_head(&dev->name_hlist, head);
		hlist_add_head(&dev->index_hlist, dev_index_hash(dev->ifindex));
		dev_hold(dev);
		dev->reg_state = NETREG_REGISTERING;
		write_unlock_bh(&dev_base_lock);

		/* Notify protocols, that a new device appeared. */
		raw_notifier_call_chain(&netdev_chain, NETDEV_REGISTER, dev);

		/* Finish registration after unlock */
		net_set_todo(dev);
		ret = 0;

		out:
		@@ -3008,7 +3012,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
		*
		* We are invoked by rtnl_unlock() after it drops the semaphore.
		* This allows us to deal with problems:
		* 1) We can create/delete sysfs objects which invoke hotplug
		* 1) We can delete sysfs objects which invoke hotplug
		* without deadlocking with linkwatch via keventd.
		* 2) Since we run with the RTNL semaphore not held, we can sleep
		* safely in order to wait for the netdev refcnt to drop to zero.
		@@ -3017,8 +3021,6 @@ static DEFINE_MUTEX(net_todo_run_mutex);
		void netdev_run_todo(void)
		{
		struct list_head list = LIST_HEAD_INIT(list);
		int err;


		/* Need to guard against multiple cpu's getting out of order. */
		mutex_lock(&net_todo_run_mutex);
		@@ -3041,16 +3043,13 @@ void netdev_run_todo(void)
		= list_entry(list.next, struct net_device, todo_list);
		list_del(&dev->todo_list);

		switch(dev->reg_state) {
		case NETREG_REGISTERING:
		err = netdev_register_sysfs(dev);
		if (err)
		printk(KERN_ERR "%s: failed sysfs registration (%d)\n",
		dev->name, err);
		dev->reg_state = NETREG_REGISTERED;
		break;
		if (unlikely(dev->reg_state != NETREG_UNREGISTERING)) {
		printk(KERN_ERR "network todo '%s' but state %d\n",
		dev->name, dev->reg_state);
		dump_stack();
		continue;
		}

		case NETREG_UNREGISTERING:
		netdev_unregister_sysfs(dev);
		dev->reg_state = NETREG_UNREGISTERED;

		@@ -3062,19 +3061,11 @@ void netdev_run_todo(void)
		BUG_TRAP(!dev->ip6_ptr);
		BUG_TRAP(!dev->dn_ptr);


		/* It must be the very last action,
		* after this 'dev' may point to freed up memory.
		*/
		if (dev->destructor)
		dev->destructor(dev);
		break;

		default:
		printk(KERN_ERR "network todo '%s' but state %d\n",
		dev->name, dev->reg_state);
		break;
		}
		}

		out:

Admin message