Re: [tpmdd-devel] [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support

2016-11-14 Thread Nayna 


On 11/15/2016 07:45 AM, Jarkko Sakkinen wrote:
> On Mon, Nov 14, 2016 at 04:25:14PM -0800, Jarkko Sakkinen wrote:
>> On Mon, Nov 14, 2016 at 02:33:23PM -0800, Jarkko Sakkinen wrote:
>>> On Mon, Nov 14, 2016 at 05:00:47AM -0500, Nayna Jain wrote:
 This patch set includes the cleanup and bug fixes patches, previously
 part of the "tpm: add the securityfs pseudo files support for TPM 2.0
 firmware event log" patch set, in order to upstream them more quickly.
>>>
>>> I applied the patches. I'm not yet sure whether these are part of the
>>> 4.10 pull request or whether I postpone to 4.11 (my preference would be
>>> 4.10 but I do not want to close that right now). I'll do testing next
>>> week before doing pull request.
>>>
>>> I hope that the commits gets some reviews and testing now that they are
>>> easily testable in my master branch.
>>
>> Event log still works and they do not seem to break TPM 2.0 (tried both
>> machine with tpm_crb and tpm_tis).
>>
>> Stefan: would you mind check that these do not break your TPM 1.2
>> environment? I already tried wih TPM 1.2 machine but probably would
>> make sense to peer test.
>
> I'm dropping commits 8/9 and 9/9 from my tree and *will not* include
> them to my 4.10 pull request.

Will fix this and resend the patch 8/9 and 9/9 again.

Thanks & Regards,
- Nayna

>
> /Jarkko
>


--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

Re: [tpmdd-devel] [PATCH] tpm: drop chip->is_open and chip->duration_adjusted

2016-11-14 Thread Jarkko Sakkinen 
On Mon, Nov 14, 2016 at 09:30:01PM -0700, Jason Gunthorpe wrote:
> On Mon, Nov 14, 2016 at 03:44:58PM -0800, Jarkko Sakkinen wrote:
> > Use atomic bitops for chip->flags so that we do not need chip->is_open
> > and chip->duration_adjusted anymore.
> 
> I don't know if it s a really great idea to use atomic bit ops for
> things that do not need to be atomic.. It makes the locking scheme
> less clear. is open is genuinely different since it relies on the
> atomic for correctness.

The way I see it is one of the status flags bound to chip among the
others. I do not see this cause too much harm for clarity. It eases
debugging the driver a bit because you get more state out of 'flags'.

It also makes code little a bit more robust as flags is independent of
locks.

How strong is your opposition here? I do not see any exceptional damage
done but see some subtle but still significant benefits.

> Merging is_duration makes lots of sense though

Also timeout_adjusted should be merged (for some reason missed it).

> Jason

/Jarkko

--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

Re: [tpmdd-devel] [PATCH] tpm: drop chip->is_open and chip->duration_adjusted

2016-11-14 Thread Jason Gunthorpe 
On Mon, Nov 14, 2016 at 03:44:58PM -0800, Jarkko Sakkinen wrote:
> Use atomic bitops for chip->flags so that we do not need chip->is_open
> and chip->duration_adjusted anymore.

I don't know if it s a really great idea to use atomic bit ops for
things that do not need to be atomic.. It makes the locking scheme
less clear. is open is genuinely different since it relies on the
atomic for correctness.

Merging is_duration makes lots of sense though

Jason

--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

Re: [tpmdd-devel] [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support

2016-11-14 Thread Jarkko Sakkinen 
On Mon, Nov 14, 2016 at 04:25:14PM -0800, Jarkko Sakkinen wrote:
> On Mon, Nov 14, 2016 at 02:33:23PM -0800, Jarkko Sakkinen wrote:
> > On Mon, Nov 14, 2016 at 05:00:47AM -0500, Nayna Jain wrote:
> > > This patch set includes the cleanup and bug fixes patches, previously
> > > part of the "tpm: add the securityfs pseudo files support for TPM 2.0
> > > firmware event log" patch set, in order to upstream them more quickly.
> > 
> > I applied the patches. I'm not yet sure whether these are part of the
> > 4.10 pull request or whether I postpone to 4.11 (my preference would be
> > 4.10 but I do not want to close that right now). I'll do testing next
> > week before doing pull request.
> > 
> > I hope that the commits gets some reviews and testing now that they are
> > easily testable in my master branch.
> 
> Event log still works and they do not seem to break TPM 2.0 (tried both
> machine with tpm_crb and tpm_tis).
> 
> Stefan: would you mind check that these do not break your TPM 1.2
> environment? I already tried wih TPM 1.2 machine but probably would
> make sense to peer test.

I'm dropping commits 8/9 and 9/9 from my tree and *will not* include
them to my 4.10 pull request.

/Jarkko

--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

Re: [tpmdd-devel] [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support

2016-11-14 Thread Jarkko Sakkinen 
On Mon, Nov 14, 2016 at 02:33:23PM -0800, Jarkko Sakkinen wrote:
> On Mon, Nov 14, 2016 at 05:00:47AM -0500, Nayna Jain wrote:
> > This patch set includes the cleanup and bug fixes patches, previously
> > part of the "tpm: add the securityfs pseudo files support for TPM 2.0
> > firmware event log" patch set, in order to upstream them more quickly.
> 
> I applied the patches. I'm not yet sure whether these are part of the
> 4.10 pull request or whether I postpone to 4.11 (my preference would be
> 4.10 but I do not want to close that right now). I'll do testing next
> week before doing pull request.
> 
> I hope that the commits gets some reviews and testing now that they are
> easily testable in my master branch.

Event log still works and they do not seem to break TPM 2.0 (tried both
machine with tpm_crb and tpm_tis).

Stefan: would you mind check that these do not break your TPM 1.2
environment? I already tried wih TPM 1.2 machine but probably would
make sense to peer test.

/Jarkko

--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

Re: [tpmdd-devel] [PATCH v6 7/9] tpm: redefine read_log() to handle ACPI/OF at runtime

2016-11-14 Thread Jarkko Sakkinen 
On Mon, Nov 14, 2016 at 05:00:54AM -0500, Nayna Jain wrote:
> Currently, read_log() has two implementations: one for ACPI platforms
> and the other for device tree(OF) based platforms. The proper one is
> selected at compile time using Kconfig and #ifdef in the Makefile,
> which is not the recommended approach.
> 
> This patch removes the #ifdef in the Makefile by defining a single
> read_log() method, which checks for ACPI/OF event log properties at
> runtime.
> 
> Suggested-by: Jason Gunthorpe 
> Signed-off-by: Nayna Jain 
> Reviewed-by: Jason Gunthorpe 
> Reviewed-by: Jarkko Sakkinen 

Tested-by: Jarkko Sakkinen 

/Jarkko

--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

Re: [tpmdd-devel] [PATCH v6 5/9] tpm: have event log use the tpm_chip

2016-11-14 Thread Jarkko Sakkinen 
On Mon, Nov 14, 2016 at 03:44:01PM -0800, Jarkko Sakkinen wrote:
> On Mon, Nov 14, 2016 at 05:00:52AM -0500, Nayna Jain wrote:
> > Move the backing memory for the event log into tpm_chip and push
> > the tpm_chip into read_log. This optimizes read_log processing by
> > only doing it once and prepares things for the next patches in the
> > series which require the tpm_chip to locate the event log via
> > ACPI and OF handles instead of searching.
> > 
> > This is straightfoward except for the issue of passing a kref through
> > i_private with securityfs. Since securityfs_remove does not have any
> > removal fencing like sysfs we use the inode lock to safely get a
> > kref on the tpm_chip.
> > 
> > Suggested-by: Jason Gunthorpe 
> > Signed-off-by: Nayna Jain 
> 
> Reviewed-by: Jarkko Sakkinen 

Tested-by: Jarkko Sakkinen 

/Jarkko

--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

Re: [tpmdd-devel] [PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops

2016-11-14 Thread Jarkko Sakkinen 
On Mon, Nov 14, 2016 at 02:22:09PM -0800, Jarkko Sakkinen wrote:
> On Mon, Nov 14, 2016 at 05:00:53AM -0500, Nayna Jain wrote:
> > This patch fixes the missing .owner field in
> > tpm_bios_measurements_ops definition.
> > 
> > Suggested-by: Jason Gunthorpe 
> > Signed-off-by: Nayna Jain 
> 
> Reviewed-by: Jarkko Sakkinen 

Tested-by: Jarkko Sakkinen 

/Jarkko

--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

Re: [tpmdd-devel] [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files

2016-11-14 Thread Jarkko Sakkinen 
On Mon, Nov 14, 2016 at 02:21:14PM -0800, Jarkko Sakkinen wrote:
> On Mon, Nov 14, 2016 at 05:00:49AM -0500, Nayna Jain wrote:
> > checkpatch.pl flags warning for symbolic permissions and suggests
> > to replace with octal value.
> > 
> > This patch changes securityfs pseudo files permission
> > to octal values in tpm_bios_log_setup().
> > 
> > Signed-off-by: Nayna Jain 
> 
> Reviewed-by: Jarkko Sakkinen 

Tested-by: Jarkko Sakkinen 

/Jarkko

--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

[tpmdd-devel] [PATCH] tpm: drop chip->is_open and chip->duration_adjusted

2016-11-14 Thread Jarkko Sakkinen 
Use atomic bitops for chip->flags so that we do not need chip->is_open
and chip->duration_adjusted anymore.

Signed-off-by: Jarkko Sakkinen 
---
 drivers/char/tpm/st33zp24/st33zp24.c |  6 +++---
 drivers/char/tpm/tpm-chip.c  | 14 --
 drivers/char/tpm/tpm-dev.c   |  9 +++--
 drivers/char/tpm/tpm-interface.c | 30 +++---
 drivers/char/tpm/tpm-sysfs.c |  2 +-
 drivers/char/tpm/tpm.h   | 14 +++---
 drivers/char/tpm/tpm2-cmd.c  |  2 +-
 drivers/char/tpm/tpm_crb.c   |  2 +-
 drivers/char/tpm/tpm_i2c_nuvoton.c   |  8 
 drivers/char/tpm/tpm_tis_core.c  | 26 +-
 drivers/char/tpm/tpm_vtpm_proxy.c|  2 +-
 11 files changed, 57 insertions(+), 58 deletions(-)

diff --git a/drivers/char/tpm/st33zp24/st33zp24.c 
b/drivers/char/tpm/st33zp24/st33zp24.c
index 6f060c7..14734a0 100644
--- a/drivers/char/tpm/st33zp24/st33zp24.c
+++ b/drivers/char/tpm/st33zp24/st33zp24.c
@@ -267,7 +267,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, 
unsigned long timeout,
 
stop = jiffies + timeout;
 
-   if (chip->flags & TPM_CHIP_FLAG_IRQ) {
+   if (test_bit(TPM_CHIP_FLAG_IRQ, >flags)) {
cur_intrs = tpm_dev->intrs;
clear_interruption(tpm_dev);
enable_irq(tpm_dev->irq);
@@ -429,7 +429,7 @@ static int st33zp24_send(struct tpm_chip *chip, unsigned 
char *buf,
if (ret < 0)
goto out_err;
 
-   if (chip->flags & TPM_CHIP_FLAG_IRQ) {
+   if (test_bit(TPM_CHIP_FLAG_IRQ, >flags)) {
ordinal = be32_to_cpu(*((__be32 *) (buf + 6)));
 
ret = wait_for_stat(chip, TPM_STS_DATA_AVAIL | TPM_STS_VALID,
@@ -586,7 +586,7 @@ int st33zp24_probe(void *phy_id, const struct 
st33zp24_phy_ops *ops,
goto _tpm_clean_answer;
 
tpm_dev->irq = irq;
-   chip->flags |= TPM_CHIP_FLAG_IRQ;
+   set_bit(TPM_CHIP_FLAG_IRQ, >flags);
 
disable_irq_nosync(tpm_dev->irq);
}
diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 3f27753..04819e1 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -183,7 +183,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev,
goto out;
 
if (!dev)
-   chip->flags |= TPM_CHIP_FLAG_VIRTUAL;
+   set_bit(TPM_CHIP_FLAG_VIRTUAL, >flags);
 
cdev_init(>cdev, _fops);
chip->cdev.owner = THIS_MODULE;
@@ -271,7 +271,7 @@ static void tpm_del_char_device(struct tpm_chip *chip)
 
/* Make the driver uncallable. */
down_write(>ops_sem);
-   if (chip->flags & TPM_CHIP_FLAG_TPM2)
+   if (test_bit(TPM_CHIP_FLAG_TPM2, >flags))
tpm2_shutdown(chip, TPM2_SU_CLEAR);
chip->ops = NULL;
up_write(>ops_sem);
@@ -281,7 +281,8 @@ static void tpm_del_legacy_sysfs(struct tpm_chip *chip)
 {
struct attribute **i;
 
-   if (chip->flags & (TPM_CHIP_FLAG_TPM2 | TPM_CHIP_FLAG_VIRTUAL))
+   if (test_bit(TPM_CHIP_FLAG_TPM2, >flags) ||
+   test_bit(TPM_CHIP_FLAG_VIRTUAL, >flags))
return;
 
sysfs_remove_link(>dev.parent->kobj, "ppi");
@@ -299,8 +300,9 @@ static int tpm_add_legacy_sysfs(struct tpm_chip *chip)
struct attribute **i;
int rc;
 
-   if (chip->flags & (TPM_CHIP_FLAG_TPM2 | TPM_CHIP_FLAG_VIRTUAL))
-   return 0;
+   if (test_bit(TPM_CHIP_FLAG_TPM2, >flags) ||
+   test_bit(TPM_CHIP_FLAG_VIRTUAL, >flags))
+   return;
 
rc = __compat_only_sysfs_link_entry_to_kobj(
>dev.parent->kobj, >dev.kobj, "ppi");
@@ -335,7 +337,7 @@ int tpm_chip_register(struct tpm_chip *chip)
int rc;
 
if (chip->ops->flags & TPM_OPS_AUTO_STARTUP) {
-   if (chip->flags & TPM_CHIP_FLAG_TPM2)
+   if (test_bit(TPM_CHIP_FLAG_TPM2, >flags))
rc = tpm2_auto_startup(chip);
else
rc = tpm1_auto_startup(chip);
diff --git a/drivers/char/tpm/tpm-dev.c b/drivers/char/tpm/tpm-dev.c
index 912ad30..3738c38 100644
--- a/drivers/char/tpm/tpm-dev.c
+++ b/drivers/char/tpm/tpm-dev.c
@@ -57,17 +57,14 @@ static int tpm_open(struct inode *inode, struct file *file)
container_of(inode->i_cdev, struct tpm_chip, cdev);
struct file_priv *priv;
 
-   /* It's assured that the chip will be opened just once,
-* by the check of is_open variable, which is protected
-* by driver_lock. */
-   if (test_and_set_bit(0, >is_open)) {
+   if (test_and_set_bit(TPM_CHIP_FLAG_IS_OPEN, >flags)) {
dev_dbg(>dev, "Another process owns this TPM\n");
return -EBUSY;
}
 
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (priv == NULL) {
-   clear_bit(0,

Re: [tpmdd-devel] [PATCH v6 5/9] tpm: have event log use the tpm_chip

2016-11-14 Thread Jarkko Sakkinen 
On Mon, Nov 14, 2016 at 05:00:52AM -0500, Nayna Jain wrote:
> Move the backing memory for the event log into tpm_chip and push
> the tpm_chip into read_log. This optimizes read_log processing by
> only doing it once and prepares things for the next patches in the
> series which require the tpm_chip to locate the event log via
> ACPI and OF handles instead of searching.
> 
> This is straightfoward except for the issue of passing a kref through
> i_private with securityfs. Since securityfs_remove does not have any
> removal fencing like sysfs we use the inode lock to safely get a
> kref on the tpm_chip.
> 
> Suggested-by: Jason Gunthorpe 
> Signed-off-by: Nayna Jain 

Reviewed-by: Jarkko Sakkinen 

/Jarkko

> ---
>  drivers/char/tpm/tpm-chip.c |  3 +-
>  drivers/char/tpm/tpm.h  | 11 ++
>  drivers/char/tpm/tpm_acpi.c | 15 +--
>  drivers/char/tpm/tpm_eventlog.c | 88 
> ++---
>  drivers/char/tpm/tpm_eventlog.h |  2 +-
>  drivers/char/tpm/tpm_of.c   |  4 +-
>  6 files changed, 85 insertions(+), 38 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 250a651..3f27753 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -127,6 +127,7 @@ static void tpm_dev_release(struct device *dev)
>   idr_remove(_nums_idr, chip->dev_num);
>   mutex_unlock(_lock);
>  
> + kfree(chip->log.bios_event_log);
>   kfree(chip);
>  }
>  
> @@ -345,7 +346,7 @@ int tpm_chip_register(struct tpm_chip *chip)
>   tpm_sysfs_add_device(chip);
>  
>   rc = tpm_bios_log_setup(chip);
> - if (rc)
> + if (rc == -ENODEV)
>   return rc;
>  
>   tpm_add_ppi(chip);
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index 9d69580..1ae9768 100644
> --- a/drivers/char/tpm/tpm.h
> +++ b/drivers/char/tpm/tpm.h
> @@ -35,6 +35,8 @@
>  #include 
>  #include 
>  
> +#include "tpm_eventlog.h"
> +
>  enum tpm_const {
>   TPM_MINOR = 224,/* officially assigned */
>   TPM_BUFSIZE = 4096,
> @@ -146,6 +148,11 @@ enum tpm_chip_flags {
>   TPM_CHIP_FLAG_HAVE_TIMEOUTS = BIT(4),
>  };
>  
> +struct tpm_chip_seqops {
> + struct tpm_chip *chip;
> + const struct seq_operations *seqops;
> +};
> +
>  struct tpm_chip {
>   struct device dev;
>   struct cdev cdev;
> @@ -157,6 +164,10 @@ struct tpm_chip {
>   struct rw_semaphore ops_sem;
>   const struct tpm_class_ops *ops;
>  
> + struct tpm_bios_log log;
> + struct tpm_chip_seqops bin_log_seqops;
> + struct tpm_chip_seqops ascii_log_seqops;
> +
>   unsigned int flags;
>  
>   int dev_num;/* /dev/tpm# */
> diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
> index 565a947..01dfb35 100644
> --- a/drivers/char/tpm/tpm_acpi.c
> +++ b/drivers/char/tpm/tpm_acpi.c
> @@ -9,7 +9,7 @@
>   *
>   * Maintained by: 
>   *
> - * Access to the eventlog extended by the TCG BIOS of PC platform
> + * Access to the event log extended by the TCG BIOS of PC platform
>   *
>   * This program is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU General Public License
> @@ -45,13 +45,15 @@ struct acpi_tcpa {
>  };
>  
>  /* read binary bios log */
> -int read_log(struct tpm_bios_log *log)
> +int read_log(struct tpm_chip *chip)
>  {
>   struct acpi_tcpa *buff;
>   acpi_status status;
>   void __iomem *virt;
>   u64 len, start;
> + struct tpm_bios_log *log;
>  
> + log = >log;
>   if (log->bios_event_log != NULL) {
>   printk(KERN_ERR
>  "%s: ERROR - Eventlog already initialized\n",
> @@ -97,13 +99,18 @@ int read_log(struct tpm_bios_log *log)
>  
>   virt = acpi_os_map_iomem(start, len);
>   if (!virt) {
> - kfree(log->bios_event_log);
>   printk("%s: ERROR - Unable to map memory\n", __func__);
> - return -EIO;
> + goto err;
>   }
>  
>   memcpy_fromio(log->bios_event_log, virt, len);
>  
>   acpi_os_unmap_iomem(virt, len);
>   return 0;
> +
> +err:
> + kfree(log->bios_event_log);
> + log->bios_event_log = NULL;
> + return -EIO;
> +
>  }
> diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
> index 57ac862..f8c42fe 100644
> --- a/drivers/char/tpm/tpm_eventlog.c
> +++ b/drivers/char/tpm/tpm_eventlog.c
> @@ -11,7 +11,7 @@
>   *
>   * Maintained by: 
>   *
> - * Access to the eventlog created by a system's firmware / BIOS
> + * Access to the event log created by a system's firmware / BIOS
>   *
>   * This program is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU General Public License
> @@ -73,7 +73,8 @@ static const char* tcpa_pc_event_id_strings[] = {
>

Re: [tpmdd-devel] [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support

2016-11-14 Thread Jarkko Sakkinen 
On Mon, Nov 14, 2016 at 05:00:47AM -0500, Nayna Jain wrote:
> This patch set includes the cleanup and bug fixes patches, previously
> part of the "tpm: add the securityfs pseudo files support for TPM 2.0
> firmware event log" patch set, in order to upstream them more quickly.

I applied the patches. I'm not yet sure whether these are part of the
4.10 pull request or whether I postpone to 4.11 (my preference would be
4.10 but I do not want to close that right now). I'll do testing next
week before doing pull request.

I hope that the commits gets some reviews and testing now that they are
easily testable in my master branch.

/Jarkko

> 
> Changelog History:
> 
> v6:
> 
> - Patch "tpm: replace symbolic permission with octal for securityfs files"
>   - New Patch.
> - Patch "tpm: have event log use the tpm_chip"
>   - Changed commit description as per Jason's suggestion.
>   - Fixed bug related to kfree() for bios_event_log.
>   - Moved inode_unlock() just after get_device() in open().
>   - Returned -ENODEV for read_log() ENOMEM error and other errors as it is.
>   - Added comment in tpm_bios_log_teardown() to explain inode_lock()/unlock
> reasoning.
>   - Splitted .owner into different patch.
> - Patch "tpm: fix the missing .owner in tpm_bios_measurements_ops"
>   - New Patch.
> - Patch "tpm: cleanup of printk error messages"
>   - Replaced dev_info() with dev_warn().
>   - Updated commit description subject line.
> 
> v5:
> 
> - Moved cleanup/fixes patches into this patch set.
> - Patch "fix the race condition between event log access and chip
> getting unregistered"
>   - updated subject line and commit description.
>   - modified fops code to use chip kref.
>   - modified fops to lock inode before accessing inode private data.
>   - renamed tpm_securityfs_data to tpm_chip_seqops, as it no more
>   holds bios log, but associates seqops with respective chip. For
>   the same reason, moved it to tpm.h
> - Patch "replace or remove printk error messages"
>   - cleaned up dev_dbg and used dev_info as applicable.
> 
> v4:
> 
> - Includes feedbacks from Jarkko and Jason.
> - Patch "tpm: define a generic open() method for ascii & bios
> measurements".
>   - Fix indentation issue.
> - Patch "tpm: replace the dynamically allocated bios_dir as
>   struct dentry array". 
>   - Continue to use bios_dir_count variable to use is_bad() checks and
>   to maintain correct order for securityfs_remove() during teardown.
>   - Reset chip->bios_dir_count in teardown() function.
> - Patch "tpm: validate the event log access before tpm_bios_log_setup".
>   - Retain TPM2 check which was removed in previous patch.
>   - Add tpm_bios_log_setup failure handling.
>   - Remove use of private data from v3 version of patch. Add a new
>   member to struct tpm_chip to achieve the same purpose.
> - Patch "tpm: redefine the read_log method to check for ACPI/OF 
> properties sequentially".
>   - Move replacement of CONFIG_TCG_IBMVTPM with CONFIG_OF to
>   this patch from patch 3.
>   - Replace -1 error code with -ENODEV.
> - Patch "tpm: replace the of_find_node_by_name() with dev of_node
> property".
>  - Uses chip->dev.parent->of_node.
>  - Created separate patch for cleanup of pr_err messages.
> - Patch "tpm: remove printk error messages".
>  - New Patch.
> - Patch "tpm: add the securityfs file support for TPM 2.0 event log".
>  - Parses event digests using event alg_id rather than event log header
>  alg_id.
>  - Uses of_property_match_string to differentiate tpm/vtpm compatible
>  property.
>  - Adds the comment for difference in tpm/vtpm endianness.
> 
> v3:
> 
> - Includes the review feedbacks as suggested by Jason.
> - Split of patches into one patch per idea.
> - Generic open() method for ascii/bios measurements.
> - Replacement of of **bios_dir with *bios_dir[3].
> - Verifying readlog() is successful before creating securityfs entries.
> - Generic readlog() to check for ACPI/OF in sequence.
> - read_log_of() method now uses of_node propertry rather than
> calling find_device_by_name.
> - read_log differentiates vtpm/tpm using its compatible property.
> - Cleans pr_err with dev_dbg.
> - Commit msgs subject line prefixed with tpm.
> 
> v2:
> 
> - Fixes issues as given in feedback by Jason.
> - Adds documentation for device tree.
> 
> Nayna Jain (9):
>   tpm: define a generic open() method for ascii & bios measurements
>   tpm: replace symbolic permission with octal for securityfs files
>   tpm: replace dynamically allocated bios_dir with a static array
>   tpm: drop tpm1_chip_register(/unregister)
>   tpm: have event log use the tpm_chip
>   tpm: fix the missing .owner in tpm_bios_measurements_ops
>   tpm: redefine read_log() to handle ACPI/OF at runtime
>   tpm: replace of_find_node_by_name() with dev of_node property
>   tpm: cleanup of printk error messages
> 
>  drivers/char/tpm/Makefile   |  14 +--
>  drivers/char/tpm/tpm-chip.c |  33 ++
>  drivers/char/tpm/tpm-sysfs.c|   3 +
>  drivers/char/tpm/tpm.h

Re: [tpmdd-devel] [PATCH v6 9/9] tpm: cleanup of printk error messages

2016-11-14 Thread Jarkko Sakkinen 
On Mon, Nov 14, 2016 at 05:00:56AM -0500, Nayna Jain wrote:
> This patch removes the unnecessary error messages on failing to
> allocate memory and replaces pr_err/printk with dev_dbg/dev_info
> as applicable.
> 
> Suggested-by: Jason Gunthorpe 
> Signed-off-by: Nayna Jain 

Reviewed-by: Jarkko Sakkinen 

/Jarkko

> ---
>  drivers/char/tpm/tpm_acpi.c | 16 
>  drivers/char/tpm/tpm_of.c   | 29 +
>  2 files changed, 13 insertions(+), 32 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
> index fa30c969..ddbaef2 100644
> --- a/drivers/char/tpm/tpm_acpi.c
> +++ b/drivers/char/tpm/tpm_acpi.c
> @@ -60,11 +60,8 @@ int read_log_acpi(struct tpm_chip *chip)
>   status = acpi_get_table(ACPI_SIG_TCPA, 1,
>   (struct acpi_table_header **));
>  
> - if (ACPI_FAILURE(status)) {
> - printk(KERN_ERR "%s: ERROR - Could not get TCPA table\n",
> -__func__);
> + if (ACPI_FAILURE(status))
>   return -EIO;
> - }
>  
>   switch(buff->platform_class) {
>   case BIOS_SERVER:
> @@ -78,25 +75,20 @@ int read_log_acpi(struct tpm_chip *chip)
>   break;
>   }
>   if (!len) {
> - printk(KERN_ERR "%s: ERROR - TCPA log area empty\n", __func__);
> + dev_warn(>dev, "%s: TCPA log area empty\n", __func__);
>   return -EIO;
>   }
>  
>   /* malloc EventLog space */
>   log->bios_event_log = kmalloc(len, GFP_KERNEL);
> - if (!log->bios_event_log) {
> - printk("%s: ERROR - Not enough  Memory for BIOS measurements\n",
> - __func__);
> + if (!log->bios_event_log)
>   return -ENOMEM;
> - }
>  
>   log->bios_event_log_end = log->bios_event_log + len;
>  
>   virt = acpi_os_map_iomem(start, len);
> - if (!virt) {
> - printk("%s: ERROR - Unable to map memory\n", __func__);
> + if (!virt)
>   goto err;
> - }
>  
>   memcpy_fromio(log->bios_event_log, virt, len);
>  
> diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
> index 22b8f81..3af829f 100644
> --- a/drivers/char/tpm/tpm_of.c
> +++ b/drivers/char/tpm/tpm_of.c
> @@ -31,40 +31,29 @@ int read_log_of(struct tpm_chip *chip)
>   log = >log;
>   if (chip->dev.parent->of_node)
>   np = chip->dev.parent->of_node;
> - if (!np) {
> - pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);
> + if (!np)
>   return -ENODEV;
> - }
>  
>   sizep = of_get_property(np, "linux,sml-size", NULL);
> - if (sizep == NULL) {
> - pr_err("%s: ERROR - SML size not found\n", __func__);
> - goto cleanup_eio;
> - }
> + if (sizep == NULL)
> + return -EIO;
> +
>   if (*sizep == 0) {
> - pr_err("%s: ERROR - event log area empty\n", __func__);
> - goto cleanup_eio;
> + dev_warn(>dev, "%s: Event log area empty\n", __func__);
> + return -EIO;
>   }
>  
>   basep = of_get_property(np, "linux,sml-base", NULL);
> - if (basep == NULL) {
> - pr_err("%s: ERROR - SML not found\n", __func__);
> - goto cleanup_eio;
> - }
> + if (basep == NULL)
> + return -EIO;
>  
>   log->bios_event_log = kmalloc(*sizep, GFP_KERNEL);
> - if (!log->bios_event_log) {
> - pr_err("%s: ERROR - Not enough memory for BIOS measurements\n",
> -__func__);
> + if (!log->bios_event_log)
>   return -ENOMEM;
> - }
>  
>   log->bios_event_log_end = log->bios_event_log + *sizep;
>  
>   memcpy(log->bios_event_log, __va(*basep), *sizep);
>  
>   return 0;
> -
> -cleanup_eio:
> - return -EIO;
>  }
> -- 
> 2.5.0
> 

--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

Re: [tpmdd-devel] [PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops

2016-11-14 Thread Jarkko Sakkinen 
On Mon, Nov 14, 2016 at 05:00:53AM -0500, Nayna Jain wrote:
> This patch fixes the missing .owner field in
> tpm_bios_measurements_ops definition.
> 
> Suggested-by: Jason Gunthorpe 
> Signed-off-by: Nayna Jain 

Reviewed-by: Jarkko Sakkinen 

/Jarkko

> ---
>  drivers/char/tpm/tpm_eventlog.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
> index f8c42fe..5575ffc 100644
> --- a/drivers/char/tpm/tpm_eventlog.c
> +++ b/drivers/char/tpm/tpm_eventlog.c
> @@ -349,6 +349,7 @@ static int tpm_bios_measurements_open(struct inode *inode,
>  }
>  
>  static const struct file_operations tpm_bios_measurements_ops = {
> + .owner = THIS_MODULE,
>   .open = tpm_bios_measurements_open,
>   .read = seq_read,
>   .llseek = seq_lseek,
> -- 
> 2.5.0
> 

--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

Re: [tpmdd-devel] [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files

2016-11-14 Thread Jarkko Sakkinen 
On Mon, Nov 14, 2016 at 05:00:49AM -0500, Nayna Jain wrote:
> checkpatch.pl flags warning for symbolic permissions and suggests
> to replace with octal value.
> 
> This patch changes securityfs pseudo files permission
> to octal values in tpm_bios_log_setup().
> 
> Signed-off-by: Nayna Jain 

Reviewed-by: Jarkko Sakkinen 

/Jarkko

> ---
>  drivers/char/tpm/tpm_eventlog.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
> index 42b49c4..9467e31 100644
> --- a/drivers/char/tpm/tpm_eventlog.c
> +++ b/drivers/char/tpm/tpm_eventlog.c
> @@ -378,7 +378,7 @@ struct dentry **tpm_bios_log_setup(const char *name)
>  
>   bin_file =
>   securityfs_create_file("binary_bios_measurements",
> -S_IRUSR | S_IRGRP, tpm_dir,
> +0440, tpm_dir,
>  (void *)_binary_b_measurements_seqops,
>  _bios_measurements_ops);
>   if (is_bad(bin_file))
> @@ -386,7 +386,7 @@ struct dentry **tpm_bios_log_setup(const char *name)
>  
>   ascii_file =
>   securityfs_create_file("ascii_bios_measurements",
> -S_IRUSR | S_IRGRP, tpm_dir,
> +0440, tpm_dir,
>  (void *)_ascii_b_measurements_seqops,
>  _bios_measurements_ops);
>   if (is_bad(ascii_file))
> -- 
> 2.5.0
> 

--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

Re: [tpmdd-devel] [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files

2016-11-14 Thread Jarkko Sakkinen 
On Mon, Nov 14, 2016 at 05:00:49AM -0500, Nayna Jain wrote:
> checkpatch.pl flags warning for symbolic permissions and suggests
> to replace with octal value.
> 
> This patch changes securityfs pseudo files permission
> to octal values in tpm_bios_log_setup().
> 
> Signed-off-by: Nayna Jain 

Reviewed-by: Jarkko Sakkinen 

/Jarkko

> ---
>  drivers/char/tpm/tpm_eventlog.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
> index 42b49c4..9467e31 100644
> --- a/drivers/char/tpm/tpm_eventlog.c
> +++ b/drivers/char/tpm/tpm_eventlog.c
> @@ -378,7 +378,7 @@ struct dentry **tpm_bios_log_setup(const char *name)
>  
>   bin_file =
>   securityfs_create_file("binary_bios_measurements",
> -S_IRUSR | S_IRGRP, tpm_dir,
> +0440, tpm_dir,
>  (void *)_binary_b_measurements_seqops,
>  _bios_measurements_ops);
>   if (is_bad(bin_file))
> @@ -386,7 +386,7 @@ struct dentry **tpm_bios_log_setup(const char *name)
>  
>   ascii_file =
>   securityfs_create_file("ascii_bios_measurements",
> -S_IRUSR | S_IRGRP, tpm_dir,
> +0440, tpm_dir,
>  (void *)_ascii_b_measurements_seqops,
>  _bios_measurements_ops);
>   if (is_bad(ascii_file))
> -- 
> 2.5.0
> 

--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

Re: [tpmdd-devel] [PATCH 2/2] tpm/tpm2-chip: fix kdoc errors

2016-11-14 Thread Winkler, Tomas 
.org
> Subject: Re: [PATCH 2/2] tpm/tpm2-chip: fix kdoc errors
> 
> On Tue, Nov 01, 2016 at 03:05:14AM +0200, Tomas Winkler wrote:
> > Use correct kdoc format, describe correct parameters and return values.
> >
> > Signed-off-by: Tomas Winkler 
> > ---
> >  drivers/char/tpm/tpm2-cmd.c | 107
> > +++-
> >  1 file changed, 66 insertions(+), 41 deletions(-)
> >
> > diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
> > index 7df55d58c939..a7a519c87bee 100644
> > --- a/drivers/char/tpm/tpm2-cmd.c
> > +++ b/drivers/char/tpm/tpm2-cmd.c
> > @@ -258,11 +258,13 @@ static const struct tpm_input_header
> tpm2_pcrread_header = {
> >   * tpm2_pcr_read() - read a PCR value
> >   * @chip:  TPM chip to use.
> >   * @pcr_idx:   index of the PCR to read.
> > - * @ref_buf:   buffer to store the resulting hash,
> > + * @res_buf:   buffer to store the resulting hash,
> >   *
> > - * 0 is returned when the operation is successful. If a negative
> > number is
> > - * returned it remarks a POSIX error code. If a positive number is
> > returned
> > - * it remarks a TPM error.
> > + *
> > + * Return:
> > + * 0 when the operation is successful
> > + * A negative number for system errors (errno)
> > + * A positive number for a TPM error.
> >   */
> >  int tpm2_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)  {
> > @@ -304,13 +306,15 @@ static const struct tpm_input_header
> > tpm2_pcrextend_header = {
> >
> >  /**
> >   * tpm2_pcr_extend() - extend a PCR value
> > + *
> >   * @chip:  TPM chip to use.
> >   * @pcr_idx:   index of the PCR.
> >   * @hash:  hash value to use for the extend operation.
> >   *
> > - * 0 is returned when the operation is successful. If a negative
> > number is
> > - * returned it remarks a POSIX error code. If a positive number is
> > returned
> > - * it remarks a TPM error.
> > + * Return:
> > + * 0 when the operation is successful
> > + * A negative number for system errors (errno)
> > + * A positive number for a TPM error.
> 
> Put this to tpm_transmit_cmd only and refer to that from other functions with
> "same as with tpm_transmit_cmd()" with parenthesis because that marks in rst
> a link to that function.

And then tpm_transmit_cmd() will point to tpm_transmit() ? 
I'm not sure I'm happy about those links, rst is okay but after all  mostly 
we're just looking directly to the sources with a simple editor. 
Anyhow this patch is to resolve the kdoc syntax bug, the overhaul of the 
documentation can be built on top of it. 

Thanks
Tomas


--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

[tpmdd-devel] [PATCH v6 5/9] tpm: have event log use the tpm_chip

2016-11-14 Thread Nayna Jain 
Move the backing memory for the event log into tpm_chip and push
the tpm_chip into read_log. This optimizes read_log processing by
only doing it once and prepares things for the next patches in the
series which require the tpm_chip to locate the event log via
ACPI and OF handles instead of searching.

This is straightfoward except for the issue of passing a kref through
i_private with securityfs. Since securityfs_remove does not have any
removal fencing like sysfs we use the inode lock to safely get a
kref on the tpm_chip.

Suggested-by: Jason Gunthorpe 
Signed-off-by: Nayna Jain 
---
 drivers/char/tpm/tpm-chip.c |  3 +-
 drivers/char/tpm/tpm.h  | 11 ++
 drivers/char/tpm/tpm_acpi.c | 15 +--
 drivers/char/tpm/tpm_eventlog.c | 88 ++---
 drivers/char/tpm/tpm_eventlog.h |  2 +-
 drivers/char/tpm/tpm_of.c   |  4 +-
 6 files changed, 85 insertions(+), 38 deletions(-)

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 250a651..3f27753 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -127,6 +127,7 @@ static void tpm_dev_release(struct device *dev)
idr_remove(_nums_idr, chip->dev_num);
mutex_unlock(_lock);
 
+   kfree(chip->log.bios_event_log);
kfree(chip);
 }
 
@@ -345,7 +346,7 @@ int tpm_chip_register(struct tpm_chip *chip)
tpm_sysfs_add_device(chip);
 
rc = tpm_bios_log_setup(chip);
-   if (rc)
+   if (rc == -ENODEV)
return rc;
 
tpm_add_ppi(chip);
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 9d69580..1ae9768 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -35,6 +35,8 @@
 #include 
 #include 
 
+#include "tpm_eventlog.h"
+
 enum tpm_const {
TPM_MINOR = 224,/* officially assigned */
TPM_BUFSIZE = 4096,
@@ -146,6 +148,11 @@ enum tpm_chip_flags {
TPM_CHIP_FLAG_HAVE_TIMEOUTS = BIT(4),
 };
 
+struct tpm_chip_seqops {
+   struct tpm_chip *chip;
+   const struct seq_operations *seqops;
+};
+
 struct tpm_chip {
struct device dev;
struct cdev cdev;
@@ -157,6 +164,10 @@ struct tpm_chip {
struct rw_semaphore ops_sem;
const struct tpm_class_ops *ops;
 
+   struct tpm_bios_log log;
+   struct tpm_chip_seqops bin_log_seqops;
+   struct tpm_chip_seqops ascii_log_seqops;
+
unsigned int flags;
 
int dev_num;/* /dev/tpm# */
diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
index 565a947..01dfb35 100644
--- a/drivers/char/tpm/tpm_acpi.c
+++ b/drivers/char/tpm/tpm_acpi.c
@@ -9,7 +9,7 @@
  *
  * Maintained by: 
  *
- * Access to the eventlog extended by the TCG BIOS of PC platform
+ * Access to the event log extended by the TCG BIOS of PC platform
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -45,13 +45,15 @@ struct acpi_tcpa {
 };
 
 /* read binary bios log */
-int read_log(struct tpm_bios_log *log)
+int read_log(struct tpm_chip *chip)
 {
struct acpi_tcpa *buff;
acpi_status status;
void __iomem *virt;
u64 len, start;
+   struct tpm_bios_log *log;
 
+   log = >log;
if (log->bios_event_log != NULL) {
printk(KERN_ERR
   "%s: ERROR - Eventlog already initialized\n",
@@ -97,13 +99,18 @@ int read_log(struct tpm_bios_log *log)
 
virt = acpi_os_map_iomem(start, len);
if (!virt) {
-   kfree(log->bios_event_log);
printk("%s: ERROR - Unable to map memory\n", __func__);
-   return -EIO;
+   goto err;
}
 
memcpy_fromio(log->bios_event_log, virt, len);
 
acpi_os_unmap_iomem(virt, len);
return 0;
+
+err:
+   kfree(log->bios_event_log);
+   log->bios_event_log = NULL;
+   return -EIO;
+
 }
diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
index 57ac862..f8c42fe 100644
--- a/drivers/char/tpm/tpm_eventlog.c
+++ b/drivers/char/tpm/tpm_eventlog.c
@@ -11,7 +11,7 @@
  *
  * Maintained by: 
  *
- * Access to the eventlog created by a system's firmware / BIOS
+ * Access to the event log created by a system's firmware / BIOS
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -73,7 +73,8 @@ static const char* tcpa_pc_event_id_strings[] = {
 static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
 {
loff_t i;
-   struct tpm_bios_log *log = m->private;
+   struct tpm_chip *chip = m->private;
+   struct tpm_bios_log *log = >log;
void *addr = log->bios_event_log;
void *limit = log->bios_event_log_end;
struct

[tpmdd-devel] [PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops

2016-11-14 Thread Nayna Jain 
This patch fixes the missing .owner field in
tpm_bios_measurements_ops definition.

Suggested-by: Jason Gunthorpe 
Signed-off-by: Nayna Jain 
---
 drivers/char/tpm/tpm_eventlog.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
index f8c42fe..5575ffc 100644
--- a/drivers/char/tpm/tpm_eventlog.c
+++ b/drivers/char/tpm/tpm_eventlog.c
@@ -349,6 +349,7 @@ static int tpm_bios_measurements_open(struct inode *inode,
 }
 
 static const struct file_operations tpm_bios_measurements_ops = {
+   .owner = THIS_MODULE,
.open = tpm_bios_measurements_open,
.read = seq_read,
.llseek = seq_lseek,
-- 
2.5.0


--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

[tpmdd-devel] [PATCH v6 9/9] tpm: cleanup of printk error messages

2016-11-14 Thread Nayna Jain 
This patch removes the unnecessary error messages on failing to
allocate memory and replaces pr_err/printk with dev_dbg/dev_info
as applicable.

Suggested-by: Jason Gunthorpe 
Signed-off-by: Nayna Jain 
---
 drivers/char/tpm/tpm_acpi.c | 16 
 drivers/char/tpm/tpm_of.c   | 29 +
 2 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
index fa30c969..ddbaef2 100644
--- a/drivers/char/tpm/tpm_acpi.c
+++ b/drivers/char/tpm/tpm_acpi.c
@@ -60,11 +60,8 @@ int read_log_acpi(struct tpm_chip *chip)
status = acpi_get_table(ACPI_SIG_TCPA, 1,
(struct acpi_table_header **));
 
-   if (ACPI_FAILURE(status)) {
-   printk(KERN_ERR "%s: ERROR - Could not get TCPA table\n",
-  __func__);
+   if (ACPI_FAILURE(status))
return -EIO;
-   }
 
switch(buff->platform_class) {
case BIOS_SERVER:
@@ -78,25 +75,20 @@ int read_log_acpi(struct tpm_chip *chip)
break;
}
if (!len) {
-   printk(KERN_ERR "%s: ERROR - TCPA log area empty\n", __func__);
+   dev_warn(>dev, "%s: TCPA log area empty\n", __func__);
return -EIO;
}
 
/* malloc EventLog space */
log->bios_event_log = kmalloc(len, GFP_KERNEL);
-   if (!log->bios_event_log) {
-   printk("%s: ERROR - Not enough  Memory for BIOS measurements\n",
-   __func__);
+   if (!log->bios_event_log)
return -ENOMEM;
-   }
 
log->bios_event_log_end = log->bios_event_log + len;
 
virt = acpi_os_map_iomem(start, len);
-   if (!virt) {
-   printk("%s: ERROR - Unable to map memory\n", __func__);
+   if (!virt)
goto err;
-   }
 
memcpy_fromio(log->bios_event_log, virt, len);
 
diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
index 22b8f81..3af829f 100644
--- a/drivers/char/tpm/tpm_of.c
+++ b/drivers/char/tpm/tpm_of.c
@@ -31,40 +31,29 @@ int read_log_of(struct tpm_chip *chip)
log = >log;
if (chip->dev.parent->of_node)
np = chip->dev.parent->of_node;
-   if (!np) {
-   pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);
+   if (!np)
return -ENODEV;
-   }
 
sizep = of_get_property(np, "linux,sml-size", NULL);
-   if (sizep == NULL) {
-   pr_err("%s: ERROR - SML size not found\n", __func__);
-   goto cleanup_eio;
-   }
+   if (sizep == NULL)
+   return -EIO;
+
if (*sizep == 0) {
-   pr_err("%s: ERROR - event log area empty\n", __func__);
-   goto cleanup_eio;
+   dev_warn(>dev, "%s: Event log area empty\n", __func__);
+   return -EIO;
}
 
basep = of_get_property(np, "linux,sml-base", NULL);
-   if (basep == NULL) {
-   pr_err("%s: ERROR - SML not found\n", __func__);
-   goto cleanup_eio;
-   }
+   if (basep == NULL)
+   return -EIO;
 
log->bios_event_log = kmalloc(*sizep, GFP_KERNEL);
-   if (!log->bios_event_log) {
-   pr_err("%s: ERROR - Not enough memory for BIOS measurements\n",
-  __func__);
+   if (!log->bios_event_log)
return -ENOMEM;
-   }
 
log->bios_event_log_end = log->bios_event_log + *sizep;
 
memcpy(log->bios_event_log, __va(*basep), *sizep);
 
return 0;
-
-cleanup_eio:
-   return -EIO;
 }
-- 
2.5.0


--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

[tpmdd-devel] [PATCH v6 8/9] tpm: replace of_find_node_by_name() with dev of_node property

2016-11-14 Thread Nayna Jain 
Using the device of_node property is a better way to refer to the
device tree node rather than of_find_node_by_name().

Suggested-by: Jason Gunthorpe 
Signed-off-by: Nayna Jain 
Reviewed-by: Jarkko Sakkinen 
---
 drivers/char/tpm/tpm_of.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
index 7c30752..22b8f81 100644
--- a/drivers/char/tpm/tpm_of.c
+++ b/drivers/char/tpm/tpm_of.c
@@ -29,7 +29,8 @@ int read_log_of(struct tpm_chip *chip)
struct tpm_bios_log *log;
 
log = >log;
-   np = of_find_node_by_name(NULL, "vtpm");
+   if (chip->dev.parent->of_node)
+   np = chip->dev.parent->of_node;
if (!np) {
pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);
return -ENODEV;
@@ -55,18 +56,15 @@ int read_log_of(struct tpm_chip *chip)
if (!log->bios_event_log) {
pr_err("%s: ERROR - Not enough memory for BIOS measurements\n",
   __func__);
-   of_node_put(np);
return -ENOMEM;
}
 
log->bios_event_log_end = log->bios_event_log + *sizep;
 
memcpy(log->bios_event_log, __va(*basep), *sizep);
-   of_node_put(np);
 
return 0;
 
 cleanup_eio:
-   of_node_put(np);
return -EIO;
 }
-- 
2.5.0


--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

[tpmdd-devel] [PATCH v6 7/9] tpm: redefine read_log() to handle ACPI/OF at runtime

2016-11-14 Thread Nayna Jain 
Currently, read_log() has two implementations: one for ACPI platforms
and the other for device tree(OF) based platforms. The proper one is
selected at compile time using Kconfig and #ifdef in the Makefile,
which is not the recommended approach.

This patch removes the #ifdef in the Makefile by defining a single
read_log() method, which checks for ACPI/OF event log properties at
runtime.

Suggested-by: Jason Gunthorpe 
Signed-off-by: Nayna Jain 
Reviewed-by: Jason Gunthorpe 
Reviewed-by: Jarkko Sakkinen 
---
 drivers/char/tpm/Makefile   | 14 --
 drivers/char/tpm/tpm_acpi.c |  9 ++---
 drivers/char/tpm/tpm_eventlog.c | 20 
 drivers/char/tpm/tpm_eventlog.h | 22 +-
 drivers/char/tpm/tpm_of.c   |  8 ++--
 5 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile
index a385fb8..a05b1eb 100644
--- a/drivers/char/tpm/Makefile
+++ b/drivers/char/tpm/Makefile
@@ -2,16 +2,10 @@
 # Makefile for the kernel tpm device drivers.
 #
 obj-$(CONFIG_TCG_TPM) += tpm.o
-tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o
-tpm-$(CONFIG_ACPI) += tpm_ppi.o
-
-ifdef CONFIG_ACPI
-   tpm-y += tpm_eventlog.o tpm_acpi.o
-else
-ifdef CONFIG_TCG_IBMVTPM
-   tpm-y += tpm_eventlog.o tpm_of.o
-endif
-endif
+tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o \
+   tpm_eventlog.o
+tpm-$(CONFIG_ACPI) += tpm_ppi.o tpm_acpi.o
+tpm-$(CONFIG_OF) += tpm_of.o
 obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o
 obj-$(CONFIG_TCG_TIS) += tpm_tis.o
 obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o
diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
index 01dfb35..fa30c969 100644
--- a/drivers/char/tpm/tpm_acpi.c
+++ b/drivers/char/tpm/tpm_acpi.c
@@ -6,6 +6,7 @@
  * Stefan Berger 
  * Reiner Sailer 
  * Kylene Hall 
+ * Nayna Jain 
  *
  * Maintained by: 
  *
@@ -45,7 +46,7 @@ struct acpi_tcpa {
 };
 
 /* read binary bios log */
-int read_log(struct tpm_chip *chip)
+int read_log_acpi(struct tpm_chip *chip)
 {
struct acpi_tcpa *buff;
acpi_status status;
@@ -54,12 +55,6 @@ int read_log(struct tpm_chip *chip)
struct tpm_bios_log *log;
 
log = >log;
-   if (log->bios_event_log != NULL) {
-   printk(KERN_ERR
-  "%s: ERROR - Eventlog already initialized\n",
-  __func__);
-   return -EFAULT;
-   }
 
/* Find TCPA entry in RSDT (ACPI_LOGICAL_ADDRESSING) */
status = acpi_get_table(ACPI_SIG_TCPA, 1,
diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
index 5575ffc..cce679b 100644
--- a/drivers/char/tpm/tpm_eventlog.c
+++ b/drivers/char/tpm/tpm_eventlog.c
@@ -365,6 +365,26 @@ static int is_bad(void *p)
return 0;
 }
 
+int read_log(struct tpm_chip *chip)
+{
+   int rc;
+
+   if (chip->log.bios_event_log != NULL) {
+   dev_dbg(>dev,
+   "%s: ERROR - event log already initialized\n",
+   __func__);
+   return -EFAULT;
+   }
+
+   rc = read_log_acpi(chip);
+   if ((rc == 0) || (rc == -ENOMEM))
+   return rc;
+
+   rc = read_log_of(chip);
+
+   return rc;
+}
+
 int tpm_bios_log_setup(struct tpm_chip *chip)
 {
const char *name = dev_name(>dev);
diff --git a/drivers/char/tpm/tpm_eventlog.h b/drivers/char/tpm/tpm_eventlog.h
index 6df2f8e..be529ad 100644
--- a/drivers/char/tpm/tpm_eventlog.h
+++ b/drivers/char/tpm/tpm_eventlog.h
@@ -73,20 +73,24 @@ enum tcpa_pc_event_ids {
HOST_TABLE_OF_DEVICES,
 };
 
-int read_log(struct tpm_chip *chip);
-
-#if defined(CONFIG_TCG_IBMVTPM) || defined(CONFIG_TCG_IBMVTPM_MODULE) || \
-   defined(CONFIG_ACPI)
-extern int tpm_bios_log_setup(struct tpm_chip *chip);
-extern void tpm_bios_log_teardown(struct tpm_chip *chip);
+#if defined(CONFIG_ACPI)
+int read_log_acpi(struct tpm_chip *chip);
 #else
-static inline int tpm_bios_log_setup(struct tpm_chip *chip)
+static inline int read_log_acpi(struct tpm_chip *chip)
 {
-   return 0;
+   return -ENODEV;
 }
-static inline void tpm_bios_log_teardown(struct tpm_chip *chip)
+#endif
+#if defined(CONFIG_OF)
+int read_log_of(struct tpm_chip *chip);
+#else
+static inline int read_log_of(struct tpm_chip *chip)
 {
+   return -ENODEV;
 }
 #endif
 
+int tpm_bios_log_setup(struct tpm_chip *chip);
+void tpm_bios_log_teardown(struct tpm_chip *chip);
+
 #endif
diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
index 68d891a..7c30752 100644
--- a/drivers/char/tpm/tpm_of.c
+++ b/drivers/char/tpm/tpm_of.c
@@ -2,6 +2,7 @@
  * Copyright 2012 IBM Corporation
  *
  *

[tpmdd-devel] [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support

2016-11-14 Thread Nayna Jain 
This patch set includes the cleanup and bug fixes patches, previously
part of the "tpm: add the securityfs pseudo files support for TPM 2.0
firmware event log" patch set, in order to upstream them more quickly.

Changelog History:

v6:

- Patch "tpm: replace symbolic permission with octal for securityfs files"
  - New Patch.
- Patch "tpm: have event log use the tpm_chip"
  - Changed commit description as per Jason's suggestion.
  - Fixed bug related to kfree() for bios_event_log.
  - Moved inode_unlock() just after get_device() in open().
  - Returned -ENODEV for read_log() ENOMEM error and other errors as it is.
  - Added comment in tpm_bios_log_teardown() to explain inode_lock()/unlock
reasoning.
  - Splitted .owner into different patch.
- Patch "tpm: fix the missing .owner in tpm_bios_measurements_ops"
  - New Patch.
- Patch "tpm: cleanup of printk error messages"
  - Replaced dev_info() with dev_warn().
  - Updated commit description subject line.

v5:

- Moved cleanup/fixes patches into this patch set.
- Patch "fix the race condition between event log access and chip
getting unregistered"
  - updated subject line and commit description.
  - modified fops code to use chip kref.
  - modified fops to lock inode before accessing inode private data.
  - renamed tpm_securityfs_data to tpm_chip_seqops, as it no more
  holds bios log, but associates seqops with respective chip. For
  the same reason, moved it to tpm.h
- Patch "replace or remove printk error messages"
  - cleaned up dev_dbg and used dev_info as applicable.

v4:

- Includes feedbacks from Jarkko and Jason.
- Patch "tpm: define a generic open() method for ascii & bios
measurements".
  - Fix indentation issue.
- Patch "tpm: replace the dynamically allocated bios_dir as
  struct dentry array". 
  - Continue to use bios_dir_count variable to use is_bad() checks and
  to maintain correct order for securityfs_remove() during teardown.
  - Reset chip->bios_dir_count in teardown() function.
- Patch "tpm: validate the event log access before tpm_bios_log_setup".
  - Retain TPM2 check which was removed in previous patch.
  - Add tpm_bios_log_setup failure handling.
  - Remove use of private data from v3 version of patch. Add a new
  member to struct tpm_chip to achieve the same purpose.
- Patch "tpm: redefine the read_log method to check for ACPI/OF 
properties sequentially".
  - Move replacement of CONFIG_TCG_IBMVTPM with CONFIG_OF to
  this patch from patch 3.
  - Replace -1 error code with -ENODEV.
- Patch "tpm: replace the of_find_node_by_name() with dev of_node
property".
 - Uses chip->dev.parent->of_node.
 - Created separate patch for cleanup of pr_err messages.
- Patch "tpm: remove printk error messages".
 - New Patch.
- Patch "tpm: add the securityfs file support for TPM 2.0 event log".
 - Parses event digests using event alg_id rather than event log header
 alg_id.
 - Uses of_property_match_string to differentiate tpm/vtpm compatible
 property.
 - Adds the comment for difference in tpm/vtpm endianness.

v3:

- Includes the review feedbacks as suggested by Jason.
- Split of patches into one patch per idea.
- Generic open() method for ascii/bios measurements.
- Replacement of of **bios_dir with *bios_dir[3].
- Verifying readlog() is successful before creating securityfs entries.
- Generic readlog() to check for ACPI/OF in sequence.
- read_log_of() method now uses of_node propertry rather than
calling find_device_by_name.
- read_log differentiates vtpm/tpm using its compatible property.
- Cleans pr_err with dev_dbg.
- Commit msgs subject line prefixed with tpm.

v2:

- Fixes issues as given in feedback by Jason.
- Adds documentation for device tree.

Nayna Jain (9):
  tpm: define a generic open() method for ascii & bios measurements
  tpm: replace symbolic permission with octal for securityfs files
  tpm: replace dynamically allocated bios_dir with a static array
  tpm: drop tpm1_chip_register(/unregister)
  tpm: have event log use the tpm_chip
  tpm: fix the missing .owner in tpm_bios_measurements_ops
  tpm: redefine read_log() to handle ACPI/OF at runtime
  tpm: replace of_find_node_by_name() with dev of_node property
  tpm: cleanup of printk error messages

 drivers/char/tpm/Makefile   |  14 +--
 drivers/char/tpm/tpm-chip.c |  33 ++
 drivers/char/tpm/tpm-sysfs.c|   3 +
 drivers/char/tpm/tpm.h  |  14 ++-
 drivers/char/tpm/tpm_acpi.c |  38 +++
 drivers/char/tpm/tpm_eventlog.c | 222 +---
 drivers/char/tpm/tpm_eventlog.h |  22 ++--
 drivers/char/tpm/tpm_of.c   |  45 +++-
 8 files changed, 187 insertions(+), 204 deletions(-)

-- 
2.5.0


--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi

[tpmdd-devel] [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister)

2016-11-14 Thread Nayna Jain 
Check for TPM2 chip in tpm_sysfs_add_device, tpm_bios_log_setup and
tpm_bios_log_teardown in order to make code flow cleaner and to enable
to implement TPM 2.0 support later on. This is partially derived from
the commit by Nayna Jain with the extension that also tpm1_chip_register
is dropped.

Signed-off-by: Jarkko Sakkinen 
---
 drivers/char/tpm/tpm-chip.c | 31 +--
 drivers/char/tpm/tpm-sysfs.c|  3 +++
 drivers/char/tpm/tpm_eventlog.c |  3 +++
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index d0c1872..250a651 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -276,28 +276,6 @@ static void tpm_del_char_device(struct tpm_chip *chip)
up_write(>ops_sem);
 }
 
-static int tpm1_chip_register(struct tpm_chip *chip)
-{
-   int rc;
-
-   if (chip->flags & TPM_CHIP_FLAG_TPM2)
-   return 0;
-
-   tpm_sysfs_add_device(chip);
-
-   rc = tpm_bios_log_setup(chip);
-
-   return rc;
-}
-
-static void tpm1_chip_unregister(struct tpm_chip *chip)
-{
-   if (chip->flags & TPM_CHIP_FLAG_TPM2)
-   return;
-
-   tpm_bios_log_teardown(chip);
-}
-
 static void tpm_del_legacy_sysfs(struct tpm_chip *chip)
 {
struct attribute **i;
@@ -364,7 +342,9 @@ int tpm_chip_register(struct tpm_chip *chip)
return rc;
}
 
-   rc = tpm1_chip_register(chip);
+   tpm_sysfs_add_device(chip);
+
+   rc = tpm_bios_log_setup(chip);
if (rc)
return rc;
 
@@ -372,7 +352,7 @@ int tpm_chip_register(struct tpm_chip *chip)
 
rc = tpm_add_char_device(chip);
if (rc) {
-   tpm1_chip_unregister(chip);
+   tpm_bios_log_teardown(chip);
return rc;
}
 
@@ -402,8 +382,7 @@ EXPORT_SYMBOL_GPL(tpm_chip_register);
 void tpm_chip_unregister(struct tpm_chip *chip)
 {
tpm_del_legacy_sysfs(chip);
-
-   tpm1_chip_unregister(chip);
+   tpm_bios_log_teardown(chip);
tpm_del_char_device(chip);
 }
 EXPORT_SYMBOL_GPL(tpm_chip_unregister);
diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c
index 59a1ead..848ad65 100644
--- a/drivers/char/tpm/tpm-sysfs.c
+++ b/drivers/char/tpm/tpm-sysfs.c
@@ -284,6 +284,9 @@ static const struct attribute_group tpm_dev_group = {
 
 void tpm_sysfs_add_device(struct tpm_chip *chip)
 {
+   if (chip->flags & TPM_CHIP_FLAG_TPM2)
+   return;
+
/* The sysfs routines rely on an implicit tpm_try_get_ops, device_del
 * is called before ops is null'd and the sysfs core synchronizes this
 * removal so that no callbacks are running or can run again
diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
index 62e9da6..57ac862 100644
--- a/drivers/char/tpm/tpm_eventlog.c
+++ b/drivers/char/tpm/tpm_eventlog.c
@@ -373,6 +373,9 @@ int tpm_bios_log_setup(struct tpm_chip *chip)
const char *name = dev_name(>dev);
unsigned int cnt;
 
+   if (chip->flags & TPM_CHIP_FLAG_TPM2)
+   return 0;
+
cnt = 0;
chip->bios_dir[cnt] = securityfs_create_dir(name, NULL);
if (is_bad(chip->bios_dir[cnt]))
-- 
2.5.0


--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

[tpmdd-devel] [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files

2016-11-14 Thread Nayna Jain 
checkpatch.pl flags warning for symbolic permissions and suggests
to replace with octal value.

This patch changes securityfs pseudo files permission
to octal values in tpm_bios_log_setup().

Signed-off-by: Nayna Jain 
---
 drivers/char/tpm/tpm_eventlog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
index 42b49c4..9467e31 100644
--- a/drivers/char/tpm/tpm_eventlog.c
+++ b/drivers/char/tpm/tpm_eventlog.c
@@ -378,7 +378,7 @@ struct dentry **tpm_bios_log_setup(const char *name)
 
bin_file =
securityfs_create_file("binary_bios_measurements",
-  S_IRUSR | S_IRGRP, tpm_dir,
+  0440, tpm_dir,
   (void *)_binary_b_measurements_seqops,
   _bios_measurements_ops);
if (is_bad(bin_file))
@@ -386,7 +386,7 @@ struct dentry **tpm_bios_log_setup(const char *name)
 
ascii_file =
securityfs_create_file("ascii_bios_measurements",
-  S_IRUSR | S_IRGRP, tpm_dir,
+  0440, tpm_dir,
   (void *)_ascii_b_measurements_seqops,
   _bios_measurements_ops);
if (is_bad(ascii_file))
-- 
2.5.0


--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel

[tpmdd-devel] [PATCH v6 3/9] tpm: replace dynamically allocated bios_dir with a static array

2016-11-14 Thread Nayna Jain 
This commit is based on a commit by Nayna Jain. Replaced dynamically
allocated bios_dir with a static array as the size is always constant.

Suggested-by: Jason Gunthorpe 
Signed-off-by: Nayna Jain 
Signed-off-by: Jarkko Sakkinen 
---
 drivers/char/tpm/tpm-chip.c |  9 ---
 drivers/char/tpm/tpm.h  |  3 ++-
 drivers/char/tpm/tpm_eventlog.c | 59 ++---
 drivers/char/tpm/tpm_eventlog.h | 10 +++
 4 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 836f056..d0c1872 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -278,14 +278,16 @@ static void tpm_del_char_device(struct tpm_chip *chip)
 
 static int tpm1_chip_register(struct tpm_chip *chip)
 {
+   int rc;
+
if (chip->flags & TPM_CHIP_FLAG_TPM2)
return 0;
 
tpm_sysfs_add_device(chip);
 
-   chip->bios_dir = tpm_bios_log_setup(dev_name(>dev));
+   rc = tpm_bios_log_setup(chip);
 
-   return 0;
+   return rc;
 }
 
 static void tpm1_chip_unregister(struct tpm_chip *chip)
@@ -293,8 +295,7 @@ static void tpm1_chip_unregister(struct tpm_chip *chip)
if (chip->flags & TPM_CHIP_FLAG_TPM2)
return;
 
-   if (chip->bios_dir)
-   tpm_bios_log_teardown(chip->bios_dir);
+   tpm_bios_log_teardown(chip);
 }
 
 static void tpm_del_legacy_sysfs(struct tpm_chip *chip)
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index f9401ca..9d69580 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -40,6 +40,7 @@ enum tpm_const {
TPM_BUFSIZE = 4096,
TPM_NUM_DEVICES = 65536,
TPM_RETRY = 50, /* 5 seconds */
+   TPM_NUM_EVENT_LOG_FILES = 3,
 };
 
 enum tpm_timeout {
@@ -171,7 +172,7 @@ struct tpm_chip {
unsigned long duration[3]; /* jiffies */
bool duration_adjusted;
 
-   struct dentry **bios_dir;
+   struct dentry *bios_dir[TPM_NUM_EVENT_LOG_FILES];
 
const struct attribute_group *groups[3];
unsigned int groups_cnt;
diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
index 9467e31..62e9da6 100644
--- a/drivers/char/tpm/tpm_eventlog.c
+++ b/drivers/char/tpm/tpm_eventlog.c
@@ -368,54 +368,47 @@ static int is_bad(void *p)
return 0;
 }
 
-struct dentry **tpm_bios_log_setup(const char *name)
+int tpm_bios_log_setup(struct tpm_chip *chip)
 {
-   struct dentry **ret = NULL, *tpm_dir, *bin_file, *ascii_file;
+   const char *name = dev_name(>dev);
+   unsigned int cnt;
 
-   tpm_dir = securityfs_create_dir(name, NULL);
-   if (is_bad(tpm_dir))
-   goto out;
+   cnt = 0;
+   chip->bios_dir[cnt] = securityfs_create_dir(name, NULL);
+   if (is_bad(chip->bios_dir[cnt]))
+   goto err;
+   cnt++;
 
-   bin_file =
+   chip->bios_dir[cnt] =
securityfs_create_file("binary_bios_measurements",
-  0440, tpm_dir,
+  0440, chip->bios_dir[0],
   (void *)_binary_b_measurements_seqops,
   _bios_measurements_ops);
-   if (is_bad(bin_file))
-   goto out_tpm;
+   if (is_bad(chip->bios_dir[cnt]))
+   goto err;
+   cnt++;
 
-   ascii_file =
+   chip->bios_dir[cnt] =
securityfs_create_file("ascii_bios_measurements",
-  0440, tpm_dir,
+  0440, chip->bios_dir[0],
   (void *)_ascii_b_measurements_seqops,
   _bios_measurements_ops);
-   if (is_bad(ascii_file))
-   goto out_bin;
+   if (is_bad(chip->bios_dir[cnt]))
+   goto err;
+   cnt++;
 
-   ret = kmalloc(3 * sizeof(struct dentry *), GFP_KERNEL);
-   if (!ret)
-   goto out_ascii;
-
-   ret[0] = ascii_file;
-   ret[1] = bin_file;
-   ret[2] = tpm_dir;
-
-   return ret;
+   return 0;
 
-out_ascii:
-   securityfs_remove(ascii_file);
-out_bin:
-   securityfs_remove(bin_file);
-out_tpm:
-   securityfs_remove(tpm_dir);
-out:
-   return NULL;
+err:
+   chip->bios_dir[cnt] = NULL;
+   tpm_bios_log_teardown(chip);
+   return -EIO;
 }
 
-void tpm_bios_log_teardown(struct dentry **lst)
+void tpm_bios_log_teardown(struct tpm_chip *chip)
 {
int i;
 
-   for (i = 0; i < 3; i++)
-   securityfs_remove(lst[i]);
+   for (i = (TPM_NUM_EVENT_LOG_FILES - 1); i >= 0; i--)
+   securityfs_remove(chip->bios_dir[i]);
 }
diff --git a/drivers/char/tpm/tpm_eventlog.h b/drivers/char/tpm/tpm_eventlog.h
index 8de62b0..fd3357e 100644
--- a/drivers/char/tpm/tpm_eventlog.h
+++

[tpmdd-devel] [PATCH v6 1/9] tpm: define a generic open() method for ascii & bios measurements

2016-11-14 Thread Nayna Jain 
open() method for event log ascii and binary bios measurements file
operations are very similar. This patch refactors the code into a
single open() call by passing seq_operations as i_node->private data.

Suggested-by: Jason Gunthorpe 
Signed-off-by: Nayna Jain 
Reviewed-by: Jarkko Sakkinen 
Reviewed-by: Jason Gunthorpe 
Tested-by: Jarkko Sakkinen 
Signed-off-by: Jarkko Sakkinen 
---
 drivers/char/tpm/tpm_eventlog.c | 63 ++---
 1 file changed, 15 insertions(+), 48 deletions(-)

diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
index e722886..42b49c4 100644
--- a/drivers/char/tpm/tpm_eventlog.c
+++ b/drivers/char/tpm/tpm_eventlog.c
@@ -7,6 +7,7 @@
  * Stefan Berger 
  * Reiner Sailer 
  * Kylene Hall 
+ * Nayna Jain 
  *
  * Maintained by: 
  *
@@ -304,26 +305,28 @@ static int tpm_ascii_bios_measurements_show(struct 
seq_file *m, void *v)
return 0;
 }
 
-static const struct seq_operations tpm_ascii_b_measurments_seqops = {
+static const struct seq_operations tpm_ascii_b_measurements_seqops = {
.start = tpm_bios_measurements_start,
.next = tpm_bios_measurements_next,
.stop = tpm_bios_measurements_stop,
.show = tpm_ascii_bios_measurements_show,
 };
 
-static const struct seq_operations tpm_binary_b_measurments_seqops = {
+static const struct seq_operations tpm_binary_b_measurements_seqops = {
.start = tpm_bios_measurements_start,
.next = tpm_bios_measurements_next,
.stop = tpm_bios_measurements_stop,
.show = tpm_binary_bios_measurements_show,
 };
 
-static int tpm_ascii_bios_measurements_open(struct inode *inode,
+static int tpm_bios_measurements_open(struct inode *inode,
struct file *file)
 {
int err;
struct tpm_bios_log *log;
struct seq_file *seq;
+   const struct seq_operations *seqops =
+   (const struct seq_operations *)inode->i_private;
 
log = kzalloc(sizeof(struct tpm_bios_log), GFP_KERNEL);
if (!log)
@@ -333,7 +336,7 @@ static int tpm_ascii_bios_measurements_open(struct inode 
*inode,
goto out_free;
 
/* now register seq file */
-   err = seq_open(file, _ascii_b_measurments_seqops);
+   err = seq_open(file, seqops);
if (!err) {
seq = file->private_data;
seq->private = log;
@@ -349,46 +352,8 @@ static int tpm_ascii_bios_measurements_open(struct inode 
*inode,
goto out;
 }
 
-static const struct file_operations tpm_ascii_bios_measurements_ops = {
-   .open = tpm_ascii_bios_measurements_open,
-   .read = seq_read,
-   .llseek = seq_lseek,
-   .release = tpm_bios_measurements_release,
-};
-
-static int tpm_binary_bios_measurements_open(struct inode *inode,
-struct file *file)
-{
-   int err;
-   struct tpm_bios_log *log;
-   struct seq_file *seq;
-
-   log = kzalloc(sizeof(struct tpm_bios_log), GFP_KERNEL);
-   if (!log)
-   return -ENOMEM;
-
-   if ((err = read_log(log)))
-   goto out_free;
-
-   /* now register seq file */
-   err = seq_open(file, _binary_b_measurments_seqops);
-   if (!err) {
-   seq = file->private_data;
-   seq->private = log;
-   } else {
-   goto out_free;
-   }
-
-out:
-   return err;
-out_free:
-   kfree(log->bios_event_log);
-   kfree(log);
-   goto out;
-}
-
-static const struct file_operations tpm_binary_bios_measurements_ops = {
-   .open = tpm_binary_bios_measurements_open,
+static const struct file_operations tpm_bios_measurements_ops = {
+   .open = tpm_bios_measurements_open,
.read = seq_read,
.llseek = seq_lseek,
.release = tpm_bios_measurements_release,
@@ -413,15 +378,17 @@ struct dentry **tpm_bios_log_setup(const char *name)
 
bin_file =
securityfs_create_file("binary_bios_measurements",
-  S_IRUSR | S_IRGRP, tpm_dir, NULL,
-  _binary_bios_measurements_ops);
+  S_IRUSR | S_IRGRP, tpm_dir,
+  (void *)_binary_b_measurements_seqops,
+  _bios_measurements_ops);
if (is_bad(bin_file))
goto out_tpm;
 
ascii_file =
securityfs_create_file("ascii_bios_measurements",
-  S_IRUSR | S_IRGRP, tpm_dir, NULL,
-  _ascii_bios_measurements_ops);
+