net: can: Convert timers to use timer_setup()

PATCH In review Kees Cook 2 participants 4 messages Oct 5, 2017 – Oct 9, 2017

Subsystems (4)

Networking Network drivers CAN network drivers CAN network layer

lore

Share & tools

lore

Kees Cook

author

2017-10-05 00:51 UTC #0 lore raw

PATCH 1/1 net: can: Convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.

Cc Oliver Hartkopp <[email protected]>

Cc Marc Kleine-Budde <[email protected]>

Cc "David S. Miller" <[email protected]>

Cc [email protected]

Cc Thomas Gleixner <[email protected]>

Signed-off-by Kees Cook <[email protected]>

---
This requires commit 686fef928bba ("timer: Prepare to change timer callback argument type") in v4.14-rc3, but should be otherwise stand-alone.

---
 net/can/af_can.c | 4 ++--
 net/can/af_can.h | 2 +-
 net/can/proc.c   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

net/can/af_can.c +2 -2

index 88edac0f3e36..1f75e11ac35a 100644
@@ -882,8 +882,8 @@ static int can_pernet_init(struct net *net)
 	if (IS_ENABLED(CONFIG_PROC_FS)) {
 		/* the statistics are updated every second (timer triggered) */
 		if (stats_timer) {
-			setup_timer(&net->can.can_stattimer, can_stat_update,
-				    (unsigned long)net);
+			timer_setup(&net->can.can_stattimer, can_stat_update,
+				    0);
 			mod_timer(&net->can.can_stattimer,
 				  round_jiffies(jiffies + HZ));
 		}

net/can/af_can.h +1 -1

index d0ef45bb2a72..eca6463c6213 100644
@@ -113,6 +113,6 @@ struct s_pstats {
 /* function prototypes for the CAN networklayer procfs (proc.c) */
 void can_init_proc(struct net *net);
 void can_remove_proc(struct net *net);
-void can_stat_update(unsigned long data);
+void can_stat_update(struct timer_list *t);
 
 #endif /* AF_CAN_H */

net/can/proc.c +4 -4

index 83045f00c63c..d979b3dc49a6 100644
@@ -115,9 +115,9 @@ static unsigned long calc_rate(unsigned long oldjif, unsigned long newjif,
 	return rate;
 }
 
-void can_stat_update(unsigned long data)
+void can_stat_update(struct timer_list *t)
 {
-	struct net *net = (struct net *)data;
+	struct net *net = from_timer(net, t, can.can_stattimer);
 	struct s_stats *can_stats = net->can.can_stats;
 	unsigned long j = jiffies; /* snapshot */

@@ -221,7 +221,7 @@ static int can_stats_proc_show(struct seq_file *m, void *v)
 
 	seq_putc(m, '\n');
 
-	if (net->can.can_stattimer.function == can_stat_update) {
+	if (net->can.can_stattimer.function == (TIMER_FUNC_TYPE)can_stat_update) {
 		seq_printf(m, " %8ld %% total match ratio (RXMR)\n",
 				can_stats->total_rx_match_ratio);

@@ -291,7 +291,7 @@ static int can_reset_stats_proc_show(struct seq_file *m, void *v)
 
 	user_reset = 1;
 
-	if (net->can.can_stattimer.function == can_stat_update) {
+	if (net->can.can_stattimer.function == (TIMER_FUNC_TYPE)can_stat_update) {
 		seq_printf(m, "Scheduled statistic reset #%ld.\n",
 				can_pstats->stats_reset + 1);
 	} else {

Signature · 6 lines

2.7.4


-- 
Kees Cook
Pixel Security

Marc Kleine-Budde

maintainer Acked-by on v1 1/1

2017-10-09 17:53 UTC #1 lore raw

Quoted 11 lines · Kees Cook

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.
Cc Oliver Hartkopp <[email protected]>
Cc Marc Kleine-Budde <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc [email protected]
Cc [email protected]
Cc Thomas Gleixner <[email protected]>
Signed-off-by Kees Cook <[email protected]>

Quoted 4 lines

---
This requires commit 686fef928bba ("timer: Prepare to change timer callback argument type") in v4.14-rc3, but should be otherwise stand-alone.

Are you taking the patch or should I apply it?

Acked-by Marc Kleine-Budde <[email protected]>

Marc

Signature · 4 lines

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   |

Kees Cook

author

2017-10-09 18:09 UTC #2 lore raw

Quoted 17 lines · Marc Kleine-Budde

Quoted 11 lines · Kees Cook
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.
Cc Oliver Hartkopp <[email protected]>
Cc Marc Kleine-Budde <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc [email protected]
Cc [email protected]
Cc Thomas Gleixner <[email protected]>
Signed-off-by Kees Cook <[email protected]>
Quoted 4 lines
---
This requires commit 686fef928bba ("timer: Prepare to change timer callback argument type") in v4.14-rc3, but should be otherwise stand-alone.

Quoted 3 lines

Are you taking the patch or should I apply it?
Acked-by Marc Kleine-Budde <[email protected]>

If you have -rc3 in your tree, please take it. If you want the timers tree to carry it instead, we can do that too.

Thanks!

-Kees

Signature · 2 lines

Kees Cook
Pixel Security

Marc Kleine-Budde

maintainer

2017-10-09 18:10 UTC #3 lore raw

Quoted 18 lines · Kees Cook

Quoted 17 lines · Marc Kleine-Budde
Quoted 15 lines · Kees Cook
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.
Cc Oliver Hartkopp <[email protected]>
Cc Marc Kleine-Budde <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc [email protected]
Cc [email protected]
Cc Thomas Gleixner <[email protected]>
Signed-off-by Kees Cook <[email protected]>
---
This requires commit 686fef928bba ("timer: Prepare to change timer callback argument type") in v4.14-rc3, but should be otherwise stand-alone.

Quoted 6 lines

Quoted 3 lines
Are you taking the patch or should I apply it?
Acked-by Marc Kleine-Budde <[email protected]>
If you have -rc3 in your tree, please take it. If you want the timers tree to carry it instead, we can do that too.

I think it will hit mainline faster via your tree, as it will go via net-next. You've my acked-by.

Marc

Signature · 4 lines

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   |