From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756332AbdJJO5W (ORCPT ); Tue, 10 Oct 2017 10:57:22 -0400 Received: from mga09.intel.com ([134.134.136.24]:31456 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932075AbdJJO5R (ORCPT ); Tue, 10 Oct 2017 10:57:17 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,505,1500966000"; d="scan'208";a="158901310" Date: Tue, 10 Oct 2017 17:57:13 +0300 From: Jarkko Sakkinen To: Nayna Jain Cc: linux-integrity@vger.kernel.org, zohar@linux.vnet.ibm.com, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, peterhuewe@gmx.de, tpmdd@selhorst.net, jgunthorpe@obsidianresearch.com, patrickc@us.ibm.com Subject: Re: [PATCH v3 1/5] tpm: move wait_for_tpm_stat() to respective driver files Message-ID: <20171010145713.i2zbuzo4iicyyeo3@linux.intel.com> References: <20171004102924.12355-1-nayna@linux.vnet.ibm.com> <20171004102924.12355-2-nayna@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171004102924.12355-2-nayna@linux.vnet.ibm.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Oct 04, 2017 at 06:29:20AM -0400, Nayna Jain wrote: > The function wait_for_tpm_stat() is currently defined in > tpm-interface file. It is a hardware specific function used > only by tpm_tis and xen-tpmfront, so it is removed from > tpm-interface.c and defined in respective driver files. > > Suggested-by: Jarkko Sakkinen > Signed-off-by: Nayna Jain Reviewed-by: Jarkko Sakkinen /Jarkko > --- > drivers/char/tpm/tpm-interface.c | 60 ---------------------------------------- > drivers/char/tpm/tpm.h | 2 -- > drivers/char/tpm/tpm_tis_core.c | 60 ++++++++++++++++++++++++++++++++++++++++ > drivers/char/tpm/xen-tpmfront.c | 60 ++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 120 insertions(+), 62 deletions(-) > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > index 1d6729be4cd6..313f7618d569 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -1035,66 +1035,6 @@ int tpm_send(u32 chip_num, void *cmd, size_t buflen) > } > EXPORT_SYMBOL_GPL(tpm_send); > > -static bool wait_for_tpm_stat_cond(struct tpm_chip *chip, u8 mask, > - bool check_cancel, bool *canceled) > -{ > - u8 status = chip->ops->status(chip); > - > - *canceled = false; > - if ((status & mask) == mask) > - return true; > - if (check_cancel && chip->ops->req_canceled(chip, status)) { > - *canceled = true; > - return true; > - } > - return false; > -} > - > -int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, > - wait_queue_head_t *queue, bool check_cancel) > -{ > - unsigned long stop; > - long rc; > - u8 status; > - bool canceled = false; > - > - /* check current status */ > - status = chip->ops->status(chip); > - if ((status & mask) == mask) > - return 0; > - > - stop = jiffies + timeout; > - > - if (chip->flags & TPM_CHIP_FLAG_IRQ) { > -again: > - timeout = stop - jiffies; > - if ((long)timeout <= 0) > - return -ETIME; > - rc = wait_event_interruptible_timeout(*queue, > - wait_for_tpm_stat_cond(chip, mask, check_cancel, > - &canceled), > - timeout); > - if (rc > 0) { > - if (canceled) > - return -ECANCELED; > - return 0; > - } > - if (rc == -ERESTARTSYS && freezing(current)) { > - clear_thread_flag(TIF_SIGPENDING); > - goto again; > - } > - } else { > - do { > - tpm_msleep(TPM_TIMEOUT); > - status = chip->ops->status(chip); > - if ((status & mask) == mask) > - return 0; > - } while (time_before(jiffies, stop)); > - } > - return -ETIME; > -} > -EXPORT_SYMBOL_GPL(wait_for_tpm_stat); > - > #define TPM_ORD_SAVESTATE 152 > #define SAVESTATE_RESULT_SIZE 10 > > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > index 2d5466a72e40..4fc83ac7abeb 100644 > --- a/drivers/char/tpm/tpm.h > +++ b/drivers/char/tpm/tpm.h > @@ -525,8 +525,6 @@ int tpm_do_selftest(struct tpm_chip *chip); > unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal); > int tpm_pm_suspend(struct device *dev); > int tpm_pm_resume(struct device *dev); > -int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, > - wait_queue_head_t *queue, bool check_cancel); > > static inline void tpm_msleep(unsigned int delay_msec) > { > diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c > index 63bc6c3b949e..b33126a35694 100644 > --- a/drivers/char/tpm/tpm_tis_core.c > +++ b/drivers/char/tpm/tpm_tis_core.c > @@ -31,6 +31,66 @@ > #include "tpm.h" > #include "tpm_tis_core.h" > > +static bool wait_for_tpm_stat_cond(struct tpm_chip *chip, u8 mask, > + bool check_cancel, bool *canceled) > +{ > + u8 status = chip->ops->status(chip); > + > + *canceled = false; > + if ((status & mask) == mask) > + return true; > + if (check_cancel && chip->ops->req_canceled(chip, status)) { > + *canceled = true; > + return true; > + } > + return false; > +} > + > +static int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask, > + unsigned long timeout, wait_queue_head_t *queue, > + bool check_cancel) > +{ > + unsigned long stop; > + long rc; > + u8 status; > + bool canceled = false; > + > + /* check current status */ > + status = chip->ops->status(chip); > + if ((status & mask) == mask) > + return 0; > + > + stop = jiffies + timeout; > + > + if (chip->flags & TPM_CHIP_FLAG_IRQ) { > +again: > + timeout = stop - jiffies; > + if ((long)timeout <= 0) > + return -ETIME; > + rc = wait_event_interruptible_timeout(*queue, > + wait_for_tpm_stat_cond(chip, mask, check_cancel, > + &canceled), > + timeout); > + if (rc > 0) { > + if (canceled) > + return -ECANCELED; > + return 0; > + } > + if (rc == -ERESTARTSYS && freezing(current)) { > + clear_thread_flag(TIF_SIGPENDING); > + goto again; > + } > + } else { > + do { > + tpm_msleep(TPM_TIMEOUT); > + status = chip->ops->status(chip); > + if ((status & mask) == mask) > + return 0; > + } while (time_before(jiffies, stop)); > + } > + return -ETIME; > +} > + > /* Before we attempt to access the TPM we must see that the valid bit is set. > * The specification says that this bit is 0 at reset and remains 0 until the > * 'TPM has gone through its self test and initialization and has established > diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c > index 656e8af95d52..d20a0a9ded27 100644 > --- a/drivers/char/tpm/xen-tpmfront.c > +++ b/drivers/char/tpm/xen-tpmfront.c > @@ -39,6 +39,66 @@ enum status_bits { > VTPM_STATUS_CANCELED = 0x8, > }; > > +static bool wait_for_tpm_stat_cond(struct tpm_chip *chip, u8 mask, > + bool check_cancel, bool *canceled) > +{ > + u8 status = chip->ops->status(chip); > + > + *canceled = false; > + if ((status & mask) == mask) > + return true; > + if (check_cancel && chip->ops->req_canceled(chip, status)) { > + *canceled = true; > + return true; > + } > + return false; > +} > + > +static int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask, > + unsigned long timeout, wait_queue_head_t *queue, > + bool check_cancel) > +{ > + unsigned long stop; > + long rc; > + u8 status; > + bool canceled = false; > + > + /* check current status */ > + status = chip->ops->status(chip); > + if ((status & mask) == mask) > + return 0; > + > + stop = jiffies + timeout; > + > + if (chip->flags & TPM_CHIP_FLAG_IRQ) { > +again: > + timeout = stop - jiffies; > + if ((long)timeout <= 0) > + return -ETIME; > + rc = wait_event_interruptible_timeout(*queue, > + wait_for_tpm_stat_cond(chip, mask, check_cancel, > + &canceled), > + timeout); > + if (rc > 0) { > + if (canceled) > + return -ECANCELED; > + return 0; > + } > + if (rc == -ERESTARTSYS && freezing(current)) { > + clear_thread_flag(TIF_SIGPENDING); > + goto again; > + } > + } else { > + do { > + tpm_msleep(TPM_TIMEOUT); > + status = chip->ops->status(chip); > + if ((status & mask) == mask) > + return 0; > + } while (time_before(jiffies, stop)); > + } > + return -ETIME; > +} > + > static u8 vtpm_status(struct tpm_chip *chip) > { > struct tpm_private *priv = dev_get_drvdata(&chip->dev); > -- > 2.13.3 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: jarkko.sakkinen@linux.intel.com (Jarkko Sakkinen) Date: Tue, 10 Oct 2017 17:57:13 +0300 Subject: [PATCH v3 1/5] tpm: move wait_for_tpm_stat() to respective driver files In-Reply-To: <20171004102924.12355-2-nayna@linux.vnet.ibm.com> References: <20171004102924.12355-1-nayna@linux.vnet.ibm.com> <20171004102924.12355-2-nayna@linux.vnet.ibm.com> Message-ID: <20171010145713.i2zbuzo4iicyyeo3@linux.intel.com> To: linux-security-module@vger.kernel.org List-Id: linux-security-module.vger.kernel.org On Wed, Oct 04, 2017 at 06:29:20AM -0400, Nayna Jain wrote: > The function wait_for_tpm_stat() is currently defined in > tpm-interface file. It is a hardware specific function used > only by tpm_tis and xen-tpmfront, so it is removed from > tpm-interface.c and defined in respective driver files. > > Suggested-by: Jarkko Sakkinen > Signed-off-by: Nayna Jain Reviewed-by: Jarkko Sakkinen /Jarkko > --- > drivers/char/tpm/tpm-interface.c | 60 ---------------------------------------- > drivers/char/tpm/tpm.h | 2 -- > drivers/char/tpm/tpm_tis_core.c | 60 ++++++++++++++++++++++++++++++++++++++++ > drivers/char/tpm/xen-tpmfront.c | 60 ++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 120 insertions(+), 62 deletions(-) > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > index 1d6729be4cd6..313f7618d569 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -1035,66 +1035,6 @@ int tpm_send(u32 chip_num, void *cmd, size_t buflen) > } > EXPORT_SYMBOL_GPL(tpm_send); > > -static bool wait_for_tpm_stat_cond(struct tpm_chip *chip, u8 mask, > - bool check_cancel, bool *canceled) > -{ > - u8 status = chip->ops->status(chip); > - > - *canceled = false; > - if ((status & mask) == mask) > - return true; > - if (check_cancel && chip->ops->req_canceled(chip, status)) { > - *canceled = true; > - return true; > - } > - return false; > -} > - > -int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, > - wait_queue_head_t *queue, bool check_cancel) > -{ > - unsigned long stop; > - long rc; > - u8 status; > - bool canceled = false; > - > - /* check current status */ > - status = chip->ops->status(chip); > - if ((status & mask) == mask) > - return 0; > - > - stop = jiffies + timeout; > - > - if (chip->flags & TPM_CHIP_FLAG_IRQ) { > -again: > - timeout = stop - jiffies; > - if ((long)timeout <= 0) > - return -ETIME; > - rc = wait_event_interruptible_timeout(*queue, > - wait_for_tpm_stat_cond(chip, mask, check_cancel, > - &canceled), > - timeout); > - if (rc > 0) { > - if (canceled) > - return -ECANCELED; > - return 0; > - } > - if (rc == -ERESTARTSYS && freezing(current)) { > - clear_thread_flag(TIF_SIGPENDING); > - goto again; > - } > - } else { > - do { > - tpm_msleep(TPM_TIMEOUT); > - status = chip->ops->status(chip); > - if ((status & mask) == mask) > - return 0; > - } while (time_before(jiffies, stop)); > - } > - return -ETIME; > -} > -EXPORT_SYMBOL_GPL(wait_for_tpm_stat); > - > #define TPM_ORD_SAVESTATE 152 > #define SAVESTATE_RESULT_SIZE 10 > > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > index 2d5466a72e40..4fc83ac7abeb 100644 > --- a/drivers/char/tpm/tpm.h > +++ b/drivers/char/tpm/tpm.h > @@ -525,8 +525,6 @@ int tpm_do_selftest(struct tpm_chip *chip); > unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal); > int tpm_pm_suspend(struct device *dev); > int tpm_pm_resume(struct device *dev); > -int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, > - wait_queue_head_t *queue, bool check_cancel); > > static inline void tpm_msleep(unsigned int delay_msec) > { > diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c > index 63bc6c3b949e..b33126a35694 100644 > --- a/drivers/char/tpm/tpm_tis_core.c > +++ b/drivers/char/tpm/tpm_tis_core.c > @@ -31,6 +31,66 @@ > #include "tpm.h" > #include "tpm_tis_core.h" > > +static bool wait_for_tpm_stat_cond(struct tpm_chip *chip, u8 mask, > + bool check_cancel, bool *canceled) > +{ > + u8 status = chip->ops->status(chip); > + > + *canceled = false; > + if ((status & mask) == mask) > + return true; > + if (check_cancel && chip->ops->req_canceled(chip, status)) { > + *canceled = true; > + return true; > + } > + return false; > +} > + > +static int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask, > + unsigned long timeout, wait_queue_head_t *queue, > + bool check_cancel) > +{ > + unsigned long stop; > + long rc; > + u8 status; > + bool canceled = false; > + > + /* check current status */ > + status = chip->ops->status(chip); > + if ((status & mask) == mask) > + return 0; > + > + stop = jiffies + timeout; > + > + if (chip->flags & TPM_CHIP_FLAG_IRQ) { > +again: > + timeout = stop - jiffies; > + if ((long)timeout <= 0) > + return -ETIME; > + rc = wait_event_interruptible_timeout(*queue, > + wait_for_tpm_stat_cond(chip, mask, check_cancel, > + &canceled), > + timeout); > + if (rc > 0) { > + if (canceled) > + return -ECANCELED; > + return 0; > + } > + if (rc == -ERESTARTSYS && freezing(current)) { > + clear_thread_flag(TIF_SIGPENDING); > + goto again; > + } > + } else { > + do { > + tpm_msleep(TPM_TIMEOUT); > + status = chip->ops->status(chip); > + if ((status & mask) == mask) > + return 0; > + } while (time_before(jiffies, stop)); > + } > + return -ETIME; > +} > + > /* Before we attempt to access the TPM we must see that the valid bit is set. > * The specification says that this bit is 0 at reset and remains 0 until the > * 'TPM has gone through its self test and initialization and has established > diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c > index 656e8af95d52..d20a0a9ded27 100644 > --- a/drivers/char/tpm/xen-tpmfront.c > +++ b/drivers/char/tpm/xen-tpmfront.c > @@ -39,6 +39,66 @@ enum status_bits { > VTPM_STATUS_CANCELED = 0x8, > }; > > +static bool wait_for_tpm_stat_cond(struct tpm_chip *chip, u8 mask, > + bool check_cancel, bool *canceled) > +{ > + u8 status = chip->ops->status(chip); > + > + *canceled = false; > + if ((status & mask) == mask) > + return true; > + if (check_cancel && chip->ops->req_canceled(chip, status)) { > + *canceled = true; > + return true; > + } > + return false; > +} > + > +static int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask, > + unsigned long timeout, wait_queue_head_t *queue, > + bool check_cancel) > +{ > + unsigned long stop; > + long rc; > + u8 status; > + bool canceled = false; > + > + /* check current status */ > + status = chip->ops->status(chip); > + if ((status & mask) == mask) > + return 0; > + > + stop = jiffies + timeout; > + > + if (chip->flags & TPM_CHIP_FLAG_IRQ) { > +again: > + timeout = stop - jiffies; > + if ((long)timeout <= 0) > + return -ETIME; > + rc = wait_event_interruptible_timeout(*queue, > + wait_for_tpm_stat_cond(chip, mask, check_cancel, > + &canceled), > + timeout); > + if (rc > 0) { > + if (canceled) > + return -ECANCELED; > + return 0; > + } > + if (rc == -ERESTARTSYS && freezing(current)) { > + clear_thread_flag(TIF_SIGPENDING); > + goto again; > + } > + } else { > + do { > + tpm_msleep(TPM_TIMEOUT); > + status = chip->ops->status(chip); > + if ((status & mask) == mask) > + return 0; > + } while (time_before(jiffies, stop)); > + } > + return -ETIME; > +} > + > static u8 vtpm_status(struct tpm_chip *chip) > { > struct tpm_private *priv = dev_get_drvdata(&chip->dev); > -- > 2.13.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html