CMSIS: Add TrustZone functions #6483

deepikabhavnani · 2018-03-27T16:16:56Z

Description

Add TZ functions to mbed-os build from CMSIS repo. These functions are required to be part of secure library when RTOS support is required in non-secure mbed-os.

Pull request type

[ ] Fix
[ ] Refactor
[ ] New target
[X] Feature
[ ] Breaking change

CC @bulislaw

TZ_context functions are part of secure state binary and are used to handle secure stack for thread execution.Template implementation from CMSIS is used, can be enhanced in future.

0xc0170 · 2018-03-27T16:21:06Z

@tkaman Please review

bulislaw · 2018-03-27T16:44:40Z

tools/importer/cmsis_importer.json

@@ -149,7 +149,8 @@
      "a019acaf8d6fb1f0512414d072f667cc2749b1d9",
      "a884fdc0639ae4e17299838ec9de4fddd83cf93c",
      "6c827cb5879bc096e45efd992dfadcb96c1d50bc",
-      "919282322e106b82fea50878f41b6c75a7eb356b"
+      "919282322e106b82fea50878f41b6c75a7eb356b",


Is there a way forward without addingn extra commits here?

@bulislaw - Can work on that if you have any suggestions. In this case the code is picked from sample implementation and wont even compile as is.
https://github.com/ARM-software/CMSIS_5/blob/develop/CMSIS/RTOS2/RTX/Examples/TrustZoneV8M/RTOS/CM33_s/tz_context.c#L29

I have 3 changes listed below of which I have solution for two, but still for header file we will need a commit, unless you want to track it some other way.

Update Stack size to 512: Can add PR to CMSIS repo

Config options : Can remove completely (Cannot add to config files which reside inside RTOS, as the entire folder is skipped during secure lib build)

Add correct header file.

Could you do this: f072380

You probably won't need the _RTE_ for current version of CMSIS

@bulislaw - b93aca2 Will have to add this change in json file.

Why? Use the #include "RTE_Components.h" and #include CMSIS_device_header the same way my commit does and configure it in config file. Is there something i'm missing?

@bulislaw - Sorry I missed the header part, but the change I wanted to address was conditional compilation. b93aca2#diff-ae477765d86108e79533ea6617f50737R28

File should be compiled only in case of secure build and not for non-secure build, will check with @theotherjimmy if we can have some option from tools

Yep. We can have that support in the tools. We currently don't have something like that. Would you like that as part of this PR? or another PR?

Added config parameter for TZ stack size and update code to add correct header file.

deepikabhavnani · 2018-03-28T21:00:05Z

Would you like that as part of this PR? or another PR?

I will leave it to you.

Commit ecf2f86 is reminder for me, Will remove it once we have support in tools

0xc0170 · 2018-04-10T13:16:30Z

Commit ecf2f86 is reminder for me, Will remove it once we have support in tools

@deepikabhavnani @theotherjimmy Are we expecting the tools support anytime soon, is this PR blocked because of it?

deepikabhavnani · 2018-04-10T14:54:01Z

@0xc0170 - ~~Yes PR is blocked for tools support~~

tz_context.c should be compiled only for secure world, definition of API's in tz_context.h should be part of secure binary/bootloader when building mbed-os as non-secure

deepikabhavnani · 2018-04-11T16:50:23Z

@bulislaw - Please review

bulislaw

Approved, we'll need to revisit that when the secure world story is a bit more matured. I wouldn't like people to assume Mbed is supposed to live in TrustZone or that the mbed_tz_context.c is a proper production solution. @SenRamakri

0xc0170 · 2018-04-17T09:07:02Z

/morph build

0xc0170

Before I approve, I would like to understand how is this used (the plans) ? As this brings some functions but how to use them, can I? should I?

cmsis/TARGET_CORTEX_M/mbed_tz_context.c - this is our file? From the name it seems, but implementation does not conform to the style we do?

mbed-ci · 2018-04-17T09:45:42Z

Build : SUCCESS

Build number : 1769
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6483/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

deepikabhavnani · 2018-04-17T15:11:24Z

@0xc0170 - cmsis/TARGET_CORTEX_M/mbed_tz_context.c is CMSIS file, part of application hence we renamed it to mbed_ - for mbed OS.
It will be used only for Cortex-M23 / M33 targets, while building the secure library. Default Mbed OS target should be NS and user will never use this source file, rather will link to secure library containing symbols of these functions.

deepikabhavnani · 2018-04-17T15:11:58Z

We'll need to revisit that when the secure world story is a bit more matured

👍

mbed-ci · 2018-04-17T15:40:59Z

Exporter Build : SUCCESS

Build number : 1408
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/6483/

mbed-ci · 2018-04-17T19:48:03Z

Test : SUCCESS

Build number : 1579
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/6483/1579

mbed-ci · 2018-04-19T00:21:25Z

Exporter Build : FAILURE

Build number : 1436
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/6483/

Add TZ_context function

ae2e2b9

TZ_context functions are part of secure state binary and are used to handle secure stack for thread execution.Template implementation from CMSIS is used, can be enhanced in future.

0xc0170 added the needs: review label Mar 27, 2018

bulislaw reviewed Mar 27, 2018

View reviewed changes

deepikabhavnani force-pushed the add_tz_functions branch from a289285 to 5425e82 Compare March 27, 2018 18:41

Trustzone stack requirement for Mbed-OS is 512 bytes

4043d95

Added config parameter for TZ stack size and update code to add correct header file.

deepikabhavnani force-pushed the add_tz_functions branch from 5425e82 to ecf2f86 Compare March 28, 2018 20:57

0xc0170 added needs: preceding PR and removed needs: review labels Apr 10, 2018

Deepika added 2 commits April 11, 2018 11:41

CMSIS/RTX: Patch to conditionally compile

d0a43b8

tz_context.c should be compiled only for secure world, definition of API's in tz_context.h should be part of secure binary/bootloader when building mbed-os as non-secure

Add SHA:d0a43b8a Conditional compilation

40e2737

deepikabhavnani force-pushed the add_tz_functions branch from ecf2f86 to 40e2737 Compare April 11, 2018 16:48

deepikabhavnani added needs: review and removed needs: preceding PR labels Apr 11, 2018

bulislaw approved these changes Apr 17, 2018

View reviewed changes

0xc0170 requested changes Apr 17, 2018

View reviewed changes

0xc0170 approved these changes Apr 18, 2018

View reviewed changes

0xc0170 added ready for merge release-version: 5.9.0-rc1 and removed needs: review labels Apr 18, 2018

0xc0170 merged commit 099e54b into ARMmbed:master Apr 18, 2018

0xc0170 removed the ready for merge label Apr 18, 2018

0xc0170 changed the title ~~Add tz functions~~ CMSIS: Add TrustZone functions Apr 18, 2018

deepikabhavnani deleted the add_tz_functions branch April 19, 2018 14:30

CMSIS: Add TrustZone functions #6483

CMSIS: Add TrustZone functions #6483

Uh oh!

Conversation

deepikabhavnani commented Mar 27, 2018

Description

Pull request type

Uh oh!

0xc0170 commented Mar 27, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

deepikabhavnani commented Mar 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xc0170 commented Apr 10, 2018

Uh oh!

deepikabhavnani commented Apr 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

deepikabhavnani commented Apr 11, 2018

Uh oh!

bulislaw left a comment

Choose a reason for hiding this comment

Uh oh!

0xc0170 commented Apr 17, 2018

Uh oh!

0xc0170 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mbed-ci commented Apr 17, 2018

Triggering tests

Uh oh!

deepikabhavnani commented Apr 17, 2018

Uh oh!

deepikabhavnani commented Apr 17, 2018

Uh oh!

mbed-ci commented Apr 17, 2018

Uh oh!

mbed-ci commented Apr 17, 2018

Uh oh!

mbed-ci commented Apr 19, 2018

Uh oh!

Uh oh!

deepikabhavnani commented Mar 28, 2018 •

edited

Loading

deepikabhavnani commented Apr 10, 2018 •

edited

Loading

0xc0170 left a comment •

edited

Loading