5a769f6ff4
optee_shm_register() expected pages to be passed as an array of page
pointers rather than as an array of contiguous pages. So fix that via
correctly passing pages as per expectation.
Fixes: a249dd200d ("tee: optee: Fix dynamic shm pool allocations")
Reported-by: Vincent Cao <vincent.t.cao@intel.com>
Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
Tested-by: Vincent Cao <vincent.t.cao@intel.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
90 lines
2.0 KiB
C
90 lines
2.0 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (c) 2015, Linaro Limited
|
|
* Copyright (c) 2017, EPAM Systems
|
|
*/
|
|
#include <linux/device.h>
|
|
#include <linux/dma-buf.h>
|
|
#include <linux/genalloc.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/tee_drv.h>
|
|
#include "optee_private.h"
|
|
#include "optee_smc.h"
|
|
#include "shm_pool.h"
|
|
|
|
static int pool_op_alloc(struct tee_shm_pool_mgr *poolm,
|
|
struct tee_shm *shm, size_t size)
|
|
{
|
|
unsigned int order = get_order(size);
|
|
struct page *page;
|
|
int rc = 0;
|
|
|
|
page = alloc_pages(GFP_KERNEL | __GFP_ZERO, order);
|
|
if (!page)
|
|
return -ENOMEM;
|
|
|
|
shm->kaddr = page_address(page);
|
|
shm->paddr = page_to_phys(page);
|
|
shm->size = PAGE_SIZE << order;
|
|
|
|
if (shm->flags & TEE_SHM_DMA_BUF) {
|
|
unsigned int nr_pages = 1 << order, i;
|
|
struct page **pages;
|
|
|
|
pages = kcalloc(nr_pages, sizeof(pages), GFP_KERNEL);
|
|
if (!pages)
|
|
return -ENOMEM;
|
|
|
|
for (i = 0; i < nr_pages; i++) {
|
|
pages[i] = page;
|
|
page++;
|
|
}
|
|
|
|
shm->flags |= TEE_SHM_REGISTER;
|
|
rc = optee_shm_register(shm->ctx, shm, pages, nr_pages,
|
|
(unsigned long)shm->kaddr);
|
|
kfree(pages);
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
static void pool_op_destroy_poolmgr(struct tee_shm_pool_mgr *poolm)
|
|
{
|
|
kfree(poolm);
|
|
}
|
|
|
|
static const struct tee_shm_pool_mgr_ops pool_ops = {
|
|
.alloc = pool_op_alloc,
|
|
.free = pool_op_free,
|
|
.destroy_poolmgr = pool_op_destroy_poolmgr,
|
|
};
|
|
|
|
/**
|
|
* optee_shm_pool_alloc_pages() - create page-based allocator pool
|
|
*
|
|
* This pool is used when OP-TEE supports dymanic SHM. In this case
|
|
* command buffers and such are allocated from kernel's own memory.
|
|
*/
|
|
struct tee_shm_pool_mgr *optee_shm_pool_alloc_pages(void)
|
|
{
|
|
struct tee_shm_pool_mgr *mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
|
|
|
|
if (!mgr)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
mgr->ops = &pool_ops;
|
|
|
|
return mgr;
|
|
}
|