From: Stefan Berger <stefanb@linux.vnet.ibm.com> To: peterhuewe@gmx.de, jarkko@kernel.org Cc: jgg@ziepe.ca, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Berger <stefanb@linux.ibm.com>, Nayna Jain <nayna@linux.ibm.com>, George Wilson <gcwilson@linux.ibm.com>, Nageswara R Sastry <rnsastry@linux.ibm.com> Subject: [PATCH] tpm: ibmvtpm: Avoid error message when process gets signal while waiting Date: Mon, 12 Jul 2021 12:25:05 -0400 [thread overview] Message-ID: <20210712162505.205943-1-stefanb@linux.vnet.ibm.com> (raw) From: Stefan Berger <stefanb@linux.ibm.com> When rngd is run as root then lots of these types of message will appear in the kernel log if the TPM has been configure to provide random bytes: [ 7406.275163] tpm tpm0: tpm_transmit: tpm_recv: error -4 The issue is caused by the following call that is interrupted while waiting for the TPM's response. sig = wait_event_interruptible(ibmvtpm->wq, !ibmvtpm->tpm_processing_cmd); The solution is to use wait_event() instead. To recreat the issue start rngd like this: sudo rngd -r /dev/hwrng -t Link: https://bugzilla.redhat.com/show_bug.cgi?id=1981473 Fixes: 6674ff145eef ("tpm_ibmvtpm: properly handle interrupted packet receptions") Cc: Nayna Jain <nayna@linux.ibm.com> Cc: George Wilson <gcwilson@linux.ibm.com> Reported-by: Nageswara R Sastry <rnsastry@linux.ibm.com> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> --- drivers/char/tpm/tpm_ibmvtpm.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c index 903604769de9..99b0442a5fdf 100644 --- a/drivers/char/tpm/tpm_ibmvtpm.c +++ b/drivers/char/tpm/tpm_ibmvtpm.c @@ -106,16 +106,13 @@ static int tpm_ibmvtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count) { struct ibmvtpm_dev *ibmvtpm = dev_get_drvdata(&chip->dev); u16 len; - int sig; if (!ibmvtpm->rtce_buf) { dev_err(ibmvtpm->dev, "ibmvtpm device is not ready\n"); return 0; } - sig = wait_event_interruptible(ibmvtpm->wq, !ibmvtpm->tpm_processing_cmd); - if (sig) - return -EINTR; + wait_event(ibmvtpm->wq, !ibmvtpm->tpm_processing_cmd); len = ibmvtpm->res_len; @@ -206,7 +203,7 @@ static int tpm_ibmvtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) { struct ibmvtpm_dev *ibmvtpm = dev_get_drvdata(&chip->dev); bool retry = true; - int rc, sig; + int rc; if (!ibmvtpm->rtce_buf) { dev_err(ibmvtpm->dev, "ibmvtpm device is not ready\n"); @@ -224,9 +221,7 @@ static int tpm_ibmvtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) dev_info(ibmvtpm->dev, "Need to wait for TPM to finish\n"); /* wait for previous command to finish */ - sig = wait_event_interruptible(ibmvtpm->wq, !ibmvtpm->tpm_processing_cmd); - if (sig) - return -EINTR; + wait_event(ibmvtpm->wq, !ibmvtpm->tpm_processing_cmd); } spin_lock(&ibmvtpm->rtce_lock); @@ -551,7 +546,7 @@ static void ibmvtpm_crq_process(struct ibmvtpm_crq *crq, /* len of the data in rtce buffer */ ibmvtpm->res_len = be16_to_cpu(crq->len); ibmvtpm->tpm_processing_cmd = false; - wake_up_interruptible(&ibmvtpm->wq); + wake_up(&ibmvtpm->wq); return; default: return; -- 2.31.1
next reply other threads:[~2021-07-12 16:25 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-12 16:25 Stefan Berger [this message] 2021-07-13 5:03 ` Nageswara Sastry 2021-07-27 2:42 ` Jarkko Sakkinen 2021-07-27 3:00 ` Stefan Berger 2021-07-28 21:50 ` Jarkko Sakkinen 2021-07-29 13:39 ` Stefan Berger 2021-07-30 0:57 ` Jarkko Sakkinen 2021-07-30 11:45 ` Stefan Berger 2021-07-29 16:19 Stefan Berger 2021-07-30 4:15 ` Nageswara Sastry
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=20210712162505.205943-1-stefanb@linux.vnet.ibm.com \ --to=stefanb@linux.vnet.ibm.com \ --cc=gcwilson@linux.ibm.com \ --cc=jarkko@kernel.org \ --cc=jgg@ziepe.ca \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=nayna@linux.ibm.com \ --cc=peterhuewe@gmx.de \ --cc=rnsastry@linux.ibm.com \ --cc=stefanb@linux.ibm.com \ --subject='Re: [PATCH] tpm: ibmvtpm: Avoid error message when process gets signal while waiting' \ /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
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).