Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccc7f496 authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files

net: print net_device reg_state in netdev_* unless it's registered 



This way we'll always know in what status the device is, unless it's
running normally (i.e. NETDEV_REGISTERED).

Also, emit a warning once in case of a bad reg_state.

CC: "David S. Miller" <davem@davemloft.net>
CC: Jason Baron <jbaron@akamai.com>
CC: Eric Dumazet <edumazet@google.com>
CC: Vlad Yasevich <vyasevic@redhat.com>
CC: stephen hemminger <stephen@networkplumber.org>
CC: Jerry Chu <hkchu@google.com>
CC: Ben Hutchings <bhutchings@solarflare.com>
CC: Joe Perches <joe@perches.com>
Signed-off-by: default avatarVeaceslav Falico <vfalico@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6f854d5

include/linux/netdevice.h

+17 −1
Original line number Diff line number Diff line
@@ -3388,6 +3388,21 @@ static inline const char *netdev_name(const struct net_device *dev) 
	return dev->name;

}



static inline const char *netdev_reg_state(const struct net_device *dev)

{

	switch (dev->reg_state) {

	case NETREG_UNINITIALIZED: return " (uninitialized)";

	case NETREG_REGISTERED: return "";

	case NETREG_UNREGISTERING: return " (unregistering)";

	case NETREG_UNREGISTERED: return " (unregistered)";

	case NETREG_RELEASED: return " (released)";

	case NETREG_DUMMY: return " (dummy)";

	}



	WARN_ONCE(1, "%s: unknown reg_state %d\n", dev->name, dev->reg_state);

	return " (unknown)";

}



__printf(3, 4)

int netdev_printk(const char *level, const struct net_device *dev,

		  const char *format, ...);
@@ -3444,7 +3459,8 @@ do { \ 
 * file/line information and a backtrace.

 */

#define netdev_WARN(dev, format, args...)			\

	WARN(1, "netdevice: %s\n" format, netdev_name(dev), ##args)

	WARN(1, "netdevice: %s%s\n" format, netdev_name(dev),	\

	     netdev_reg_state(dev), ##args)



/* netif printk helpers, similar to netdev_printk */

lib/dynamic_debug.c

+5 −3
Original line number Diff line number Diff line
@@ -614,13 +614,15 @@ int __dynamic_netdev_dbg(struct _ddebug *descriptor, 
		char buf[PREFIX_SIZE];



		res = dev_printk_emit(7, dev->dev.parent,

				      "%s%s %s %s: %pV",

				      "%s%s %s %s%s: %pV",

				      dynamic_emit_prefix(descriptor, buf),

				      dev_driver_string(dev->dev.parent),

				      dev_name(dev->dev.parent),

				      netdev_name(dev), &vaf);

				      netdev_name(dev), netdev_reg_state(dev),

				      &vaf);

	} else if (dev) {

		res = printk(KERN_DEBUG "%s: %pV", netdev_name(dev), &vaf);

		res = printk(KERN_DEBUG "%s%s: %pV", netdev_name(dev),

			     netdev_reg_state(dev), &vaf);

	} else {

		res = printk(KERN_DEBUG "(NULL net_device): %pV", &vaf);

	}

net/core/dev.c

+5 −3
Original line number Diff line number Diff line
@@ -6950,12 +6950,14 @@ static int __netdev_printk(const char *level, const struct net_device *dev, 
	if (dev && dev->dev.parent) {

		r = dev_printk_emit(level[1] - '0',

				    dev->dev.parent,

				    "%s %s %s: %pV",

				    "%s %s %s%s: %pV",

				    dev_driver_string(dev->dev.parent),

				    dev_name(dev->dev.parent),

				    netdev_name(dev), vaf);

				    netdev_name(dev), netdev_reg_state(dev),

				    vaf);

	} else if (dev) {

		r = printk("%s%s: %pV", level, netdev_name(dev), vaf);

		r = printk("%s%s%s: %pV", level, netdev_name(dev),

			   netdev_reg_state(dev), vaf);

	} else {

		r = printk("%s(NULL net_device): %pV", level, vaf);

	}