From: "Luis R. Rodriguez" <mcgrof@kernel.org>
To: gregkh@linuxfoundation.org
Cc: mfuzzey@parkeon.com, ebiederm@xmission.com,
dmitry.torokhov@gmail.com, wagi@monom.org, dwmw2@infradead.org,
jewalt@lgsinnovations.com, rafal@milecki.pl,
arend.vanspriel@broadcom.com, rjw@rjwysocki.net,
yi1.li@linux.intel.com, atull@kernel.org,
moritz.fischer@ettus.com, pmladek@suse.com,
johannes.berg@intel.com, emmanuel.grumbach@intel.com,
luciano.coelho@intel.com, kvalo@codeaurora.org, luto@kernel.org,
torvalds@linux-foundation.org, keescook@chromium.org,
takahiro.akashi@linaro.org, dhowells@redhat.com,
pjones@redhat.com, hdegoede@redhat.com, alan@linux.intel.com,
tytso@mit.edu, mtk.manpages@gmail.com,
paul.gortmaker@windriver.com, mtosatti@redhat.com,
mawilcox@microsoft.com, linux-api@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
"Luis R. Rodriguez" <mcgrof@kernel.org>,
"stable # 4 . 6" <stable@vger.kernel.org>
Subject: [PATCH 2/4] swait: add the missing killable swaits
Date: Wed, 14 Jun 2017 15:20:15 -0700 [thread overview]
Message-ID: <20170614222017.14653-3-mcgrof@kernel.org> (raw)
In-Reply-To: <20170614222017.14653-1-mcgrof@kernel.org>
Code in kernel which incorrectly used the non-killable variants could
end up having waits killed improperly. The respective killable waits
have been upstream for a while:
o wait_for_completion_killable()
o wait_for_completion_killable_timeout()
swait has been upstream since v4.6. Older kernels have had the
above variants in place for a long time.
Cc: stable <stable@vger.kernel.org> # 4.6
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
include/linux/swait.h | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/include/linux/swait.h b/include/linux/swait.h
index c1f9c62a8a50..2c700694d50a 100644
--- a/include/linux/swait.h
+++ b/include/linux/swait.h
@@ -169,4 +169,29 @@ do { \
__ret; \
})
+#define __swait_event_killable(wq, condition) \
+ ___swait_event(wq, condition, TASK_KILLABLE, 0, schedule())
+
+#define swait_event_killable(wq, condition) \
+({ \
+ int __ret = 0; \
+ if (!(condition)) \
+ __ret = __swait_event_killable(wq, condition); \
+ __ret; \
+})
+
+#define __swait_event_killable_timeout(wq, condition, timeout) \
+ ___swait_event(wq, ___wait_cond_timeout(condition), \
+ TASK_KILLABLE, timeout, \
+ __ret = schedule_timeout(__ret))
+
+#define swait_event_killable_timeout(wq, condition, timeout) \
+({ \
+ long __ret = timeout; \
+ if (!___wait_cond_timeout(condition)) \
+ __ret = __swait_event_killable_timeout(wq, \
+ condition, timeout); \
+ __ret; \
+})
+
#endif /* _LINUX_SWAIT_H */
--
2.11.0
next prev parent reply other threads:[~2017-06-14 22:20 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-14 22:20 [PATCH 0/4] firmware: fix fallback mechanism by ignoring SIGCHLD Luis R. Rodriguez
2017-06-14 22:20 ` [PATCH 1/4] test_firmware: add test case for SIGCHLD on sync fallback Luis R. Rodriguez
2017-06-14 22:20 ` Luis R. Rodriguez [this message]
2017-06-29 12:54 ` [PATCH 2/4] swait: add the missing killable swaits Greg KH
2017-06-29 13:05 ` Thomas Gleixner
2017-06-29 13:35 ` Greg KH
2017-06-29 13:46 ` Thomas Gleixner
2017-06-29 16:13 ` Linus Torvalds
2017-06-29 16:31 ` Matthew Wilcox
2017-06-29 17:29 ` Luis R. Rodriguez
2017-06-29 17:40 ` Davidlohr Bueso
2017-06-29 17:57 ` Linus Torvalds
2017-06-29 18:33 ` Davidlohr Bueso
2017-06-29 18:59 ` Linus Torvalds
2017-06-29 19:40 ` Luis R. Rodriguez
2017-06-29 19:44 ` Luis R. Rodriguez
2017-06-29 20:58 ` Jakub Kicinski
2017-06-29 22:50 ` Luis R. Rodriguez
2017-06-29 22:53 ` Jakub Kicinski
2017-06-29 23:00 ` Luis R. Rodriguez
2017-06-29 23:06 ` Jakub Kicinski
2017-07-12 21:33 ` Luis R. Rodriguez
2017-06-29 20:57 ` Linus Torvalds
2017-07-05 2:06 ` Davidlohr Bueso
2017-07-07 19:58 ` Linus Torvalds
2017-07-07 22:27 ` Davidlohr Bueso
2017-07-07 22:48 ` Linus Torvalds
2017-06-29 19:15 ` Marcelo Tosatti
2017-06-30 4:03 ` Linus Torvalds
2017-06-30 11:55 ` Marcelo Tosatti
2017-06-30 11:57 ` Marcelo Tosatti
2017-06-30 17:30 ` Krister Johansen
2017-06-14 22:20 ` [PATCH 3/4] firmware: avoid invalid fallback aborts by using killable swait Luis R. Rodriguez
2017-06-14 22:20 ` [PATCH 4/4] firmware: send -EINTR on signal abort on fallback mechanism Luis R. Rodriguez
2017-06-15 7:49 ` [PATCH 0/4] firmware: fix fallback mechanism by ignoring SIGCHLD Martin Fuzzey
2017-06-26 21:19 ` Luis R. Rodriguez
2017-06-29 15:14 ` Greg KH
2017-06-29 17:29 ` Luis R. Rodriguez
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=20170614222017.14653-3-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=alan@linux.intel.com \
--cc=arend.vanspriel@broadcom.com \
--cc=atull@kernel.org \
--cc=dhowells@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=ebiederm@xmission.com \
--cc=emmanuel.grumbach@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=jewalt@lgsinnovations.com \
--cc=johannes.berg@intel.com \
--cc=keescook@chromium.org \
--cc=kvalo@codeaurora.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luciano.coelho@intel.com \
--cc=luto@kernel.org \
--cc=mawilcox@microsoft.com \
--cc=mfuzzey@parkeon.com \
--cc=moritz.fischer@ettus.com \
--cc=mtk.manpages@gmail.com \
--cc=mtosatti@redhat.com \
--cc=paul.gortmaker@windriver.com \
--cc=pjones@redhat.com \
--cc=pmladek@suse.com \
--cc=rafal@milecki.pl \
--cc=rjw@rjwysocki.net \
--cc=stable@vger.kernel.org \
--cc=takahiro.akashi@linaro.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=wagi@monom.org \
--cc=yi1.li@linux.intel.com \
/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;
as well as URLs for NNTP newsgroup(s).