net: lapb: Add locking to the lapb module
Subsystems (3)
PATCH v6 1/1 net: lapb: Add locking to the lapb module
In the lapb module, the timers may run concurrently with other code in this module, and there is currently no locking to prevent the code from racing on "struct lapb_cb". This patch adds locking to prevent racing.
1. Add "spinlock_t lock" to "struct lapb_cb"; Add "spin_lock_bh" and "spin_unlock_bh" to APIs, timer functions and notifier functions.
2. Add "bool t1timer_stop, t2timer_stop" to "struct lapb_cb" to make us able to ask running timers to abort; Modify "lapb_stop_t1timer" and "lapb_stop_t2timer" to make them able to abort running timers; Modify "lapb_t2timer_expiry" and "lapb_t1timer_expiry" to make them abort after they are stopped by "lapb_stop_t1timer", "lapb_stop_t2timer", and "lapb_start_t1timer", "lapb_start_t2timer".
3. Let lapb_unregister wait for other API functions and running timers to stop.
4. The lapb_device_event function calls lapb_disconnect_request. In order to avoid trying to hold the lock twice, add a new function named "__lapb_disconnect_request" which assumes the lock is held, and make it called by lapb_disconnect_request and lapb_device_event.
---
Change from v5:
Add usleep_range to the waiting loop in lapb_unregister.
I didn't restore the "goto"s in "__lapb_disconnect_request" because after the function splitting there's nowhere we can "goto" anymore.
Change from v4:
Make lapb_unregister wait for other refs to "lapb" to drop, to ensure that other LAPB API calls have all finished.
Change from v3:
In lapb_unregister make sure the self-restarting t1timer has really been stopped.
Change from v2:
Create a new __lapb_disconnect_request function to reduce redundant code.
Change from v1:
Break long lines to keep the line lengths within 80 characters.
--- include/net/lapb.h | 2 ++ net/lapb/lapb_iface.c | 70 +++++++++++++++++++++++++++++++++---------- net/lapb/lapb_timer.c | 30 ++++++++++++++++--- 3 files changed, 82 insertions(+), 20 deletions(-)
include/net/lapb.h +2 -0
@@ -92,6 +92,7 @@ struct lapb_cb {unsigned short n2, n2count;unsigned short t1, t2;struct timer_list t1timer, t2timer; +bool t1timer_stop, t2timer_stop;/* Internal control information */ struct sk_buff_head write_queue;
@@ -103,6 +104,7 @@ struct lapb_cb {struct lapb_frame frmr_data;unsigned char frmr_type; +spinlock_t lock;refcount_t refcnt; };
net/lapb/lapb_iface.c +54 -16
189 lines not on this page · raw message
net/lapb/lapb_timer.c +26 -4
@@ -40,6 +40,7 @@ void lapb_start_t1timer(struct lapb_cb *lapb) lapb->t1timer.function = lapb_t1timer_expiry; lapb->t1timer.expires = jiffies + lapb->t1; + lapb->t1timer_stop = false;add_timer (&lapb->t1timer); }
@@ -50,16 +51,19 @@ void lapb_start_t2timer(struct lapb_cb *lapb) lapb->t2timer.function = lapb_t2timer_expiry; lapb->t2timer.expires = jiffies + lapb->t2; + lapb->t2timer_stop = false;add_timer (&lapb->t2timer); }void lapb_stop_t1timer (struct lapb_cb *lapb) { + lapb->t1timer_stop = true;del_timer (&lapb->t1timer); }void lapb_stop_t2timer (struct lapb_cb *lapb) { + lapb->t2timer_stop = true;del_timer (&lapb->t2timer); }
@@ -72,16 +76,31 @@ static void lapb_t2timer_expiry(struct timer_list *t) {struct lapb_cb *lapb =from_timer (lapb, t, t2timer); +spin_lock_bh (&lapb->lock); +if (timer_pending (&lapb->t2timer))/* A new timer has been set up */ + goto out; +if (lapb->t2timer_stop)/* The timer has been stopped */ + goto out; +if (lapb->condition &LAPB_ACK_PENDING_CONDITION ) { lapb->condition &= ~LAPB_ACK_PENDING_CONDITION ;lapb_timeout_response (lapb); } + +out: +spin_unlock_bh (&lapb->lock); }static void lapb_t1timer_expiry (struct timer_list *t) {struct lapb_cb *lapb =from_timer (lapb, t, t1timer); +spin_lock_bh (&lapb->lock); +if (timer_pending (&lapb->t1timer))/* A new timer has been set up */ + goto out; +if (lapb->t1timer_stop)/* The timer has been stopped */ + goto out; +switch (lapb->state) {/*
@@ -108,7 +127,7 @@ static void lapb_t1timer_expiry(struct timer_list *t) lapb->state =LAPB_STATE_0 ;lapb_disconnect_indication (lapb,LAPB_TIMEDOUT );lapb_dbg (0 ,"(%p) S1 -> S0\n" , lapb->dev); -return ; + goto out; }else { lapb->n2count++;if (lapb->mode &LAPB_EXTENDED ) {
@@ -132,7 +151,7 @@ static void lapb_t1timer_expiry(struct timer_list *t) lapb->state =LAPB_STATE_0 ;lapb_disconnect_confirmation (lapb,LAPB_TIMEDOUT );lapb_dbg (0 ,"(%p) S2 -> S0\n" , lapb->dev); -return ; + goto out; }else { lapb->n2count++;lapb_dbg (1 ,"(%p) S2 TX DISC(1)\n" , lapb->dev);
@@ -150,7 +169,7 @@ static void lapb_t1timer_expiry(struct timer_list *t)lapb_stop_t2timer (lapb);lapb_disconnect_indication (lapb,LAPB_TIMEDOUT );lapb_dbg (0 ,"(%p) S3 -> S0\n" , lapb->dev); -return ; + goto out; }else { lapb->n2count++;lapb_requeue_frames (lapb);
@@ -167,7 +186,7 @@ static void lapb_t1timer_expiry(struct timer_list *t) lapb->state =LAPB_STATE_0 ;lapb_disconnect_indication (lapb,LAPB_TIMEDOUT );lapb_dbg (0 ,"(%p) S4 -> S0\n" , lapb->dev); -return ; + goto out; }else { lapb->n2count++;lapb_transmit_frmr (lapb);
@@ -176,4 +195,7 @@ static void lapb_t1timer_expiry(struct timer_list *t) }lapb_start_t1timer (lapb); + +out: +spin_unlock_bh (&lapb->lock); }
Signature · 1 line
2.27.0
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 8 lines · On Mon, 25 Jan 2021 20:09:39 -0800 you wrote:
In the lapb module, the timers may run concurrently with other code in this module, and there is currently no locking to prevent the code from racing on "struct
lapb_cb". This patch adds locking to prevent racing.1. Add "
spinlock_tlock" to "structlapb_cb"; Add "spin_lock_bh" and "spin_unlock_bh" to APIs, timer functions and notifier functions.[...]
Here is the summary with links:
- [net,v6] net: lapb: Add locking to the lapb module
https://git.kernel.org/netdev/net/c/b491e6a7391e
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html