From: Jens Wiklander <jens.wiklander@linaro.org>
To: Sumit Garg <sumit.garg@linaro.org>
Cc: Volodymyr_Babchuk@epam.com, tee-dev@lists.linaro.org,
linux-kernel@vger.kernel.org, etienne.carriere@linaro.org
Subject: Re: [PATCH] tee: optee: Fix dynamic shm pool allocations
Date: Thu, 7 Nov 2019 12:06:03 +0100 [thread overview]
Message-ID: <20191107110603.GA8790@jax> (raw)
In-Reply-To: <1572527274-21925-1-git-send-email-sumit.garg@linaro.org>
Hi Sumit,
On Thu, Oct 31, 2019 at 06:37:54PM +0530, Sumit Garg wrote:
> In case of dynamic shared memory pool, kernel memory allocated using
> dmabuf_mgr pool needs to be registered with OP-TEE prior to its usage
> during optee_open_session() or optee_invoke_func().
>
> So fix dmabuf_mgr pool allocations via an additional call to
> optee_shm_register().
>
> Fixes: 9733b072a12a ("optee: allow to work without static shared memory")
> Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
Looks good, I'm picking this up. Etienne told me has tested this on some
of his hardware so I'll add:
Tested-by: Etienne Carriere <etienne.carriere@linaro.org>
Thanks,
Jens
> ---
>
> Depends on patch: https://lkml.org/lkml/2019/7/30/506 that adds support
> to allow registration of kernel buffers with OP-TEE.
>
> drivers/tee/optee/shm_pool.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/tee/optee/shm_pool.c b/drivers/tee/optee/shm_pool.c
> index de1d9b8..0332a53 100644
> --- a/drivers/tee/optee/shm_pool.c
> +++ b/drivers/tee/optee/shm_pool.c
> @@ -17,6 +17,7 @@ static int pool_op_alloc(struct tee_shm_pool_mgr *poolm,
> {
> unsigned int order = get_order(size);
> struct page *page;
> + int rc = 0;
>
> page = alloc_pages(GFP_KERNEL | __GFP_ZERO, order);
> if (!page)
> @@ -26,12 +27,21 @@ static int pool_op_alloc(struct tee_shm_pool_mgr *poolm,
> shm->paddr = page_to_phys(page);
> shm->size = PAGE_SIZE << order;
>
> - return 0;
> + if (shm->flags & TEE_SHM_DMA_BUF) {
> + shm->flags |= TEE_SHM_REGISTER;
> + rc = optee_shm_register(shm->ctx, shm, &page, 1 << order,
> + (unsigned long)shm->kaddr);
> + }
> +
> + return rc;
> }
>
> static void pool_op_free(struct tee_shm_pool_mgr *poolm,
> struct tee_shm *shm)
> {
> + if (shm->flags & TEE_SHM_DMA_BUF)
> + optee_shm_unregister(shm->ctx, shm);
> +
> free_pages((unsigned long)shm->kaddr, get_order(shm->size));
> shm->kaddr = NULL;
> }
> --
> 2.7.4
>
next prev parent reply other threads:[~2019-11-07 11:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-31 13:07 [PATCH] tee: optee: Fix dynamic shm pool allocations Sumit Garg
2019-11-07 11:06 ` Jens Wiklander [this message]
2019-11-07 12:41 ` Sumit Garg
2019-11-08 10:39 ` Jens Wiklander
2019-11-08 11:05 ` 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=20191107110603.GA8790@jax \
--to=jens.wiklander@linaro.org \
--cc=Volodymyr_Babchuk@epam.com \
--cc=etienne.carriere@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sumit.garg@linaro.org \
--cc=tee-dev@lists.linaro.org \
/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).