Add support of cancellation request to the TEE kernel internal
client interface. Can be used by software TPM drivers, that leverage
TEE under the hood (for instance in TPM2.0 mobile profile), for requesting
cancellation of time-consuming operations (RSA key-pair generation etc.).
Signed-off-by: Igor Opaniuk <[email protected]>
---
drivers/tee/tee_core.c | 12 ++++++++++++
include/linux/tee_drv.h | 14 ++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index 7b2bb4c..aba71a8 100644
--- a/drivers/tee/tee_core.c
+++ b/drivers/tee/tee_core.c
@@ -1027,6 +1027,18 @@ int tee_client_invoke_func(struct tee_context *ctx,
}
EXPORT_SYMBOL_GPL(tee_client_invoke_func);
+int tee_client_cancel_req(struct tee_context *ctx,
+ u32 cancel_id,
+ u32 session)
+{
+
+ if (!ctx->teedev->desc->ops->cancel_req)
+ return -EINVAL;
+ return ctx->teedev->desc->ops->cancel_req(ctx, cancel_id,
+ session);
+}
+EXPORT_SYMBOL_GPL(tee_client_cancel_req);
+
static int __init tee_init(void)
{
int rc;
diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h
index 6cfe058..62a0b56 100644
--- a/include/linux/tee_drv.h
+++ b/include/linux/tee_drv.h
@@ -526,6 +526,20 @@ int tee_client_invoke_func(struct tee_context *ctx,
struct tee_ioctl_invoke_arg *arg,
struct tee_param *param);
+/**
+ * tee_client_cancel_req() - Request cancellation of the previous open-session
+ * or invoke-command operations in a Trusted Application
+ * @ctx: TEE Context
+ * @arg: Unique cancel request id
+ * @param: Session id
+ *
+ * Returns < 0 on error else see @arg->ret for result.
+ */
+int tee_client_cancel_req(struct tee_context *ctx,
+ u32 cancel_id,
+ u32 session);
+
+
static inline bool tee_param_is_memref(struct tee_param *param)
{
switch (param->attr & TEE_IOCTL_PARAM_ATTR_TYPE_MASK) {
--
2.7.4
On Thu, Jan 24, 2019 at 2:11 PM Igor Opaniuk <[email protected]> wrote:
>
> Add support of cancellation request to the TEE kernel internal
> client interface. Can be used by software TPM drivers, that leverage
> TEE under the hood (for instance in TPM2.0 mobile profile), for requesting
> cancellation of time-consuming operations (RSA key-pair generation etc.).
>
> Signed-off-by: Igor Opaniuk <[email protected]>
> ---
> drivers/tee/tee_core.c | 12 ++++++++++++
> include/linux/tee_drv.h | 14 ++++++++++++++
> 2 files changed, 26 insertions(+)
>
> diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
> index 7b2bb4c..aba71a8 100644
> --- a/drivers/tee/tee_core.c
> +++ b/drivers/tee/tee_core.c
> @@ -1027,6 +1027,18 @@ int tee_client_invoke_func(struct tee_context *ctx,
> }
> EXPORT_SYMBOL_GPL(tee_client_invoke_func);
>
> +int tee_client_cancel_req(struct tee_context *ctx,
> + u32 cancel_id,
> + u32 session)
> +{
> +
> + if (!ctx->teedev->desc->ops->cancel_req)
> + return -EINVAL;
> + return ctx->teedev->desc->ops->cancel_req(ctx, cancel_id,
> + session);
> +}
> +EXPORT_SYMBOL_GPL(tee_client_cancel_req);
> +
> static int __init tee_init(void)
> {
> int rc;
> diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h
> index 6cfe058..62a0b56 100644
> --- a/include/linux/tee_drv.h
> +++ b/include/linux/tee_drv.h
> @@ -526,6 +526,20 @@ int tee_client_invoke_func(struct tee_context *ctx,
> struct tee_ioctl_invoke_arg *arg,
> struct tee_param *param);
>
> +/**
> + * tee_client_cancel_req() - Request cancellation of the previous open-session
> + * or invoke-command operations in a Trusted Application
> + * @ctx: TEE Context
> + * @arg: Unique cancel request id
> + * @param: Session id
These need to be updated, see struct tee_ioctl_cancel_arg in
include/uapi/linux/tee.h
Thanks,
Jens
> + *
> + * Returns < 0 on error else see @arg->ret for result.
> + */
> +int tee_client_cancel_req(struct tee_context *ctx,
> + u32 cancel_id,
> + u32 session);
> +
> +
> static inline bool tee_param_is_memref(struct tee_param *param)
> {
> switch (param->attr & TEE_IOCTL_PARAM_ATTR_TYPE_MASK) {
> --
> 2.7.4
>
right, missed that. Thanks!
Addressed this issue + also fixed the description and sent v2.
On Thu, 24 Jan 2019 at 18:19, Jens Wiklander <[email protected]> wrote:
>
> On Thu, Jan 24, 2019 at 2:11 PM Igor Opaniuk <[email protected]> wrote:
> >
> > Add support of cancellation request to the TEE kernel internal
> > client interface. Can be used by software TPM drivers, that leverage
> > TEE under the hood (for instance in TPM2.0 mobile profile), for requesting
> > cancellation of time-consuming operations (RSA key-pair generation etc.).
> >
> > Signed-off-by: Igor Opaniuk <[email protected]>
> > ---
> > drivers/tee/tee_core.c | 12 ++++++++++++
> > include/linux/tee_drv.h | 14 ++++++++++++++
> > 2 files changed, 26 insertions(+)
> >
> > diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
> > index 7b2bb4c..aba71a8 100644
> > --- a/drivers/tee/tee_core.c
> > +++ b/drivers/tee/tee_core.c
> > @@ -1027,6 +1027,18 @@ int tee_client_invoke_func(struct tee_context *ctx,
> > }
> > EXPORT_SYMBOL_GPL(tee_client_invoke_func);
> >
> > +int tee_client_cancel_req(struct tee_context *ctx,
> > + u32 cancel_id,
> > + u32 session)
> > +{
> > +
> > + if (!ctx->teedev->desc->ops->cancel_req)
> > + return -EINVAL;
> > + return ctx->teedev->desc->ops->cancel_req(ctx, cancel_id,
> > + session);
> > +}
> > +EXPORT_SYMBOL_GPL(tee_client_cancel_req);
> > +
> > static int __init tee_init(void)
> > {
> > int rc;
> > diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h
> > index 6cfe058..62a0b56 100644
> > --- a/include/linux/tee_drv.h
> > +++ b/include/linux/tee_drv.h
> > @@ -526,6 +526,20 @@ int tee_client_invoke_func(struct tee_context *ctx,
> > struct tee_ioctl_invoke_arg *arg,
> > struct tee_param *param);
> >
> > +/**
> > + * tee_client_cancel_req() - Request cancellation of the previous open-session
> > + * or invoke-command operations in a Trusted Application
> > + * @ctx: TEE Context
> > + * @arg: Unique cancel request id
> > + * @param: Session id
>
> These need to be updated, see struct tee_ioctl_cancel_arg in
> include/uapi/linux/tee.h
>
> Thanks,
> Jens
>
> > + *
> > + * Returns < 0 on error else see @arg->ret for result.
> > + */
> > +int tee_client_cancel_req(struct tee_context *ctx,
> > + u32 cancel_id,
> > + u32 session);
> > +
> > +
> > static inline bool tee_param_is_memref(struct tee_param *param)
> > {
> > switch (param->attr & TEE_IOCTL_PARAM_ATTR_TYPE_MASK) {
> > --
> > 2.7.4
> >
--
Regards,
Igor Opaniuk