[PATCH nf-next] net: netfilter: Remove NFDEBUG.

[PATCH nf-next] net: netfilter: Remove NFDEBUG.

[Varsha Rao]

Remove NFDEBUG and use pr_debug() instead of it.

Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
---
 net/netfilter/nf_internals.h | 6 ------
 net/netfilter/nf_sockopt.c   | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/net/netfilter/nf_internals.h b/net/netfilter/nf_internals.h
index 19f00a47a710..e40016742530 100644
--- a/net/netfilter/nf_internals.h
+++ b/net/netfilter/nf_internals.h
@@ -5,12 +5,6 @@
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 
-#ifdef CONFIG_NETFILTER_DEBUG
-#define NFDEBUG(format, args...)  printk(KERN_DEBUG format , ## args)
-#else
-#define NFDEBUG(format, args...)
-#endif
-
 /* nf_queue.c */
 int nf_queue(struct sk_buff *skb, struct nf_hook_state *state,
 	     struct nf_hook_entry **entryp, unsigned int verdict);
diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
index c68c1e58b362..d2a9e6b5d01f 100644
--- a/net/netfilter/nf_sockopt.c
+++ b/net/netfilter/nf_sockopt.c
@@ -33,7 +33,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
 				reg->set_optmin, reg->set_optmax)
 			|| overlap(ops->get_optmin, ops->get_optmax,
 				   reg->get_optmin, reg->get_optmax))) {
-			NFDEBUG("nf_sock overlap: %u-%u/%u-%u v %u-%u/%u-%u\n",
+			pr_debug("nf_sock overlap: %u-%u/%u-%u v %u-%u/%u-%u\n",
 				ops->set_optmin, ops->set_optmax,
 				ops->get_optmin, ops->get_optmax,
 				reg->set_optmin, reg->set_optmax,
-- 
2.13.5

Re: [PATCH nf-next] net: netfilter: Remove NFDEBUG.

[Pablo Neira Ayuso]

On Fri, Aug 25, 2017 at 04:11:12PM +0530, Varsha Rao wrote:
> Remove NFDEBUG and use pr_debug() instead of it.

Applied, thanks.

Varsha, could you remove CONFIG_NETFILTER_DEBUG too?

Update IP_NF_ASSERT() to use WARN_ON(), this is actually already there
in ip6_tables.

net/bridge/netfilter/ebtables.c:#ifdef CONFIG_NETFILTER_DEBUG
net/bridge/netfilter/ebtables.c:#ifdef CONFIG_NETFILTER_DEBUG
net/bridge/netfilter/ebtables.c:#ifdef CONFIG_NETFILTER_DEBUG
net/ipv4/netfilter/ip_tables.c:#ifdef CONFIG_NETFILTER_DEBUG
net/ipv6/netfilter/ip6_tables.c:#ifdef CONFIG_NETFILTER_DEBUG

Conversions in ebtables.c are not so straight forward, but still
possible to get rid of this.

Make sure Kconfig and defconfig lines also goes away for good.

$ git grep NETFILTER_DEBUG
arch/parisc/configs/c3000_defconfig:CONFIG_NETFILTER_DEBUG=y
arch/sh/configs/se7751_defconfig:CONFIG_NETFILTER_DEBUG=y
include/net/netfilter/nf_conntrack.h:#ifdef CONFIG_NETFILTER_DEBUG
net/Kconfig:config NETFILTER_DEBUG

Same thing for NF_CT_ASSERT(), update it to use WARN_ON() instead.

Actually, you could send two patches: One to update all NF_CT_ASSERT()
to use WARN_ON(), then a patch to remove CONFIG_NETFILTER_DEBUG and
all these _ASSERT() macros.