From: Jens Wiklander <jens.wiklander@linaro.org>
To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org,
op-tee@lists.trustedfirmware.org,
linux-arm-kernel@lists.infradead.org
Cc: "Olivier Masse" <olivier.masse@nxp.com>,
"Thierry Reding" <thierry.reding@gmail.com>,
"Yong Wu" <yong.wu@mediatek.com>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Benjamin Gaignard" <benjamin.gaignard@collabora.com>,
"Brian Starkey" <Brian.Starkey@arm.com>,
"John Stultz" <jstultz@google.com>,
"T . J . Mercier" <tjmercier@google.com>,
"Christian König" <christian.koenig@amd.com>,
"Sumit Garg" <sumit.garg@linaro.org>,
"Matthias Brugger" <matthias.bgg@gmail.com>,
"AngeloGioacchino Del Regno"
<angelogioacchino.delregno@collabora.com>,
azarrabi@qti.qualcomm.com,
"Simona Vetter" <simona.vetter@ffwll.ch>,
"Jens Wiklander" <jens.wiklander@linaro.org>
Subject: [PATCH v5 2/7] tee: add TEE_IOC_RSTMEM_FD_INFO
Date: Tue, 18 Feb 2025 15:34:51 +0100 [thread overview]
Message-ID: <20250218143527.1236668-3-jens.wiklander@linaro.org> (raw)
In-Reply-To: <20250218143527.1236668-1-jens.wiklander@linaro.org>
Add TEE_IOC_RSTMEM_FD_INFO to retrieve information about a previously
allocated restricted memory dma-buf file descriptor. This is needed if
the file descriptor from a restricted memory allocation has been saved
due to limitations in the application.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/tee/tee_core.c | 31 +++++++++++++++++++++++++++++++
drivers/tee/tee_private.h | 2 ++
drivers/tee/tee_rstmem.c | 8 ++++++++
include/uapi/linux/tee.h | 27 +++++++++++++++++++++++++++
4 files changed, 68 insertions(+)
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index f4a45b77753b..01a2a9513578 100644
--- a/drivers/tee/tee_core.c
+++ b/drivers/tee/tee_core.c
@@ -848,6 +848,35 @@ tee_ioctl_rstmem_alloc(struct tee_context *ctx,
return fd;
}
+static int
+tee_ioctl_rstmem_fd_info(struct tee_context *ctx,
+ struct tee_ioctl_rstmem_fd_info __user *udata)
+{
+ struct tee_ioctl_rstmem_fd_info data;
+ struct dma_buf *dmabuf;
+ struct tee_shm *shm;
+
+ if (copy_from_user(&data, udata, sizeof(data)))
+ return -EFAULT;
+
+ dmabuf = dma_buf_get(data.fd);
+ if (IS_ERR(dmabuf))
+ return PTR_ERR(dmabuf);
+ shm = tee_rstmem_dmabuf_to_shm(ctx, dmabuf);
+ if (!IS_ERR(shm)) {
+ data.flags = 0;
+ data.use_case = shm->use_case;
+ data.id = shm->id;
+ data.size = shm->size;
+ }
+ dma_buf_put(dmabuf);
+ if (IS_ERR(shm))
+ return PTR_ERR(shm);
+ if (copy_to_user(udata, &data, sizeof(data)))
+ return -EFAULT;
+ return 0;
+}
+
static long tee_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct tee_context *ctx = filp->private_data;
@@ -874,6 +903,8 @@ static long tee_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
return tee_ioctl_supp_send(ctx, uarg);
case TEE_IOC_RSTMEM_ALLOC:
return tee_ioctl_rstmem_alloc(ctx, uarg);
+ case TEE_IOC_RSTMEM_FD_INFO:
+ return tee_ioctl_rstmem_fd_info(ctx, uarg);
default:
return -EINVAL;
}
diff --git a/drivers/tee/tee_private.h b/drivers/tee/tee_private.h
index bf97796909c0..b076089b2512 100644
--- a/drivers/tee/tee_private.h
+++ b/drivers/tee/tee_private.h
@@ -25,5 +25,7 @@ struct tee_shm *tee_shm_register_user_buf(struct tee_context *ctx,
unsigned long addr, size_t length);
struct dma_buf *tee_rstmem_alloc(struct tee_context *ctx, u32 flags,
u32 use_case, size_t size, int *shm_id);
+struct tee_shm *tee_rstmem_dmabuf_to_shm(struct tee_context *ctx,
+ struct dma_buf *dmabuf);
#endif /*TEE_PRIVATE_H*/
diff --git a/drivers/tee/tee_rstmem.c b/drivers/tee/tee_rstmem.c
index 3b27594ec30b..5108772f3ca0 100644
--- a/drivers/tee/tee_rstmem.c
+++ b/drivers/tee/tee_rstmem.c
@@ -178,3 +178,11 @@ struct dma_buf *tee_rstmem_alloc(struct tee_context *ctx, u32 flags,
tee_device_put(teedev);
return dmabuf;
}
+
+struct tee_shm *tee_rstmem_dmabuf_to_shm(struct tee_context *ctx,
+ struct dma_buf *dmabuf)
+{
+ if (dmabuf->ops != &rstmem_generic_buf_ops)
+ return ERR_PTR(-EINVAL);
+ return dmabuf->priv;
+}
diff --git a/include/uapi/linux/tee.h b/include/uapi/linux/tee.h
index 88834448debb..30ab5bd80a55 100644
--- a/include/uapi/linux/tee.h
+++ b/include/uapi/linux/tee.h
@@ -431,6 +431,33 @@ struct tee_ioctl_rstmem_alloc_data {
#define TEE_IOC_RSTMEM_ALLOC _IOWR(TEE_IOC_MAGIC, TEE_IOC_BASE + 10, \
struct tee_ioctl_rstmem_alloc_data)
+/**
+ * struct tee_ioctl_rstmem_fd_info - Restricted memory information
+ * @fd: [in] File descriptor returned from the previous allocation
+ * @flags: [out] Flags from the allocation
+ * @use_case: [out] Restricted memory use case, TEE_IOC_UC_*
+ * @id: [out] Identifier of the restricted memory
+ * @size: [out] Size of the restricted memory
+ */
+struct tee_ioctl_rstmem_fd_info {
+ __s32 fd;
+ __u32 flags;
+ __u32 use_case;
+ __s32 id;
+ __u64 size;
+};
+
+/**
+ * TEE_IOC_RSTMEM_FD_INFO - get restricted memory information from an fd
+ *
+ * Returns information about a previously allocated restricted memory
+ * dma-buf file descriptor.
+ *
+ * Returns 0 on success or < 0 on failure
+ */
+#define TEE_IOC_RSTMEM_FD_INFO _IOWR(TEE_IOC_MAGIC, TEE_IOC_BASE + 11, \
+ struct tee_ioctl_rstmem_fd_info)
+
/*
* Five syscalls are used when communicating with the TEE driver.
* open(): opens the device associated with the driver
--
2.43.0
next prev parent reply other threads:[~2025-02-18 14:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-18 14:34 [PATCH v5 0/7] TEE subsystem for restricted dma-buf allocations Jens Wiklander
2025-02-18 14:34 ` [PATCH v5 1/7] tee: add restricted memory allocation Jens Wiklander
2025-02-18 14:34 ` Jens Wiklander [this message]
2025-02-18 14:34 ` [PATCH v5 3/7] optee: account for direction while converting parameters Jens Wiklander
2025-02-18 14:34 ` [PATCH v5 4/7] optee: sync secure world ABI headers Jens Wiklander
2025-02-18 14:34 ` [PATCH v5 5/7] optee: support restricted memory allocation Jens Wiklander
2025-02-18 14:34 ` [PATCH v5 6/7] optee: FF-A: dynamic " Jens Wiklander
2025-02-18 14:34 ` [PATCH v5 7/7] optee: smc abi: " Jens Wiklander
2025-02-18 16:46 ` [PATCH v5 0/7] TEE subsystem for restricted dma-buf allocations Daniel Stone
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=20250218143527.1236668-3-jens.wiklander@linaro.org \
--to=jens.wiklander@linaro.org \
--cc=Brian.Starkey@arm.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=azarrabi@qti.qualcomm.com \
--cc=benjamin.gaignard@collabora.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jstultz@google.com \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=olivier.masse@nxp.com \
--cc=op-tee@lists.trustedfirmware.org \
--cc=simona.vetter@ffwll.ch \
--cc=sumit.garg@linaro.org \
--cc=sumit.semwal@linaro.org \
--cc=thierry.reding@gmail.com \
--cc=tjmercier@google.com \
--cc=yong.wu@mediatek.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
all inboxes | Powered by JetHome®