From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Tadeusz Struk <tstruk@gmail.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>,
Mario Limonciello <mario.limonciello@dell.com>,
Peter Huewe <peterhuewe@gmx.de>, Jason Gunthorpe <jgg@ziepe.ca>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org,
Jeffrin Jose T <jeffrin@rajagiritech.edu.in>,
Alex Guzman <alex@guzman.io>
Subject: Re: [PATCH] tpm: Revert "tpm: fix invalid locking in NONBLOCKING mode"
Date: Thu, 28 May 2020 03:30:40 +0300 [thread overview]
Message-ID: <20200528003040.GA4781@linux.intel.com> (raw)
In-Reply-To: <f63afdc1-6c40-dc0d-bb9a-154bc51d3b95@gmail.com>
On Tue, May 26, 2020 at 12:39:37PM -0700, Tadeusz Struk wrote:
> On 5/26/20 12:14 PM, James Bottomley wrote:
> > + /* atomic tpm command send and result receive. We only hold the ops
> > + * lock during this period so that the tpm can be unregistered even if
> > + * the char dev is held open.
> > + */
> > + if (tpm_try_get_ops(priv->chip)) {
> > + ret = -EPIPE;
> > + goto out;
> > + }
> > +
> Hi James,
> This won't help if the message is read by an async tcti. If the problem lies
> in the chip get locality code, perhaps this could help to debug the root-cause
> instead of masking it out in the upper layer code:
What is TCTI and async TCTI? Not following.
> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> index 2435216bd10a..da5ecd0376bf 100644
> --- a/drivers/char/tpm/tpm_tis_core.c
> +++ b/drivers/char/tpm/tpm_tis_core.c
> @@ -202,20 +202,22 @@ static int request_locality(struct tpm_chip *chip, int l)
> return rc;
>
> stop = jiffies + chip->timeout_a;
> + timeout = stop - jiffies;
>
> if (chip->flags & TPM_CHIP_FLAG_IRQ) {
> again:
> timeout = stop - jiffies;
> if ((long)timeout <= 0)
> - return -1;
> + goto out;
> +
> rc = wait_event_interruptible_timeout(priv->int_queue,
> - (check_locality
> - (chip, l)),
> + check_locality(chip, l),
> timeout);
> if (rc > 0)
> return l;
> if (rc == -ERESTARTSYS && freezing(current)) {
> clear_thread_flag(TIF_SIGPENDING);
> + timeout = stop - jiffies;
> goto again;
> }
> } else {
> @@ -226,6 +228,10 @@ static int request_locality(struct tpm_chip *chip, int l)
> tpm_msleep(TPM_TIMEOUT);
> } while (time_before(jiffies, stop));
> }
> +out:
> + dev_warn(&chip->dev, "%s: failed to request locality %d after %lu ms\n",
> + __func__, l, timeout * HZ / 1000);
> +
> return -1;
> }
>
/Jarkko
next prev parent reply other threads:[~2020-05-28 0:30 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 18:32 [PATCH] tpm: Revert "tpm: fix invalid locking in NONBLOCKING mode" Mario Limonciello
2020-05-26 19:14 ` James Bottomley
2020-05-26 19:23 ` Mario.Limonciello
2020-05-26 19:38 ` James Bottomley
2020-05-26 22:19 ` Alex Guzman
2020-05-26 23:06 ` James Bottomley
2020-05-26 23:31 ` Alex Guzman
2020-05-27 0:18 ` James Bottomley
2020-05-27 20:09 ` Jarkko Sakkinen
2020-05-27 20:18 ` Mario.Limonciello
2020-05-28 0:43 ` Jarkko Sakkinen
2020-05-28 0:59 ` Mario.Limonciello
2020-05-28 6:53 ` Jarkko Sakkinen
2020-05-26 19:39 ` Tadeusz Struk
2020-05-26 20:00 ` James Bottomley
2020-05-26 21:33 ` Tadeusz Struk
2020-05-26 22:34 ` Alex Guzman
2020-05-28 0:30 ` Jarkko Sakkinen [this message]
2020-05-28 4:40 ` Tadeusz Struk
2020-05-28 6:55 ` Jarkko Sakkinen
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=20200528003040.GA4781@linux.intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=alex@guzman.io \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=jeffrin@rajagiritech.edu.in \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mario.limonciello@dell.com \
--cc=peterhuewe@gmx.de \
--cc=tstruk@gmail.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).