From: Sumit Garg <sumit.garg@linaro.org> To: keyrings@vger.kernel.org, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org Cc: jens.wiklander@linaro.org, corbet@lwn.net, dhowells@redhat.com, jejb@linux.ibm.com, jarkko.sakkinen@linux.intel.com, zohar@linux.ibm.com, jmorris@namei.org, serge@hallyn.com, ard.biesheuvel@linaro.org, daniel.thompson@linaro.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, tee-dev@lists.linaro.org, Sumit Garg <sumit.garg@linaro.org> Subject: [RFC 2/7] tee: enable support to register kernel memory Date: Thu, 13 Jun 2019 10:42:28 +0000 [thread overview] Message-ID: <1560421833-27414-3-git-send-email-sumit.garg@linaro.org> (raw) In-Reply-To: <1560421833-27414-1-git-send-email-sumit.garg@linaro.org> Enable support to register kernel memory reference with TEE. This change will allow TEE bus drivers to register memory references. Signed-off-by: Sumit Garg <sumit.garg@linaro.org> --- drivers/tee/tee_shm.c | 16 ++++++++++++++-- include/linux/tee_drv.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 2da026f..5c69b89 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -9,6 +9,7 @@ #include <linux/sched.h> #include <linux/slab.h> #include <linux/tee_drv.h> +#include <linux/uio.h> #include "tee_private.h" static void tee_shm_release(struct tee_shm *shm) @@ -224,13 +225,14 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, { struct tee_device *teedev = ctx->teedev; const u32 req_flags = TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED; + const u32 req_ker_flags = TEE_SHM_DMA_BUF | TEE_SHM_KERNEL_MAPPED; struct tee_shm *shm; void *ret; int rc; int num_pages; unsigned long start; - if (flags != req_flags) + if (flags != req_flags && flags != req_ker_flags) return ERR_PTR(-ENOTSUPP); if (!tee_device_get(teedev)) @@ -264,7 +266,17 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, goto err; } - rc = get_user_pages_fast(start, num_pages, FOLL_WRITE, shm->pages); + if (flags & TEE_SHM_USER_MAPPED) { + rc = get_user_pages_fast(start, num_pages, FOLL_WRITE, + shm->pages); + } else { + const struct kvec kiov = { + .iov_base = (void *)start, + .iov_len = PAGE_SIZE + }; + + rc = get_kernel_pages(&kiov, num_pages, 0, shm->pages); + } if (rc > 0) shm->num_pages = rc; if (rc != num_pages) { diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 7a03f68..dedf8fa 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -26,6 +26,7 @@ #define TEE_SHM_REGISTER BIT(3) /* Memory registered in secure world */ #define TEE_SHM_USER_MAPPED BIT(4) /* Memory mapped in user space */ #define TEE_SHM_POOL BIT(5) /* Memory allocated from pool */ +#define TEE_SHM_KERNEL_MAPPED BIT(6) /* Memory mapped in kernel space */ struct device; struct tee_device; -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Sumit Garg <sumit.garg@linaro.org> To: keyrings@vger.kernel.org, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org Cc: jens.wiklander@linaro.org, corbet@lwn.net, dhowells@redhat.com, jejb@linux.ibm.com, jarkko.sakkinen@linux.intel.com, zohar@linux.ibm.com, jmorris@namei.org, serge@hallyn.com, ard.biesheuvel@linaro.org, daniel.thompson@linaro.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, tee-dev@lists.linaro.org, Sumit Garg <sumit.garg@linaro.org> Subject: [RFC 2/7] tee: enable support to register kernel memory Date: Thu, 13 Jun 2019 16:00:28 +0530 [thread overview] Message-ID: <1560421833-27414-3-git-send-email-sumit.garg@linaro.org> (raw) In-Reply-To: <1560421833-27414-1-git-send-email-sumit.garg@linaro.org> Enable support to register kernel memory reference with TEE. This change will allow TEE bus drivers to register memory references. Signed-off-by: Sumit Garg <sumit.garg@linaro.org> --- drivers/tee/tee_shm.c | 16 ++++++++++++++-- include/linux/tee_drv.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 2da026f..5c69b89 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -9,6 +9,7 @@ #include <linux/sched.h> #include <linux/slab.h> #include <linux/tee_drv.h> +#include <linux/uio.h> #include "tee_private.h" static void tee_shm_release(struct tee_shm *shm) @@ -224,13 +225,14 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, { struct tee_device *teedev = ctx->teedev; const u32 req_flags = TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED; + const u32 req_ker_flags = TEE_SHM_DMA_BUF | TEE_SHM_KERNEL_MAPPED; struct tee_shm *shm; void *ret; int rc; int num_pages; unsigned long start; - if (flags != req_flags) + if (flags != req_flags && flags != req_ker_flags) return ERR_PTR(-ENOTSUPP); if (!tee_device_get(teedev)) @@ -264,7 +266,17 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, goto err; } - rc = get_user_pages_fast(start, num_pages, FOLL_WRITE, shm->pages); + if (flags & TEE_SHM_USER_MAPPED) { + rc = get_user_pages_fast(start, num_pages, FOLL_WRITE, + shm->pages); + } else { + const struct kvec kiov = { + .iov_base = (void *)start, + .iov_len = PAGE_SIZE + }; + + rc = get_kernel_pages(&kiov, num_pages, 0, shm->pages); + } if (rc > 0) shm->num_pages = rc; if (rc != num_pages) { diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 7a03f68..dedf8fa 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -26,6 +26,7 @@ #define TEE_SHM_REGISTER BIT(3) /* Memory registered in secure world */ #define TEE_SHM_USER_MAPPED BIT(4) /* Memory mapped in user space */ #define TEE_SHM_POOL BIT(5) /* Memory allocated from pool */ +#define TEE_SHM_KERNEL_MAPPED BIT(6) /* Memory mapped in kernel space */ struct device; struct tee_device; -- 2.7.4
next prev parent reply other threads:[~2019-06-13 10:42 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-13 10:30 [RFC 0/7] Introduce TEE based Trusted Keys support Sumit Garg 2019-06-13 10:42 ` Sumit Garg 2019-06-13 10:30 ` [RFC 1/7] tee: optee: allow kernel pages to register as shm Sumit Garg 2019-06-13 10:42 ` Sumit Garg 2019-06-13 15:12 ` Jarkko Sakkinen 2019-06-13 15:12 ` Jarkko Sakkinen 2019-06-13 15:17 ` Jarkko Sakkinen 2019-06-13 15:17 ` Jarkko Sakkinen 2019-06-13 15:17 ` Jarkko Sakkinen 2019-06-13 15:17 ` Jarkko Sakkinen 2019-06-14 5:12 ` Sumit Garg 2019-06-14 5:24 ` Sumit Garg 2019-06-14 8:15 ` Jens Wiklander 2019-06-14 8:15 ` Jens Wiklander 2019-06-13 10:30 ` Sumit Garg [this message] 2019-06-13 10:42 ` [RFC 2/7] tee: enable support to register kernel memory Sumit Garg 2019-06-13 15:20 ` Jarkko Sakkinen 2019-06-13 15:20 ` Jarkko Sakkinen 2019-06-14 5:13 ` Sumit Garg 2019-06-14 5:25 ` Sumit Garg 2019-06-14 8:16 ` Jens Wiklander 2019-06-14 8:16 ` Jens Wiklander 2019-06-13 10:30 ` [RFC 3/7] tee: add private login method for kernel clients Sumit Garg 2019-06-13 10:42 ` Sumit Garg 2019-07-08 15:39 ` Jens Wiklander 2019-07-08 15:39 ` Jens Wiklander 2019-07-09 5:56 ` Sumit Garg 2019-07-09 5:56 ` Sumit Garg 2019-07-09 7:03 ` Jens Wiklander 2019-07-09 7:03 ` Jens Wiklander 2019-07-09 9:36 ` Sumit Garg 2019-07-09 9:48 ` Sumit Garg 2019-07-29 7:08 ` Jens Wiklander 2019-07-29 7:08 ` Jens Wiklander 2019-07-29 13:13 ` Sumit Garg 2019-07-29 13:25 ` Sumit Garg 2019-06-13 10:30 ` [RFC 4/7] KEYS: trusted: Introduce TEE based Trusted Keys Sumit Garg 2019-06-13 10:42 ` Sumit Garg 2019-06-13 15:32 ` Jarkko Sakkinen 2019-06-13 15:32 ` Jarkko Sakkinen 2019-06-14 5:43 ` Sumit Garg 2019-06-14 5:55 ` Sumit Garg 2019-06-13 10:30 ` [RFC 5/7] KEYS: encrypted: Allow TEE based trusted master keys Sumit Garg 2019-06-13 10:42 ` Sumit Garg 2019-06-13 10:30 ` [RFC 6/7] doc: keys: Document usage of TEE based Trusted Keys Sumit Garg 2019-06-13 10:42 ` Sumit Garg 2019-06-13 15:34 ` Jarkko Sakkinen 2019-06-13 15:34 ` Jarkko Sakkinen 2019-06-14 5:37 ` Sumit Garg 2019-06-14 5:49 ` Sumit Garg 2019-06-14 15:36 ` Jarkko Sakkinen 2019-06-14 15:36 ` Jarkko Sakkinen 2019-06-13 10:30 ` [RFC 7/7] MAINTAINERS: Add entry for " Sumit Garg 2019-06-13 10:42 ` Sumit Garg 2019-06-13 16:40 ` [RFC 0/7] Introduce TEE based Trusted Keys support Casey Schaufler 2019-06-13 16:40 ` Casey Schaufler 2019-06-14 0:03 ` Mimi Zohar 2019-06-14 0:03 ` Mimi Zohar 2019-06-14 8:17 ` Sumit Garg 2019-06-14 8:29 ` Sumit Garg 2019-06-14 5:58 ` Sumit Garg 2019-06-14 5:58 ` Sumit Garg 2019-07-08 12:41 ` Sumit Garg 2019-07-08 12:53 ` Sumit Garg 2019-07-08 16:31 ` Jens Wiklander 2019-07-08 16:31 ` Jens Wiklander 2019-07-09 5:58 ` Sumit Garg 2019-07-09 5:59 ` Sumit Garg
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=1560421833-27414-3-git-send-email-sumit.garg@linaro.org \ --to=sumit.garg@linaro.org \ --cc=ard.biesheuvel@linaro.org \ --cc=corbet@lwn.net \ --cc=daniel.thompson@linaro.org \ --cc=dhowells@redhat.com \ --cc=jarkko.sakkinen@linux.intel.com \ --cc=jejb@linux.ibm.com \ --cc=jens.wiklander@linaro.org \ --cc=jmorris@namei.org \ --cc=keyrings@vger.kernel.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=serge@hallyn.com \ --cc=tee-dev@lists.linaro.org \ --cc=zohar@linux.ibm.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.