From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755811AbbBDOhU (ORCPT ); Wed, 4 Feb 2015 09:37:20 -0500 Received: from terminus.zytor.com ([198.137.202.10]:38768 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754632AbbBDOhP (ORCPT ); Wed, 4 Feb 2015 09:37:15 -0500 Date: Wed, 4 Feb 2015 06:36:48 -0800 From: tip-bot for Johan Hedberg Message-ID: Cc: peterz@infradead.org, torvalds@linux-foundation.org, hpa@zytor.com, johan.hedberg@intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org Reply-To: hpa@zytor.com, torvalds@linux-foundation.org, peterz@infradead.org, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, johan.hedberg@intel.com In-Reply-To: <1422616476-2917-2-git-send-email-johan.hedberg@gmail.com> References: <1422616476-2917-2-git-send-email-johan.hedberg@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/wait: Introduce wait_on_bit_timeout() Git-Commit-ID: 44fc0e5eec00db5fba748803c95920098089c4cc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 44fc0e5eec00db5fba748803c95920098089c4cc Gitweb: http://git.kernel.org/tip/44fc0e5eec00db5fba748803c95920098089c4cc Author: Johan Hedberg AuthorDate: Fri, 30 Jan 2015 13:14:36 +0200 Committer: Ingo Molnar CommitDate: Wed, 4 Feb 2015 07:52:32 +0100 sched/wait: Introduce wait_on_bit_timeout() Add a new wait_on_bit_timeout() helper, basically the same as wait_on_bit() except that it also takes a 'timeout' parameter. All the building blocks like bit_wait_timeout() and out_of_line_wait_on_bit_timeout() are already in place so the addition is rather simple. Signed-off-by: Johan Hedberg Signed-off-by: Peter Zijlstra (Intel) Cc: davem@davemloft.net Cc: Linus Torvalds Link: http://lkml.kernel.org/r/1422616476-2917-2-git-send-email-johan.hedberg@gmail.com Signed-off-by: Ingo Molnar --- include/linux/wait.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/linux/wait.h b/include/linux/wait.h index 37423e0..537d58e 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -990,6 +990,32 @@ wait_on_bit_io(void *word, int bit, unsigned mode) } /** + * wait_on_bit_timeout - wait for a bit to be cleared or a timeout elapses + * @word: the word being waited on, a kernel virtual address + * @bit: the bit of the word being waited on + * @mode: the task state to sleep in + * @timeout: timeout, in jiffies + * + * Use the standard hashed waitqueue table to wait for a bit + * to be cleared. This is similar to wait_on_bit(), except also takes a + * timeout parameter. + * + * Returned value will be zero if the bit was cleared before the + * @timeout elapsed, or non-zero if the @timeout elapsed or process + * received a signal and the mode permitted wakeup on that signal. + */ +static inline int +wait_on_bit_timeout(void *word, int bit, unsigned mode, unsigned long timeout) +{ + might_sleep(); + if (!test_bit(bit, word)) + return 0; + return out_of_line_wait_on_bit_timeout(word, bit, + bit_wait_timeout, + mode, timeout); +} + +/** * wait_on_bit_action - wait for a bit to be cleared * @word: the word being waited on, a kernel virtual address * @bit: the bit of the word being waited on