iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tee: add tee_shm_alloc_user_buf()

Browse Source 
Adds a new function tee_shm_alloc_user_buf() for user mode allocations,
replacing passing the flags TEE_SHM_MAPPED | TEE_SHM_DMA_BUF to
tee_shm_alloc().

Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
This commit is contained in:
Jens Wiklander 2022-02-04 10:33:52 +01:00
parent f41b6be1eb
commit 71cc47d4cc
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tee/tee_core.c
View File

@ -297,7 +297,7 @@ static int tee_ioctl_shm_alloc(struct tee_context *ctx,
if (data.flags) if (data.flags)
return -EINVAL; return -EINVAL;
shm = tee_shm_alloc(ctx, data.size, TEE_SHM_MAPPED | TEE_SHM_DMA_BUF); shm = tee_shm_alloc_user_buf(ctx, data.size);
if (IS_ERR(shm)) if (IS_ERR(shm))
return PTR_ERR(shm); return PTR_ERR(shm);

2
drivers/tee/tee_private.h
View File

@ -68,4 +68,6 @@ void tee_device_put(struct tee_device *teedev);
void teedev_ctx_get(struct tee_context *ctx); void teedev_ctx_get(struct tee_context *ctx);
void teedev_ctx_put(struct tee_context *ctx); void teedev_ctx_put(struct tee_context *ctx);
struct tee_shm *tee_shm_alloc_user_buf(struct tee_context *ctx, size_t size);
#endif /*TEE_PRIVATE_H*/ #endif /*TEE_PRIVATE_H*/

17
drivers/tee/tee_shm.c
View File

@ -127,6 +127,23 @@ err_dev_put:
} }
EXPORT_SYMBOL_GPL(tee_shm_alloc); EXPORT_SYMBOL_GPL(tee_shm_alloc);
/**
* tee_shm_alloc_user_buf() - Allocate shared memory for user space
* @ctx: Context that allocates the shared memory
* @size: Requested size of shared memory
*
* Memory allocated as user space shared memory is automatically freed when
* the TEE file pointer is closed. The primary usage of this function is
* when the TEE driver doesn't support registering ordinary user space
* memory.
*
* @returns a pointer to 'struct tee_shm'
*/
struct tee_shm *tee_shm_alloc_user_buf(struct tee_context *ctx, size_t size)
{
return tee_shm_alloc(ctx, size, TEE_SHM_MAPPED | TEE_SHM_DMA_BUF);
}
/** /**
* tee_shm_alloc_kernel_buf() - Allocate shared memory for kernel buffer * tee_shm_alloc_kernel_buf() - Allocate shared memory for kernel buffer
* @ctx: Context that allocates the shared memory * @ctx: Context that allocates the shared memory

2
drivers/tee/tee_shm_pool.c
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2015, Linaro Limited * Copyright (c) 2015 Linaro Limited
*/ */
#include <linux/device.h> #include <linux/device.h>
#include <linux/dma-buf.h> #include <linux/dma-buf.h>

2
include/linux/tee_drv.h
View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* /*
* Copyright (c) 2015-2016, Linaro Limited * Copyright (c) 2015-2016 Linaro Limited
*/ */
#ifndef __TEE_DRV_H #ifndef __TEE_DRV_H