From: Oliver Neukum <oneukum@suse.com>
To: wim@linux-watchdog.org, linux@roeck-us.net,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Oliver Neukum <oneukum@suse.com>
Subject: [PATCH 7/8] usb_pcwd: WDIOC_SETTIMEOUT: prevent preemption
Date: Thu, 27 Apr 2023 15:33:49 +0200 [thread overview]
Message-ID: <20230427133350.31064-8-oneukum@suse.com> (raw)
In-Reply-To: <20230427133350.31064-1-oneukum@suse.com>
Delays between altering the watchdog
and giving the keepalive need to be controlled.
Do not allow preemption.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Oliver Neukum <oneukum@suse.com>
---
drivers/watchdog/pcwd_usb.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index 50ba88019ed6..09cae7a6ad07 100644
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -459,10 +459,14 @@ static long usb_pcwd_ioctl(struct file *file, unsigned int cmd,
if (get_user(new_heartbeat, p))
return -EFAULT;
- if (usb_pcwd_set_heartbeat(usb_pcwd_device, new_heartbeat))
+ preempt_disable(); /* we are on a clock now */
+ if (usb_pcwd_set_heartbeat(usb_pcwd_device, new_heartbeat)) {
+ preempt_enable();
return -EINVAL;
+ }
usb_pcwd_keepalive(usb_pcwd_device);
+ preempt_enable();
}
fallthrough;
--
2.40.0
next prev parent reply other threads:[~2023-04-27 13:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230427133350.31064-1-oneukum@suse.com>
2023-04-27 13:33 ` [PATCH 1/8] pwcd_usb: fix error handling in probe Oliver Neukum
2023-04-27 13:33 ` [PATCH 2/8] pcwd_usb: stop open race disconnect Oliver Neukum
2023-04-27 13:33 ` [PATCH 3/8] pcwd_usb: usb_pcwd_open handle and return errors Oliver Neukum
2023-04-27 13:33 ` [PATCH 4/8] pcwd_usb: do not leave a freed URB active Oliver Neukum
2023-04-27 13:33 ` [PATCH 5/8] pcwd_usb: usb_pcwd_ioctl: return IO errors Oliver Neukum
2023-04-27 13:33 ` [PATCH 6/8] pcwd_usb: memory ordering of interrupt and waiter Oliver Neukum
2023-04-27 13:33 ` Oliver Neukum [this message]
2023-04-27 13:33 ` [PATCH 8/8] usb_pcwd: remove superfluous usb_device pointer Oliver Neukum
2023-05-13 8:52 ` Dan Carpenter
2023-04-27 14:12 ` watchdog: pcwd driver updates (was: No subject) Guenter Roeck
2023-04-27 14:19 ` Oliver Neukum
2023-04-27 14:35 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230427133350.31064-8-oneukum@suse.com \
--to=oneukum@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox