| Message ID | 20180412101350.210547-3-tweek@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Apr 12, 2018 at 12:13:48PM +0200, Thiebaud Weksteen wrote: > Signed-off-by: Thiebaud Weksteen <tweek@google.com> > Suggested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> /Jarkko
[Cc'ing Petr Vorel and the ltp mailing list] Hi Jarrko, On Fri, 2018-04-20 at 08:39 +0300, Jarkko Sakkinen wrote: > On Thu, Apr 12, 2018 at 12:13:48PM +0200, Thiebaud Weksteen wrote: > > Signed-off-by: Thiebaud Weksteen <tweek@google.com> > > Suggested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> I just noticed this is queued in your next branch. Petr Vorel has been updating the IMA LTP tests. One of those IMA LTP tests includes walking the TPM binary_runtime_measurements in order to calculate the IMA boot-aggregate. The IMA boot-aggregate is the first measurement in the IMA measurement list. Mimi
Hi Mimi, > [Cc'ing Petr Vorel and the ltp mailing list] > Hi Jarrko, > On Fri, 2018-04-20 at 08:39 +0300, Jarkko Sakkinen wrote: > > On Thu, Apr 12, 2018 at 12:13:48PM +0200, Thiebaud Weksteen wrote: > > > Signed-off-by: Thiebaud Weksteen <tweek@google.com> > > > Suggested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > I just noticed this is queued in your next branch. > Petr Vorel has been updating the IMA LTP tests. One of those IMA LTP > tests includes walking the TPM binary_runtime_measurements in order to > calculate the IMA boot-aggregate. The IMA boot-aggregate is the first > measurement in the IMA measurement list. Did you meant that this commit ([2]) in linux-tpmdd/next changed location of binary_runtime_measurements in sysfs? IMHO these commits ([1], [2], [3]) just put source code into eventlog/ subdirectory: > Mimi Kind regards, Petr [1] 75d647f5de69 tpm: Move eventlog declarations to its own header [2] 9b01b5356629 tpm: Move shared eventlog functions to common.c [3] 0bfb23746052 tpm: Move eventlog files to a subdirectory
On Mon, May 07, 2018 at 04:36:37PM -0400, Mimi Zohar wrote: > [Cc'ing Petr Vorel and the ltp mailing list] > > Hi Jarrko, > > On Fri, 2018-04-20 at 08:39 +0300, Jarkko Sakkinen wrote: > > On Thu, Apr 12, 2018 at 12:13:48PM +0200, Thiebaud Weksteen wrote: > > > Signed-off-by: Thiebaud Weksteen <tweek@google.com> > > > Suggested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > > > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > I just noticed this is queued in your next branch. > > Petr Vorel has been updating the IMA LTP tests. One of those IMA LTP > tests includes walking the TPM binary_runtime_measurements in order to > calculate the IMA boot-aggregate. The IMA boot-aggregate is the first > measurement in the IMA measurement list. > > Mimi Sorry, not following how these connect directly? /Jarkko
On Wed, 2018-05-09 at 16:51 +0200, Petr Vorel wrote: > Hi Mimi, > > > [Cc'ing Petr Vorel and the ltp mailing list] > > > Hi Jarrko, > > > On Fri, 2018-04-20 at 08:39 +0300, Jarkko Sakkinen wrote: > > > On Thu, Apr 12, 2018 at 12:13:48PM +0200, Thiebaud Weksteen wrote: > > > > Signed-off-by: Thiebaud Weksteen <tweek@google.com> > > > > Suggested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > > > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > > Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > > I just noticed this is queued in your next branch. > > > Petr Vorel has been updating the IMA LTP tests. One of those IMA LTP > > tests includes walking the TPM binary_runtime_measurements in order to > > calculate the IMA boot-aggregate. The IMA boot-aggregate is the first > > measurement in the IMA measurement list. > > Did you meant that this commit ([2]) in linux-tpmdd/next changed location of > binary_runtime_measurements in sysfs? > > IMHO these commits ([1], [2], [3]) just put source code into eventlog/ subdirectory: I mistakenly thought the eventlog itself was being moved, not the source code. thanks, Mimi > > Kind regards, > Petr > > [1] 75d647f5de69 tpm: Move eventlog declarations to its own header > [2] 9b01b5356629 tpm: Move shared eventlog functions to common.c > [3] 0bfb23746052 tpm: Move eventlog files to a subdirectory >
diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index acd758381c58..5dcf5bd35a3d 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile @@ -4,11 +4,11 @@ # obj-$(CONFIG_TCG_TPM) += tpm.o tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o \ - tpm-dev-common.o tpmrm-dev.o tpm1_eventlog.o tpm2_eventlog.o \ + tpm-dev-common.o tpmrm-dev.o eventlog/tpm1.o eventlog/tpm2.o \ tpm2-space.o -tpm-$(CONFIG_ACPI) += tpm_ppi.o tpm_eventlog_acpi.o -tpm-$(CONFIG_EFI) += tpm_eventlog_efi.o -tpm-$(CONFIG_OF) += tpm_eventlog_of.o +tpm-$(CONFIG_ACPI) += tpm_ppi.o eventlog/acpi.o +tpm-$(CONFIG_EFI) += eventlog/efi.o +tpm-$(CONFIG_OF) += eventlog/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_eventlog_acpi.c b/drivers/char/tpm/eventlog/acpi.c similarity index 99% rename from drivers/char/tpm/tpm_eventlog_acpi.c rename to drivers/char/tpm/eventlog/acpi.c index 66f19e93c216..8476be2e9526 100644 --- a/drivers/char/tpm/tpm_eventlog_acpi.c +++ b/drivers/char/tpm/eventlog/acpi.c @@ -27,7 +27,7 @@ #include <linux/acpi.h> #include <linux/tpm_eventlog.h> -#include "tpm.h" +#include "../tpm.h" struct acpi_tcpa { struct acpi_table_header hdr; diff --git a/drivers/char/tpm/tpm_eventlog_efi.c b/drivers/char/tpm/eventlog/efi.c similarity index 98% rename from drivers/char/tpm/tpm_eventlog_efi.c rename to drivers/char/tpm/eventlog/efi.c index e3f9ffd341d2..e1593c5271a4 100644 --- a/drivers/char/tpm/tpm_eventlog_efi.c +++ b/drivers/char/tpm/eventlog/efi.c @@ -14,7 +14,7 @@ #include <linux/efi.h> #include <linux/tpm_eventlog.h> -#include "tpm.h" +#include "../tpm.h" /* read binary bios log from EFI configuration table */ int tpm_read_log_efi(struct tpm_chip *chip) diff --git a/drivers/char/tpm/tpm_eventlog_of.c b/drivers/char/tpm/eventlog/of.c similarity index 99% rename from drivers/char/tpm/tpm_eventlog_of.c rename to drivers/char/tpm/eventlog/of.c index d74568d58a66..d98c184d5c13 100644 --- a/drivers/char/tpm/tpm_eventlog_of.c +++ b/drivers/char/tpm/eventlog/of.c @@ -19,7 +19,7 @@ #include <linux/of.h> #include <linux/tpm_eventlog.h> -#include "tpm.h" +#include "../tpm.h" int tpm_read_log_of(struct tpm_chip *chip) { diff --git a/drivers/char/tpm/tpm1_eventlog.c b/drivers/char/tpm/eventlog/tpm1.c similarity index 99% rename from drivers/char/tpm/tpm1_eventlog.c rename to drivers/char/tpm/eventlog/tpm1.c index add798bd69d0..d6aea3ca950e 100644 --- a/drivers/char/tpm/tpm1_eventlog.c +++ b/drivers/char/tpm/eventlog/tpm1.c @@ -28,7 +28,7 @@ #include <linux/slab.h> #include <linux/tpm_eventlog.h> -#include "tpm.h" +#include "../tpm.h" static const char* tcpa_event_type_strings[] = { diff --git a/drivers/char/tpm/tpm2_eventlog.c b/drivers/char/tpm/eventlog/tpm2.c similarity index 99% rename from drivers/char/tpm/tpm2_eventlog.c rename to drivers/char/tpm/eventlog/tpm2.c index 1ce4411292ba..f0723fa9ae14 100644 --- a/drivers/char/tpm/tpm2_eventlog.c +++ b/drivers/char/tpm/eventlog/tpm2.c @@ -23,7 +23,7 @@ #include <linux/slab.h> #include <linux/tpm_eventlog.h> -#include "tpm.h" +#include "../tpm.h" /* * calc_tpm2_event_size() - calculate the event size, where event
Signed-off-by: Thiebaud Weksteen <tweek@google.com> Suggested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> --- drivers/char/tpm/Makefile | 8 ++++---- drivers/char/tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} | 2 +- drivers/char/tpm/{tpm_eventlog_efi.c => eventlog/efi.c} | 2 +- drivers/char/tpm/{tpm_eventlog_of.c => eventlog/of.c} | 2 +- drivers/char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} | 2 +- drivers/char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename drivers/char/tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} (99%) rename drivers/char/tpm/{tpm_eventlog_efi.c => eventlog/efi.c} (98%) rename drivers/char/tpm/{tpm_eventlog_of.c => eventlog/of.c} (99%) rename drivers/char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} (99%) rename drivers/char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} (99%)