OP-TEE RPC argument cache
Adds caching of the OP-TEE argument structure used to pass request to secure world. This reduces quite a bit of unnecessary alloc/free and possibly switching back and forth to secure work in order to register the buffers in some configurations, most notably FF-A. -----BEGIN PGP SIGNATURE----- iQJOBAABCgA4FiEEFV+gSSXZJY9ZyuB5LinzTIcAHJcFAmJy2qcaHGplbnMud2lr bGFuZGVyQGxpbmFyby5vcmcACgkQLinzTIcAHJfGvRAAwWWyMSRRxFGlaiENphwg vLKP0faPgW4kBPLI7bd6ItpWlMNNx6ixtqZo8Icz0yke7yb/5m1wi3jC1rz2FuvU JZXdepakJ3TGDpXWX6wVSpZFGfq/l41OTmFh3BV3DvUCMTfjXzcUJqv9zHpWwgU/ qPY/hhWzrJcJ8fTi6tXtExAhUsGxAmSJ/s+ShvNYXbNa8hrgyU3Nq15HODGR1BXS +2mos1F4KlGRxhPu+hCRqyyD5l3Tkzk4HFoSt6AOfBQ9voSCcw8XVtL9/4Jx3592 +99Y+VqsnJJNEHiSD6ESRyKadRIZvH4zwKBh92J3z/NhhxmeC1isDFYkmlgoxCaq OgPdFUa0Nq3JlIY4W+0c3TS0N/CGXrRFkDChEbn4sdQOKeIUy70yX/Eml5d+xhAC JDnSzz/B6i8qYgXwK6srSiY2uKi75L4qhGQmemp1x4HToRjEjTfWaKX2rBjfspiQ 8/9HQBG7Xk1PYiAN0z4xIjpoYqMRLwrtGm7J0Ep8/PKFyr+yzIHkYLFtoWGv9PZa F23/muMZALUxCLwm03/WmlFqmEeY2cFh/dB6UBIVpBmTM3X7QPdrTwVpamLgmtyT hwONAOpmUGF6du0a84Gz2D3unUaGXGI8Ccyam2MsYYQF9vwxp0HU/Q08zR69vMJA BmVbSlUfIPcMLOP0xamfrx4= =vq/I -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmJz2LIACgkQmmx57+YA GNltcBAAws2PU8EbtUoyYsJlClc1lxj+pUfT9snyv8CJVSLV6a+c94EUrxApJiZv HWyNrGfjRCY0otXzI+uFz9VbRC7sOWZNygdK0oDu+P9kkRNqzqdzfD366ms/VOGJ cswKla5iqKWThkBM4jA2aZA6YdXg4yHjU5h529K5kd/MlW4FyPrN11Bj3ELMeqH5 XaPkbGMoUgOTkk2CA/9VxVJz2n3fIvXXPYox2fsaDeNJIv3Y0GLEZSC0qE79lve5 kALRxoHfawyTkHtmVu+3btaUDyjoopRXP0oxo2e3kssGoOUpCJ5OJ8FQhiCiTWXi dXE0U7HdM1NNfUSwo87BaE64oMaAULd1OJsOsPkTzzJwvHlcSewAip2y0dd5N7N9 ngcfBKWo+D17dVNKCVgA7rATMP5se2wtx2/u2TGsyOTmqhteR3hXznHVRm8ZrHCy yjtj/5SCqQL9/0/jRGLUR0BwhL0K8+zpW56uQ28cy1a9j7E5iROnrHRmqE6fYaaF /sD08lGaeqRKRuIJxFe0OVpQlgVN4ZL75dkujS7OUCrtI++No3QzCjlkSnLdNKdk +UB8r3NNPrZSWqdz87Otd+8T6nt7NBbGK/R2yZMtYy1l532VFLguJvRzuY75J8ks 8LgvZ0AumWRJbig+WdTulanXneAKgugpdwLGfDzNUt8P1nnjVE4= =XEqq -----END PGP SIGNATURE----- Merge tag 'optee-rpc-arg-for-v5.19' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers OP-TEE RPC argument cache Adds caching of the OP-TEE argument structure used to pass request to secure world. This reduces quite a bit of unnecessary alloc/free and possibly switching back and forth to secure work in order to register the buffers in some configurations, most notably FF-A. * tag 'optee-rpc-arg-for-v5.19' of https://git.linaro.org/people/jens.wiklander/linux-tee: optee: cache argument shared memory structs optee: add FF-A capability OPTEE_FFA_SEC_CAP_ARG_OFFSET optee: add OPTEE_SMC_CALL_WITH_RPC_ARG and OPTEE_SMC_CALL_WITH_REGD_ARG optee: rename rpc_arg_count to rpc_param_count Link: https://lore.kernel.org/r/20220504201759.GA180315@jade Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
6c6012ab96
@ -11,6 +11,34 @@
|
||||
#include <linux/types.h>
|
||||
#include "optee_private.h"
|
||||
|
||||
#define MAX_ARG_PARAM_COUNT 6
|
||||
|
||||
/*
|
||||
* How much memory we allocate for each entry. This doesn't have to be a
|
||||
* single page, but it makes sense to keep at least keep it as multiples of
|
||||
* the page size.
|
||||
*/
|
||||
#define SHM_ENTRY_SIZE PAGE_SIZE
|
||||
|
||||
/*
|
||||
* We need to have a compile time constant to be able to determine the
|
||||
* maximum needed size of the bit field.
|
||||
*/
|
||||
#define MIN_ARG_SIZE OPTEE_MSG_GET_ARG_SIZE(MAX_ARG_PARAM_COUNT)
|
||||
#define MAX_ARG_COUNT_PER_ENTRY (SHM_ENTRY_SIZE / MIN_ARG_SIZE)
|
||||
|
||||
/*
|
||||
* Shared memory for argument structs are cached here. The number of
|
||||
* arguments structs that can fit is determined at runtime depending on the
|
||||
* needed RPC parameter count reported by secure world
|
||||
* (optee->rpc_param_count).
|
||||
*/
|
||||
struct optee_shm_arg_entry {
|
||||
struct list_head list_node;
|
||||
struct tee_shm *shm;
|
||||
DECLARE_BITMAP(map, MAX_ARG_COUNT_PER_ENTRY);
|
||||
};
|
||||
|
||||
void optee_cq_wait_init(struct optee_call_queue *cq,
|
||||
struct optee_call_waiter *w)
|
||||
{
|
||||
@ -104,37 +132,149 @@ static struct optee_session *find_session(struct optee_context_data *ctxdata,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
struct tee_shm *optee_get_msg_arg(struct tee_context *ctx, size_t num_params,
|
||||
struct optee_msg_arg **msg_arg)
|
||||
void optee_shm_arg_cache_init(struct optee *optee, u32 flags)
|
||||
{
|
||||
INIT_LIST_HEAD(&optee->shm_arg_cache.shm_args);
|
||||
mutex_init(&optee->shm_arg_cache.mutex);
|
||||
optee->shm_arg_cache.flags = flags;
|
||||
}
|
||||
|
||||
void optee_shm_arg_cache_uninit(struct optee *optee)
|
||||
{
|
||||
struct list_head *head = &optee->shm_arg_cache.shm_args;
|
||||
struct optee_shm_arg_entry *entry;
|
||||
|
||||
mutex_destroy(&optee->shm_arg_cache.mutex);
|
||||
while (!list_empty(head)) {
|
||||
entry = list_first_entry(head, struct optee_shm_arg_entry,
|
||||
list_node);
|
||||
list_del(&entry->list_node);
|
||||
if (find_first_bit(entry->map, MAX_ARG_COUNT_PER_ENTRY) !=
|
||||
MAX_ARG_COUNT_PER_ENTRY) {
|
||||
pr_err("Freeing non-free entry\n");
|
||||
}
|
||||
tee_shm_free(entry->shm);
|
||||
kfree(entry);
|
||||
}
|
||||
}
|
||||
|
||||
size_t optee_msg_arg_size(size_t rpc_param_count)
|
||||
{
|
||||
size_t sz = OPTEE_MSG_GET_ARG_SIZE(MAX_ARG_PARAM_COUNT);
|
||||
|
||||
if (rpc_param_count)
|
||||
sz += OPTEE_MSG_GET_ARG_SIZE(rpc_param_count);
|
||||
|
||||
return sz;
|
||||
}
|
||||
|
||||
/**
|
||||
* optee_get_msg_arg() - Provide shared memory for argument struct
|
||||
* @ctx: Caller TEE context
|
||||
* @num_params: Number of parameter to store
|
||||
* @entry_ret: Entry pointer, needed when freeing the buffer
|
||||
* @shm_ret: Shared memory buffer
|
||||
* @offs_ret: Offset of argument strut in shared memory buffer
|
||||
*
|
||||
* @returns a pointer to the argument struct in memory, else an ERR_PTR
|
||||
*/
|
||||
struct optee_msg_arg *optee_get_msg_arg(struct tee_context *ctx,
|
||||
size_t num_params,
|
||||
struct optee_shm_arg_entry **entry_ret,
|
||||
struct tee_shm **shm_ret,
|
||||
u_int *offs_ret)
|
||||
{
|
||||
struct optee *optee = tee_get_drvdata(ctx->teedev);
|
||||
size_t sz = OPTEE_MSG_GET_ARG_SIZE(num_params);
|
||||
struct tee_shm *shm;
|
||||
size_t sz = optee_msg_arg_size(optee->rpc_param_count);
|
||||
struct optee_shm_arg_entry *entry;
|
||||
struct optee_msg_arg *ma;
|
||||
size_t args_per_entry;
|
||||
u_long bit;
|
||||
u_int offs;
|
||||
void *res;
|
||||
|
||||
/*
|
||||
* rpc_arg_count is set to the number of allocated parameters in
|
||||
* the RPC argument struct if a second MSG arg struct is expected.
|
||||
* The second arg struct will then be used for RPC.
|
||||
*/
|
||||
if (optee->rpc_arg_count)
|
||||
sz += OPTEE_MSG_GET_ARG_SIZE(optee->rpc_arg_count);
|
||||
if (num_params > MAX_ARG_PARAM_COUNT)
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
shm = tee_shm_alloc_priv_buf(ctx, sz);
|
||||
if (IS_ERR(shm))
|
||||
return shm;
|
||||
if (optee->shm_arg_cache.flags & OPTEE_SHM_ARG_SHARED)
|
||||
args_per_entry = SHM_ENTRY_SIZE / sz;
|
||||
else
|
||||
args_per_entry = 1;
|
||||
|
||||
ma = tee_shm_get_va(shm, 0);
|
||||
if (IS_ERR(ma)) {
|
||||
tee_shm_free(shm);
|
||||
return (void *)ma;
|
||||
mutex_lock(&optee->shm_arg_cache.mutex);
|
||||
list_for_each_entry(entry, &optee->shm_arg_cache.shm_args, list_node) {
|
||||
bit = find_first_zero_bit(entry->map, MAX_ARG_COUNT_PER_ENTRY);
|
||||
if (bit < args_per_entry)
|
||||
goto have_entry;
|
||||
}
|
||||
|
||||
memset(ma, 0, OPTEE_MSG_GET_ARG_SIZE(num_params));
|
||||
ma->num_params = num_params;
|
||||
*msg_arg = ma;
|
||||
/*
|
||||
* No entry was found, let's allocate a new.
|
||||
*/
|
||||
entry = kzalloc(sizeof(*entry), GFP_KERNEL);
|
||||
if (!entry) {
|
||||
res = ERR_PTR(-ENOMEM);
|
||||
goto out;
|
||||
}
|
||||
|
||||
return shm;
|
||||
if (optee->shm_arg_cache.flags & OPTEE_SHM_ARG_ALLOC_PRIV)
|
||||
res = tee_shm_alloc_priv_buf(ctx, SHM_ENTRY_SIZE);
|
||||
else
|
||||
res = tee_shm_alloc_kernel_buf(ctx, SHM_ENTRY_SIZE);
|
||||
|
||||
if (IS_ERR(res)) {
|
||||
kfree(entry);
|
||||
goto out;
|
||||
}
|
||||
entry->shm = res;
|
||||
list_add(&entry->list_node, &optee->shm_arg_cache.shm_args);
|
||||
bit = 0;
|
||||
|
||||
have_entry:
|
||||
offs = bit * sz;
|
||||
res = tee_shm_get_va(entry->shm, offs);
|
||||
if (IS_ERR(res))
|
||||
goto out;
|
||||
ma = res;
|
||||
set_bit(bit, entry->map);
|
||||
memset(ma, 0, sz);
|
||||
ma->num_params = num_params;
|
||||
*entry_ret = entry;
|
||||
*shm_ret = entry->shm;
|
||||
*offs_ret = offs;
|
||||
out:
|
||||
mutex_unlock(&optee->shm_arg_cache.mutex);
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* optee_free_msg_arg() - Free previsouly obtained shared memory
|
||||
* @ctx: Caller TEE context
|
||||
* @entry: Pointer returned when the shared memory was obtained
|
||||
* @offs: Offset of shared memory buffer to free
|
||||
*
|
||||
* This function frees the shared memory obtained with optee_get_msg_arg().
|
||||
*/
|
||||
void optee_free_msg_arg(struct tee_context *ctx,
|
||||
struct optee_shm_arg_entry *entry, u_int offs)
|
||||
{
|
||||
struct optee *optee = tee_get_drvdata(ctx->teedev);
|
||||
size_t sz = optee_msg_arg_size(optee->rpc_param_count);
|
||||
u_long bit;
|
||||
|
||||
if (offs > SHM_ENTRY_SIZE || offs % sz) {
|
||||
pr_err("Invalid offs %u\n", offs);
|
||||
return;
|
||||
}
|
||||
bit = offs / sz;
|
||||
|
||||
mutex_lock(&optee->shm_arg_cache.mutex);
|
||||
|
||||
if (!test_bit(bit, entry->map))
|
||||
pr_err("Bit pos %lu is already free\n", bit);
|
||||
clear_bit(bit, entry->map);
|
||||
|
||||
mutex_unlock(&optee->shm_arg_cache.mutex);
|
||||
}
|
||||
|
||||
int optee_open_session(struct tee_context *ctx,
|
||||
@ -143,16 +283,19 @@ int optee_open_session(struct tee_context *ctx,
|
||||
{
|
||||
struct optee *optee = tee_get_drvdata(ctx->teedev);
|
||||
struct optee_context_data *ctxdata = ctx->data;
|
||||
int rc;
|
||||
struct optee_shm_arg_entry *entry;
|
||||
struct tee_shm *shm;
|
||||
struct optee_msg_arg *msg_arg;
|
||||
struct optee_session *sess = NULL;
|
||||
uuid_t client_uuid;
|
||||
u_int offs;
|
||||
int rc;
|
||||
|
||||
/* +2 for the meta parameters added below */
|
||||
shm = optee_get_msg_arg(ctx, arg->num_params + 2, &msg_arg);
|
||||
if (IS_ERR(shm))
|
||||
return PTR_ERR(shm);
|
||||
msg_arg = optee_get_msg_arg(ctx, arg->num_params + 2,
|
||||
&entry, &shm, &offs);
|
||||
if (IS_ERR(msg_arg))
|
||||
return PTR_ERR(msg_arg);
|
||||
|
||||
msg_arg->cmd = OPTEE_MSG_CMD_OPEN_SESSION;
|
||||
msg_arg->cancel_id = arg->cancel_id;
|
||||
@ -185,7 +328,7 @@ int optee_open_session(struct tee_context *ctx,
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (optee->ops->do_call_with_arg(ctx, shm)) {
|
||||
if (optee->ops->do_call_with_arg(ctx, shm, offs)) {
|
||||
msg_arg->ret = TEEC_ERROR_COMMUNICATION;
|
||||
msg_arg->ret_origin = TEEC_ORIGIN_COMMS;
|
||||
}
|
||||
@ -212,26 +355,28 @@ int optee_open_session(struct tee_context *ctx,
|
||||
arg->ret_origin = msg_arg->ret_origin;
|
||||
}
|
||||
out:
|
||||
tee_shm_free(shm);
|
||||
optee_free_msg_arg(ctx, entry, offs);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
int optee_close_session_helper(struct tee_context *ctx, u32 session)
|
||||
{
|
||||
struct tee_shm *shm;
|
||||
struct optee *optee = tee_get_drvdata(ctx->teedev);
|
||||
struct optee_shm_arg_entry *entry;
|
||||
struct optee_msg_arg *msg_arg;
|
||||
struct tee_shm *shm;
|
||||
u_int offs;
|
||||
|
||||
shm = optee_get_msg_arg(ctx, 0, &msg_arg);
|
||||
if (IS_ERR(shm))
|
||||
return PTR_ERR(shm);
|
||||
msg_arg = optee_get_msg_arg(ctx, 0, &entry, &shm, &offs);
|
||||
if (IS_ERR(msg_arg))
|
||||
return PTR_ERR(msg_arg);
|
||||
|
||||
msg_arg->cmd = OPTEE_MSG_CMD_CLOSE_SESSION;
|
||||
msg_arg->session = session;
|
||||
optee->ops->do_call_with_arg(ctx, shm);
|
||||
optee->ops->do_call_with_arg(ctx, shm, offs);
|
||||
|
||||
tee_shm_free(shm);
|
||||
optee_free_msg_arg(ctx, entry, offs);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -259,9 +404,11 @@ int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg,
|
||||
{
|
||||
struct optee *optee = tee_get_drvdata(ctx->teedev);
|
||||
struct optee_context_data *ctxdata = ctx->data;
|
||||
struct tee_shm *shm;
|
||||
struct optee_shm_arg_entry *entry;
|
||||
struct optee_msg_arg *msg_arg;
|
||||
struct optee_session *sess;
|
||||
struct tee_shm *shm;
|
||||
u_int offs;
|
||||
int rc;
|
||||
|
||||
/* Check that the session is valid */
|
||||
@ -271,9 +418,10 @@ int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg,
|
||||
if (!sess)
|
||||
return -EINVAL;
|
||||
|
||||
shm = optee_get_msg_arg(ctx, arg->num_params, &msg_arg);
|
||||
if (IS_ERR(shm))
|
||||
return PTR_ERR(shm);
|
||||
msg_arg = optee_get_msg_arg(ctx, arg->num_params,
|
||||
&entry, &shm, &offs);
|
||||
if (IS_ERR(msg_arg))
|
||||
return PTR_ERR(msg_arg);
|
||||
msg_arg->cmd = OPTEE_MSG_CMD_INVOKE_COMMAND;
|
||||
msg_arg->func = arg->func;
|
||||
msg_arg->session = arg->session;
|
||||
@ -284,7 +432,7 @@ int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg,
|
||||
if (rc)
|
||||
goto out;
|
||||
|
||||
if (optee->ops->do_call_with_arg(ctx, shm)) {
|
||||
if (optee->ops->do_call_with_arg(ctx, shm, offs)) {
|
||||
msg_arg->ret = TEEC_ERROR_COMMUNICATION;
|
||||
msg_arg->ret_origin = TEEC_ORIGIN_COMMS;
|
||||
}
|
||||
@ -298,7 +446,7 @@ int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg,
|
||||
arg->ret = msg_arg->ret;
|
||||
arg->ret_origin = msg_arg->ret_origin;
|
||||
out:
|
||||
tee_shm_free(shm);
|
||||
optee_free_msg_arg(ctx, entry, offs);
|
||||
return rc;
|
||||
}
|
||||
|
||||
@ -306,9 +454,11 @@ int optee_cancel_req(struct tee_context *ctx, u32 cancel_id, u32 session)
|
||||
{
|
||||
struct optee *optee = tee_get_drvdata(ctx->teedev);
|
||||
struct optee_context_data *ctxdata = ctx->data;
|
||||
struct tee_shm *shm;
|
||||
struct optee_shm_arg_entry *entry;
|
||||
struct optee_msg_arg *msg_arg;
|
||||
struct optee_session *sess;
|
||||
struct tee_shm *shm;
|
||||
u_int offs;
|
||||
|
||||
/* Check that the session is valid */
|
||||
mutex_lock(&ctxdata->mutex);
|
||||
@ -317,16 +467,16 @@ int optee_cancel_req(struct tee_context *ctx, u32 cancel_id, u32 session)
|
||||
if (!sess)
|
||||
return -EINVAL;
|
||||
|
||||
shm = optee_get_msg_arg(ctx, 0, &msg_arg);
|
||||
if (IS_ERR(shm))
|
||||
return PTR_ERR(shm);
|
||||
msg_arg = optee_get_msg_arg(ctx, 0, &entry, &shm, &offs);
|
||||
if (IS_ERR(msg_arg))
|
||||
return PTR_ERR(msg_arg);
|
||||
|
||||
msg_arg->cmd = OPTEE_MSG_CMD_CANCEL;
|
||||
msg_arg->session = session;
|
||||
msg_arg->cancel_id = cancel_id;
|
||||
optee->ops->do_call_with_arg(ctx, shm);
|
||||
optee->ops->do_call_with_arg(ctx, shm, offs);
|
||||
|
||||
tee_shm_free(shm);
|
||||
optee_free_msg_arg(ctx, entry, offs);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -171,6 +171,7 @@ void optee_remove_common(struct optee *optee)
|
||||
optee_unregister_devices();
|
||||
|
||||
optee_notif_uninit(optee);
|
||||
optee_shm_arg_cache_uninit(optee);
|
||||
teedev_close_context(optee->ctx);
|
||||
/*
|
||||
* The two devices have to be unregistered before we can free the
|
||||
|
@ -601,6 +601,7 @@ done:
|
||||
* optee_ffa_do_call_with_arg() - Do a FF-A call to enter OP-TEE in secure world
|
||||
* @ctx: calling context
|
||||
* @shm: shared memory holding the message to pass to secure world
|
||||
* @offs: offset of the message in @shm
|
||||
*
|
||||
* Does a FF-A call to OP-TEE in secure world and handles eventual resulting
|
||||
* Remote Procedure Calls (RPC) from OP-TEE.
|
||||
@ -609,24 +610,33 @@ done:
|
||||
*/
|
||||
|
||||
static int optee_ffa_do_call_with_arg(struct tee_context *ctx,
|
||||
struct tee_shm *shm)
|
||||
struct tee_shm *shm, u_int offs)
|
||||
{
|
||||
struct ffa_send_direct_data data = {
|
||||
.data0 = OPTEE_FFA_YIELDING_CALL_WITH_ARG,
|
||||
.data1 = (u32)shm->sec_world_id,
|
||||
.data2 = (u32)(shm->sec_world_id >> 32),
|
||||
.data3 = shm->offset,
|
||||
.data3 = offs,
|
||||
};
|
||||
struct optee_msg_arg *arg;
|
||||
unsigned int rpc_arg_offs;
|
||||
struct optee_msg_arg *rpc_arg;
|
||||
|
||||
arg = tee_shm_get_va(shm, 0);
|
||||
/*
|
||||
* The shared memory object has to start on a page when passed as
|
||||
* an argument struct. This is also what the shm pool allocator
|
||||
* returns, but check this before calling secure world to catch
|
||||
* eventual errors early in case something changes.
|
||||
*/
|
||||
if (shm->offset)
|
||||
return -EINVAL;
|
||||
|
||||
arg = tee_shm_get_va(shm, offs);
|
||||
if (IS_ERR(arg))
|
||||
return PTR_ERR(arg);
|
||||
|
||||
rpc_arg_offs = OPTEE_MSG_GET_ARG_SIZE(arg->num_params);
|
||||
rpc_arg = tee_shm_get_va(shm, rpc_arg_offs);
|
||||
rpc_arg = tee_shm_get_va(shm, offs + rpc_arg_offs);
|
||||
if (IS_ERR(rpc_arg))
|
||||
return PTR_ERR(rpc_arg);
|
||||
|
||||
@ -678,7 +688,8 @@ static bool optee_ffa_api_is_compatbile(struct ffa_device *ffa_dev,
|
||||
|
||||
static bool optee_ffa_exchange_caps(struct ffa_device *ffa_dev,
|
||||
const struct ffa_dev_ops *ops,
|
||||
unsigned int *rpc_arg_count)
|
||||
u32 *sec_caps,
|
||||
unsigned int *rpc_param_count)
|
||||
{
|
||||
struct ffa_send_direct_data data = { OPTEE_FFA_EXCHANGE_CAPABILITIES };
|
||||
int rc;
|
||||
@ -693,7 +704,8 @@ static bool optee_ffa_exchange_caps(struct ffa_device *ffa_dev,
|
||||
return false;
|
||||
}
|
||||
|
||||
*rpc_arg_count = (u8)data.data1;
|
||||
*rpc_param_count = (u8)data.data1;
|
||||
*sec_caps = data.data2;
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -772,11 +784,13 @@ static void optee_ffa_remove(struct ffa_device *ffa_dev)
|
||||
static int optee_ffa_probe(struct ffa_device *ffa_dev)
|
||||
{
|
||||
const struct ffa_dev_ops *ffa_ops;
|
||||
unsigned int rpc_arg_count;
|
||||
unsigned int rpc_param_count;
|
||||
struct tee_shm_pool *pool;
|
||||
struct tee_device *teedev;
|
||||
struct tee_context *ctx;
|
||||
u32 arg_cache_flags = 0;
|
||||
struct optee *optee;
|
||||
u32 sec_caps;
|
||||
int rc;
|
||||
|
||||
ffa_ops = ffa_dev_ops_get(ffa_dev);
|
||||
@ -788,8 +802,11 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
|
||||
if (!optee_ffa_api_is_compatbile(ffa_dev, ffa_ops))
|
||||
return -EINVAL;
|
||||
|
||||
if (!optee_ffa_exchange_caps(ffa_dev, ffa_ops, &rpc_arg_count))
|
||||
if (!optee_ffa_exchange_caps(ffa_dev, ffa_ops, &sec_caps,
|
||||
&rpc_param_count))
|
||||
return -EINVAL;
|
||||
if (sec_caps & OPTEE_FFA_SEC_CAP_ARG_OFFSET)
|
||||
arg_cache_flags |= OPTEE_SHM_ARG_SHARED;
|
||||
|
||||
optee = kzalloc(sizeof(*optee), GFP_KERNEL);
|
||||
if (!optee)
|
||||
@ -805,7 +822,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
|
||||
optee->ops = &optee_ffa_ops;
|
||||
optee->ffa.ffa_dev = ffa_dev;
|
||||
optee->ffa.ffa_ops = ffa_ops;
|
||||
optee->rpc_arg_count = rpc_arg_count;
|
||||
optee->rpc_param_count = rpc_param_count;
|
||||
|
||||
teedev = tee_device_alloc(&optee_ffa_clnt_desc, NULL, optee->pool,
|
||||
optee);
|
||||
@ -838,6 +855,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
|
||||
mutex_init(&optee->call_queue.mutex);
|
||||
INIT_LIST_HEAD(&optee->call_queue.waiters);
|
||||
optee_supp_init(&optee->supp);
|
||||
optee_shm_arg_cache_init(optee, arg_cache_flags);
|
||||
ffa_dev_set_drvdata(ffa_dev, optee);
|
||||
ctx = teedev_open(optee->teedev);
|
||||
if (IS_ERR(ctx)) {
|
||||
|
@ -81,8 +81,16 @@
|
||||
* as the second MSG arg struct for
|
||||
* OPTEE_FFA_YIELDING_CALL_WITH_ARG.
|
||||
* Bit[31:8]: Reserved (MBZ)
|
||||
* w5-w7: Note used (MBZ)
|
||||
* w5: Bitfield of secure world capabilities OPTEE_FFA_SEC_CAP_* below,
|
||||
* unused bits MBZ.
|
||||
* w6-w7: Not used (MBZ)
|
||||
*/
|
||||
/*
|
||||
* Secure world supports giving an offset into the argument shared memory
|
||||
* object, see also OPTEE_FFA_YIELDING_CALL_WITH_ARG
|
||||
*/
|
||||
#define OPTEE_FFA_SEC_CAP_ARG_OFFSET BIT(0)
|
||||
|
||||
#define OPTEE_FFA_EXCHANGE_CAPABILITIES OPTEE_FFA_BLOCKING_CALL(2)
|
||||
|
||||
/*
|
||||
@ -112,6 +120,8 @@
|
||||
* OPTEE_MSG_GET_ARG_SIZE(num_params) follows a struct optee_msg_arg
|
||||
* for RPC, this struct has reserved space for the number of RPC
|
||||
* parameters as returned by OPTEE_FFA_EXCHANGE_CAPABILITIES.
|
||||
* MBZ unless the bit OPTEE_FFA_SEC_CAP_ARG_OFFSET is received with
|
||||
* OPTEE_FFA_EXCHANGE_CAPABILITIES.
|
||||
* w7: Not used (MBZ)
|
||||
* Resume from RPC. Register usage:
|
||||
* w3: Service ID, OPTEE_FFA_YIELDING_CALL_RESUME
|
||||
|
@ -59,6 +59,16 @@ struct optee_notif {
|
||||
u_long *bitmap;
|
||||
};
|
||||
|
||||
#define OPTEE_SHM_ARG_ALLOC_PRIV BIT(0)
|
||||
#define OPTEE_SHM_ARG_SHARED BIT(1)
|
||||
struct optee_shm_arg_entry;
|
||||
struct optee_shm_arg_cache {
|
||||
u32 flags;
|
||||
/* Serializes access to this struct */
|
||||
struct mutex mutex;
|
||||
struct list_head shm_args;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct optee_supp - supplicant synchronization struct
|
||||
* @ctx the context of current connected supplicant.
|
||||
@ -121,7 +131,7 @@ struct optee;
|
||||
*/
|
||||
struct optee_ops {
|
||||
int (*do_call_with_arg)(struct tee_context *ctx,
|
||||
struct tee_shm *shm_arg);
|
||||
struct tee_shm *shm_arg, u_int offs);
|
||||
int (*to_msg_param)(struct optee *optee,
|
||||
struct optee_msg_param *msg_params,
|
||||
size_t num_params, const struct tee_param *params);
|
||||
@ -143,7 +153,7 @@ struct optee_ops {
|
||||
* @notif: notification synchronization struct
|
||||
* @supp: supplicant synchronization struct for RPC to supplicant
|
||||
* @pool: shared memory pool
|
||||
* @rpc_arg_count: If > 0 number of RPC parameters to make room for
|
||||
* @rpc_param_count: If > 0 number of RPC parameters to make room for
|
||||
* @scan_bus_done flag if device registation was already done.
|
||||
* @scan_bus_wq workqueue to scan optee bus and register optee drivers
|
||||
* @scan_bus_work workq to scan optee bus and register optee drivers
|
||||
@ -157,11 +167,12 @@ struct optee {
|
||||
struct optee_smc smc;
|
||||
struct optee_ffa ffa;
|
||||
};
|
||||
struct optee_shm_arg_cache shm_arg_cache;
|
||||
struct optee_call_queue call_queue;
|
||||
struct optee_notif notif;
|
||||
struct optee_supp supp;
|
||||
struct tee_shm_pool *pool;
|
||||
unsigned int rpc_arg_count;
|
||||
unsigned int rpc_param_count;
|
||||
bool scan_bus_done;
|
||||
struct workqueue_struct *scan_bus_wq;
|
||||
struct work_struct scan_bus_work;
|
||||
@ -273,8 +284,18 @@ void optee_cq_wait_for_completion(struct optee_call_queue *cq,
|
||||
void optee_cq_wait_final(struct optee_call_queue *cq,
|
||||
struct optee_call_waiter *w);
|
||||
int optee_check_mem_type(unsigned long start, size_t num_pages);
|
||||
struct tee_shm *optee_get_msg_arg(struct tee_context *ctx, size_t num_params,
|
||||
struct optee_msg_arg **msg_arg);
|
||||
|
||||
void optee_shm_arg_cache_init(struct optee *optee, u32 flags);
|
||||
void optee_shm_arg_cache_uninit(struct optee *optee);
|
||||
struct optee_msg_arg *optee_get_msg_arg(struct tee_context *ctx,
|
||||
size_t num_params,
|
||||
struct optee_shm_arg_entry **entry,
|
||||
struct tee_shm **shm_ret,
|
||||
u_int *offs);
|
||||
void optee_free_msg_arg(struct tee_context *ctx,
|
||||
struct optee_shm_arg_entry *entry, u_int offs);
|
||||
size_t optee_msg_arg_size(size_t rpc_param_count);
|
||||
|
||||
|
||||
struct tee_shm *optee_rpc_cmd_alloc_suppl(struct tee_context *ctx, size_t sz);
|
||||
void optee_rpc_cmd_free_suppl(struct tee_context *ctx, struct tee_shm *shm);
|
||||
|
@ -107,14 +107,22 @@ struct optee_smc_call_get_os_revision_result {
|
||||
/*
|
||||
* Call with struct optee_msg_arg as argument
|
||||
*
|
||||
* When calling this function normal world has a few responsibilities:
|
||||
* When called with OPTEE_SMC_CALL_WITH_RPC_ARG or
|
||||
* OPTEE_SMC_CALL_WITH_REGD_ARG in a0 there is one RPC struct optee_msg_arg
|
||||
* following after the first struct optee_msg_arg. The RPC struct
|
||||
* optee_msg_arg has reserved space for the number of RPC parameters as
|
||||
* returned by OPTEE_SMC_EXCHANGE_CAPABILITIES.
|
||||
*
|
||||
* When calling these functions, normal world has a few responsibilities:
|
||||
* 1. It must be able to handle eventual RPCs
|
||||
* 2. Non-secure interrupts should not be masked
|
||||
* 3. If asynchronous notifications has been negotiated successfully, then
|
||||
* asynchronous notifications should be unmasked during this call.
|
||||
* the interrupt for asynchronous notifications should be unmasked
|
||||
* during this call.
|
||||
*
|
||||
* Call register usage:
|
||||
* a0 SMC Function ID, OPTEE_SMC*CALL_WITH_ARG
|
||||
* Call register usage, OPTEE_SMC_CALL_WITH_ARG and
|
||||
* OPTEE_SMC_CALL_WITH_RPC_ARG:
|
||||
* a0 SMC Function ID, OPTEE_SMC_CALL_WITH_ARG or OPTEE_SMC_CALL_WITH_RPC_ARG
|
||||
* a1 Upper 32 bits of a 64-bit physical pointer to a struct optee_msg_arg
|
||||
* a2 Lower 32 bits of a 64-bit physical pointer to a struct optee_msg_arg
|
||||
* a3 Cache settings, not used if physical pointer is in a predefined shared
|
||||
@ -122,6 +130,15 @@ struct optee_smc_call_get_os_revision_result {
|
||||
* a4-6 Not used
|
||||
* a7 Hypervisor Client ID register
|
||||
*
|
||||
* Call register usage, OPTEE_SMC_CALL_WITH_REGD_ARG:
|
||||
* a0 SMC Function ID, OPTEE_SMC_CALL_WITH_REGD_ARG
|
||||
* a1 Upper 32 bits of a 64-bit shared memory cookie
|
||||
* a2 Lower 32 bits of a 64-bit shared memory cookie
|
||||
* a3 Offset of the struct optee_msg_arg in the shared memory with the
|
||||
* supplied cookie
|
||||
* a4-6 Not used
|
||||
* a7 Hypervisor Client ID register
|
||||
*
|
||||
* Normal return register usage:
|
||||
* a0 Return value, OPTEE_SMC_RETURN_*
|
||||
* a1-3 Not used
|
||||
@ -154,6 +171,10 @@ struct optee_smc_call_get_os_revision_result {
|
||||
#define OPTEE_SMC_FUNCID_CALL_WITH_ARG OPTEE_MSG_FUNCID_CALL_WITH_ARG
|
||||
#define OPTEE_SMC_CALL_WITH_ARG \
|
||||
OPTEE_SMC_STD_CALL_VAL(OPTEE_SMC_FUNCID_CALL_WITH_ARG)
|
||||
#define OPTEE_SMC_CALL_WITH_RPC_ARG \
|
||||
OPTEE_SMC_STD_CALL_VAL(OPTEE_SMC_FUNCID_CALL_WITH_RPC_ARG)
|
||||
#define OPTEE_SMC_CALL_WITH_REGD_ARG \
|
||||
OPTEE_SMC_STD_CALL_VAL(OPTEE_SMC_FUNCID_CALL_WITH_REGD_ARG)
|
||||
|
||||
/*
|
||||
* Get Shared Memory Config
|
||||
@ -202,7 +223,11 @@ struct optee_smc_get_shm_config_result {
|
||||
* a0 OPTEE_SMC_RETURN_OK
|
||||
* a1 bitfield of secure world capabilities OPTEE_SMC_SEC_CAP_*
|
||||
* a2 The maximum secure world notification number
|
||||
* a3-7 Preserved
|
||||
* a3 Bit[7:0]: Number of parameters needed for RPC to be supplied
|
||||
* as the second MSG arg struct for
|
||||
* OPTEE_SMC_CALL_WITH_ARG
|
||||
* Bit[31:8]: Reserved (MBZ)
|
||||
* a4-7 Preserved
|
||||
*
|
||||
* Error return register usage:
|
||||
* a0 OPTEE_SMC_RETURN_ENOTAVAIL, can't use the capabilities from normal world
|
||||
@ -227,6 +252,8 @@ struct optee_smc_get_shm_config_result {
|
||||
#define OPTEE_SMC_SEC_CAP_MEMREF_NULL BIT(4)
|
||||
/* Secure world supports asynchronous notification of normal world */
|
||||
#define OPTEE_SMC_SEC_CAP_ASYNC_NOTIF BIT(5)
|
||||
/* Secure world supports pre-allocating RPC arg struct */
|
||||
#define OPTEE_SMC_SEC_CAP_RPC_ARG BIT(6)
|
||||
|
||||
#define OPTEE_SMC_FUNCID_EXCHANGE_CAPABILITIES 9
|
||||
#define OPTEE_SMC_EXCHANGE_CAPABILITIES \
|
||||
@ -236,7 +263,7 @@ struct optee_smc_exchange_capabilities_result {
|
||||
unsigned long status;
|
||||
unsigned long capabilities;
|
||||
unsigned long max_notif_value;
|
||||
unsigned long reserved0;
|
||||
unsigned long data;
|
||||
};
|
||||
|
||||
/*
|
||||
@ -358,6 +385,9 @@ struct optee_smc_disable_shm_cache_result {
|
||||
* should be called until all pended values have been retrieved. When a
|
||||
* value is retrieved, it's cleared from the record in secure world.
|
||||
*
|
||||
* It is expected that this function is called from an interrupt handler
|
||||
* in normal world.
|
||||
*
|
||||
* Call requests usage:
|
||||
* a0 SMC Function ID, OPTEE_SMC_GET_ASYNC_NOTIF_VALUE
|
||||
* a1-6 Not used
|
||||
@ -390,6 +420,12 @@ struct optee_smc_disable_shm_cache_result {
|
||||
#define OPTEE_SMC_GET_ASYNC_NOTIF_VALUE \
|
||||
OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_GET_ASYNC_NOTIF_VALUE)
|
||||
|
||||
/* See OPTEE_SMC_CALL_WITH_RPC_ARG above */
|
||||
#define OPTEE_SMC_FUNCID_CALL_WITH_RPC_ARG 18
|
||||
|
||||
/* See OPTEE_SMC_CALL_WITH_REGD_ARG above */
|
||||
#define OPTEE_SMC_FUNCID_CALL_WITH_REGD_ARG 19
|
||||
|
||||
/*
|
||||
* Resume from RPC (for example after processing a foreign interrupt)
|
||||
*
|
||||
|
@ -437,6 +437,7 @@ static int optee_shm_register(struct tee_context *ctx, struct tee_shm *shm,
|
||||
struct optee_msg_arg *msg_arg;
|
||||
struct tee_shm *shm_arg;
|
||||
u64 *pages_list;
|
||||
size_t sz;
|
||||
int rc;
|
||||
|
||||
if (!num_pages)
|
||||
@ -450,15 +451,30 @@ static int optee_shm_register(struct tee_context *ctx, struct tee_shm *shm,
|
||||
if (!pages_list)
|
||||
return -ENOMEM;
|
||||
|
||||
shm_arg = optee_get_msg_arg(ctx, 1, &msg_arg);
|
||||
/*
|
||||
* We're about to register shared memory we can't register shared
|
||||
* memory for this request or there's a catch-22.
|
||||
*
|
||||
* So in this we'll have to do the good old temporary private
|
||||
* allocation instead of using optee_get_msg_arg().
|
||||
*/
|
||||
sz = optee_msg_arg_size(optee->rpc_param_count);
|
||||
shm_arg = tee_shm_alloc_priv_buf(ctx, sz);
|
||||
if (IS_ERR(shm_arg)) {
|
||||
rc = PTR_ERR(shm_arg);
|
||||
goto out;
|
||||
}
|
||||
msg_arg = tee_shm_get_va(shm_arg, 0);
|
||||
if (IS_ERR(msg_arg)) {
|
||||
rc = PTR_ERR(msg_arg);
|
||||
goto out;
|
||||
}
|
||||
|
||||
optee_fill_pages_list(pages_list, pages, num_pages,
|
||||
tee_shm_get_page_offset(shm));
|
||||
|
||||
memset(msg_arg, 0, OPTEE_MSG_GET_ARG_SIZE(1));
|
||||
msg_arg->num_params = 1;
|
||||
msg_arg->cmd = OPTEE_MSG_CMD_REGISTER_SHM;
|
||||
msg_arg->params->attr = OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT |
|
||||
OPTEE_MSG_ATTR_NONCONTIG;
|
||||
@ -471,7 +487,7 @@ static int optee_shm_register(struct tee_context *ctx, struct tee_shm *shm,
|
||||
msg_arg->params->u.tmem.buf_ptr = virt_to_phys(pages_list) |
|
||||
(tee_shm_get_page_offset(shm) & (OPTEE_MSG_NONCONTIG_PAGE_SIZE - 1));
|
||||
|
||||
if (optee->ops->do_call_with_arg(ctx, shm_arg) ||
|
||||
if (optee->ops->do_call_with_arg(ctx, shm_arg, 0) ||
|
||||
msg_arg->ret != TEEC_SUCCESS)
|
||||
rc = -EINVAL;
|
||||
|
||||
@ -487,19 +503,37 @@ static int optee_shm_unregister(struct tee_context *ctx, struct tee_shm *shm)
|
||||
struct optee_msg_arg *msg_arg;
|
||||
struct tee_shm *shm_arg;
|
||||
int rc = 0;
|
||||
size_t sz;
|
||||
|
||||
shm_arg = optee_get_msg_arg(ctx, 1, &msg_arg);
|
||||
/*
|
||||
* We're about to unregister shared memory and we may not be able
|
||||
* register shared memory for this request in case we're called
|
||||
* from optee_shm_arg_cache_uninit().
|
||||
*
|
||||
* So in order to keep things simple in this function just as in
|
||||
* optee_shm_register() we'll use temporary private allocation
|
||||
* instead of using optee_get_msg_arg().
|
||||
*/
|
||||
sz = optee_msg_arg_size(optee->rpc_param_count);
|
||||
shm_arg = tee_shm_alloc_priv_buf(ctx, sz);
|
||||
if (IS_ERR(shm_arg))
|
||||
return PTR_ERR(shm_arg);
|
||||
msg_arg = tee_shm_get_va(shm_arg, 0);
|
||||
if (IS_ERR(msg_arg)) {
|
||||
rc = PTR_ERR(msg_arg);
|
||||
goto out;
|
||||
}
|
||||
|
||||
memset(msg_arg, 0, sz);
|
||||
msg_arg->num_params = 1;
|
||||
msg_arg->cmd = OPTEE_MSG_CMD_UNREGISTER_SHM;
|
||||
|
||||
msg_arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_RMEM_INPUT;
|
||||
msg_arg->params[0].u.rmem.shm_ref = (unsigned long)shm;
|
||||
|
||||
if (optee->ops->do_call_with_arg(ctx, shm_arg) ||
|
||||
if (optee->ops->do_call_with_arg(ctx, shm_arg, 0) ||
|
||||
msg_arg->ret != TEEC_SUCCESS)
|
||||
rc = -EINVAL;
|
||||
out:
|
||||
tee_shm_free(shm_arg);
|
||||
return rc;
|
||||
}
|
||||
@ -732,16 +766,9 @@ static void optee_rpc_finalize_call(struct optee_call_ctx *call_ctx)
|
||||
}
|
||||
|
||||
static void handle_rpc_func_cmd(struct tee_context *ctx, struct optee *optee,
|
||||
struct tee_shm *shm,
|
||||
struct optee_msg_arg *arg,
|
||||
struct optee_call_ctx *call_ctx)
|
||||
{
|
||||
struct optee_msg_arg *arg;
|
||||
|
||||
arg = tee_shm_get_va(shm, 0);
|
||||
if (IS_ERR(arg)) {
|
||||
pr_err("%s: tee_shm_get_va %p failed\n", __func__, shm);
|
||||
return;
|
||||
}
|
||||
|
||||
switch (arg->cmd) {
|
||||
case OPTEE_RPC_CMD_SHM_ALLOC:
|
||||
@ -765,11 +792,13 @@ static void handle_rpc_func_cmd(struct tee_context *ctx, struct optee *optee,
|
||||
* Result of RPC is written back into @param.
|
||||
*/
|
||||
static void optee_handle_rpc(struct tee_context *ctx,
|
||||
struct optee_msg_arg *rpc_arg,
|
||||
struct optee_rpc_param *param,
|
||||
struct optee_call_ctx *call_ctx)
|
||||
{
|
||||
struct tee_device *teedev = ctx->teedev;
|
||||
struct optee *optee = tee_get_drvdata(teedev);
|
||||
struct optee_msg_arg *arg;
|
||||
struct tee_shm *shm;
|
||||
phys_addr_t pa;
|
||||
|
||||
@ -801,8 +830,19 @@ static void optee_handle_rpc(struct tee_context *ctx,
|
||||
*/
|
||||
break;
|
||||
case OPTEE_SMC_RPC_FUNC_CMD:
|
||||
shm = reg_pair_to_ptr(param->a1, param->a2);
|
||||
handle_rpc_func_cmd(ctx, optee, shm, call_ctx);
|
||||
if (rpc_arg) {
|
||||
arg = rpc_arg;
|
||||
} else {
|
||||
shm = reg_pair_to_ptr(param->a1, param->a2);
|
||||
arg = tee_shm_get_va(shm, 0);
|
||||
if (IS_ERR(arg)) {
|
||||
pr_err("%s: tee_shm_get_va %p failed\n",
|
||||
__func__, shm);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
handle_rpc_func_cmd(ctx, optee, arg, call_ctx);
|
||||
break;
|
||||
default:
|
||||
pr_warn("Unknown RPC func 0x%x\n",
|
||||
@ -816,7 +856,8 @@ static void optee_handle_rpc(struct tee_context *ctx,
|
||||
/**
|
||||
* optee_smc_do_call_with_arg() - Do an SMC to OP-TEE in secure world
|
||||
* @ctx: calling context
|
||||
* @arg: shared memory holding the message to pass to secure world
|
||||
* @shm: shared memory holding the message to pass to secure world
|
||||
* @offs: offset of the message in @shm
|
||||
*
|
||||
* Does and SMC to OP-TEE in secure world and handles eventual resulting
|
||||
* Remote Procedure Calls (RPC) from OP-TEE.
|
||||
@ -824,21 +865,46 @@ static void optee_handle_rpc(struct tee_context *ctx,
|
||||
* Returns return code from secure world, 0 is OK
|
||||
*/
|
||||
static int optee_smc_do_call_with_arg(struct tee_context *ctx,
|
||||
struct tee_shm *arg)
|
||||
struct tee_shm *shm, u_int offs)
|
||||
{
|
||||
struct optee *optee = tee_get_drvdata(ctx->teedev);
|
||||
struct optee_call_waiter w;
|
||||
struct optee_rpc_param param = { };
|
||||
struct optee_call_ctx call_ctx = { };
|
||||
phys_addr_t parg;
|
||||
struct optee_msg_arg *rpc_arg = NULL;
|
||||
int rc;
|
||||
|
||||
rc = tee_shm_get_pa(arg, 0, &parg);
|
||||
if (rc)
|
||||
return rc;
|
||||
if (optee->rpc_param_count) {
|
||||
struct optee_msg_arg *arg;
|
||||
unsigned int rpc_arg_offs;
|
||||
|
||||
param.a0 = OPTEE_SMC_CALL_WITH_ARG;
|
||||
reg_pair_from_64(¶m.a1, ¶m.a2, parg);
|
||||
arg = tee_shm_get_va(shm, offs);
|
||||
if (IS_ERR(arg))
|
||||
return PTR_ERR(arg);
|
||||
|
||||
rpc_arg_offs = OPTEE_MSG_GET_ARG_SIZE(arg->num_params);
|
||||
rpc_arg = tee_shm_get_va(shm, offs + rpc_arg_offs);
|
||||
if (IS_ERR(arg))
|
||||
return PTR_ERR(arg);
|
||||
}
|
||||
|
||||
if (rpc_arg && tee_shm_is_dynamic(shm)) {
|
||||
param.a0 = OPTEE_SMC_CALL_WITH_REGD_ARG;
|
||||
reg_pair_from_64(¶m.a1, ¶m.a2, (u_long)shm);
|
||||
param.a3 = offs;
|
||||
} else {
|
||||
phys_addr_t parg;
|
||||
|
||||
rc = tee_shm_get_pa(shm, offs, &parg);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
if (rpc_arg)
|
||||
param.a0 = OPTEE_SMC_CALL_WITH_RPC_ARG;
|
||||
else
|
||||
param.a0 = OPTEE_SMC_CALL_WITH_ARG;
|
||||
reg_pair_from_64(¶m.a1, ¶m.a2, parg);
|
||||
}
|
||||
/* Initialize waiter */
|
||||
optee_cq_wait_init(&optee->call_queue, &w);
|
||||
while (true) {
|
||||
@ -862,7 +928,7 @@ static int optee_smc_do_call_with_arg(struct tee_context *ctx,
|
||||
param.a1 = res.a1;
|
||||
param.a2 = res.a2;
|
||||
param.a3 = res.a3;
|
||||
optee_handle_rpc(ctx, ¶m, &call_ctx);
|
||||
optee_handle_rpc(ctx, rpc_arg, ¶m, &call_ctx);
|
||||
} else {
|
||||
rc = res.a0;
|
||||
break;
|
||||
@ -881,17 +947,19 @@ static int optee_smc_do_call_with_arg(struct tee_context *ctx,
|
||||
|
||||
static int simple_call_with_arg(struct tee_context *ctx, u32 cmd)
|
||||
{
|
||||
struct optee_shm_arg_entry *entry;
|
||||
struct optee_msg_arg *msg_arg;
|
||||
struct tee_shm *shm;
|
||||
u_int offs;
|
||||
|
||||
shm = optee_get_msg_arg(ctx, 0, &msg_arg);
|
||||
if (IS_ERR(shm))
|
||||
return PTR_ERR(shm);
|
||||
msg_arg = optee_get_msg_arg(ctx, 0, &entry, &shm, &offs);
|
||||
if (IS_ERR(msg_arg))
|
||||
return PTR_ERR(msg_arg);
|
||||
|
||||
msg_arg->cmd = cmd;
|
||||
optee_smc_do_call_with_arg(ctx, shm);
|
||||
optee_smc_do_call_with_arg(ctx, shm, offs);
|
||||
|
||||
tee_shm_free(shm);
|
||||
optee_free_msg_arg(ctx, entry, offs);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1118,7 +1186,8 @@ static bool optee_msg_api_revision_is_compatible(optee_invoke_fn *invoke_fn)
|
||||
}
|
||||
|
||||
static bool optee_msg_exchange_capabilities(optee_invoke_fn *invoke_fn,
|
||||
u32 *sec_caps, u32 *max_notif_value)
|
||||
u32 *sec_caps, u32 *max_notif_value,
|
||||
unsigned int *rpc_param_count)
|
||||
{
|
||||
union {
|
||||
struct arm_smccc_res smccc;
|
||||
@ -1145,6 +1214,10 @@ static bool optee_msg_exchange_capabilities(optee_invoke_fn *invoke_fn,
|
||||
*max_notif_value = res.result.max_notif_value;
|
||||
else
|
||||
*max_notif_value = OPTEE_DEFAULT_MAX_NOTIF_VALUE;
|
||||
if (*sec_caps & OPTEE_SMC_SEC_CAP_RPC_ARG)
|
||||
*rpc_param_count = (u8)res.result.data;
|
||||
else
|
||||
*rpc_param_count = 0;
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -1251,7 +1324,8 @@ static int optee_smc_remove(struct platform_device *pdev)
|
||||
* reference counters and also avoid wild pointers in secure world
|
||||
* into the old shared memory range.
|
||||
*/
|
||||
optee_disable_shm_cache(optee);
|
||||
if (!optee->rpc_param_count)
|
||||
optee_disable_shm_cache(optee);
|
||||
|
||||
optee_smc_notif_uninit_irq(optee);
|
||||
|
||||
@ -1274,7 +1348,10 @@ static int optee_smc_remove(struct platform_device *pdev)
|
||||
*/
|
||||
static void optee_shutdown(struct platform_device *pdev)
|
||||
{
|
||||
optee_disable_shm_cache(platform_get_drvdata(pdev));
|
||||
struct optee *optee = platform_get_drvdata(pdev);
|
||||
|
||||
if (!optee->rpc_param_count)
|
||||
optee_disable_shm_cache(optee);
|
||||
}
|
||||
|
||||
static int optee_probe(struct platform_device *pdev)
|
||||
@ -1283,9 +1360,11 @@ static int optee_probe(struct platform_device *pdev)
|
||||
struct tee_shm_pool *pool = ERR_PTR(-EINVAL);
|
||||
struct optee *optee = NULL;
|
||||
void *memremaped_shm = NULL;
|
||||
unsigned int rpc_param_count;
|
||||
struct tee_device *teedev;
|
||||
struct tee_context *ctx;
|
||||
u32 max_notif_value;
|
||||
u32 arg_cache_flags;
|
||||
u32 sec_caps;
|
||||
int rc;
|
||||
|
||||
@ -1306,7 +1385,8 @@ static int optee_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
if (!optee_msg_exchange_capabilities(invoke_fn, &sec_caps,
|
||||
&max_notif_value)) {
|
||||
&max_notif_value,
|
||||
&rpc_param_count)) {
|
||||
pr_warn("capabilities mismatch\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
@ -1314,14 +1394,48 @@ static int optee_probe(struct platform_device *pdev)
|
||||
/*
|
||||
* Try to use dynamic shared memory if possible
|
||||
*/
|
||||
if (sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM)
|
||||
if (sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM) {
|
||||
/*
|
||||
* If we have OPTEE_SMC_SEC_CAP_RPC_ARG we can ask
|
||||
* optee_get_msg_arg() to pre-register (by having
|
||||
* OPTEE_SHM_ARG_ALLOC_PRIV cleared) the page used to pass
|
||||
* an argument struct.
|
||||
*
|
||||
* With the page is pre-registered we can use a non-zero
|
||||
* offset for argument struct, this is indicated with
|
||||
* OPTEE_SHM_ARG_SHARED.
|
||||
*
|
||||
* This means that optee_smc_do_call_with_arg() will use
|
||||
* OPTEE_SMC_CALL_WITH_REGD_ARG for pre-registered pages.
|
||||
*/
|
||||
if (sec_caps & OPTEE_SMC_SEC_CAP_RPC_ARG)
|
||||
arg_cache_flags = OPTEE_SHM_ARG_SHARED;
|
||||
else
|
||||
arg_cache_flags = OPTEE_SHM_ARG_ALLOC_PRIV;
|
||||
|
||||
pool = optee_shm_pool_alloc_pages();
|
||||
}
|
||||
|
||||
/*
|
||||
* If dynamic shared memory is not available or failed - try static one
|
||||
*/
|
||||
if (IS_ERR(pool) && (sec_caps & OPTEE_SMC_SEC_CAP_HAVE_RESERVED_SHM))
|
||||
if (IS_ERR(pool) && (sec_caps & OPTEE_SMC_SEC_CAP_HAVE_RESERVED_SHM)) {
|
||||
/*
|
||||
* The static memory pool can use non-zero page offsets so
|
||||
* let optee_get_msg_arg() know that with OPTEE_SHM_ARG_SHARED.
|
||||
*
|
||||
* optee_get_msg_arg() should not pre-register the
|
||||
* allocated page used to pass an argument struct, this is
|
||||
* indicated with OPTEE_SHM_ARG_ALLOC_PRIV.
|
||||
*
|
||||
* This means that optee_smc_do_call_with_arg() will use
|
||||
* OPTEE_SMC_CALL_WITH_ARG if rpc_param_count is 0, else
|
||||
* OPTEE_SMC_CALL_WITH_RPC_ARG.
|
||||
*/
|
||||
arg_cache_flags = OPTEE_SHM_ARG_SHARED |
|
||||
OPTEE_SHM_ARG_ALLOC_PRIV;
|
||||
pool = optee_config_shm_memremap(invoke_fn, &memremaped_shm);
|
||||
}
|
||||
|
||||
if (IS_ERR(pool))
|
||||
return PTR_ERR(pool);
|
||||
@ -1335,6 +1449,7 @@ static int optee_probe(struct platform_device *pdev)
|
||||
optee->ops = &optee_ops;
|
||||
optee->smc.invoke_fn = invoke_fn;
|
||||
optee->smc.sec_caps = sec_caps;
|
||||
optee->rpc_param_count = rpc_param_count;
|
||||
|
||||
teedev = tee_device_alloc(&optee_clnt_desc, NULL, pool, optee);
|
||||
if (IS_ERR(teedev)) {
|
||||
@ -1363,6 +1478,7 @@ static int optee_probe(struct platform_device *pdev)
|
||||
optee_supp_init(&optee->supp);
|
||||
optee->smc.memremaped_shm = memremaped_shm;
|
||||
optee->pool = pool;
|
||||
optee_shm_arg_cache_init(optee, arg_cache_flags);
|
||||
|
||||
platform_set_drvdata(pdev, optee);
|
||||
ctx = teedev_open(optee->teedev);
|
||||
@ -1403,7 +1519,12 @@ static int optee_probe(struct platform_device *pdev)
|
||||
*/
|
||||
optee_disable_unmapped_shm_cache(optee);
|
||||
|
||||
optee_enable_shm_cache(optee);
|
||||
/*
|
||||
* Only enable the shm cache in case we're not able to pass the RPC
|
||||
* arg struct right after the normal arg struct.
|
||||
*/
|
||||
if (!optee->rpc_param_count)
|
||||
optee_enable_shm_cache(optee);
|
||||
|
||||
if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM)
|
||||
pr_info("dynamic shared memory is enabled\n");
|
||||
@ -1416,7 +1537,8 @@ static int optee_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
|
||||
err_disable_shm_cache:
|
||||
optee_disable_shm_cache(optee);
|
||||
if (!optee->rpc_param_count)
|
||||
optee_disable_shm_cache(optee);
|
||||
optee_smc_notif_uninit_irq(optee);
|
||||
optee_unregister_devices();
|
||||
err_notif_uninit:
|
||||
@ -1424,6 +1546,7 @@ err_notif_uninit:
|
||||
err_close_ctx:
|
||||
teedev_close_context(ctx);
|
||||
err_supp_uninit:
|
||||
optee_shm_arg_cache_uninit(optee);
|
||||
optee_supp_uninit(&optee->supp);
|
||||
mutex_destroy(&optee->call_queue.mutex);
|
||||
err_unreg_supp_teedev:
|
||||
|
Loading…
Reference in New Issue
Block a user