From patchwork Fri Jan 11 11:47:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 155329 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp480543jaa; Fri, 11 Jan 2019 03:50:18 -0800 (PST) X-Google-Smtp-Source: ALg8bN6ZjT3dXQyPYHwHxtfMjAH1FXNtBJGtSdf18jX31INjkzgKuf+gcxA7gBhWrY3tv9t04dBN X-Received: by 2002:a63:8149:: with SMTP id t70mr13327712pgd.172.1547207418386; Fri, 11 Jan 2019 03:50:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547207418; cv=none; d=google.com; s=arc-20160816; b=OU4hAcV56AW5YxlJi4Sci+T2dH2A/0X+XDHlUO8Y9s9BiAH4IvWeJn27FB5pAn5vX8 5pb8DM+BkG9rYgCL2SJnXA5LNDp4Ej2C6HIDNGCZX5C46APC9fOOyqeS6bCuYfW/HKFr BiNk5l56HG5+dhMqM6xUxXjUctrxS8P384q6cZ4u9XLkbPWFFiLP/JlegYc4K+uy6xg/ cPedjKMiKCmAZXaQDc783i5XO6auqt2BOTdKLygp25yxfBMbWRi4YHW/W6xTkz+0o7GD Ddt0k5Q2I0MjyqFGBg2ruM6DxkFPxDSZ92zFE0LQeoOetwVX6y775UrBQRY/dS4aRUcp xEuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=Zqnv4LLkDg8wPzP1MIvwucQL3XBVPPUY8eZwPtDeR+I=; b=RZUEcgdgGd9qyJSmBtIPJoA1qPukZKqdojLPwakU7UYHYUUejiDCDDLbJb9cKri9OI Om37hTOQ1CHYmZhuDUkDXvQbD4dYwSDNuZGrHJ4W515pwmCgiEXh/JOL2BXfHC/sqcRz 5y8WGbUC2FFyC+3xjni2Yz5cywR/K/hcJKbwNmnYbdXoK5xEVjlRZRqndycU9DTyhTOG FPYxj5T4rzXGn6IGUwEK9+LPGwf71oWRx/cUCNEG+fkPTO/lm17/V+MuNlQNoDL0JSxb GIQL2rbWoI/YtamwS2hkTKN3yfn4cr3S+YrbhyhkKV1cNIVFkD84jscEa+LP0xnGq1S1 Fvag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=An9XWEfx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 128si2676182pgh.261.2019.01.11.03.50.18; Fri, 11 Jan 2019 03:50:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=An9XWEfx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731778AbfAKLuR (ORCPT + 31 others); Fri, 11 Jan 2019 06:50:17 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:39152 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729272AbfAKLuN (ORCPT ); Fri, 11 Jan 2019 06:50:13 -0500 Received: by mail-pl1-f195.google.com with SMTP id 101so6670632pld.6 for ; Fri, 11 Jan 2019 03:50:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Zqnv4LLkDg8wPzP1MIvwucQL3XBVPPUY8eZwPtDeR+I=; b=An9XWEfxwBQmgY60VBFH2PgnzUFECLIYcdZATyaB+XWVeq82O4UE+u0WtmzHvjtUBX SB6oboCayi2YZm9mMaCL597MrPCQOht5/suCwwVcqoo0nmtxZf3dAH0FSFPBNycC0uBE Nlc7Sd+8q7bmhlSwWL7d8ia293GvGjM7JPBDE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Zqnv4LLkDg8wPzP1MIvwucQL3XBVPPUY8eZwPtDeR+I=; b=HvEyMZlJI6npj9lQVrAiO1kwEFaVqUzMhTUviHXtxB1z+tuW4WK6BNOe2W0Eb8hEUQ Vpgiee0d2YKlut4z1nqjg2dYiZ4LX2vRU1D76cpHKVW/XhvdzF6DhqJ1U82okrhPjD/s D3oMg6vcVJANz+xsz2pGxNMPNfdptsuAFo35KE4vDeXoGS4UdraQXKfZRzNu9z6gd251 MDsel+SgwbR+ir1IjXuij94wNUtBAhWXBTVF+ikqc8EVsowJqyK+J0EczDKL6FE91w5Q iHGwrPDtOy1sZXwHVe9ZGZDg+I59c01sFiSaQAzEHPBUJkw7+QcsYgex8BRQm5nZBo2y /mjg== X-Gm-Message-State: AJcUukeEMlcebJPWJgMQAQDtyMx428zzcdnmCq9ljKXdaEYjlaSy3nyO /irI3D7UL52PQxeLL/0Ecyh1sA== X-Received: by 2002:a17:902:6b49:: with SMTP id g9mr14099084plt.98.1547207412969; Fri, 11 Jan 2019 03:50:12 -0800 (PST) Received: from localhost.localdomain ([117.196.233.251]) by smtp.gmail.com with ESMTPSA id b2sm143199988pfm.3.2019.01.11.03.50.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Jan 2019 03:50:12 -0800 (PST) From: Sumit Garg To: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jens.wiklander@linaro.org, mpm@selenic.com, herbert@gondor.apana.org.au, robh+dt@kernel.org, mark.rutland@arm.com, arnd@arndb.de, gregkh@linuxfoundation.org, daniel.thompson@linaro.org, ard.biesheuvel@linaro.org, bhsharma@redhat.com, tee-dev@lists.linaro.org, Sumit Garg Subject: [PATCH v3 2/4] tee: add supp_nowait flag in tee_context struct Date: Fri, 11 Jan 2019 17:17:29 +0530 Message-Id: <1547207251-9372-3-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547207251-9372-1-git-send-email-sumit.garg@linaro.org> References: <1547207251-9372-1-git-send-email-sumit.garg@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This flag indicates that requests in this context should not wait for tee-supplicant daemon to be started if not present and just return with an error code. It is needed for requests which should be non-blocking in nature like ones arising from TEE based kernel drivers or any in kernel api that uses TEE internal client interface. Signed-off-by: Sumit Garg --- drivers/tee/optee/supp.c | 10 +++++++++- drivers/tee/tee_core.c | 13 +++++++++++++ include/linux/tee_drv.h | 6 ++++++ 3 files changed, 28 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/tee/optee/supp.c b/drivers/tee/optee/supp.c index 43626e1..92f56b8 100644 --- a/drivers/tee/optee/supp.c +++ b/drivers/tee/optee/supp.c @@ -88,10 +88,18 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params, { struct optee *optee = tee_get_drvdata(ctx->teedev); struct optee_supp *supp = &optee->supp; - struct optee_supp_req *req = kzalloc(sizeof(*req), GFP_KERNEL); + struct optee_supp_req *req; bool interruptable; u32 ret; + /* + * Return in case there is no supplicant available and + * non-blocking request. + */ + if (!supp->ctx && ctx->supp_nowait) + return TEEC_ERROR_COMMUNICATION; + + req = kzalloc(sizeof(*req), GFP_KERNEL); if (!req) return TEEC_ERROR_OUT_OF_MEMORY; diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index a685940..eed83bd 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -105,6 +105,11 @@ static int tee_open(struct inode *inode, struct file *filp) if (IS_ERR(ctx)) return PTR_ERR(ctx); + /* + * Default user-space behaviour is to wait for tee-supplicant + * if not present for any requests in this context. + */ + ctx->supp_nowait = false; filp->private_data = ctx; return 0; } @@ -981,6 +986,14 @@ tee_client_open_context(struct tee_context *start, } while (IS_ERR(ctx) && PTR_ERR(ctx) != -ENOMEM); put_device(put_dev); + /* + * Default behaviour for in kernel client is to not wait for + * tee-supplicant if not present for any requests in this context. + * Also this flag could be configured again before call to + * tee_client_open_session() if any in kernel client requires + * different behaviour. + */ + ctx->supp_nowait = true; return ctx; } EXPORT_SYMBOL_GPL(tee_client_open_context); diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index ed16bf1..fe1a920 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -49,6 +49,11 @@ struct tee_shm_pool; * @releasing: flag that indicates if context is being released right now. * It is needed to break circular dependency on context during * shared memory release. + * @supp_nowait: flag that indicates that requests in this context should not + * wait for tee-supplicant daemon to be started if not present + * and just return with an error code. It is needed for requests + * that arises from TEE based kernel drivers that should be + * non-blocking in nature. */ struct tee_context { struct tee_device *teedev; @@ -56,6 +61,7 @@ struct tee_context { void *data; struct kref refcount; bool releasing; + bool supp_nowait; }; struct tee_param_memref {