TEE: minor cleanup
Subsystems (2)
v5 cover TEE: minor cleanup
- Address some spelling errors and typos
- Support CMD_OPTEE_RPMB for SANDBOX configurations and add python tests
- Remove common.h inclusion for drivers/tee
- Add calls for closing tee session after every read/write operation.
CI build:
[1] https://dev.azure.com/igoropaniuk/u-boot/_build/results?buildId=33&view=results
Changes in v5:
- Extended commit message for "cmd: optee_rpmb: close tee session"
- Added R-b tag
Changes in v4:
- Rebased on the latest master and excluded "tee: sandbox: fix spelling errors", as it was merged already by Heinrich Schuchardt
Changes in v3:
- Added calls for closing tee session after every read/write operation
Changes in v2:
- Fixed chimp_optee.c:37:9: error: implicit declaration of function 'memset'
- Applied R-b and T-b tags
Igor Opaniuk (5):
tee: optee: fix description in Kconfig
cmd: optee_rpmb: close tee session
cmd: optee_rpmb: build cmd for sandbox
test: py: add optee_rpmb tests
tee: remove common.h inclusion
cmd/Kconfig | 4 +++- cmd/optee_rpmb.c | 23 +++++++++++++++++------ drivers/tee/broadcom/chimp_optee.c | 3 ++- drivers/tee/optee/Kconfig | 2 +- drivers/tee/optee/core.c | 1 - drivers/tee/optee/i2c.c | 1 - drivers/tee/optee/rpmb.c | 1 - drivers/tee/optee/supplicant.c | 2 +- drivers/tee/sandbox.c | 2 +- drivers/tee/tee-uclass.c | 1 - test/py/tests/test_optee_rpmb.py | 20 ++++++++++++++++++++ 11 files changed, 45 insertions(+), 15 deletions(-) create mode 100644 test/py/tests/test_optee_rpmb.py
Signature · 1 line
2.34.1
PATCH v5 1/5 tee: optee: fix description in Kconfig
Fix OPTEE_TA_AVB symbol description in Kconfig:
s/"write"rb"/"write_rb"/g
---
(no changes since v2)
Changes in v2:
- Applied R-b tags
drivers/tee/optee/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tee/optee/Kconfig +1 -1
@@ -19,7 +19,7 @@ config OPTEE_TA_AVB default y help Enables support for the AVB Trusted Application (TA) in OP-TEE. - The TA can support the "avb" subcommands "read_rb", "write"rb" + The TA can support the "avb" subcommands "read_rb", "write_rb" and "is_unlocked". config OPTEE_TA_RPC_TEST
Signature · 1 line
2.34.1
PATCH v5 2/5 cmd: optee_rpmb: close tee session
In reply to Igor OpaniukClose tee session after each optee_rpmb invocation, as there is no reason to keep it open, considering the absence of any available mechanism to clean up all open sessions automatically before handing over control to the Linux kernel. Without proper clean-up we might end up with orphaned sessions registered in OP-TEE OS core (obvious resource leak).
---
Changes in v5:
- Extended commit message, added more details about the reasons why the change was needed
cmd/optee_rpmb.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
cmd/optee_rpmb.c +17 -6
@@ -87,8 +87,10 @@ static int read_persistent_value(const char *name, rc =tee_shm_alloc (tee, name_size,TEE_SHM_ALLOC , &shm_name); -if (rc) -return -ENOMEM ; +if (rc) { + rc = -ENOMEM ; + goto close_session; + } rc =tee_shm_alloc (tee, buffer_size,TEE_SHM_ALLOC , &shm_buf);
@@ -125,6 +127,9 @@ out:tee_shm_free (shm_buf); free_name:tee_shm_free (shm_name); +close_session: +tee_close_session (tee, session); + tee =NULL ;return rc; }
@@ -139,17 +144,20 @@ static int write_persistent_value(const char *name,struct tee_param param[2 ];size_t name_size =strlen (name) +1 ; +if (!value_size) +return -EINVAL ; +if (!tee) {if (avb_ta_open_session ())return -ENODEV ; } -if (!value_size) -return -EINVAL ; rc =tee_shm_alloc (tee, name_size,TEE_SHM_ALLOC , &shm_name); -if (rc) -return -ENOMEM ; +if (rc) { + rc = -ENOMEM ; + goto close_session; + } rc =tee_shm_alloc (tee, value_size,TEE_SHM_ALLOC , &shm_buf);
@@ -178,6 +186,9 @@ out:tee_shm_free (shm_buf); free_name:tee_shm_free (shm_name); +close_session: +tee_close_session (tee, session); + tee =NULL ;return rc; }
Signature · 1 line
2.34.1
PATCH v5 3/5 cmd: optee_rpmb: build cmd for sandbox
In reply to Igor OpaniukSupport CMD_OPTEE_RPMB for SANDBOX configurations. Test:
$ ./u-boot -d arch/sandbox/dts/test.dtb ... => optee_rpmb write_pvalue test_variable test_value Wrote 11 bytes => optee_rpmb read_pvalue test_variable 11 Read 11 bytes, value = test_value
---
(no changes since v2)
Changes in v2:
- Applied R-b and T-b tags
cmd/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
cmd/Kconfig +3 -1
@@ -1394,7 +1394,9 @@ config CMD_CLONE config CMD_OPTEE_RPMB bool "Enable read/write support on RPMB via OPTEE" - depends on SUPPORT_EMMC_RPMB && OPTEE + depends on (SUPPORT_EMMC_RPMB && OPTEE) || SANDBOX_TEE + default y if SANDBOX_TEE + select OPTEE_TA_AVB if SANDBOX_TEE help Enable the commands for reading, writing persistent named values in the Replay Protection Memory Block partition in eMMC by
Signature · 1 line
2.34.1
PATCH v5 4/5 test: py: add optee_rpmb tests
In reply to Igor OpaniukAdd read/write tests for optee_rpmb cmd.
---
(no changes since v1)
test/py/tests/test_optee_rpmb.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 test/py/tests/test_optee_rpmb.py
test/py/tests/test_optee_rpmb.py new file +20 -0
@@ -0,0 +1,20 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Tests for OP-TEE RPMB read/write support + +""" +This tests optee_rpmb cmd in U-Boot +""" + +import pytest +import u_boot_utils as util + [email protected]('cmd_optee_rpmb') +def test_optee_rpmb_read_write(u_boot_console): + """Test OP-TEE RPMB cmd read/write + """ + response = u_boot_console.run_command('optee_rpmb write_pvalue test_variable test_value') + assert response == 'Wrote 11 bytes' + + response = u_boot_console.run_command('optee_rpmb read_pvalue test_variable 11') + assert response == 'Read 11 bytes, value = test_value'
Signature · 1 line
2.34.1
PATCH v5 5/5 tee: remove common.h inclusion
In reply to Igor OpaniukThe usage of the common.h include file is deprecated [1], and has already been removed from several files.
Get rid of all inclusions in the "drivers/tee" directory, and replace it with required include files directly where needed.
[1] doc/develop/codingstyle.rst
---
Changes in v5:
- Extended commit message for "cmd: optee_rpmb: close tee session"
- Added R-b tag
Changes in v4:
- Rebased on the latest master and excluded "tee: sandbox: fix spelling errors", as it was merged already by Heinrich Schuchardt
Changes in v3:
- Added calls for closing tee session after every read/write operation
- Added calls for closing tee session after every read/write operation
Changes in v2:
- Fixed chimp_optee.c:37:9: error: implicit declaration of function 'memset'
- Applied R-b and T-b tags
- Fixed chimp_optee.c:37:9: error: implicit declaration of function 'memset'
drivers/tee/broadcom/chimp_optee.c | 3 ++- drivers/tee/optee/core.c | 1 - drivers/tee/optee/i2c.c | 1 - drivers/tee/optee/rpmb.c | 1 - drivers/tee/optee/supplicant.c | 2 +- drivers/tee/sandbox.c | 2 +- drivers/tee/tee-uclass.c | 1 - 7 files changed, 4 insertions(+), 7 deletions(-)
drivers/tee/broadcom/chimp_optee.c +2 -1
@@ -3,9 +3,10 @@* Copyright 2020 Broadcom. */ -#include <common.h> #include <tee.h> #include <broadcom/chimp.h> +#include <linux/errno.h> +#include <string.h> #ifdef CONFIG_CHIMP_OPTEE
drivers/tee/optee/core.c +0 -1
@@ -3,7 +3,6 @@* Copyright (c) 2018-2020 Linaro Limited */ -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <dm/device_compat.h>
drivers/tee/optee/i2c.c +0 -1
@@ -3,7 +3,6 @@* Copyright (c) 2020 Foundries.io Ltd */ -#include <common.h> #include <dm.h> #include <i2c.h> #include <tee.h>
drivers/tee/optee/rpmb.c +0 -1
@@ -3,7 +3,6 @@* Copyright (c) 2018 Linaro Limited */ -#include <common.h> #include <dm.h> #include <log.h> #include <tee.h>
drivers/tee/optee/supplicant.c +1 -1
@@ -3,10 +3,10 @@* Copyright (c) 2018, Linaro Limited */ -#include <common.h> #include <log.h> #include <malloc.h> #include <tee.h> +#include <linux/errno.h> #include <linux/types.h> #include "optee_msg.h"
drivers/tee/sandbox.c +1 -1
@@ -2,7 +2,7 @@/* * Copyright (C) 2018 Linaro Limited */ -#include <common.h> +#include <dm.h> #include <sandboxtee.h> #include <tee.h>
drivers/tee/tee-uclass.c +0 -1
@@ -5,7 +5,6 @@#define LOG_CATEGORY UCLASS_TEE -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <log.h>
Signature · 1 line
2.34.1