* [PATCH v3] tpm: vtpm_proxy: Suppress error logging when in closed state
@ 2017-05-25 22:29 Stefan Berger
2017-05-30 4:51 ` Jarkko Sakkinen
2017-06-01 17:14 ` Jarkko Sakkinen
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Berger @ 2017-05-25 22:29 UTC (permalink / raw)
To: jarkko.sakkinen, tpmdd-devel
Cc: linux-security-module, linux-kernel, jgunthorpe, Stefan Berger
Suppress the error logging when the core TPM driver sends commands
to the VTPM proxy driver and -EPIPE is returned in case the VTPM
proxy driver is 'closed' (closed anonymous file descriptor). This
error code is only returned by the send function and by tpm_transmit
when the VTPM proxy driver is being used.
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
drivers/char/tpm/tpm-interface.c | 5 +++--
drivers/char/tpm/tpm2-cmd.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index d711186..d2b4df6 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -430,8 +430,9 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
rc = chip->ops->send(chip, (u8 *) buf, count);
if (rc < 0) {
- dev_err(&chip->dev,
- "tpm_transmit: tpm_send: error %d\n", rc);
+ if (rc != -EPIPE)
+ dev_err(&chip->dev,
+ "%s: tpm_send: error %d\n", __func__, rc);
goto out;
}
diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index 3ee6883..3a99643 100644
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@ -840,7 +840,7 @@ void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type)
/* In places where shutdown command is sent there's no much we can do
* except print the error code on a system failure.
*/
- if (rc < 0)
+ if (rc < 0 && rc != -EPIPE)
dev_warn(&chip->dev, "transmit returned %d while stopping the TPM",
rc);
}
--
2.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] tpm: vtpm_proxy: Suppress error logging when in closed state
2017-05-25 22:29 [PATCH v3] tpm: vtpm_proxy: Suppress error logging when in closed state Stefan Berger
@ 2017-05-30 4:51 ` Jarkko Sakkinen
2017-06-01 17:14 ` Jarkko Sakkinen
1 sibling, 0 replies; 3+ messages in thread
From: Jarkko Sakkinen @ 2017-05-30 4:51 UTC (permalink / raw)
To: Stefan Berger
Cc: tpmdd-devel, linux-security-module, linux-kernel, jgunthorpe
On Thu, May 25, 2017 at 06:29:13PM -0400, Stefan Berger wrote:
> Suppress the error logging when the core TPM driver sends commands
> to the VTPM proxy driver and -EPIPE is returned in case the VTPM
> proxy driver is 'closed' (closed anonymous file descriptor). This
> error code is only returned by the send function and by tpm_transmit
> when the VTPM proxy driver is being used.
>
> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviwed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
/Jarkko
> ---
> drivers/char/tpm/tpm-interface.c | 5 +++--
> drivers/char/tpm/tpm2-cmd.c | 2 +-
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> index d711186..d2b4df6 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -430,8 +430,9 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
>
> rc = chip->ops->send(chip, (u8 *) buf, count);
> if (rc < 0) {
> - dev_err(&chip->dev,
> - "tpm_transmit: tpm_send: error %d\n", rc);
> + if (rc != -EPIPE)
> + dev_err(&chip->dev,
> + "%s: tpm_send: error %d\n", __func__, rc);
> goto out;
> }
>
> diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
> index 3ee6883..3a99643 100644
> --- a/drivers/char/tpm/tpm2-cmd.c
> +++ b/drivers/char/tpm/tpm2-cmd.c
> @@ -840,7 +840,7 @@ void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type)
> /* In places where shutdown command is sent there's no much we can do
> * except print the error code on a system failure.
> */
> - if (rc < 0)
> + if (rc < 0 && rc != -EPIPE)
> dev_warn(&chip->dev, "transmit returned %d while stopping the TPM",
> rc);
> }
> --
> 2.4.3
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] tpm: vtpm_proxy: Suppress error logging when in closed state
2017-05-25 22:29 [PATCH v3] tpm: vtpm_proxy: Suppress error logging when in closed state Stefan Berger
2017-05-30 4:51 ` Jarkko Sakkinen
@ 2017-06-01 17:14 ` Jarkko Sakkinen
1 sibling, 0 replies; 3+ messages in thread
From: Jarkko Sakkinen @ 2017-06-01 17:14 UTC (permalink / raw)
To: Stefan Berger
Cc: tpmdd-devel, linux-security-module, linux-kernel, jgunthorpe
On Thu, May 25, 2017 at 06:29:13PM -0400, Stefan Berger wrote:
> Suppress the error logging when the core TPM driver sends commands
> to the VTPM proxy driver and -EPIPE is returned in case the VTPM
> proxy driver is 'closed' (closed anonymous file descriptor). This
> error code is only returned by the send function and by tpm_transmit
> when the VTPM proxy driver is being used.
>
> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> ---
> drivers/char/tpm/tpm-interface.c | 5 +++--
> drivers/char/tpm/tpm2-cmd.c | 2 +-
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> index d711186..d2b4df6 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -430,8 +430,9 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
>
> rc = chip->ops->send(chip, (u8 *) buf, count);
> if (rc < 0) {
> - dev_err(&chip->dev,
> - "tpm_transmit: tpm_send: error %d\n", rc);
> + if (rc != -EPIPE)
> + dev_err(&chip->dev,
> + "%s: tpm_send: error %d\n", __func__, rc);
> goto out;
> }
>
> diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
> index 3ee6883..3a99643 100644
> --- a/drivers/char/tpm/tpm2-cmd.c
> +++ b/drivers/char/tpm/tpm2-cmd.c
> @@ -840,7 +840,7 @@ void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type)
> /* In places where shutdown command is sent there's no much we can do
> * except print the error code on a system failure.
> */
> - if (rc < 0)
> + if (rc < 0 && rc != -EPIPE)
> dev_warn(&chip->dev, "transmit returned %d while stopping the TPM",
> rc);
> }
> --
> 2.4.3
>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkine@linux.intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkine@linux.intel.com>
/Jarkko
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-06-01 17:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-25 22:29 [PATCH v3] tpm: vtpm_proxy: Suppress error logging when in closed state Stefan Berger
2017-05-30 4:51 ` Jarkko Sakkinen
2017-06-01 17:14 ` Jarkko Sakkinen
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).