[PATCH can-next] can: add missing initialization of CAN statistics

[PATCH can-next] can: add missing initialization of CAN statistics

[Oliver Hartkopp]

The total rx/tx rate (TXR and RXR) only start working after a statistic reset.
This patch initializes the statistic data structures and the timer init value
to provide proper values directly from the start.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
---
 net/can/af_can.c |  1 +
 net/can/af_can.h |  1 +
 net/can/proc.c   | 21 ++++++++++++++-------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/net/can/af_can.c b/net/can/af_can.c
index 1108079..cefe98c 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -912,6 +912,7 @@ static __init int can_init(void)
 		return -ENOMEM;
 
 	if (IS_ENABLED(CONFIG_PROC_FS)) {
+		can_init_stats();
 		if (stats_timer) {
 		/* the statistics are updated every second (timer triggered) */
 			setup_timer(&can_stattimer, can_stat_update, 0);
diff --git a/net/can/af_can.h b/net/can/af_can.h
index fca0fe9..8361047 100644
--- a/net/can/af_can.h
+++ b/net/can/af_can.h
@@ -115,6 +115,7 @@ extern struct dev_rcv_lists can_rx_alldev_list;
 /* function prototypes for the CAN networklayer procfs (proc.c) */
 void can_init_proc(void);
 void can_remove_proc(void);
+void can_init_stats(void);
 void can_stat_update(unsigned long data);
 
 /* structures and variables from af_can.c needed in proc.c for reading */
diff --git a/net/can/proc.c b/net/can/proc.c
index 85ef7bb..056e9f5 100644
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -86,7 +86,7 @@ static const char rx_list_name[][8] = {
  * af_can statistics stuff
  */
 
-static void can_init_stats(void)
+static void can_reset_stats(void)
 {
 	/*
 	 * This memset function is called from a timer context (when
@@ -104,6 +104,13 @@ static void can_init_stats(void)
 	}
 }
 
+void can_init_stats(void)
+{
+	memset(&can_pstats, 0, sizeof(can_pstats));
+	memset(&can_stats, 0, sizeof(can_stats));
+	can_stats.jiffies_init = jiffies;
+}
+
 static unsigned long calc_rate(unsigned long oldjif, unsigned long newjif,
 			       unsigned long count)
 {
@@ -130,23 +137,23 @@ void can_stat_update(unsigned long data)
 
 	/* restart counting in timer context on user request */
 	if (user_reset)
-		can_init_stats();
+		can_reset_stats();
 
 	/* restart counting on jiffies overflow */
 	if (j < can_stats.jiffies_init)
-		can_init_stats();
+		can_reset_stats();
 
 	/* prevent overflow in calc_rate() */
 	if (can_stats.rx_frames > (ULONG_MAX / HZ))
-		can_init_stats();
+		can_reset_stats();
 
 	/* prevent overflow in calc_rate() */
 	if (can_stats.tx_frames > (ULONG_MAX / HZ))
-		can_init_stats();
+		can_reset_stats();
 
 	/* matches overflow - very improbable */
 	if (can_stats.matches > (ULONG_MAX / 100))
-		can_init_stats();
+		can_reset_stats();
 
 	/* calc total values */
 	if (can_stats.rx_frames)
@@ -296,7 +303,7 @@ static int can_reset_stats_proc_show(struct seq_file *m, void *v)
 
 	} else {
 		if (can_stats.jiffies_init != jiffies)
-			can_init_stats();
+			can_reset_stats();
 
 		seq_printf(m, "Performed statistic reset #%ld.\n",
 				can_pstats.stats_reset);
-- 
2.8.1

Re: [PATCH can-next] can: add missing initialization of CAN statistics

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 2432 bytes --]

On 07/06/2016 09:19 AM, Oliver Hartkopp wrote:
> The total rx/tx rate (TXR and RXR) only start working after a statistic reset.
> This patch initializes the statistic data structures and the timer init value
> to provide proper values directly from the start.
> 
> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
> ---
>  net/can/af_can.c |  1 +
>  net/can/af_can.h |  1 +
>  net/can/proc.c   | 21 ++++++++++++++-------
>  3 files changed, 16 insertions(+), 7 deletions(-)
> 
> diff --git a/net/can/af_can.c b/net/can/af_can.c
> index 1108079..cefe98c 100644
> --- a/net/can/af_can.c
> +++ b/net/can/af_can.c
> @@ -912,6 +912,7 @@ static __init int can_init(void)
>  		return -ENOMEM;
>  
>  	if (IS_ENABLED(CONFIG_PROC_FS)) {
> +		can_init_stats();
>  		if (stats_timer) {
>  		/* the statistics are updated every second (timer triggered) */
>  			setup_timer(&can_stattimer, can_stat_update, 0);
> diff --git a/net/can/af_can.h b/net/can/af_can.h
> index fca0fe9..8361047 100644
> --- a/net/can/af_can.h
> +++ b/net/can/af_can.h
> @@ -115,6 +115,7 @@ extern struct dev_rcv_lists can_rx_alldev_list;
>  /* function prototypes for the CAN networklayer procfs (proc.c) */
>  void can_init_proc(void);
>  void can_remove_proc(void);
> +void can_init_stats(void);
>  void can_stat_update(unsigned long data);
>  
>  /* structures and variables from af_can.c needed in proc.c for reading */
> diff --git a/net/can/proc.c b/net/can/proc.c
> index 85ef7bb..056e9f5 100644
> --- a/net/can/proc.c
> +++ b/net/can/proc.c
> @@ -86,7 +86,7 @@ static const char rx_list_name[][8] = {
>   * af_can statistics stuff
>   */
>  
> -static void can_init_stats(void)
> +static void can_reset_stats(void)
>  {
>  	/*
>  	 * This memset function is called from a timer context (when
> @@ -104,6 +104,13 @@ static void can_init_stats(void)
>  	}
>  }
>  
> +void can_init_stats(void)
> +{
> +	memset(&can_pstats, 0, sizeof(can_pstats));
> +	memset(&can_stats, 0, sizeof(can_stats));

I think this is not needed, as both are global variables, right?

> +	can_stats.jiffies_init = jiffies;
> +}
> +

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 455 bytes --]

Re: [PATCH can-next] can: add missing initialization of CAN statistics

[Oliver Hartkopp]

On 07/06/2016 09:24 AM, Marc Kleine-Budde wrote:
> On 07/06/2016 09:19 AM, Oliver Hartkopp wrote:


>> +void can_init_stats(void)
>> +{
>> +	memset(&can_pstats, 0, sizeof(can_pstats));
>> +	memset(&can_stats, 0, sizeof(can_stats));
>
> I think this is not needed, as both are global variables, right?

Yes they are.

Is it assured that global variables are initialized with zero like 
static variables?

If so I can provide a far smaller patch :-)

Oliver

Re: [PATCH can-next] can: add missing initialization of CAN statistics

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 790 bytes --]

On 07/06/2016 09:27 AM, Oliver Hartkopp wrote:
> 
> 
> On 07/06/2016 09:24 AM, Marc Kleine-Budde wrote:
>> On 07/06/2016 09:19 AM, Oliver Hartkopp wrote:
> 
> 
>>> +void can_init_stats(void)
>>> +{
>>> +	memset(&can_pstats, 0, sizeof(can_pstats));
>>> +	memset(&can_stats, 0, sizeof(can_stats));
>>
>> I think this is not needed, as both are global variables, right?
> 
> Yes they are.
> 
> Is it assured that global variables are initialized with zero like 
> static variables?

Yes.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 455 bytes --]