Commit 71cc47d4 authored by Jens Wiklander's avatar Jens Wiklander
Browse files

tee: add tee_shm_alloc_user_buf() 



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: default avatarSumit Garg <sumit.garg@linaro.org>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
parent f41b6be1

drivers/tee/tee_core.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int tee_ioctl_shm_alloc(struct tee_context *ctx, 
	if (data.flags)

		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))

		return PTR_ERR(shm);

drivers/tee/tee_private.h

+2 −0
Original line number Diff line number Diff line
@@ -68,4 +68,6 @@ void tee_device_put(struct tee_device *teedev); 
void teedev_ctx_get(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*/

drivers/tee/tee_shm.c

+17 −0
Original line number Diff line number Diff line
@@ -127,6 +127,23 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags) 
}

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

 * @ctx:	Context that allocates the shared memory

drivers/tee/tee_shm_pool.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2015, Linaro Limited

 * Copyright (c) 2015 Linaro Limited

 */

#include <linux/device.h>

#include <linux/dma-buf.h>

include/linux/tee_drv.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2015-2016, Linaro Limited

 * Copyright (c) 2015-2016 Linaro Limited

 */



#ifndef __TEE_DRV_H