From: Jens Wiklander <jens.wiklander@linaro.org>
To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org
Cc: Sumit Garg <sumit.garg@linaro.org>,
Herbert Xu <herbert@gondor.apana.org.au>,
Devaraj Rangasamy <Devaraj.Rangasamy@amd.com>,
Rijo Thomas <Rijo-john.Thomas@amd.com>,
David Howells <dhowells@redhat.com>,
Tyler Hicks <tyhicks@linux.microsoft.com>,
Jens Wiklander <jens.wiklander@linaro.org>
Subject: [PATCH v2 03/12] tee: add tee_shm_alloc_user_buf()
Date: Fri, 14 Jan 2022 16:08:15 +0100 [thread overview]
Message-ID: <20220114150824.3578829-4-jens.wiklander@linaro.org> (raw)
In-Reply-To: <20220114150824.3578829-1-jens.wiklander@linaro.org>
Adds a new function tee_shm_alloc_user_buf() or user mode allocations,
replacing passing the flags TEE_SHM_MAPPED | TEE_SHM_DMA_BUF to
tee_shm_alloc().
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/tee/tee_core.c | 2 +-
drivers/tee/tee_shm.c | 18 ++++++++++++++++++
drivers/tee/tee_shm_pool.c | 2 +-
include/linux/tee_drv.h | 3 ++-
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index 3fc426dad2df..a15812baaeb1 100644
--- a/drivers/tee/tee_core.c
+++ b/drivers/tee/tee_core.c
@@ -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);
diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
index 499fccba3d74..b43178986985 100644
--- a/drivers/tee/tee_shm.c
+++ b/drivers/tee/tee_shm.c
@@ -127,6 +127,24 @@ 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);
+}
+EXPORT_SYMBOL_GPL(tee_shm_alloc_user_buf);
+
/**
* tee_shm_alloc_kernel_buf() - Allocate shared memory for kernel buffer
* @ctx: Context that allocates the shared memory
diff --git a/drivers/tee/tee_shm_pool.c b/drivers/tee/tee_shm_pool.c
index a9f9d50fd181..0e460347138a 100644
--- a/drivers/tee/tee_shm_pool.c
+++ b/drivers/tee/tee_shm_pool.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Copyright (c) 2015, Linaro Limited
+ * Copyright (c) 2015, 2017, 2022 Linaro Limited
*/
#include <linux/device.h>
#include <linux/dma-buf.h>
diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h
index 6b0f0d01ebdf..26b450484ac1 100644
--- a/include/linux/tee_drv.h
+++ b/include/linux/tee_drv.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
- * Copyright (c) 2015-2016, Linaro Limited
+ * Copyright (c) 2015-2022 Linaro Limited
*/
#ifndef __TEE_DRV_H
@@ -308,6 +308,7 @@ void *tee_get_drvdata(struct tee_device *teedev);
* @returns a pointer to 'struct tee_shm'
*/
struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags);
+struct tee_shm *tee_shm_alloc_user_buf(struct tee_context *ctx, size_t size);
struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t size);
/**
--
2.31.1
next prev parent reply other threads:[~2022-01-14 15:08 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 15:08 [PATCH v2 00/12] tee: shared memory updates Jens Wiklander
2022-01-14 15:08 ` [PATCH v2 01/12] hwrng: optee-rng: use tee_shm_alloc_kernel_buf() Jens Wiklander
2022-01-18 12:12 ` Sumit Garg
2022-01-14 15:08 ` [PATCH v2 02/12] tee: remove unused tee_shm_pool_alloc_res_mem() Jens Wiklander
2022-01-18 12:57 ` Sumit Garg
2022-01-14 15:08 ` Jens Wiklander [this message]
2022-01-18 13:11 ` [PATCH v2 03/12] tee: add tee_shm_alloc_user_buf() Sumit Garg
2022-01-19 7:36 ` Jens Wiklander
2022-01-14 15:08 ` [PATCH v2 04/12] tee: simplify shm pool handling Jens Wiklander
2022-01-20 10:06 ` Sumit Garg
2022-01-20 12:56 ` Jens Wiklander
2022-01-21 13:06 ` Sumit Garg
2022-01-21 13:47 ` Jens Wiklander
2022-01-14 15:08 ` [PATCH v2 05/12] tee: replace tee_shm_alloc() Jens Wiklander
2022-01-20 10:41 ` Sumit Garg
2022-01-20 13:02 ` Jens Wiklander
2022-01-14 15:08 ` [PATCH v2 06/12] optee: add driver private tee_context Jens Wiklander
2022-01-21 12:48 ` Sumit Garg
2022-01-24 13:58 ` Jens Wiklander
2022-01-14 15:08 ` [PATCH v2 07/12] optee: use driver internal tee_contex for some rpc Jens Wiklander
2022-01-21 12:54 ` Sumit Garg
2022-01-21 13:28 ` Jerome Forissier
2022-01-21 13:37 ` Sumit Garg
2022-01-21 14:02 ` Jens Wiklander
2022-01-14 15:08 ` [PATCH v2 08/12] optee: add optee_pool_op_free_helper() Jens Wiklander
2022-01-20 10:57 ` Sumit Garg
2022-01-14 15:08 ` [PATCH v2 09/12] tee: add tee_shm_register_{user,kernel}_buf() Jens Wiklander
2022-01-20 11:00 ` Sumit Garg
2022-01-20 13:06 ` Jens Wiklander
2022-01-14 15:08 ` [PATCH v2 10/12] KEYS: trusted: tee: use tee_shm_register_kernel_buf() Jens Wiklander
2022-01-20 11:03 ` Sumit Garg
2022-01-14 15:08 ` [PATCH v2 11/12] tee: replace tee_shm_register() Jens Wiklander
2022-01-20 11:51 ` Sumit Garg
2022-01-20 14:12 ` Jens Wiklander
2022-01-21 12:57 ` Sumit Garg
2022-01-14 15:08 ` [PATCH v2 12/12] tee: refactor TEE_SHM_* flags Jens Wiklander
2022-01-20 13:03 ` Sumit Garg
2022-01-21 7:23 ` Jens Wiklander
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220114150824.3578829-4-jens.wiklander@linaro.org \
--to=jens.wiklander@linaro.org \
--cc=Devaraj.Rangasamy@amd.com \
--cc=Rijo-john.Thomas@amd.com \
--cc=dhowells@redhat.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=op-tee@lists.trustedfirmware.org \
--cc=sumit.garg@linaro.org \
--cc=tyhicks@linux.microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).