watchdog: dw_wdt: No need for a spinlock
PATCH v2 1/2 watchdog: dw_wdt: No need for a spinlock
Right now the dw_wdt uses a spinlock to protect dw_wdt_open(). The problem is that while holding the spinlock we call:
-> dw_wdt_set_top()
-> dw_wdt_top_in_seconds()
-> clk_get_rate()
-> clk_prepare_lock()
-> mutex_lock()Locking a mutex while holding a spinlock is not allowed and leads to warnings like "BUG: spinlock wrong CPU on CPU#1", among other problems.
There's no reason to use a spinlock. Only dw_wdt_open() was protected and the test_and_set_bit() at the start of that function protects us anyway.
---
Changes in v2:
- Don't switch to mutex; just don't use spinlock at all as per Dmitry
drivers/watchdog/dw_wdt.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/watchdog/dw_wdt.c +0 -7
@@ -35,7 +35,6 @@#include <linux/pm.h> #include <linux/platform_device.h> #include <linux/reboot.h> -#include <linux/spinlock.h> #include <linux/timer.h> #include <linux/uaccess.h> #include <linux/watchdog.h>
@@ -61,7 +60,6 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "#define WDT_TIMEOUT (HZ / 2) static struct { - spinlock_t lock; void __iomem *regs; struct clk *clk; unsigned long in_use;
@@ -177,7 +175,6 @@ static int dw_wdt_open(struct inode *inode, struct file *filp)/* Make sure we don't get unloaded. */ __module_get (THIS_MODULE ); -spin_lock (&dw_wdt.lock);if (!dw_wdt_is_enabled ()) {/* * The watchdog is not currently enabled. Set the timeout to
@@ -190,8 +187,6 @@ static int dw_wdt_open(struct inode *inode, struct file *filp)dw_wdt_set_next_heartbeat (); -spin_unlock (&dw_wdt.lock); -return nonseekable_open (inode, filp); }
@@ -348,8 +343,6 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)if (ret)return ret; -spin_lock_init (&dw_wdt.lock); - ret =misc_register (&dw_wdt_miscdev);if (ret) goto out_disable_clk;
Signature · 1 line
2.2.0.rc0.207.ga3a616c
PATCH v2 2/2 watchdog: dw_wdt: keepalive the watchdog at write time
If you've got code that does this in a tight loop
1. Open watchdog
2. Send 'expect close'
3. Close watchdog
...you'll eventually trigger a watchdog reset. You can reproduce this by using daisydog (1) and running:
while true; do daisydog -c > /dev/null; done
The problem is that each time you write to the watchdog for 'expect close' it moves the timer .5 seconds out. The timer thus never fires and never pats the watchdog for you.
1: http://git.chromium.org/gitweb/?p=chromiumos/third_party/daisydog.git
---
Changes in v2: None
drivers/watchdog/dw_wdt.c | 1 + 1 file changed, 1 insertion(+)
drivers/watchdog/dw_wdt.c +1 -0
@@ -215,6 +215,7 @@ static ssize_t dw_wdt_write(struct file *filp, const char __user *buf, }dw_wdt_set_next_heartbeat (); +dw_wdt_keepalive ();mod_timer (&dw_wdt.timer, jiffies +WDT_TIMEOUT );return len;
Signature · 1 line
2.2.0.rc0.207.ga3a616c
Re: [PATCH v2 2/2] watchdog: dw_wdt: keepalive the watchdog at write time
Quoted 12 lines · Doug Anderson
If you've got code that does this in a tight loop
1. Open watchdog
2. Send 'expect close'
3. Close watchdog
...you'll eventually trigger a watchdog reset. You can reproduce this by using daisydog (1) and running:
while true; do daisydog -c >/dev/null; doneThe problem is that each time you write to the watchdog for 'expect close' it moves the timer .5 seconds out. The timer thus never fires and never pats the watchdog for you.
Quoted 5 lines
1: http://git.chromium.org/gitweb/?p=chromiumos/third_party/daisydog.git
Signed-off-by Doug Anderson <[email protected]>Reviewed-by Guenter Roeck <[email protected]>Tested-by Jisheng Zhang <[email protected]>
Quoted 21 lines
---
Changes in v2: Nonedrivers/watchdog/dw_wdt.c | 1 + 1 file changed, 1 insertion(+)drivers/watchdog/dw_wdt.c +1
-0@@ -215,6 +215,7 @@ static ssize_t dw_wdt_write(struct file *filp, const char __user *buf, }dw_wdt_set_next_heartbeat (); +dw_wdt_keepalive ();mod_timer (&dw_wdt.timer, jiffies +WDT_TIMEOUT );return len;Signature · 1 line
2.2.0.rc0.207.ga3a616c
Signature · 1 line
Dmitry
Quoted 12 lines · Doug Anderson
Right now the
dw_wdtuses a spinlock to protectdw_wdt_open(). The problem is that while holding the spinlock we call:
->dw_wdt_set_top()-> dw_wdt_top_in_seconds() -> clk_get_rate() -> clk_prepare_lock() -> mutex_lock()Locking a mutex while holding a spinlock is not allowed and leads to warnings like "BUG: spinlock wrong CPU on CPU#1", among other problems.
Quoted 5 lines
There's no reason to use a spinlock. Only
dw_wdt_open()was protected and thetest_and_set_bit()at the start of that function protects us anyway.Signed-off-by Doug Anderson <[email protected]>
Quoted 62 lines · On Thu, 7 May 2015 21:27:44 -0700 Doug Anderson <[email protected]> wrote:
Right now the
dw_wdtuses a spinlock to protectdw_wdt_open(). The problem is that while holding the spinlock we call:
->dw_wdt_set_top()
->dw_wdt_top_in_seconds()-> clk_get_rate() -> clk_prepare_lock() -> mutex_lock()Locking a mutex while holding a spinlock is not allowed and leads to warnings like "BUG: spinlock wrong CPU on CPU#1", among other problems.
There's no reason to use a spinlock. Only
dw_wdt_open()was protected and thetest_and_set_bit()at the start of that function protects us anyway.Signed-off-by Doug Anderson <[email protected]>---
Changes in v2:
- Don't switch to mutex; just don't use spinlock at all as per Dmitrydrivers/watchdog/dw_wdt.c | 7 ------- 1 file changed, 7 deletions(-)drivers/watchdog/dw_wdt.c +0
-5@@ -35,7 +35,6 @@#include <linux/pm.h> #include <linux/platform_device.h> #include <linux/reboot.h> -#include <linux/spinlock.h> #include <linux/timer.h> #include <linux/uaccess.h> #include <linux/watchdog.h> @@ -61,7 +60,6 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "#define WDT_TIMEOUT (HZ / 2) static struct { - spinlock_t lock; void __iomem *regs; struct clk *clk; unsigned long in_use;@@ -177,7 +175,6 @@ static int dw_wdt_open(struct inode *inode, struct file *filp)/* Make sure we don't get unloaded. */ __module_get (THIS_MODULE ); -spin_lock (&dw_wdt.lock);if (!dw_wdt_is_enabled ()) {/* * The watchdog is not currently enabled. Set the timeout to @@ -190,8 +187,6 @@ static int dw_wdt_open(struct inode *inode, struct file *filp)dw_wdt_set_next_heartbeat (); -spin_unlock (&dw_wdt.lock); -return nonseekable_open (inode, filp); }
drivers/watchdog/dw_wdt.c static int dw_wdt_drv_probe(struct platform_device *pdev) · line 348
Quoted 8 lines
drivers/watchdog/dw_wdt.c +0
-2@@ -348,8 +343,6 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)if (ret)return ret; -spin_lock_init (&dw_wdt.lock); - ret =misc_register (&dw_wdt_miscdev);if (ret) goto out_disable_clk;
Quoted 12 lines · Doug Anderson
Right now the
dw_wdtuses a spinlock to protectdw_wdt_open(). The problem is that while holding the spinlock we call:
->dw_wdt_set_top()
->dw_wdt_top_in_seconds()-> clk_get_rate() -> clk_prepare_lock() -> mutex_lock()Locking a mutex while holding a spinlock is not allowed and leads to warnings like "BUG: spinlock wrong CPU on CPU#1", among other problems.
Quoted 8 lines
There's no reason to use a spinlock. Only
dw_wdt_open()was protected and thetest_and_set_bit()at the start of that function protects us anyway.Signed-off-by Doug Anderson <[email protected]>---
Changes in v2:
- Don't switch to mutex; just don't use spinlock at all as per Dmitry
Quoted 53 lines
drivers/watchdog/dw_wdt.c | 7 ------- 1 file changed, 7 deletions(-)drivers/watchdog/dw_wdt.c +0
-7@@ -35,7 +35,6 @@#include <linux/pm.h> #include <linux/platform_device.h> #include <linux/reboot.h> -#include <linux/spinlock.h> #include <linux/timer.h> #include <linux/uaccess.h> #include <linux/watchdog.h> @@ -61,7 +60,6 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "#define WDT_TIMEOUT (HZ / 2) static struct { - spinlock_t lock; void __iomem *regs; struct clk *clk; unsigned long in_use;@@ -177,7 +175,6 @@ static int dw_wdt_open(struct inode *inode, struct file *filp)/* Make sure we don't get unloaded. */ __module_get (THIS_MODULE ); -spin_lock (&dw_wdt.lock);if (!dw_wdt_is_enabled ()) {/* * The watchdog is not currently enabled. Set the timeout to @@ -190,8 +187,6 @@ static int dw_wdt_open(struct inode *inode, struct file *filp)dw_wdt_set_next_heartbeat (); -spin_unlock (&dw_wdt.lock); -return nonseekable_open (inode, filp); }@@ -348,8 +343,6 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)if (ret)return ret; -spin_lock_init (&dw_wdt.lock); - ret =misc_register (&dw_wdt_miscdev);if (ret) goto out_disable_clk;Signature · 1 line
2.2.0.rc0.207.ga3a616c
Signature · 1 line
Dmitry