subject:"\[PATCH\] ipv6\: addrconf\: Use normal debugging style"

Re: [PATCH] ipv6: addrconf: Use normal debugging style

2018-03-27 Thread David Miller

From: Joe Perches 
Date: Mon, 26 Mar 2018 08:35:01 -0700

> Remove local ADBG macro and use netdev_dbg/pr_debug
> 
> Miscellanea:
> 
> o Remove unnecessary debug message after allocation failure as there
>   already is a dump_stack() on the failure paths
> o Leave the allocation failure message on snmp6_alloc_dev as there
>   is one code path that does not do a dump_stack()
> 
> Signed-off-by: Joe Perches 
> ---
> 
> Remerged resend of http://patchwork.ozlabs.org/patch/826028/
> back in October 2017

Applied to net-next, thanks Joe.

[PATCH] ipv6: addrconf: Use normal debugging style

2018-03-26 Thread Joe Perches

Remove local ADBG macro and use netdev_dbg/pr_debug

Miscellanea:

o Remove unnecessary debug message after allocation failure as there
  already is a dump_stack() on the failure paths
o Leave the allocation failure message on snmp6_alloc_dev as there
  is one code path that does not do a dump_stack()

Signed-off-by: Joe Perches 
---

Remerged resend of http://patchwork.ozlabs.org/patch/826028/
back in October 2017

 net/ipv6/addrconf.c | 28 
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 6fd4bbdc444f..0d104bd74934 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -94,15 +94,6 @@
 #include 
 #include 
 
-/* Set to 3 to get tracing... */
-#define ACONF_DEBUG 2
-
-#if ACONF_DEBUG >= 3
-#define ADBG(fmt, ...) printk(fmt, ##__VA_ARGS__)
-#else
-#define ADBG(fmt, ...) do { if (0) printk(fmt, ##__VA_ARGS__); } while (0)
-#endif
-
 #defineINFINITY_LIFE_TIME  0x
 
 #define IPV6_MAX_STRLEN \
@@ -409,9 +400,8 @@ static struct inet6_dev *ipv6_add_dev(struct net_device 
*dev)
dev_hold(dev);
 
if (snmp6_alloc_dev(ndev) < 0) {
-   ADBG(KERN_WARNING
-   "%s: cannot allocate memory for statistics; dev=%s.\n",
-   __func__, dev->name);
+   netdev_dbg(dev, "%s: cannot allocate memory for statistics\n",
+  __func__);
neigh_parms_release(_tbl, ndev->nd_parms);
dev_put(dev);
kfree(ndev);
@@ -419,9 +409,8 @@ static struct inet6_dev *ipv6_add_dev(struct net_device 
*dev)
}
 
if (snmp6_register_dev(ndev) < 0) {
-   ADBG(KERN_WARNING
-   "%s: cannot create /proc/net/dev_snmp6/%s\n",
-   __func__, dev->name);
+   netdev_dbg(dev, "%s: cannot create /proc/net/dev_snmp6/%s\n",
+  __func__, dev->name);
goto err_release;
}
 
@@ -984,7 +973,7 @@ static int ipv6_add_addr_hash(struct net_device *dev, 
struct inet6_ifaddr *ifa)
 
/* Ignore adding duplicate addresses on an interface */
if (ipv6_chk_same_addr(dev_net(dev), >addr, dev, hash)) {
-   ADBG("ipv6_add_addr: already assigned\n");
+   netdev_dbg(dev, "ipv6_add_addr: already assigned\n");
err = -EEXIST;
} else {
hlist_add_head_rcu(>addr_lst, _addr_lst[hash]);
@@ -1044,7 +1033,6 @@ ipv6_add_addr(struct inet6_dev *idev, const struct 
in6_addr *addr,
 
ifa = kzalloc(sizeof(*ifa), gfp_flags);
if (!ifa) {
-   ADBG("ipv6_add_addr: malloc failed\n");
err = -ENOBUFS;
goto out;
}
@@ -2618,7 +2606,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, 
int len, bool sllao)
pinfo = (struct prefix_info *) opt;
 
if (len < sizeof(struct prefix_info)) {
-   ADBG("addrconf: prefix option too short\n");
+   netdev_dbg(dev, "addrconf: prefix option too short\n");
return;
}
 
@@ -4446,8 +4434,8 @@ static void addrconf_verify_rtnl(void)
if (time_before(next_sched, jiffies + ADDRCONF_TIMER_FUZZ_MAX))
next_sched = jiffies + ADDRCONF_TIMER_FUZZ_MAX;
 
-   ADBG(KERN_DEBUG "now = %lu, schedule = %lu, rounded schedule = %lu => 
%lu\n",
- now, next, next_sec, next_sched);
+   pr_debug("now = %lu, schedule = %lu, rounded schedule = %lu => %lu\n",
+now, next, next_sec, next_sched);
mod_delayed_work(addrconf_wq, _chk_work, next_sched - now);
rcu_read_unlock_bh();
 }
-- 
2.15.0

Re: [PATCH] ipv6: addrconf: Use normal debugging style

2017-10-16 Thread David Miller

From: Joe Perches 
Date: Sun, 15 Oct 2017 09:49:10 -0700

> Remove local ADBG macro and use netdev_dbg/pr_debug
> 
> Miscellanea:
> 
> o Remove unnecessary debug message after allocation failure as there
>   already is a dump_stack() on the failure paths
> o Leave the allocation failure message on snmp6_alloc_dev as there
>   is one code path that does not do a dump_stack()
> 
> Signed-off-by: Joe Perches 

Joe please resubmit this when/if David's changes get applied.

[PATCH] ipv6: addrconf: Use normal debugging style

2017-10-15 Thread Joe Perches

Remove local ADBG macro and use netdev_dbg/pr_debug

Miscellanea:

o Remove unnecessary debug message after allocation failure as there
  already is a dump_stack() on the failure paths
o Leave the allocation failure message on snmp6_alloc_dev as there
  is one code path that does not do a dump_stack()

Signed-off-by: Joe Perches 
---

o This is on top of David Ahern's proposed patch
  net: ipv6: Make inet6addr_validator a blocking notifier

 net/ipv6/addrconf.c | 28 
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 31ff12277bcf..c505e84dda1f 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -94,15 +94,6 @@
 #include 
 #include 
 
-/* Set to 3 to get tracing... */
-#define ACONF_DEBUG 2
-
-#if ACONF_DEBUG >= 3
-#define ADBG(fmt, ...) printk(fmt, ##__VA_ARGS__)
-#else
-#define ADBG(fmt, ...) do { if (0) printk(fmt, ##__VA_ARGS__); } while (0)
-#endif
-
 #defineINFINITY_LIFE_TIME  0x
 
 #define IPV6_MAX_STRLEN \
@@ -409,9 +400,8 @@ static struct inet6_dev *ipv6_add_dev(struct net_device 
*dev)
dev_hold(dev);
 
if (snmp6_alloc_dev(ndev) < 0) {
-   ADBG(KERN_WARNING
-   "%s: cannot allocate memory for statistics; dev=%s.\n",
-   __func__, dev->name);
+   netdev_dbg(dev, "%s: cannot allocate memory for statistics\n",
+  __func__);
neigh_parms_release(_tbl, ndev->nd_parms);
dev_put(dev);
kfree(ndev);
@@ -419,9 +409,8 @@ static struct inet6_dev *ipv6_add_dev(struct net_device 
*dev)
}
 
if (snmp6_register_dev(ndev) < 0) {
-   ADBG(KERN_WARNING
-   "%s: cannot create /proc/net/dev_snmp6/%s\n",
-   __func__, dev->name);
+   netdev_dbg(dev, "%s: cannot create /proc/net/dev_snmp6/%s\n",
+  __func__, dev->name);
goto err_release;
}
 
@@ -966,7 +955,7 @@ static int ipv6_add_addr_hash(struct net_device *dev, 
struct inet6_ifaddr *ifa)
 
/* Ignore adding duplicate addresses on an interface */
if (ipv6_chk_same_addr(dev_net(dev), >addr, dev)) {
-   ADBG("ipv6_add_addr: already assigned\n");
+   netdev_dbg(dev, "ipv6_add_addr: already assigned\n");
err = -EEXIST;
goto out;
}
@@ -1029,7 +1018,6 @@ ipv6_add_addr(struct inet6_dev *idev, const struct 
in6_addr *addr,
 
ifa = kzalloc(sizeof(*ifa), gfp_flags);
if (!ifa) {
-   ADBG("ipv6_add_addr: malloc failed\n");
err = -ENOBUFS;
goto out;
}
@@ -2575,7 +2563,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, 
int len, bool sllao)
pinfo = (struct prefix_info *) opt;
 
if (len < sizeof(struct prefix_info)) {
-   ADBG("addrconf: prefix option too short\n");
+   netdev_dbg(dev, "addrconf: prefix option too short\n");
return;
}
 
@@ -4373,8 +4361,8 @@ static void addrconf_verify_rtnl(void)
if (time_before(next_sched, jiffies + ADDRCONF_TIMER_FUZZ_MAX))
next_sched = jiffies + ADDRCONF_TIMER_FUZZ_MAX;
 
-   ADBG(KERN_DEBUG "now = %lu, schedule = %lu, rounded schedule = %lu => 
%lu\n",
- now, next, next_sec, next_sched);
+   pr_debug("now = %lu, schedule = %lu, rounded schedule = %lu => %lu\n",
+now, next, next_sec, next_sched);
mod_delayed_work(addrconf_wq, _chk_work, next_sched - now);
rcu_read_unlock_bh();
 }
-- 
2.10.0.rc2.1.g053435c

Re: [PATCH] ipv6: addrconf: Use normal debugging style

[PATCH] ipv6: addrconf: Use normal debugging style

Re: [PATCH] ipv6: addrconf: Use normal debugging style

[PATCH] ipv6: addrconf: Use normal debugging style

4 matches

Site Navigation

Mail list logo

Footer information