- OP-TEE - lists.trustedfirmware.org

by Jelle Sels

Hi all, As part of Trusted Services project we are extending OP-TEE to be a full complaint FF-A S-EL1 SPMC. This work is still on going but some of the Trusted Services applications are already compatible. We created https://developer.trustedfirmware.org/w/trusted-services/op-tee-spmc/ which gives the current status of the SPMC work and can be a starting point for everyone who wants to get started with the Trusted Services or OP-TEE as a S-EL1 SPMC. Please feel free to ask any questions on the Trusted Service and the OP-TEE mailing list. https://lists.trustedfirmware.org/mailman3/lists/trusted-services.lists.tru… https://lists.trustedfirmware.org/mailman3/lists/op-tee.lists.trustedfirmwa… Regards, Jelle

4 years, 3 months

1
0
0 0

Linaro OP-TEE Contribution (LOC) monthly meeting Feb 2022

by Ruchika Gupta

Hi, OP-TEE Contributions (LOC) monthly meeting is planned for Thursday Feb 24 @16.00 (UTC). We have following on the agenda - SDP DT Configuration, Olivier Masse, NXP If you have any more topics you'd like to discuss, please let us know and we can schedule them. Meeting details: --------------- Date/time: Feb 24(a)16.00 (UTC) https://everytimezone.com/s/fef76b1b Connection details: https://www.trustedfirmware.org/meetings/ Meeting notes: http://bit.ly/loc-notes Regards, Ruchika on behalf of the Linaro OP-TEE team

4 years, 3 months

1
1
0 0

[PATCH v3] tee: make tee_shm_register_kernel_buf vmalloc supported

by Phil Chang

In some low-memory devices, it's hard to aquire large-orders pages, this patch allowed user using scatter pages to register shm. Signed-off-by: Phil Chang <phil.chang(a)mediatek.com> --- Changelog v2 -> v3: use the "n" variable to walk through "page_count" drivers/tee/optee/call.c | 2 +- drivers/tee/tee_shm.c | 37 ++++++++++++++++++++++++++----------- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index bd49ec934060..2082e632adff 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -362,7 +362,7 @@ int optee_check_mem_type(unsigned long start, size_t num_pages) * Allow kernel address to register with OP-TEE as kernel * pages are configured as normal memory only. */ - if (virt_addr_valid(start)) + if (virt_addr_valid(start) || is_vmalloc_addr((void *)start)) return 0; mmap_read_lock(mm); diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index f31e29e8f1ca..1412adad9397 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -23,21 +23,36 @@ static void shm_put_kernel_pages(struct page **pages, size_t page_count) static int shm_get_kernel_pages(unsigned long start, size_t page_count, struct page **pages) { - struct kvec *kiov; - size_t n; int rc; + size_t n; - kiov = kcalloc(page_count, sizeof(*kiov), GFP_KERNEL); - if (!kiov) - return -ENOMEM; + if (is_vmalloc_addr((void *)start)) { + struct page *page; - for (n = 0; n < page_count; n++) { - kiov[n].iov_base = (void *)(start + n * PAGE_SIZE); - kiov[n].iov_len = PAGE_SIZE; - } + for (n = 0; n < page_count; n++) { + page = vmalloc_to_page((void *)(start + PAGE_SIZE * n)); + if (!page) + return -ENOMEM; + + get_page(page); + pages[n] = page; + } + rc = page_count; + } else { + struct kvec *kiov; - rc = get_kernel_pages(kiov, page_count, 0, pages); - kfree(kiov); + kiov = kcalloc(page_count, sizeof(*kiov), GFP_KERNEL); + if (!kiov) + return -ENOMEM; + + for (n = 0; n < page_count; n++) { + kiov[n].iov_base = (void *)(start + n * PAGE_SIZE); + kiov[n].iov_len = PAGE_SIZE; + } + + rc = get_kernel_pages(kiov, page_count, 0, pages); + kfree(kiov); + } return rc; } -- 2.25.1

4 years, 3 months

2
1
0 0

[GIT PULL] tee: shared memory updates for v5.18

by Jens Wiklander

Hello arm-soc maintainers, Please pull this TEE shared memory cleanup. Some kernel internal APIs are replaced with easier to use counter parts. The TEE shared memory pool is also simplified. Note that this pull request includes two patches which are outside the TEE subsystem: - 231b1fc5da09 ("KEYS: trusted: tee: use tee_shm_register_kernel_buf()") - e7ddab084740 ("hwrng: optee-rng: use tee_shm_alloc_kernel_buf()") Those patches are reviewed by their maintainer. I've also asked the maintainers that normally sends patches upstream for these modules if it's OK that I take these patches via my tree. As I got no answer I assume that it's OK. This pull request is on top of the patch, aceeafefff73 ("optee: use driver internal tee_context for some rpc"), I've already sent (and has since been merged) for the 5.17 kernel. That's why I'm not including it in the stat. Thanks, Jens The following changes since commit aceeafefff736057e8f93f19bbfbef26abd94604: optee: use driver internal tee_context for some rpc (2022-02-03 13:36:32 +0100) are available in the Git repository at: git://git.linaro.org:/people/jens.wiklander/linux-tee.git tags/tee-shm-for-v5.18 for you to fetch changes up to a45ea4efa358577c623d7353a6ba9af3c17f6ca0: tee: refactor TEE_SHM_* flags (2022-02-16 07:49:41 +0100) ---------------------------------------------------------------- TEE shared memory cleanup for v5.18 - The TEE shared memory pool based on two pools is replaced with a single somewhat more capable pool. - Replaces tee_shm_alloc() and tee_shm_register() with new functions easier to use and maintain. The TEE subsystem and the TEE drivers are updated to use the new functions instead. - The TEE based Trusted keys routines are updated to use the new simplified functions above. - The OP-TEE based rng driver is updated to use the new simplified functions above. - The TEE_SHM-flags are refactored to better match their usage ---------------------------------------------------------------- Jens Wiklander (10): hwrng: optee-rng: use tee_shm_alloc_kernel_buf() tee: remove unused tee_shm_pool_alloc_res_mem() tee: add tee_shm_alloc_user_buf() tee: simplify shm pool handling tee: replace tee_shm_alloc() optee: add optee_pool_op_free_helper() tee: add tee_shm_register_{user,kernel}_buf() KEYS: trusted: tee: use tee_shm_register_kernel_buf() tee: replace tee_shm_register() tee: refactor TEE_SHM_* flags drivers/char/hw_random/optee-rng.c | 6 +- drivers/tee/amdtee/shm_pool.c | 55 ++---- drivers/tee/optee/Kconfig | 8 - drivers/tee/optee/call.c | 2 +- drivers/tee/optee/core.c | 21 +- drivers/tee/optee/device.c | 5 +- drivers/tee/optee/ffa_abi.c | 63 ++---- drivers/tee/optee/optee_private.h | 7 +- drivers/tee/optee/smc_abi.c | 125 ++++-------- drivers/tee/tee_core.c | 5 +- drivers/tee/tee_private.h | 15 +- drivers/tee/tee_shm.c | 320 ++++++++++++++++++++----------- drivers/tee/tee_shm_pool.c | 162 ++++------------ include/linux/tee_drv.h | 138 +++---------- security/keys/trusted-keys/trusted_tee.c | 23 +-- 15 files changed, 388 insertions(+), 567 deletions(-)

4 years, 3 months

1
0
0 0

[GIT PULL] AMDTEE simplification for v5.18

by Jens Wiklander

Hello arm-soc maintainers, Please pull this small AMDTEE driver simplification to use the LIST_HEAD() macro instead for a global variable. Note that this isn't a usual Arm driver update. This targets AMD instead, but is part of the TEE subsystem. Thanks, Jens The following changes since commit 26291c54e111ff6ba87a164d85d4a4e134b7315c: Linux 5.17-rc2 (2022-01-30 15:37:07 +0200) are available in the Git repository at: git://git.linaro.org:/people/jens.wiklander/linux-tee.git tags/amdtee-for-v5.18 for you to fetch changes up to f7b67642dd98617dc569836cdcba041c7ff00cbb: tee: amdtee: Make use of the helper macro LIST_HEAD() (2022-02-14 10:57:55 +0100) ---------------------------------------------------------------- Small simplification in AMDTE driver ---------------------------------------------------------------- Cai Huoqing (1): tee: amdtee: Make use of the helper macro LIST_HEAD() drivers/tee/amdtee/call.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

4 years, 3 months

1
0
0 0

[PATCH] tee: make tee_shm_register_kernel_buf vmalloc supported

by Phil Chang

In some low-memory devices, it's hard to aquire large-orders pages, this patch allowed user using scatter pages to register shm. Signed-off-by: Phil Chang <phil.chang(a)mediatek.com> --- drivers/tee/optee/call.c | 2 +- drivers/tee/tee_shm.c | 40 ++++++++++++++++++++++++++++------------ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index bd49ec934060..2082e632adff 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -362,7 +362,7 @@ int optee_check_mem_type(unsigned long start, size_t num_pages) * Allow kernel address to register with OP-TEE as kernel * pages are configured as normal memory only. */ - if (virt_addr_valid(start)) + if (virt_addr_valid(start) || is_vmalloc_addr((void *)start)) return 0; mmap_read_lock(mm); diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index f31e29e8f1ca..861403588485 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -23,22 +23,38 @@ static void shm_put_kernel_pages(struct page **pages, size_t page_count) static int shm_get_kernel_pages(unsigned long start, size_t page_count, struct page **pages) { - struct kvec *kiov; - size_t n; int rc; - kiov = kcalloc(page_count, sizeof(*kiov), GFP_KERNEL); - if (!kiov) - return -ENOMEM; - - for (n = 0; n < page_count; n++) { - kiov[n].iov_base = (void *)(start + n * PAGE_SIZE); - kiov[n].iov_len = PAGE_SIZE; + if (is_vmalloc_addr((void *)start)) { + struct page *page; + int i; + + for (i = 0; i < page_count; i++) { + page = vmalloc_to_page((void *)(start + PAGE_SIZE * i)); + if (!page) + return -ENOMEM; + + get_page(page); + pages[i] = page; + } + rc = page_count; + } else { + struct kvec *kiov; + size_t n; + + kiov = kcalloc(page_count, sizeof(*kiov), GFP_KERNEL); + if (!kiov) + return -ENOMEM; + + for (n = 0; n < page_count; n++) { + kiov[n].iov_base = (void *)(start + n * PAGE_SIZE); + kiov[n].iov_len = PAGE_SIZE; + } + + rc = get_kernel_pages(kiov, page_count, 0, pages); + kfree(kiov); } - rc = get_kernel_pages(kiov, page_count, 0, pages); - kfree(kiov); - return rc; } -- 2.25.1

4 years, 3 months

2
1
0 0

[PATCH] tee: amdtee: Make use of the helper macro LIST_HEAD()

by Cai Huoqing

Replace "struct list_head head = LIST_HEAD_INIT(head)" with "LIST_HEAD(head)" to simplify the code. Signed-off-by: Cai Huoqing <cai.huoqing(a)linux.dev> --- drivers/tee/amdtee/call.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tee/amdtee/call.c b/drivers/tee/amdtee/call.c index 07f36ac834c8..cec6e70f0ac9 100644 --- a/drivers/tee/amdtee/call.c +++ b/drivers/tee/amdtee/call.c @@ -122,7 +122,7 @@ static int amd_params_to_tee_params(struct tee_param *tee, u32 count, } static DEFINE_MUTEX(ta_refcount_mutex); -static struct list_head ta_list = LIST_HEAD_INIT(ta_list); +static LIST_HEAD(ta_list); static u32 get_ta_refcount(u32 ta_handle) { -- 2.25.1

4 years, 3 months

3
2
0 0

[GIT PULL] OP-TEE another fix for v5.17

by Jens Wiklander

Hello arm-soc maintainers, Please pull this small OP-TEE driver fix taking care of a broken return code in the error path of the two probe functions in the OP-TEE driver. Please note that this pull request is on top of the previously just merged patch which introduced the problem fixed here. Thanks, Jens The following changes since commit aceeafefff736057e8f93f19bbfbef26abd94604: optee: use driver internal tee_context for some rpc (2022-02-03 13:36:32 +0100) are available in the Git repository at: git://git.linaro.org/people/jens.wiklander/linux-tee.git tags/optee-fix2-for-v5.17 for you to fetch changes up to 40eb0dcf4114cbfff4d207890fa5a19e82da9fdc: tee: optee: fix error return code in probe function (2022-02-14 12:36:48 +0100) ---------------------------------------------------------------- OP-TEE fix error return code in probe functions ---------------------------------------------------------------- Yang Yingliang (1): tee: optee: fix error return code in probe function drivers/tee/optee/ffa_abi.c | 4 +++- drivers/tee/optee/smc_abi.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)

4 years, 3 months

1
0
0 0

[PATCH -next] tee: optee: fix error return code in probe function

by Yang Yingliang

If teedev_open() fails, probe function need return error code. Fixes: aceeafefff73 ("optee: use driver internal tee_context for some rpc") Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/tee/optee/ffa_abi.c | 4 +++- drivers/tee/optee/smc_abi.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c index f2bf6c61197f..f744ab15bf2c 100644 --- a/drivers/tee/optee/ffa_abi.c +++ b/drivers/tee/optee/ffa_abi.c @@ -869,8 +869,10 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev) optee_supp_init(&optee->supp); ffa_dev_set_drvdata(ffa_dev, optee); ctx = teedev_open(optee->teedev); - if (IS_ERR(ctx)) + if (IS_ERR(ctx)) { + rc = PTR_ERR(ctx); goto err_rhashtable_free; + } optee->ctx = ctx; rc = optee_notif_init(optee, OPTEE_DEFAULT_MAX_NOTIF_VALUE); if (rc) diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index 1a55339c7072..c517d310249f 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -1417,8 +1417,10 @@ static int optee_probe(struct platform_device *pdev) platform_set_drvdata(pdev, optee); ctx = teedev_open(optee->teedev); - if (IS_ERR(ctx)) + if (IS_ERR(ctx)) { + rc = PTR_ERR(ctx); goto err_supp_uninit; + } optee->ctx = ctx; rc = optee_notif_init(optee, max_notif_value); if (rc) -- 2.25.1

4 years, 3 months

2
1
0 0

[PATCH] optee: make tee_shm_register vmalloc supported

by Phil Chang

This patch allowed the tee shm use vmalloc area buffer. Signed-off-by: Phil Chang <phil.chang(a)mediatek.com> --- Hi, In some low-memory devices, it's hard to aquire large-orders pages, this pathes is allowed user use scatter pages to register shm. Thanks. drivers/tee/optee/call.c | 2 +- drivers/tee/tee_shm.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index b25cc1fac945..937bcc7df8e4 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -362,7 +362,7 @@ int optee_check_mem_type(unsigned long start, size_t num_pages) * Allow kernel address to register with OP-TEE as kernel * pages are configured as normal memory only. */ - if (virt_addr_valid(start)) + if (virt_addr_valid(start) || is_vmalloc_addr((void *)start)) return 0; mmap_read_lock(mm); diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 499fccba3d74..31d0c10485ff 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -195,6 +195,20 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, if (flags & TEE_SHM_USER_MAPPED) { rc = pin_user_pages_fast(start, num_pages, FOLL_WRITE, shm->pages); + } else if (is_vmalloc_addr((void *)start)) { + struct page *page; + int i; + + for (i = 0; i < num_pages; i++) { + page = vmalloc_to_page((void *)(start + PAGE_SIZE * i)); + if (!page) { + ret = ERR_PTR(-ENOMEM); + goto err; + } + get_page(page); + shm->pages[i] = page; + } + rc = num_pages; } else { struct kvec *kiov; int i; -- 2.25.1

4 years, 3 months

2
1
0 0

2026

2025

2024

2023

2022

2021

2020

OP-TEE