Re: [PATCH v8 2/4] KEYS: trusted: Introduce TEE based Trusted Keys

[Sumit Garg <sumit.garg@linaro.org>]

[-- Attachment #1: Type: text/plain, Size: 10727 bytes --]

Hi Jarkko,

On Fri, 22 Jan 2021 at 23:42, Jarkko Sakkinen <jarkko@kernel.org> wrote:
>
> On Thu, Jan 21, 2021 at 05:23:45PM +0100, Jerome Forissier wrote:
> >
> >
> > On 1/21/21 4:24 PM, Jarkko Sakkinen wrote:
> > > On Thu, Jan 21, 2021 at 05:07:42PM +0200, Jarkko Sakkinen wrote:
> > >> On Thu, Jan 21, 2021 at 09:44:07AM +0100, Jerome Forissier wrote:
> > >>>
> > >>>
> > >>> On 1/21/21 1:02 AM, Jarkko Sakkinen via OP-TEE wrote:
> > >>>> On Wed, Jan 20, 2021 at 12:53:28PM +0530, Sumit Garg wrote:
> > >>>>> On Wed, 20 Jan 2021 at 07:01, Jarkko Sakkinen <jarkko@kernel.org> wrote:
> > >>>>>>
> > >>>>>> On Tue, Jan 19, 2021 at 12:30:42PM +0200, Jarkko Sakkinen wrote:
> > >>>>>>> On Fri, Jan 15, 2021 at 11:32:31AM +0530, Sumit Garg wrote:
> > >>>>>>>> On Thu, 14 Jan 2021 at 07:35, Jarkko Sakkinen <jarkko@kernel.org> wrote:
> > >>>>>>>>>
> > >>>>>>>>> On Wed, Jan 13, 2021 at 04:47:00PM +0530, Sumit Garg wrote:
> > >>>>>>>>>> Hi Jarkko,
> > >>>>>>>>>>
> > >>>>>>>>>> On Mon, 11 Jan 2021 at 22:05, Jarkko Sakkinen <jarkko@kernel.org> wrote:
> > >>>>>>>>>>>
> > >>>>>>>>>>> On Tue, Nov 03, 2020 at 09:31:44PM +0530, Sumit Garg wrote:
> > >>>>>>>>>>>> Add support for TEE based trusted keys where TEE provides the functionality
> > >>>>>>>>>>>> to seal and unseal trusted keys using hardware unique key.
> > >>>>>>>>>>>>
> > >>>>>>>>>>>> Refer to Documentation/tee.txt for detailed information about TEE.
> > >>>>>>>>>>>>
> > >>>>>>>>>>>> Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
> > >>>>>>>>>>>
> > >>>>>>>>>>> I haven't yet got QEMU environment working with aarch64, this produces
> > >>>>>>>>>>> just a blank screen:
> > >>>>>>>>>>>
> > >>>>>>>>>>> ./output/host/usr/bin/qemu-system-aarch64 -M virt -cpu cortex-a53 -smp 1 -kernel output/images/Image -initrd output/images/rootfs.cpio -serial stdio
> > >>>>>>>>>>>
> > >>>>>>>>>>> My BuildRoot fork for TPM and keyring testing is located over here:
> > >>>>>>>>>>>
> > >>>>>>>>>>> https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/buildroot-tpmdd.git/
> > >>>>>>>>>>>
> > >>>>>>>>>>> The "ARM version" is at this point in aarch64 branch. Over time I will
> > >>>>>>>>>>> define tpmdd-x86_64 and tpmdd-aarch64 boards and everything will be then
> > >>>>>>>>>>> in the master branch.
> > >>>>>>>>>>>
> > >>>>>>>>>>> To create identical images you just need to
> > >>>>>>>>>>>
> > >>>>>>>>>>> $ make tpmdd_defconfig && make
> > >>>>>>>>>>>
> > >>>>>>>>>>> Can you check if you see anything obviously wrong? I'm eager to test this
> > >>>>>>>>>>> patch set, and in bigger picture I really need to have ready to run
> > >>>>>>>>>>> aarch64 environment available.
> > >>>>>>>>>>
> > >>>>>>>>>> I would rather suggest you to follow steps listed here [1] as to test
> > >>>>>>>>>> this feature on Qemu aarch64 we need to build firmwares such as TF-A,
> > >>>>>>>>>> OP-TEE, UEFI etc. which are all integrated into OP-TEE Qemu build
> > >>>>>>>>>> system [2]. And then it would be easier to migrate them to your
> > >>>>>>>>>> buildroot environment as well.
> > >>>>>>>>>>
> > >>>>>>>>>> [1] https://lists.trustedfirmware.org/pipermail/op-tee/2020-May/000027.html
> > >>>>>>>>>> [2] https://optee.readthedocs.io/en/latest/building/devices/qemu.html#qemu-v8
> > >>>>>>>>>>
> > >>>>>>>>>> -Sumit
> > >>>>>>>>>
> > >>>>>>>>> Can you provide 'keyctl_change'? Otherwise, the steps are easy to follow.
> > >>>>>>>>>
> > >>>>>>>>
> > >>>>>>>> $ cat keyctl_change
> > >>>>>>>> diff --git a/common.mk b/common.mk
> > >>>>>>>> index aeb7b41..663e528 100644
> > >>>>>>>> --- a/common.mk
> > >>>>>>>> +++ b/common.mk
> > >>>>>>>> @@ -229,6 +229,7 @@ BR2_PACKAGE_OPTEE_TEST_SDK ?= $(OPTEE_OS_TA_DEV_KIT_DIR)
> > >>>>>>>>  BR2_PACKAGE_OPTEE_TEST_SITE ?= $(OPTEE_TEST_PATH)
> > >>>>>>>>  BR2_PACKAGE_STRACE ?= y
> > >>>>>>>>  BR2_TARGET_GENERIC_GETTY_PORT ?= $(if
> > >>>>>>>> $(CFG_NW_CONSOLE_UART),ttyAMA$(CFG_NW_CONSOLE_UART),ttyAMA0)
> > >>>>>>>> +BR2_PACKAGE_KEYUTILS := y
> > >>>>>>>>
> > >>>>>>>>  # All BR2_* variables from the makefile or the environment are appended to
> > >>>>>>>>  # ../out-br/extra.conf. All values are quoted "..." except y and n.
> > >>>>>>>> diff --git a/kconfigs/qemu.conf b/kconfigs/qemu.conf
> > >>>>>>>> index 368c18a..832ab74 100644
> > >>>>>>>> --- a/kconfigs/qemu.conf
> > >>>>>>>> +++ b/kconfigs/qemu.conf
> > >>>>>>>> @@ -20,3 +20,5 @@ CONFIG_9P_FS=y
> > >>>>>>>>  CONFIG_9P_FS_POSIX_ACL=y
> > >>>>>>>>  CONFIG_HW_RANDOM=y
> > >>>>>>>>  CONFIG_HW_RANDOM_VIRTIO=y
> > >>>>>>>> +CONFIG_TRUSTED_KEYS=y
> > >>>>>>>> +CONFIG_ENCRYPTED_KEYS=y
> > >>>>>>>>
> > >>>>>>>>> After I've successfully tested 2/4, I'd suggest that you roll out one more
> > >>>>>>>>> version and CC the documentation patch to Elaine and Mini, and clearly
> > >>>>>>>>> remark in the commit message that TEE is a standard, with a link to the
> > >>>>>>>>> specification.
> > >>>>>>>>>
> > >>>>>>>>
> > >>>>>>>> Sure, I will roll out the next version after your testing.
> > >>>>>>>
> > >>>>>>> Thanks, I'll try this at instant, and give my feedback.
> > >>>>>>
> > >>>>>> I bump into this:
> > >>>>>>
> > >>>>>> $ make run-only
> > >>>>>> ln -sf /home/jarkko/devel/tpm/optee/build/../out-br/images/rootfs.cpio.gz /home/jarkko/devel/tpm/optee/build/../out/bin/
> > >>>>>> ln: failed to create symbolic link '/home/jarkko/devel/tpm/optee/build/../out/bin/': No such file or directory
> > >>>>>> make: *** [Makefile:194: run-only] Error 1
> > >>>>>>
> > >>>>>
> > >>>>> Could you check if the following directory tree is built after
> > >>>>> executing the below command?
> > >>>>>
> > >>>>> $ make -j`nproc`
> > >>>>> CFG_IN_TREE_EARLY_TAS=trusted_keys/f04a0fe7-1f5d-4b9b-abf7-619b85b4ce8c
> > >>>>>
> > >>>>> $ tree out/bin/
> > >>>>> out/bin/
> > >>>>> ├── bl1.bin -> /home/sumit/build/optee/build/../trusted-firmware-a/build/qemu/release/bl1.bin
> > >>>>> ├── bl2.bin -> /home/sumit/build/optee/build/../trusted-firmware-a/build/qemu/release/bl2.bin
> > >>>>> ├── bl31.bin ->
> > >>>>> /home/sumit/build/optee/build/../trusted-firmware-a/build/qemu/release/bl31.bin
> > >>>>> ├── bl32.bin ->
> > >>>>> /home/sumit/build/optee/build/../optee_os/out/arm/core/tee-header_v2.bin
> > >>>>> ├── bl32_extra1.bin ->
> > >>>>> /home/sumit/build/optee/build/../optee_os/out/arm/core/tee-pager_v2.bin
> > >>>>> ├── bl32_extra2.bin ->
> > >>>>> /home/sumit/build/optee/build/../optee_os/out/arm/core/tee-pageable_v2.bin
> > >>>>> ├── bl33.bin ->
> > >>>>> /home/sumit/build/optee/build/../edk2/Build/ArmVirtQemuKernel-AARCH64/RELEASE_GCC49/FV/QEMU_EFI.fd
> > >>>>> ├── Image -> /home/sumit/build/optee/build/../linux/arch/arm64/boot/Image
> > >>>>> └── rootfs.cpio.gz ->
> > >>>>> /home/sumit/build/optee/build/../out-br/images/rootfs.cpio.gz
> > >>>>>
> > >>>>> 0 directories, 9 files
> > >>>>>
> > >>>>> -Sumit
> > >>>>
> > >>>> I actually spotted a build error that was unnoticed last time:
> > >>>>
> > >>>> make[2]: Entering directory '/home/jarkko/devel/tpm/optee/edk2/BaseTools/Tests'
> > >>>> /bin/sh: 1: python: not found
> > >>>>
> > >>>> I'd prefer not to install Python2. It has been EOL over a year.
> > >>>
> > >>> AFAIK, everything should build fine with Python3. On my Ubuntu 20.04
> > >>> machine, this is accomplished by installing package "python-is-python3"
> > >>> (after uninstalling "python-is-python2" if need be).
> > >>>
> > >>> $ ls -l /usr/bin/python
> > >>> lrwxrwxrwx 1 root root 7 Apr 15  2020 /usr/bin/python -> python3
> > >>
> > >> Right, just found about this in unrelated context :-) [*]
> > >>
> > >> Hope this will work out...
> > >>
> > >> [*] https://github.com/surge-synthesizer/surge/pull/3655
> > >
> > > Now I get
> > >
> > > Traceback (most recent call last):
> > >   File "/home/jarkko/Projects/tpm/optee/edk2/BaseTools/Tests/RunTests.py", line 36, in <module>
> > >     allTests = GetAllTestsSuite()
> > >   File "/home/jarkko/Projects/tpm/optee/edk2/BaseTools/Tests/RunTests.py", line 33, in GetAllTestsSuite
> > >     return unittest.TestSuite([GetCTestSuite(), GetPythonTestSuite()])
> > >   File "/home/jarkko/Projects/tpm/optee/edk2/BaseTools/Tests/RunTests.py", line 25, in GetCTestSuite
> > >     import CToolsTests
> > >   File "/home/jarkko/Projects/tpm/optee/edk2/BaseTools/Tests/CToolsTests.py", line 22, in <module>
> > >     import TianoCompress
> > >   File "/home/jarkko/Projects/tpm/optee/edk2/BaseTools/Tests/TianoCompress.py", line 69, in <module>
> > >     TheTestSuite = TestTools.MakeTheTestSuite(locals())
> > >   File "/home/jarkko/Projects/tpm/optee/edk2/BaseTools/Tests/TestTools.py", line 43, in MakeTheTestSuite
> > >     for name, item in localItems.iteritems():
> > > AttributeError: 'dict' object has no attribute 'iteritems'
> >
> > Right. Same here after removing all traces of Python2 from my system :-/
> >
> > A couple of fixes are needed:
> > 1. EDK2 needs to be upgraded to tag or later [1]
> > 2. The PYTHON3_ENABLE environment variable needs to be set to TRUE [2]
> >
> > [1] https://github.com/OP-TEE/manifest/pull/177
> > [2] https://github.com/OP-TEE/build/pull/450
>
> BTW, Is to *really* impossible to test this with plain BuildRoot.  It's
> obvious that this forks BR internally.
>
> I mean even if I get this working once, this will feels like a clumsy way
> to test Aarch64 regularly. I use BuildRoot extensively for x86 testing. And
> it would be nice to be able to start doing regular ARM testing.

The main reason to guide you towards the OP-TEE build system is that
you will be able to build all the firmwares (TF-A, OP-TEE, edk2 etc.)
from source. If you don't need to rebuild those then I have prepared a
flash firmware binary blob for your testing (attached flash.bin). So
Qemu cmdline will look like:

$ qemu-system-aarch64 -nographic -s -machine virt,secure=on -cpu
cortex-a57 -kernel out/bin/Image -no-acpi -append
'console=ttyAMA0,38400 keep_bootcon root=/dev/vda2' -initrd
out/bin/rootfs.cpio.gz -smp 2 -m 1024 -bios flash.bin -d unimp

Here you can use "Image" and "rootfs.cpio.gz" from your plain BR builds.

Give it a try and let me know if this works for you.

>
> The mainline BuildRoot does have bunch of BR2_PACKAGE_OPTEE_* included.
> Are they all broken?

These aren't broken but they are used to package OP-TEE user-space
components into rootfs but they aren't required to test Trusted Keys
as it uses kernel interface to OP-TEE instead.

-Sumit

>
> Here's a reference where I got with that endeavour:
>
> https://lore.kernel.org/linux-integrity/X%2Fx+N0fgrzIZTeNi@kernel.org/
>
> /Jarkko

[-- Attachment #2: flash.bin --]
[-- Type: application/octet-stream, Size: 4152932 bytes --]