* [PATCH Netfilter] net: netfilter: Replace printk() with more standardize output format.
@ 2018-03-10 18:39 Arushi Singhal
2018-03-10 19:13 ` Pablo Neira Ayuso
2018-03-11 3:41 ` [Outreachy kernel] " Vaishali Thakkar
0 siblings, 2 replies; 7+ messages in thread
From: Arushi Singhal @ 2018-03-10 18:39 UTC (permalink / raw)
To: pablo; +Cc: Jozsef Kadlecsik, Florian Westphal, David S. Miller,
outreachy-kernel
printk() is the raw way to print output and should be avoided.
For drivers with defined "struct device object", dev_*macro() is
prefer and for "struct netdevice object", netdev_*macro() is prefer over
dev_*macro() to standardize the output format within the subsystem.
If no "struct device object" is defined prefer pr_*macro() over
printk().
This patch Replace printk having a log level with the appropriate output
format according to the order of preference.
Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
---
net/netfilter/nf_conntrack_acct.c | 2 +-
net/netfilter/nf_conntrack_ecache.c | 2 +-
net/netfilter/nf_conntrack_timestamp.c | 2 +-
net/netfilter/nf_nat_core.c | 2 +-
net/netfilter/nfnetlink_queue.c | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
index 8669167..fc7329d 100644
--- a/net/netfilter/nf_conntrack_acct.c
+++ b/net/netfilter/nf_conntrack_acct.c
@@ -80,7 +80,7 @@ static int nf_conntrack_acct_init_sysctl(struct net *net)
net->ct.acct_sysctl_header = register_net_sysctl(net, "net/netfilter",
table);
if (!net->ct.acct_sysctl_header) {
- printk(KERN_ERR "nf_conntrack_acct: can't register to sysctl.\n");
+ netdev_err(net->loopback_dev, "nf_conntrack_acct: can't register to sysctl.\n");
goto out_register;
}
return 0;
diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
index caac41a..c1fb296 100644
--- a/net/netfilter/nf_conntrack_ecache.c
+++ b/net/netfilter/nf_conntrack_ecache.c
@@ -372,7 +372,7 @@ static int nf_conntrack_event_init_sysctl(struct net *net)
net->ct.event_sysctl_header =
register_net_sysctl(net, "net/netfilter", table);
if (!net->ct.event_sysctl_header) {
- printk(KERN_ERR "nf_ct_event: can't register to sysctl.\n");
+ netdev_err(net->loopback_dev, "nf_ct_event: can't register to sysctl.\n");
goto out_register;
}
return 0;
diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
index 4c4734b..abd9fbd 100644
--- a/net/netfilter/nf_conntrack_timestamp.c
+++ b/net/netfilter/nf_conntrack_timestamp.c
@@ -58,7 +58,7 @@ static int nf_conntrack_tstamp_init_sysctl(struct net *net)
net->ct.tstamp_sysctl_header = register_net_sysctl(net, "net/netfilter",
table);
if (!net->ct.tstamp_sysctl_header) {
- printk(KERN_ERR "nf_ct_tstamp: can't register to sysctl.\n");
+ netdev_err(net->loopback_dev, "nf_ct_tstamp: can't register to sysctl.\n");
goto out_register;
}
return 0;
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
index 6c38421..dcda5ac 100644
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -814,7 +814,7 @@ static int __init nf_nat_init(void)
ret = nf_ct_extend_register(&nat_extend);
if (ret < 0) {
nf_ct_free_hashtable(nf_nat_bysource, nf_nat_htable_size);
- printk(KERN_ERR "nf_nat_core: Unable to register extension\n");
+ pr_err("nf_nat_core: Unable to register extension\n");
return ret;
}
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 8bba231..4b4bef5 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -834,8 +834,8 @@ nfqnl_mangle(void *data, int data_len, struct nf_queue_entry *e, int diff)
nskb = skb_copy_expand(e->skb, skb_headroom(e->skb),
diff, GFP_ATOMIC);
if (!nskb) {
- printk(KERN_WARNING "nf_queue: OOM "
- "in mangle, dropping packet\n");
+ netdev_warn(nskb->dev, "nf_queue: OOM "
+ "in mangle, dropping packet\n");
return -ENOMEM;
}
kfree_skb(e->skb);
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH Netfilter] net: netfilter: Replace printk() with more standardize output format.
2018-03-10 18:39 [PATCH Netfilter] net: netfilter: Replace printk() with more standardize output format Arushi Singhal
@ 2018-03-10 19:13 ` Pablo Neira Ayuso
2018-03-11 5:07 ` Arushi Singhal
2018-03-11 3:41 ` [Outreachy kernel] " Vaishali Thakkar
1 sibling, 1 reply; 7+ messages in thread
From: Pablo Neira Ayuso @ 2018-03-10 19:13 UTC (permalink / raw)
To: Arushi Singhal
Cc: Jozsef Kadlecsik, Florian Westphal, David S. Miller,
outreachy-kernel, netfilter-devel
On Sun, Mar 11, 2018 at 12:09:07AM +0530, Arushi Singhal wrote:
> printk() is the raw way to print output and should be avoided.
>
> For drivers with defined "struct device object", dev_*macro() is
> prefer and for "struct netdevice object", netdev_*macro() is prefer over
> dev_*macro() to standardize the output format within the subsystem.
>
> If no "struct device object" is defined prefer pr_*macro() over
> printk().
>
> This patch Replace printk having a log level with the appropriate output
> format according to the order of preference.
>
> Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
> ---
> net/netfilter/nf_conntrack_acct.c | 2 +-
> net/netfilter/nf_conntrack_ecache.c | 2 +-
> net/netfilter/nf_conntrack_timestamp.c | 2 +-
> net/netfilter/nf_nat_core.c | 2 +-
> net/netfilter/nfnetlink_queue.c | 4 ++--
> 5 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
> index 8669167..fc7329d 100644
> --- a/net/netfilter/nf_conntrack_acct.c
> +++ b/net/netfilter/nf_conntrack_acct.c
> @@ -80,7 +80,7 @@ static int nf_conntrack_acct_init_sysctl(struct net *net)
> net->ct.acct_sysctl_header = register_net_sysctl(net, "net/netfilter",
> table);
> if (!net->ct.acct_sysctl_header) {
> - printk(KERN_ERR "nf_conntrack_acct: can't register to sysctl.\n");
> + netdev_err(net->loopback_dev, "nf_conntrack_acct: can't register to sysctl.\n");
Please, use pr_err instead.
And while you are at it, add
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
whenever possible, thanks!
P.S: Send your netfilter patches to netfilter-devel@vger.kernel.org.
> goto out_register;
> }
> return 0;
> diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
> index caac41a..c1fb296 100644
> --- a/net/netfilter/nf_conntrack_ecache.c
> +++ b/net/netfilter/nf_conntrack_ecache.c
> @@ -372,7 +372,7 @@ static int nf_conntrack_event_init_sysctl(struct net *net)
> net->ct.event_sysctl_header =
> register_net_sysctl(net, "net/netfilter", table);
> if (!net->ct.event_sysctl_header) {
> - printk(KERN_ERR "nf_ct_event: can't register to sysctl.\n");
> + netdev_err(net->loopback_dev, "nf_ct_event: can't register to sysctl.\n");
> goto out_register;
> }
> return 0;
> diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
> index 4c4734b..abd9fbd 100644
> --- a/net/netfilter/nf_conntrack_timestamp.c
> +++ b/net/netfilter/nf_conntrack_timestamp.c
> @@ -58,7 +58,7 @@ static int nf_conntrack_tstamp_init_sysctl(struct net *net)
> net->ct.tstamp_sysctl_header = register_net_sysctl(net, "net/netfilter",
> table);
> if (!net->ct.tstamp_sysctl_header) {
> - printk(KERN_ERR "nf_ct_tstamp: can't register to sysctl.\n");
> + netdev_err(net->loopback_dev, "nf_ct_tstamp: can't register to sysctl.\n");
> goto out_register;
> }
> return 0;
> diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
> index 6c38421..dcda5ac 100644
> --- a/net/netfilter/nf_nat_core.c
> +++ b/net/netfilter/nf_nat_core.c
> @@ -814,7 +814,7 @@ static int __init nf_nat_init(void)
> ret = nf_ct_extend_register(&nat_extend);
> if (ret < 0) {
> nf_ct_free_hashtable(nf_nat_bysource, nf_nat_htable_size);
> - printk(KERN_ERR "nf_nat_core: Unable to register extension\n");
> + pr_err("nf_nat_core: Unable to register extension\n");
> return ret;
> }
>
> diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
> index 8bba231..4b4bef5 100644
> --- a/net/netfilter/nfnetlink_queue.c
> +++ b/net/netfilter/nfnetlink_queue.c
> @@ -834,8 +834,8 @@ nfqnl_mangle(void *data, int data_len, struct nf_queue_entry *e, int diff)
> nskb = skb_copy_expand(e->skb, skb_headroom(e->skb),
> diff, GFP_ATOMIC);
> if (!nskb) {
> - printk(KERN_WARNING "nf_queue: OOM "
> - "in mangle, dropping packet\n");
> + netdev_warn(nskb->dev, "nf_queue: OOM "
> + "in mangle, dropping packet\n");
> return -ENOMEM;
> }
> kfree_skb(e->skb);
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Outreachy kernel] [PATCH Netfilter] net: netfilter: Replace printk() with more standardize output format.
2018-03-10 18:39 [PATCH Netfilter] net: netfilter: Replace printk() with more standardize output format Arushi Singhal
2018-03-10 19:13 ` Pablo Neira Ayuso
@ 2018-03-11 3:41 ` Vaishali Thakkar
2018-03-11 4:41 ` Arushi Singhal
1 sibling, 1 reply; 7+ messages in thread
From: Vaishali Thakkar @ 2018-03-11 3:41 UTC (permalink / raw)
To: Arushi Singhal
Cc: Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal,
David S. Miller, outreachy-kernel
On Sun, Mar 11, 2018 at 12:09 AM, Arushi Singhal
<arushisinghal19971997@gmail.com> wrote:
> printk() is the raw way to print output and should be avoided.
>
> For drivers with defined "struct device object", dev_*macro() is
> prefer and for "struct netdevice object", netdev_*macro() is prefer over
> dev_*macro() to standardize the output format within the subsystem.
>
> If no "struct device object" is defined prefer pr_*macro() over
> printk().
>
> This patch Replace printk having a log level with the appropriate output
> format according to the order of preference.
Hi Arushi,
As mentioned in the IRC chat for Outreachy applicants, please drop
outreachy-kernel mailing list while sending patches to other subsystems
than drivers/staging to avoid confusion.
Thank you!
> Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
> ---
> net/netfilter/nf_conntrack_acct.c | 2 +-
> net/netfilter/nf_conntrack_ecache.c | 2 +-
> net/netfilter/nf_conntrack_timestamp.c | 2 +-
> net/netfilter/nf_nat_core.c | 2 +-
> net/netfilter/nfnetlink_queue.c | 4 ++--
> 5 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
> index 8669167..fc7329d 100644
> --- a/net/netfilter/nf_conntrack_acct.c
> +++ b/net/netfilter/nf_conntrack_acct.c
> @@ -80,7 +80,7 @@ static int nf_conntrack_acct_init_sysctl(struct net *net)
> net->ct.acct_sysctl_header = register_net_sysctl(net, "net/netfilter",
> table);
> if (!net->ct.acct_sysctl_header) {
> - printk(KERN_ERR "nf_conntrack_acct: can't register to sysctl.\n");
> + netdev_err(net->loopback_dev, "nf_conntrack_acct: can't register to sysctl.\n");
> goto out_register;
> }
> return 0;
> diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
> index caac41a..c1fb296 100644
> --- a/net/netfilter/nf_conntrack_ecache.c
> +++ b/net/netfilter/nf_conntrack_ecache.c
> @@ -372,7 +372,7 @@ static int nf_conntrack_event_init_sysctl(struct net *net)
> net->ct.event_sysctl_header =
> register_net_sysctl(net, "net/netfilter", table);
> if (!net->ct.event_sysctl_header) {
> - printk(KERN_ERR "nf_ct_event: can't register to sysctl.\n");
> + netdev_err(net->loopback_dev, "nf_ct_event: can't register to sysctl.\n");
> goto out_register;
> }
> return 0;
> diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
> index 4c4734b..abd9fbd 100644
> --- a/net/netfilter/nf_conntrack_timestamp.c
> +++ b/net/netfilter/nf_conntrack_timestamp.c
> @@ -58,7 +58,7 @@ static int nf_conntrack_tstamp_init_sysctl(struct net *net)
> net->ct.tstamp_sysctl_header = register_net_sysctl(net, "net/netfilter",
> table);
> if (!net->ct.tstamp_sysctl_header) {
> - printk(KERN_ERR "nf_ct_tstamp: can't register to sysctl.\n");
> + netdev_err(net->loopback_dev, "nf_ct_tstamp: can't register to sysctl.\n");
> goto out_register;
> }
> return 0;
> diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
> index 6c38421..dcda5ac 100644
> --- a/net/netfilter/nf_nat_core.c
> +++ b/net/netfilter/nf_nat_core.c
> @@ -814,7 +814,7 @@ static int __init nf_nat_init(void)
> ret = nf_ct_extend_register(&nat_extend);
> if (ret < 0) {
> nf_ct_free_hashtable(nf_nat_bysource, nf_nat_htable_size);
> - printk(KERN_ERR "nf_nat_core: Unable to register extension\n");
> + pr_err("nf_nat_core: Unable to register extension\n");
> return ret;
> }
>
> diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
> index 8bba231..4b4bef5 100644
> --- a/net/netfilter/nfnetlink_queue.c
> +++ b/net/netfilter/nfnetlink_queue.c
> @@ -834,8 +834,8 @@ nfqnl_mangle(void *data, int data_len, struct nf_queue_entry *e, int diff)
> nskb = skb_copy_expand(e->skb, skb_headroom(e->skb),
> diff, GFP_ATOMIC);
> if (!nskb) {
> - printk(KERN_WARNING "nf_queue: OOM "
> - "in mangle, dropping packet\n");
> + netdev_warn(nskb->dev, "nf_queue: OOM "
> + "in mangle, dropping packet\n");
> return -ENOMEM;
> }
> kfree_skb(e->skb);
> --
> 2.7.4
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20180310183906.GA20125%40seema-Inspiron-15-3567.
> For more options, visit https://groups.google.com/d/optout.
--
Vaishali
http://vaishalithakkar.in/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Outreachy kernel] [PATCH Netfilter] net: netfilter: Replace printk() with more standardize output format.
2018-03-11 3:41 ` [Outreachy kernel] " Vaishali Thakkar
@ 2018-03-11 4:41 ` Arushi Singhal
2018-03-11 6:44 ` Vaishali Thakkar
0 siblings, 1 reply; 7+ messages in thread
From: Arushi Singhal @ 2018-03-11 4:41 UTC (permalink / raw)
To: Vaishali Thakkar
Cc: Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal,
David S. Miller, outreachy-kernel
[-- Attachment #1: Type: text/plain, Size: 5887 bytes --]
On Sun, Mar 11, 2018 at 9:11 AM, Vaishali Thakkar <vthakkar1994@gmail.com>
wrote:
> On Sun, Mar 11, 2018 at 12:09 AM, Arushi Singhal
> <arushisinghal19971997@gmail.com> wrote:
> > printk() is the raw way to print output and should be avoided.
> >
> > For drivers with defined "struct device object", dev_*macro() is
> > prefer and for "struct netdevice object", netdev_*macro() is prefer over
> > dev_*macro() to standardize the output format within the subsystem.
> >
> > If no "struct device object" is defined prefer pr_*macro() over
> > printk().
> >
> > This patch Replace printk having a log level with the appropriate output
> > format according to the order of preference.
>
> Hi Arushi,
>
> As mentioned in the IRC chat for Outreachy applicants, please drop
> outreachy-kernel mailing list while sending patches to other subsystems
> than drivers/staging to avoid confusion.
>
> Hello Vaishali
I know, but netfilter is the part of the outreachy project.
Want to clarify if project patches need to be send on kernel mailing list
or not?
Arushi
> Thank you!
>
> > Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
> > ---
> > net/netfilter/nf_conntrack_acct.c | 2 +-
> > net/netfilter/nf_conntrack_ecache.c | 2 +-
> > net/netfilter/nf_conntrack_timestamp.c | 2 +-
> > net/netfilter/nf_nat_core.c | 2 +-
> > net/netfilter/nfnetlink_queue.c | 4 ++--
> > 5 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/net/netfilter/nf_conntrack_acct.c
> b/net/netfilter/nf_conntrack_acct.c
> > index 8669167..fc7329d 100644
> > --- a/net/netfilter/nf_conntrack_acct.c
> > +++ b/net/netfilter/nf_conntrack_acct.c
> > @@ -80,7 +80,7 @@ static int nf_conntrack_acct_init_sysctl(struct net
> *net)
> > net->ct.acct_sysctl_header = register_net_sysctl(net,
> "net/netfilter",
> > table);
> > if (!net->ct.acct_sysctl_header) {
> > - printk(KERN_ERR "nf_conntrack_acct: can't register to
> sysctl.\n");
> > + netdev_err(net->loopback_dev, "nf_conntrack_acct: can't
> register to sysctl.\n");
> > goto out_register;
> > }
> > return 0;
> > diff --git a/net/netfilter/nf_conntrack_ecache.c
> b/net/netfilter/nf_conntrack_ecache.c
> > index caac41a..c1fb296 100644
> > --- a/net/netfilter/nf_conntrack_ecache.c
> > +++ b/net/netfilter/nf_conntrack_ecache.c
> > @@ -372,7 +372,7 @@ static int nf_conntrack_event_init_sysctl(struct
> net *net)
> > net->ct.event_sysctl_header =
> > register_net_sysctl(net, "net/netfilter", table);
> > if (!net->ct.event_sysctl_header) {
> > - printk(KERN_ERR "nf_ct_event: can't register to
> sysctl.\n");
> > + netdev_err(net->loopback_dev, "nf_ct_event: can't
> register to sysctl.\n");
> > goto out_register;
> > }
> > return 0;
> > diff --git a/net/netfilter/nf_conntrack_timestamp.c
> b/net/netfilter/nf_conntrack_timestamp.c
> > index 4c4734b..abd9fbd 100644
> > --- a/net/netfilter/nf_conntrack_timestamp.c
> > +++ b/net/netfilter/nf_conntrack_timestamp.c
> > @@ -58,7 +58,7 @@ static int nf_conntrack_tstamp_init_sysctl(struct net
> *net)
> > net->ct.tstamp_sysctl_header = register_net_sysctl(net,
> "net/netfilter",
> > table);
> > if (!net->ct.tstamp_sysctl_header) {
> > - printk(KERN_ERR "nf_ct_tstamp: can't register to
> sysctl.\n");
> > + netdev_err(net->loopback_dev, "nf_ct_tstamp: can't
> register to sysctl.\n");
> > goto out_register;
> > }
> > return 0;
> > diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
> > index 6c38421..dcda5ac 100644
> > --- a/net/netfilter/nf_nat_core.c
> > +++ b/net/netfilter/nf_nat_core.c
> > @@ -814,7 +814,7 @@ static int __init nf_nat_init(void)
> > ret = nf_ct_extend_register(&nat_extend);
> > if (ret < 0) {
> > nf_ct_free_hashtable(nf_nat_bysource,
> nf_nat_htable_size);
> > - printk(KERN_ERR "nf_nat_core: Unable to register
> extension\n");
> > + pr_err("nf_nat_core: Unable to register extension\n");
> > return ret;
> > }
> >
> > diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_
> queue.c
> > index 8bba231..4b4bef5 100644
> > --- a/net/netfilter/nfnetlink_queue.c
> > +++ b/net/netfilter/nfnetlink_queue.c
> > @@ -834,8 +834,8 @@ nfqnl_mangle(void *data, int data_len, struct
> nf_queue_entry *e, int diff)
> > nskb = skb_copy_expand(e->skb,
> skb_headroom(e->skb),
> > diff, GFP_ATOMIC);
> > if (!nskb) {
> > - printk(KERN_WARNING "nf_queue: OOM "
> > - "in mangle, dropping packet\n");
> > + netdev_warn(nskb->dev, "nf_queue: OOM "
> > + "in mangle, dropping
> packet\n");
> > return -ENOMEM;
> > }
> > kfree_skb(e->skb);
> > --
> > 2.7.4
> >
> > --
> > You received this message because you are subscribed to the Google
> Groups "outreachy-kernel" group.
> > To unsubscribe from this group and stop receiving emails from it, send
> an email to outreachy-kernel+unsubscribe@googlegroups.com.
> > To post to this group, send email to outreachy-kernel@googlegroups.com.
> > To view this discussion on the web visit https://groups.google.com/d/
> msgid/outreachy-kernel/20180310183906.GA20125%40seema-Inspiron-15-3567.
> > For more options, visit https://groups.google.com/d/optout.
>
>
>
> --
> Vaishali
> http://vaishalithakkar.in/
>
[-- Attachment #2: Type: text/html, Size: 8428 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH Netfilter] net: netfilter: Replace printk() with more standardize output format.
2018-03-10 19:13 ` Pablo Neira Ayuso
@ 2018-03-11 5:07 ` Arushi Singhal
2018-03-11 10:55 ` Florian Westphal
0 siblings, 1 reply; 7+ messages in thread
From: Arushi Singhal @ 2018-03-11 5:07 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: Jozsef Kadlecsik, Florian Westphal, David S. Miller,
outreachy-kernel, Netfilter Developer Mailing List
[-- Attachment #1: Type: text/plain, Size: 5147 bytes --]
On Sun, Mar 11, 2018 at 12:43 AM, Pablo Neira Ayuso <pablo@netfilter.org>
wrote:
> On Sun, Mar 11, 2018 at 12:09:07AM +0530, Arushi Singhal wrote:
> > printk() is the raw way to print output and should be avoided.
> >
> > For drivers with defined "struct device object", dev_*macro() is
> > prefer and for "struct netdevice object", netdev_*macro() is prefer over
> > dev_*macro() to standardize the output format within the subsystem.
> >
> > If no "struct device object" is defined prefer pr_*macro() over
> > printk().
> >
> > This patch Replace printk having a log level with the appropriate output
> > format according to the order of preference.
> >
> > Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
> > ---
> > net/netfilter/nf_conntrack_acct.c | 2 +-
> > net/netfilter/nf_conntrack_ecache.c | 2 +-
> > net/netfilter/nf_conntrack_timestamp.c | 2 +-
> > net/netfilter/nf_nat_core.c | 2 +-
> > net/netfilter/nfnetlink_queue.c | 4 ++--
> > 5 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/net/netfilter/nf_conntrack_acct.c
> b/net/netfilter/nf_conntrack_acct.c
> > index 8669167..fc7329d 100644
> > --- a/net/netfilter/nf_conntrack_acct.c
> > +++ b/net/netfilter/nf_conntrack_acct.c
> > @@ -80,7 +80,7 @@ static int nf_conntrack_acct_init_sysctl(struct net
> *net)
> > net->ct.acct_sysctl_header = register_net_sysctl(net,
> "net/netfilter",
> > table);
> > if (!net->ct.acct_sysctl_header) {
> > - printk(KERN_ERR "nf_conntrack_acct: can't register to
> sysctl.\n");
> > + netdev_err(net->loopback_dev, "nf_conntrack_acct: can't
> register to sysctl.\n");
>
> Please, use pr_err instead.
>
> And while you are at it, add
>
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> whenever possible, thanks!
>
> P.S: Send your netfilter patches to netfilter-devel@vger.kernel.org.
>
Hello Pablo
I''ll resend the patch according your suggestions.
Just for curiosity wanted to ask why not netdev_*().
Arushi
>
> > goto out_register;
> > }
> > return 0;
> > diff --git a/net/netfilter/nf_conntrack_ecache.c
> b/net/netfilter/nf_conntrack_ecache.c
> > index caac41a..c1fb296 100644
> > --- a/net/netfilter/nf_conntrack_ecache.c
> > +++ b/net/netfilter/nf_conntrack_ecache.c
> > @@ -372,7 +372,7 @@ static int nf_conntrack_event_init_sysctl(struct
> net *net)
> > net->ct.event_sysctl_header =
> > register_net_sysctl(net, "net/netfilter", table);
> > if (!net->ct.event_sysctl_header) {
> > - printk(KERN_ERR "nf_ct_event: can't register to
> sysctl.\n");
> > + netdev_err(net->loopback_dev, "nf_ct_event: can't register
> to sysctl.\n");
> > goto out_register;
> > }
> > return 0;
> > diff --git a/net/netfilter/nf_conntrack_timestamp.c
> b/net/netfilter/nf_conntrack_timestamp.c
> > index 4c4734b..abd9fbd 100644
> > --- a/net/netfilter/nf_conntrack_timestamp.c
> > +++ b/net/netfilter/nf_conntrack_timestamp.c
> > @@ -58,7 +58,7 @@ static int nf_conntrack_tstamp_init_sysctl(struct net
> *net)
> > net->ct.tstamp_sysctl_header = register_net_sysctl(net,
> "net/netfilter",
> > table);
> > if (!net->ct.tstamp_sysctl_header) {
> > - printk(KERN_ERR "nf_ct_tstamp: can't register to
> sysctl.\n");
> > + netdev_err(net->loopback_dev, "nf_ct_tstamp: can't
> register to sysctl.\n");
> > goto out_register;
> > }
> > return 0;
> > diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
> > index 6c38421..dcda5ac 100644
> > --- a/net/netfilter/nf_nat_core.c
> > +++ b/net/netfilter/nf_nat_core.c
> > @@ -814,7 +814,7 @@ static int __init nf_nat_init(void)
> > ret = nf_ct_extend_register(&nat_extend);
> > if (ret < 0) {
> > nf_ct_free_hashtable(nf_nat_bysource, nf_nat_htable_size);
> > - printk(KERN_ERR "nf_nat_core: Unable to register
> extension\n");
> > + pr_err("nf_nat_core: Unable to register extension\n");
> > return ret;
> > }
> >
> > diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_
> queue.c
> > index 8bba231..4b4bef5 100644
> > --- a/net/netfilter/nfnetlink_queue.c
> > +++ b/net/netfilter/nfnetlink_queue.c
> > @@ -834,8 +834,8 @@ nfqnl_mangle(void *data, int data_len, struct
> nf_queue_entry *e, int diff)
> > nskb = skb_copy_expand(e->skb,
> skb_headroom(e->skb),
> > diff, GFP_ATOMIC);
> > if (!nskb) {
> > - printk(KERN_WARNING "nf_queue: OOM "
> > - "in mangle, dropping packet\n");
> > + netdev_warn(nskb->dev, "nf_queue: OOM "
> > + "in mangle, dropping
> packet\n");
> > return -ENOMEM;
> > }
> > kfree_skb(e->skb);
> > --
> > 2.7.4
> >
>
[-- Attachment #2: Type: text/html, Size: 7194 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Outreachy kernel] [PATCH Netfilter] net: netfilter: Replace printk() with more standardize output format.
2018-03-11 4:41 ` Arushi Singhal
@ 2018-03-11 6:44 ` Vaishali Thakkar
0 siblings, 0 replies; 7+ messages in thread
From: Vaishali Thakkar @ 2018-03-11 6:44 UTC (permalink / raw)
To: Arushi Singhal
Cc: Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal,
David S. Miller, outreachy-kernel
On Sun, Mar 11, 2018 at 10:11 AM, Arushi Singhal
<arushisinghal19971997@gmail.com> wrote:
>
>
> On Sun, Mar 11, 2018 at 9:11 AM, Vaishali Thakkar <vthakkar1994@gmail.com>
> wrote:
>>
>> On Sun, Mar 11, 2018 at 12:09 AM, Arushi Singhal
>> <arushisinghal19971997@gmail.com> wrote:
>> > printk() is the raw way to print output and should be avoided.
>> >
>> > For drivers with defined "struct device object", dev_*macro() is
>> > prefer and for "struct netdevice object", netdev_*macro() is prefer over
>> > dev_*macro() to standardize the output format within the subsystem.
>> >
>> > If no "struct device object" is defined prefer pr_*macro() over
>> > printk().
>> >
>> > This patch Replace printk having a log level with the appropriate output
>> > format according to the order of preference.
>>
>> Hi Arushi,
>>
>> As mentioned in the IRC chat for Outreachy applicants, please drop
>> outreachy-kernel mailing list while sending patches to other subsystems
>> than drivers/staging to avoid confusion.
>>
> Hello Vaishali
>
> I know, but netfilter is the part of the outreachy project.
>
> Want to clarify if project patches need to be send on kernel mailing list or
> not?
Hi Arushi,
My comment was common for your other patches, not specific to patches
for netfilter. I just happen to comment on your latest patch in my inbox.
I agree with cc'ing outreachy-kernel mailing list when submitting patches
for the netfilter project.
Sorry for the confusion!
> Arushi
>>
>> Thank you!
>>
>> > Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
>> > ---
>> > net/netfilter/nf_conntrack_acct.c | 2 +-
>> > net/netfilter/nf_conntrack_ecache.c | 2 +-
>> > net/netfilter/nf_conntrack_timestamp.c | 2 +-
>> > net/netfilter/nf_nat_core.c | 2 +-
>> > net/netfilter/nfnetlink_queue.c | 4 ++--
>> > 5 files changed, 6 insertions(+), 6 deletions(-)
>> >
>> > diff --git a/net/netfilter/nf_conntrack_acct.c
>> > b/net/netfilter/nf_conntrack_acct.c
>> > index 8669167..fc7329d 100644
>> > --- a/net/netfilter/nf_conntrack_acct.c
>> > +++ b/net/netfilter/nf_conntrack_acct.c
>> > @@ -80,7 +80,7 @@ static int nf_conntrack_acct_init_sysctl(struct net
>> > *net)
>> > net->ct.acct_sysctl_header = register_net_sysctl(net,
>> > "net/netfilter",
>> > table);
>> > if (!net->ct.acct_sysctl_header) {
>> > - printk(KERN_ERR "nf_conntrack_acct: can't register to
>> > sysctl.\n");
>> > + netdev_err(net->loopback_dev, "nf_conntrack_acct: can't
>> > register to sysctl.\n");
>> > goto out_register;
>> > }
>> > return 0;
>> > diff --git a/net/netfilter/nf_conntrack_ecache.c
>> > b/net/netfilter/nf_conntrack_ecache.c
>> > index caac41a..c1fb296 100644
>> > --- a/net/netfilter/nf_conntrack_ecache.c
>> > +++ b/net/netfilter/nf_conntrack_ecache.c
>> > @@ -372,7 +372,7 @@ static int nf_conntrack_event_init_sysctl(struct net
>> > *net)
>> > net->ct.event_sysctl_header =
>> > register_net_sysctl(net, "net/netfilter", table);
>> > if (!net->ct.event_sysctl_header) {
>> > - printk(KERN_ERR "nf_ct_event: can't register to
>> > sysctl.\n");
>> > + netdev_err(net->loopback_dev, "nf_ct_event: can't
>> > register to sysctl.\n");
>> > goto out_register;
>> > }
>> > return 0;
>> > diff --git a/net/netfilter/nf_conntrack_timestamp.c
>> > b/net/netfilter/nf_conntrack_timestamp.c
>> > index 4c4734b..abd9fbd 100644
>> > --- a/net/netfilter/nf_conntrack_timestamp.c
>> > +++ b/net/netfilter/nf_conntrack_timestamp.c
>> > @@ -58,7 +58,7 @@ static int nf_conntrack_tstamp_init_sysctl(struct net
>> > *net)
>> > net->ct.tstamp_sysctl_header = register_net_sysctl(net,
>> > "net/netfilter",
>> > table);
>> > if (!net->ct.tstamp_sysctl_header) {
>> > - printk(KERN_ERR "nf_ct_tstamp: can't register to
>> > sysctl.\n");
>> > + netdev_err(net->loopback_dev, "nf_ct_tstamp: can't
>> > register to sysctl.\n");
>> > goto out_register;
>> > }
>> > return 0;
>> > diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
>> > index 6c38421..dcda5ac 100644
>> > --- a/net/netfilter/nf_nat_core.c
>> > +++ b/net/netfilter/nf_nat_core.c
>> > @@ -814,7 +814,7 @@ static int __init nf_nat_init(void)
>> > ret = nf_ct_extend_register(&nat_extend);
>> > if (ret < 0) {
>> > nf_ct_free_hashtable(nf_nat_bysource,
>> > nf_nat_htable_size);
>> > - printk(KERN_ERR "nf_nat_core: Unable to register
>> > extension\n");
>> > + pr_err("nf_nat_core: Unable to register extension\n");
>> > return ret;
>> > }
>> >
>> > diff --git a/net/netfilter/nfnetlink_queue.c
>> > b/net/netfilter/nfnetlink_queue.c
>> > index 8bba231..4b4bef5 100644
>> > --- a/net/netfilter/nfnetlink_queue.c
>> > +++ b/net/netfilter/nfnetlink_queue.c
>> > @@ -834,8 +834,8 @@ nfqnl_mangle(void *data, int data_len, struct
>> > nf_queue_entry *e, int diff)
>> > nskb = skb_copy_expand(e->skb,
>> > skb_headroom(e->skb),
>> > diff, GFP_ATOMIC);
>> > if (!nskb) {
>> > - printk(KERN_WARNING "nf_queue: OOM "
>> > - "in mangle, dropping packet\n");
>> > + netdev_warn(nskb->dev, "nf_queue: OOM "
>> > + "in mangle, dropping
>> > packet\n");
>> > return -ENOMEM;
>> > }
>> > kfree_skb(e->skb);
>> > --
>> > 2.7.4
>> >
>> > --
>> > You received this message because you are subscribed to the Google
>> > Groups "outreachy-kernel" group.
>> > To unsubscribe from this group and stop receiving emails from it, send
>> > an email to outreachy-kernel+unsubscribe@googlegroups.com.
>> > To post to this group, send email to outreachy-kernel@googlegroups.com.
>> > To view this discussion on the web visit
>> > https://groups.google.com/d/msgid/outreachy-kernel/20180310183906.GA20125%40seema-Inspiron-15-3567.
>> > For more options, visit https://groups.google.com/d/optout.
>>
>>
>>
>> --
>> Vaishali
>> http://vaishalithakkar.in/
>
>
--
Vaishali
http://vaishalithakkar.in/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH Netfilter] net: netfilter: Replace printk() with more standardize output format.
2018-03-11 5:07 ` Arushi Singhal
@ 2018-03-11 10:55 ` Florian Westphal
0 siblings, 0 replies; 7+ messages in thread
From: Florian Westphal @ 2018-03-11 10:55 UTC (permalink / raw)
To: Arushi Singhal
Cc: Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal,
David S. Miller, outreachy-kernel,
Netfilter Developer Mailing List
Arushi Singhal <arushisinghal19971997@gmail.com> wrote:
> I''ll resend the patch according your suggestions.
>
> Just for curiosity wanted to ask why not netdev_*().
netfilter is not a network driver.
> > > register_net_sysctl(net, "net/netfilter", table);
> > > if (!net->ct.event_sysctl_header) {
> > > - printk(KERN_ERR "nf_ct_event: can't register to
> > sysctl.\n");
> > > + netdev_err(net->loopback_dev, "nf_ct_event: can't register
> > to sysctl.\n");
This claims that the error is related to loopback device. Its not.
> > > if (!nskb) {
> > > - printk(KERN_WARNING "nf_queue: OOM "
> > > - "in mangle, dropping packet\n");
> > > + netdev_warn(nskb->dev, "nf_queue: OOM "
> > > + "in mangle, dropping
This now points at a random network device, but again
this condition doesn't have anything to do with a network device.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-03-11 10:55 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-10 18:39 [PATCH Netfilter] net: netfilter: Replace printk() with more standardize output format Arushi Singhal
2018-03-10 19:13 ` Pablo Neira Ayuso
2018-03-11 5:07 ` Arushi Singhal
2018-03-11 10:55 ` Florian Westphal
2018-03-11 3:41 ` [Outreachy kernel] " Vaishali Thakkar
2018-03-11 4:41 ` Arushi Singhal
2018-03-11 6:44 ` Vaishali Thakkar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.