From: Kylene Jo Hall <kjhall@us.ibm.com>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel <linux-kernel@vger.kernel.org>,
TPM Device Driver List <tpmdd-devel@lists.sourceforge.net>
Subject: [PATCH] tpm: update to use wait_event calls
Date: Tue, 11 Apr 2006 15:15:59 -0500 [thread overview]
Message-ID: <1144786559.12054.15.camel@localhost.localdomain> (raw)
In-Reply-To: <20060410150324.4dd55994.akpm@osdl.org>
On Mon, 2006-04-10 at 15:03 -0700, Andrew Morton wrote:
>
> > + interruptible_sleep_on_timeout(&chip->vendor.int_queue,
> > + HZ *
> > + chip->vendor.timeout_a /
> > + 1000);
> >
> > ...
> >
> > + interruptible_sleep_on_timeout(queue, HZ * timeout / 1000);
>
> Please don't use the sleep_on functions. They are racy unless (iirc) both
> the waker and wakee are holding lock_kernel(). If the race hits, we miss a
> wakeup.
>
> These should be converted to the not-racy wait_event_interruptible().
Changed in this patch.
Use wait_event_interruptible_timeout in place of
interruptible_sleep_on_timeout due to its racy nature.
Signed-off-by: Kylie Hall <kjhall@us.ibm.com>
---
drivers/char/tpm/tpm_tis.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
--- linux-2.6.17-rc1/drivers/char/tpm/tpm_tis.c 2006-04-11 12:18:35.573996500 -0500
+++ linux-2.6.16-44/drivers/char/tpm/tpm_tis.c 2006-04-11 14:00:04.341229250 -0500
@@ -95,10 +95,10 @@ static int request_locality(struct tpm_c
chip->vendor.iobase + TPM_ACCESS(l));
if (chip->vendor.irq) {
- interruptible_sleep_on_timeout(&chip->vendor.int_queue,
- HZ *
- chip->vendor.timeout_a /
- 1000);
+ wait_event_interruptible_timeout(chip->vendor.int_queue,
+ (check_locality(chip, l) >= 0),
+ HZ * chip->vendor.timeout_a /
+ 1000);
if (check_locality(chip, l) >= 0)
return l;
@@ -150,7 +150,7 @@ static int get_burstcount(struct tpm_chi
}
static int wait_for_stat(struct tpm_chip *chip, u8 mask, u32 timeout,
- wait_queue_head_t * queue)
+ wait_queue_head_t *queue)
{
unsigned long stop;
u8 status;
@@ -161,7 +161,10 @@ static int wait_for_stat(struct tpm_chip
return 0;
if (chip->vendor.irq) {
- interruptible_sleep_on_timeout(queue, HZ * timeout / 1000);
+ wait_event_interruptible_timeout(*queue,
+ ((tpm_tis_status(chip) &
+ mask) == mask),
+ HZ * timeout / 1000);
status = tpm_tis_status(chip);
if ((status & mask) == mask)
return 0;
next prev parent reply other threads:[~2006-04-11 20:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-10 14:37 [PATCH 7/7] tpm: Driver for next generation TPM chips Kylene Jo Hall
2006-04-10 22:03 ` Andrew Morton
2006-04-11 20:15 ` Kylene Jo Hall [this message]
2006-04-11 20:31 ` [PATCH] tpm: update to use wait_event calls Nish Aravamudan
2006-04-11 22:32 ` [PATCH] tpm: use wait_event return code and msecs_to_jiffies Kylene Jo Hall
2006-04-11 20:40 ` [PATCH] tpm: update to use wait_event calls Ingo Oeser
2006-04-11 23:05 ` [PATCH 7/7] tpm: Driver for next generation TPM chips Nishanth Aravamudan
2006-04-12 17:29 ` Kylene Jo Hall
2006-04-12 17:32 ` Nishanth Aravamudan
2006-04-12 21:48 ` [PATCH] tpm: msecs_to_jiffies cleanups Kylene Jo Hall
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=1144786559.12054.15.camel@localhost.localdomain \
--to=kjhall@us.ibm.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tpmdd-devel@lists.sourceforge.net \
/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).