From patchwork Thu Jan 24 05:54:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 156451 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1563163jaa; Wed, 23 Jan 2019 21:55:12 -0800 (PST) X-Google-Smtp-Source: ALg8bN4iykKkuojStABK57gf5yucNMG2WFdplX4olXeKVsc5FltvE3i1NP9bD2JARw7Qr1H9Y1x4 X-Received: by 2002:a65:5a4c:: with SMTP id z12mr4746811pgs.188.1548309312566; Wed, 23 Jan 2019 21:55:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548309312; cv=none; d=google.com; s=arc-20160816; b=zUi4wbqzUBUGUKudqs/8dEfYy2WT6LAbq7pxd3EilZ6xS8SIQh5QID+j5ZsJBj1msF 85Xu6dnniTbdEM1VpTvoHjhJc7dcUMt4teI0CjnZg88J+AUsEl7pIhUrO0HNrlN6nGtz m/ZZdWPj3tjVDZ18J9SJApN/D4yZhapm1Wlq8gjfZcddYRPzUqRTSAX9YYOvqqlKsq2a wwF6/XYaMNhBpAGN9I/OJoqFaTS4NnvlkuAT0xAPMrRJsRJAc4R8tZTYUtSXlpNOK+SA 20oy0PkCDDQCAm5jDZz06DRz2RresSx25jeFlmBMPx0RnVpy2hUazD2kREZ2DNUsfgIM JaNw== 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=5WMo/K4NuXKTODlcOV8f6/OWQaH3XOAMMukaI5750UI=; b=ODsxJKJhWt1Mg3T267HqK9gm1ZLfgllJWAQ4t55P99N7vdbyp8mJTEa41y8oPN99bk X+ASJmvVTV33MBMuCCexi8V3vMi7RN7gPZ2kOm+yGASP+n71pRzwhh9oBJFIo6qTZi2C 4XPad081U5h8XS2N6rBUK8mYRLRoEXu2KzANLCGLT4UjQwgwL/9dp6UpnMEZgk9uP/Xp I+ql0aVMVDt/EeJwg7HmiEpLa/xhMGhh5jlNJ/K/Ec89Ar9HO2wllpY7cb/yWh5bRIHA 4IfbrpAI9pvoW7COgSpIkMvpjW1O5iSKyc3UM5v9eqhWGJ+OX218l2RcYOKx2/A98LfP Zdiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iqkoHCb0; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-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 g69si20578507pfg.225.2019.01.23.21.55.12; Wed, 23 Jan 2019 21:55:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-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=iqkoHCb0; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-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 S1726378AbfAXFzL (ORCPT + 3 others); Thu, 24 Jan 2019 00:55:11 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:39059 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726079AbfAXFzL (ORCPT ); Thu, 24 Jan 2019 00:55:11 -0500 Received: by mail-pg1-f196.google.com with SMTP id w6so2191987pgl.6 for ; Wed, 23 Jan 2019 21:55:10 -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=5WMo/K4NuXKTODlcOV8f6/OWQaH3XOAMMukaI5750UI=; b=iqkoHCb0D12KSX8xX/nbyXtJokbNEDfvHMY/GyHBXq81j8sSpwP3WmNyFgkBUWJBN0 RybR4KRXBaeFG8tgnWVjaVK9MpOX/SWxYjRjdf4WsAmbyej89736nTKKEzYNZz9Y2OYq aLosQuHDe1C/FLERVRO3UGZSlHcVyUJ6eQyX8= 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=5WMo/K4NuXKTODlcOV8f6/OWQaH3XOAMMukaI5750UI=; b=ApIb9rPP2PY319luUkmtLPttnu0o4Wsg5A05dQ+sesNQDOXq0hbpL6pZopRd3Q4cmg fYzVMVygSquRchFirfepnE5hUwDiI4jG/PsoaCOddJK9lBfqQIxW3lzPKPbTmyBtaWuj qD6tgk8BNEYDXtxiM1O5OGL1QG+5ZlUrkHzZ3dumoeP54/94VNN/jNCXZ0Xu02QpGsKr v5g7XD8X1Po9ptKrdvwrlnj45wcrieEwbpoLmCFPv9viFfU3Ixx/82x6U7FYt1DKjzab uhLr2069BtZgz7nhaD8hlN8lOpCCL2Hy59C+CyvwHEnogowmjvwrCInJ86lppQifCcAt BMNw== X-Gm-Message-State: AJcUukd1VxijS1L0UmRsnuZVpFLqe9JPYjsv3MHTKQwClQWaRYTlkAGo St7XN4OTWibUwZabW1YKvCv8DQ== X-Received: by 2002:a63:5621:: with SMTP id k33mr4770340pgb.395.1548309310512; Wed, 23 Jan 2019 21:55:10 -0800 (PST) Received: from localhost.localdomain ([117.196.233.31]) by smtp.gmail.com with ESMTPSA id i2sm32297287pfi.66.2019.01.23.21.55.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Jan 2019 21:55:09 -0800 (PST) From: Sumit Garg To: jens.wiklander@linaro.org, herbert@gondor.apana.org.au, ard.biesheuvel@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, yamada.masahiro@socionext.com, michal.lkml@markovi.net, mpm@selenic.com, robh+dt@kernel.org, mark.rutland@arm.com, arnd@arndb.de, gregkh@linuxfoundation.org, daniel.thompson@linaro.org, bhsharma@redhat.com, tee-dev@lists.linaro.org, Sumit Garg Subject: [PATCH v5 1/4] tee: add bus driver framework for TEE based devices Date: Thu, 24 Jan 2019 11:24:36 +0530 Message-Id: <1548309279-5281-2-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548309279-5281-1-git-send-email-sumit.garg@linaro.org> References: <1548309279-5281-1-git-send-email-sumit.garg@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Introduce a generic TEE bus driver concept for TEE based kernel drivers which would like to communicate with TEE based devices/services. Also add support in module device table for these new TEE based devices. In this TEE bus concept, devices/services are identified via Universally Unique Identifier (UUID) and drivers register a table of device UUIDs which they can support. So this TEE bus framework registers following apis: - match(): Iterates over the driver UUID table to find a corresponding match for device UUID. If a match is found, then this particular device is probed via corresponding probe api registered by the driver. This process happens whenever a device or a driver is registered with TEE bus. - uevent(): Notifies user-space (udev) whenever a new device is registered on this bus for auto-loading of out-of-tree drivers. Also this framework allows for device enumeration to be specific to corresponding TEE implementation like OP-TEE etc. Signed-off-by: Sumit Garg --- drivers/tee/tee_core.c | 57 ++++++++++++++++++++++++++++++++++++--- include/linux/mod_devicetable.h | 9 +++++++ include/linux/tee_drv.h | 32 +++++++++++++++++++++- scripts/mod/devicetable-offsets.c | 3 +++ scripts/mod/file2alias.c | 19 +++++++++++++ 5 files changed, 115 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 7b2bb4c..9f4c8bc 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -15,7 +15,6 @@ #define pr_fmt(fmt) "%s: " fmt, __func__ #include -#include #include #include #include @@ -1027,6 +1026,42 @@ int tee_client_invoke_func(struct tee_context *ctx, } EXPORT_SYMBOL_GPL(tee_client_invoke_func); +static int tee_client_device_match(struct device *dev, + struct device_driver *drv) +{ + const struct tee_client_device_id *id_table; + struct tee_client_device *tee_device; + + id_table = to_tee_client_driver(drv)->id_table; + tee_device = to_tee_client_device(dev); + + while (!uuid_is_null(&id_table->uuid)) { + if (uuid_equal(&tee_device->id.uuid, &id_table->uuid)) + return 1; + id_table++; + } + + return 0; +} + +static int tee_client_device_uevent(struct device *dev, + struct kobj_uevent_env *env) +{ + uuid_t *dev_id = &to_tee_client_device(dev)->id.uuid; + + if (add_uevent_var(env, "MODALIAS=tee:%pUb", dev_id)) + return -ENOMEM; + + return 0; +} + +struct bus_type tee_bus_type = { + .name = "tee", + .match = tee_client_device_match, + .uevent = tee_client_device_uevent, +}; +EXPORT_SYMBOL_GPL(tee_bus_type); + static int __init tee_init(void) { int rc; @@ -1040,18 +1075,32 @@ static int __init tee_init(void) rc = alloc_chrdev_region(&tee_devt, 0, TEE_NUM_DEVICES, "tee"); if (rc) { pr_err("failed to allocate char dev region\n"); - class_destroy(tee_class); - tee_class = NULL; + goto out_unreg_class; } + rc = bus_register(&tee_bus_type); + if (rc) { + pr_err("failed to register tee bus\n"); + goto out_unreg_chrdev; + } + + return 0; + +out_unreg_chrdev: + unregister_chrdev_region(tee_devt, TEE_NUM_DEVICES); +out_unreg_class: + class_destroy(tee_class); + tee_class = NULL; + return rc; } static void __exit tee_exit(void) { + bus_unregister(&tee_bus_type); + unregister_chrdev_region(tee_devt, TEE_NUM_DEVICES); class_destroy(tee_class); tee_class = NULL; - unregister_chrdev_region(tee_devt, TEE_NUM_DEVICES); } subsys_initcall(tee_init); diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index f9bd2f3..14eaeeb 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -779,4 +779,13 @@ struct typec_device_id { kernel_ulong_t driver_data; }; +/** + * struct tee_client_device_id - tee based device identifier + * @uuid: For TEE based client devices we use the device uuid as + * the identifier. + */ +struct tee_client_device_id { + uuid_t uuid; +}; + #endif /* LINUX_MOD_DEVICETABLE_H */ diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 6cfe058..ce957ce 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -15,11 +15,14 @@ #ifndef __TEE_DRV_H #define __TEE_DRV_H -#include +#include #include #include #include +#include #include +#include +#include /* * The file describes the API provided by the generic TEE driver to the @@ -538,4 +541,31 @@ static inline bool tee_param_is_memref(struct tee_param *param) } } +extern struct bus_type tee_bus_type; + +/** + * struct tee_client_device - tee based device + * @id: device identifier + * @dev: device structure + */ +struct tee_client_device { + struct tee_client_device_id id; + struct device dev; +}; + +#define to_tee_client_device(d) container_of(d, struct tee_client_device, dev) + +/** + * struct tee_client_driver - tee client driver + * @id_table: device id table supported by this driver + * @driver: driver structure + */ +struct tee_client_driver { + const struct tee_client_device_id *id_table; + struct device_driver driver; +}; + +#define to_tee_client_driver(d) \ + container_of(d, struct tee_client_driver, driver) + #endif /*__TEE_DRV_H*/ diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c index 2930044..1607183 100644 --- a/scripts/mod/devicetable-offsets.c +++ b/scripts/mod/devicetable-offsets.c @@ -225,5 +225,8 @@ int main(void) DEVID_FIELD(typec_device_id, svid); DEVID_FIELD(typec_device_id, mode); + DEVID(tee_client_device_id); + DEVID_FIELD(tee_client_device_id, uuid); + return 0; } diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index a37af7d..d0e4172 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -37,6 +37,9 @@ typedef unsigned char __u8; typedef struct { __u8 b[16]; } uuid_le; +typedef struct { + __u8 b[16]; +} uuid_t; /* Big exception to the "don't include kernel headers into userspace, which * even potentially has different endianness and word sizes, since @@ -1287,6 +1290,21 @@ static int do_typec_entry(const char *filename, void *symval, char *alias) return 1; } +/* Looks like: tee:uuid */ +static int do_tee_entry(const char *filename, void *symval, char *alias) +{ + DEF_FIELD(symval, tee_client_device_id, uuid); + + sprintf(alias, "tee:%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", + uuid.b[0], uuid.b[1], uuid.b[2], uuid.b[3], uuid.b[4], + uuid.b[5], uuid.b[6], uuid.b[7], uuid.b[8], uuid.b[9], + uuid.b[10], uuid.b[11], uuid.b[12], uuid.b[13], uuid.b[14], + uuid.b[15]); + + add_wildcard(alias); + return 1; +} + /* Does namelen bytes of name exactly match the symbol? */ static bool sym_is(const char *name, unsigned namelen, const char *symbol) { @@ -1357,6 +1375,7 @@ static const struct devtable devtable[] = { {"fslmc", SIZE_fsl_mc_device_id, do_fsl_mc_entry}, {"tbsvc", SIZE_tb_service_id, do_tbsvc_entry}, {"typec", SIZE_typec_device_id, do_typec_entry}, + {"tee", SIZE_tee_client_device_id, do_tee_entry}, }; /* Create MODULE_ALIAS() statements. From patchwork Thu Jan 24 05:54:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 156452 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1563237jaa; Wed, 23 Jan 2019 21:55:19 -0800 (PST) X-Google-Smtp-Source: ALg8bN5YW4khWTiXBNw428rXFA/BNDSiWlteU9VXYuev4wl5KpKWdrO6KYPTSt/zp85s+cC2jQ1m X-Received: by 2002:a17:902:227:: with SMTP id 36mr5316420plc.140.1548309319336; Wed, 23 Jan 2019 21:55:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548309319; cv=none; d=google.com; s=arc-20160816; b=k5sZ/pYds42GNVKI1JRcRBl3+TZdm3ZddfbXVsORPFgiHWCq9gI3YidL1y83aSS5A4 8LRdaTq5aPf0ooxDOj4k1x6QjAz34v90Ofj3/00VN02laGlOTysyn68mfJnu/gplkWSN l5Yi2/k6dgtnbyCIW3kfzYtGQXWU6snbIXvsJ/H/7pQ937Kx9UYp+pM621gMTu8zyYI3 jLgn25Q09qkP/yfvooQlaGYHUvIpFPSR5vwD6IahC06HmX7pA+VQIDohdIEOJmr2BOGA HSNfLoUGpCFvA2XqZFNAwe5v3mF4tJuzsFVagA+bJmnpa3MH8O4YsS/1D3Og/kLKLy/k t8Cw== 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=uCrF0MHFiiOEn/l4nkIlAADg2vAfaRqdogSuqFtzV9k=; b=lN9fg9kPwB30ZDQzkFdpPBH5GRJG1Tv11/CVnT0AUi4SI0oe5joKau75TrqIjH/eBd EcCIcnw/MVtK9OvCZtacYyCUU/n/rAkiuPFcAoaXbqR+TC+7q2Q565ZnDxRG298uPzC0 awpTtJddks/5hUISeqBrLD9AMRGdTBnAXUdsrdBu12Mc/6yI3g2R8V34lmgYy59E1bkz 505obil7hxQP76KgtH4xbyVbmNZKm9jPenaQe7yl2+YhBeYrtXhSoRou2QCdnLk/0vzw hYcgUdqA0U1+LUQGmcC1wRCDtg5JuuQfuhYPiO/wBN9qGBo2igHC98bOON3ZInoWPG+Y MMNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JGNKJHNf; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-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 n30si20277872pgb.406.2019.01.23.21.55.19; Wed, 23 Jan 2019 21:55:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-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=JGNKJHNf; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-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 S1726413AbfAXFzS (ORCPT + 3 others); Thu, 24 Jan 2019 00:55:18 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:44653 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726377AbfAXFzS (ORCPT ); Thu, 24 Jan 2019 00:55:18 -0500 Received: by mail-pl1-f194.google.com with SMTP id e11so2376440plt.11 for ; Wed, 23 Jan 2019 21:55:18 -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=uCrF0MHFiiOEn/l4nkIlAADg2vAfaRqdogSuqFtzV9k=; b=JGNKJHNfB8OpS+iqfBYSqEZmTbwnhdAh72JuR+u7tWudBZETFbpORniJwId0PaTomh MnQK0pINot+0uTLkzC69EkObthIGj9NdWyGDjya6f04uljmgqMgxf7b97X0/G2LtZBH2 kWRKG8CCYHWouyTsX2tEfQus59wm7apcMSyvE= 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=uCrF0MHFiiOEn/l4nkIlAADg2vAfaRqdogSuqFtzV9k=; b=D1xnsX1pn5e3ADp9IVLBceTXLRjIcr/x0lOpl3Cs+IRqqJ4nk/28c+Lm/7sWG9stFJ AYf8OwqZLoXoJARKN3DBF77FhAJjkMslPC8YaQMpWodzFFUIqG7aMuHjrOLzZ7yLzeV4 49JqlDrAlExWvwtWvwJkL3n5Hewa3/B1P8kV4qYo6PYPYa5fIKhBPgDo8A9W+/smWT7w SO9k4lKjIHs50/11oqFysoSkkRH9H+osdXViaK8eQ4NUbgdRUtF39E/TeZmoVa1AUriV zJWA4Jk/PbjFOOhfoQCYw4hgdOxATlIYWYvBTHZLiTvFGj4ICwjK7JVHPO5D1Il59h6X j/Dg== X-Gm-Message-State: AJcUukfW1pwwWLZ8TGBpiPGO8sbLYHapz4PbePr/L16azNvNfZiAsv8p UsP3c3ol9OjjWbhxrRFyvzr6qw== X-Received: by 2002:a17:902:6bc9:: with SMTP id m9mr5165878plt.173.1548309317693; Wed, 23 Jan 2019 21:55:17 -0800 (PST) Received: from localhost.localdomain ([117.196.233.31]) by smtp.gmail.com with ESMTPSA id i2sm32297287pfi.66.2019.01.23.21.55.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Jan 2019 21:55:17 -0800 (PST) From: Sumit Garg To: jens.wiklander@linaro.org, herbert@gondor.apana.org.au, ard.biesheuvel@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, yamada.masahiro@socionext.com, michal.lkml@markovi.net, mpm@selenic.com, robh+dt@kernel.org, mark.rutland@arm.com, arnd@arndb.de, gregkh@linuxfoundation.org, daniel.thompson@linaro.org, bhsharma@redhat.com, tee-dev@lists.linaro.org, Sumit Garg Subject: [PATCH v5 2/4] tee: add supp_nowait flag in tee_context struct Date: Thu, 24 Jan 2019 11:24:37 +0530 Message-Id: <1548309279-5281-3-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548309279-5281-1-git-send-email-sumit.garg@linaro.org> References: <1548309279-5281-1-git-send-email-sumit.garg@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@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 Reviewed-by: Daniel Thompson 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 9f4c8bc..2612dfa 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 ce957ce..56d7f1b 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -50,6 +50,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; @@ -57,6 +62,7 @@ struct tee_context { void *data; struct kref refcount; bool releasing; + bool supp_nowait; }; struct tee_param_memref { From patchwork Thu Jan 24 05:54:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 156453 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1563334jaa; Wed, 23 Jan 2019 21:55:27 -0800 (PST) X-Google-Smtp-Source: ALg8bN5ilTz0YMRc6zaSoCIy2zlwofqEvEUqTcosIDjQochAuqwClLfNPbCAq5cyrT/1GjD4+KpO X-Received: by 2002:a63:2c0e:: with SMTP id s14mr4828951pgs.132.1548309327104; Wed, 23 Jan 2019 21:55:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548309327; cv=none; d=google.com; s=arc-20160816; b=d465XFSjk+VV3BiAhVOECTtAq6vojcH63WX5FfBYSQvmhgOPB7bhjEPhjoBLn6uMsR pCK2wmPGj5QE3rPcKmikO15Koe2Fovz5jk5yew31bdqX2QVcBzSjTU23YDELmmFhvk56 P50rtGJBNfXXEPt/RWKh0dKY5KU0nzxScY2epLg8Tvi1wdIJ3bc/nMoE1nYm9DArepo+ T+0nkp3DsPPjma0x5WKVuhu3GN5b1CCccvlCywCK7bH5x4YsRe9Pec5b5/j45uhN+tam ghhoPhsnzZnU8+1DPAvEs0NBkUrV0zBOqM9nWk1LfFH3jN+8NKeIP08ufkpvlRHR6jD8 bpGg== 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=dnEldj1krFnyBcZ28g4diO0QN2WcNK+iA+Bx1sW0hq8=; b=aFxefArgu7K2FG7+57bYQ00E25ZXkWUNTn5z+yCoWhpNp6W4v5ytasFam87ekZbbHA DyOyYyhIicxMyleYgQsEcgmoWxcjZd6SeFntPaNc9dKFaMkHzBmSQXo4gcum1lph9ZDf LiMHweItzLbpRrVanWl3KH5QnlXn7Yae4raG0JsSJJPO3DvvWKE1nl+OnQFW0Zbs9Jcf AcaGUxxDEdaCo53cKKbHzdfJa0ilySFQQAcRI6Ejj1hRmJ/81vA/4pTPRPX+cGECdPdz o/QGC4GvcaPyGwrnhZGITbDW6OXgw0Xt6BMHMQ7nyASE74u91llcQLneoi7iEZ9VsJDd BdTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VaGymbJP; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-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 b24si19094881pgi.308.2019.01.23.21.55.26; Wed, 23 Jan 2019 21:55:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-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=VaGymbJP; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-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 S1726919AbfAXFz0 (ORCPT + 3 others); Thu, 24 Jan 2019 00:55:26 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:35988 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726229AbfAXFz0 (ORCPT ); Thu, 24 Jan 2019 00:55:26 -0500 Received: by mail-pf1-f196.google.com with SMTP id b85so2462741pfc.3 for ; Wed, 23 Jan 2019 21:55:25 -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=dnEldj1krFnyBcZ28g4diO0QN2WcNK+iA+Bx1sW0hq8=; b=VaGymbJPULjIim8SHv3rYB5raJQI/ankG2MB+Z7UNr0gHpjpTbp+katTbn4guhBP2O w86v0JqQOxa7jMMgQcQnp7zlVnm7+aKit6PMhSyCAV7l93/CKh8agoaN8cc4SdxnpU61 MkVrGEIEB5eG9bqDZ9a8GxK06KUTXBRMQNqFg= 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=dnEldj1krFnyBcZ28g4diO0QN2WcNK+iA+Bx1sW0hq8=; b=udU0yI9fvJQNuHv+qnqFNBm95HgQG6wmVmKXxHpJvnoY6LqPZj4IzSvd44d/CA8KdX Pr66Jvb1UAMcvvdW4rtVkDTy1wpOwZBox/8wx5UffcEN9NtgOIv6vDatXSWia99T/S2L I8tL/mPCFvwkYV2DaXWUfvelV35E3qpli0GQ7510EdkRW5GlYo3+P/6GKcltM9YPnyI4 67HqaP6VvDF7xsYruL7Ze4YCT6JhockhGtnjCQiFH6ovaaxt+HMWDilr/GrJgnBAIEMz UDjQUg3CrLhnLVPGqfyz7S2FdcFxG6n0GHT98UWB+UKBe00YFIWeiVotZX0I9qV+h1+t tdmQ== X-Gm-Message-State: AJcUukdo6ajGOp1lR+vnUH5GgF0czBg/a0/qXe+EMFXY6nzCXuqKFz+Y X0Sy0pjoQj/4m/eDdffWQP81dQ== X-Received: by 2002:a62:68c5:: with SMTP id d188mr5294359pfc.194.1548309325096; Wed, 23 Jan 2019 21:55:25 -0800 (PST) Received: from localhost.localdomain ([117.196.233.31]) by smtp.gmail.com with ESMTPSA id i2sm32297287pfi.66.2019.01.23.21.55.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Jan 2019 21:55:24 -0800 (PST) From: Sumit Garg To: jens.wiklander@linaro.org, herbert@gondor.apana.org.au, ard.biesheuvel@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, yamada.masahiro@socionext.com, michal.lkml@markovi.net, mpm@selenic.com, robh+dt@kernel.org, mark.rutland@arm.com, arnd@arndb.de, gregkh@linuxfoundation.org, daniel.thompson@linaro.org, bhsharma@redhat.com, tee-dev@lists.linaro.org, Sumit Garg Subject: [PATCH v5 3/4] tee: optee: add TEE bus device enumeration support Date: Thu, 24 Jan 2019 11:24:38 +0530 Message-Id: <1548309279-5281-4-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548309279-5281-1-git-send-email-sumit.garg@linaro.org> References: <1548309279-5281-1-git-send-email-sumit.garg@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org OP-TEE provides a pseudo TA to enumerate TAs which can act as devices/ services for TEE bus. So implement device enumeration using invoke function: PTA_CMD_GET_DEVICES provided by pseudo TA to fetch array of device UUIDs. Also register these enumerated devices with TEE bus as "optee-clntX" device. Signed-off-by: Sumit Garg --- drivers/tee/optee/Makefile | 1 + drivers/tee/optee/core.c | 4 + drivers/tee/optee/device.c | 153 ++++++++++++++++++++++++++++++++++++++ drivers/tee/optee/optee_private.h | 3 + 4 files changed, 161 insertions(+) create mode 100644 drivers/tee/optee/device.c -- 2.7.4 Reviewed-by: Daniel Thompson diff --git a/drivers/tee/optee/Makefile b/drivers/tee/optee/Makefile index 48d262a..56263ae 100644 --- a/drivers/tee/optee/Makefile +++ b/drivers/tee/optee/Makefile @@ -5,3 +5,4 @@ optee-objs += call.o optee-objs += rpc.o optee-objs += supp.o optee-objs += shm_pool.o +optee-objs += device.o diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index e5efce3..ac59c77 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -634,6 +634,10 @@ static struct optee *optee_probe(struct device_node *np) if (optee->sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM) pr_info("dynamic shared memory is enabled\n"); + rc = optee_enumerate_devices(); + if (rc) + goto err; + pr_info("initialized driver\n"); return optee; err: diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c new file mode 100644 index 0000000..987e552 --- /dev/null +++ b/drivers/tee/optee/device.c @@ -0,0 +1,153 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2019 Linaro Ltd. + */ + +#include +#include +#include +#include +#include "optee_private.h" + +/* + * Get device UUIDs + * + * [out] memref[0] Array of device UUIDs + * + * Return codes: + * TEE_SUCCESS - Invoke command success + * TEE_ERROR_BAD_PARAMETERS - Incorrect input param + * TEE_ERROR_SHORT_BUFFER - Output buffer size less than required + */ +#define PTA_CMD_GET_DEVICES 0x0 + +static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data) +{ + if (ver->impl_id == TEE_IMPL_ID_OPTEE) + return 1; + else + return 0; +} + +static int get_devices(struct tee_context *ctx, u32 session, + struct tee_shm *device_shm, u32 *shm_size) +{ + u32 ret = 0; + struct tee_ioctl_invoke_arg inv_arg = {0}; + struct tee_param param[4] = {0}; + + /* Invoke PTA_CMD_GET_DEVICES function */ + inv_arg.func = PTA_CMD_GET_DEVICES; + inv_arg.session = session; + inv_arg.num_params = 4; + + /* Fill invoke cmd params */ + param[0].attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT; + param[0].u.memref.shm = device_shm; + param[0].u.memref.size = *shm_size; + param[0].u.memref.shm_offs = 0; + + ret = tee_client_invoke_func(ctx, &inv_arg, param); + if ((ret < 0) || ((inv_arg.ret != TEEC_SUCCESS) && + (inv_arg.ret != TEEC_ERROR_SHORT_BUFFER))) { + pr_err("PTA_CMD_GET_DEVICES invoke function err: %x\n", + inv_arg.ret); + return -EINVAL; + } + + *shm_size = param[0].u.memref.size; + + return 0; +} + +static int optee_register_device(const uuid_t *device_uuid, u32 device_id) +{ + struct tee_client_device *optee_device = NULL; + int rc; + + optee_device = kzalloc(sizeof(*optee_device), GFP_KERNEL); + if (!optee_device) + return -ENOMEM; + + optee_device->dev.bus = &tee_bus_type; + dev_set_name(&optee_device->dev, "optee-clnt%u", device_id); + uuid_copy(&optee_device->id.uuid, device_uuid); + + rc = device_register(&optee_device->dev); + if (rc) { + pr_err("device registration failed, err: %d\n", rc); + kfree(optee_device); + } + + return rc; +} + +int optee_enumerate_devices(void) +{ + const uuid_t pta_uuid = + UUID_INIT(0x7011a688, 0xddde, 0x4053, + 0xa5, 0xa9, 0x7b, 0x3c, 0x4d, 0xdf, 0x13, 0xb8); + struct tee_ioctl_open_session_arg sess_arg = {0}; + struct tee_shm *device_shm = NULL; + const uuid_t *device_uuid = NULL; + struct tee_context *ctx = NULL; + u32 shm_size = 0, idx, num_devices = 0; + int rc; + + /* Open context with OP-TEE driver */ + ctx = tee_client_open_context(NULL, optee_ctx_match, NULL, NULL); + if (IS_ERR(ctx)) + return -ENODEV; + + /* Open session with device enumeration pseudo TA */ + memcpy(sess_arg.uuid, pta_uuid.b, TEE_IOCTL_UUID_LEN); + sess_arg.clnt_login = TEE_IOCTL_LOGIN_PUBLIC; + sess_arg.num_params = 0; + + rc = tee_client_open_session(ctx, &sess_arg, NULL); + if ((rc < 0) || (sess_arg.ret != TEEC_SUCCESS)) { + /* Device enumeration pseudo TA not found */ + rc = 0; + goto out_ctx; + } + + rc = get_devices(ctx, sess_arg.session, NULL, &shm_size); + if (rc < 0) + goto out_sess; + + device_shm = tee_shm_alloc(ctx, shm_size, + TEE_SHM_MAPPED | TEE_SHM_DMA_BUF); + if (IS_ERR(device_shm)) { + pr_err("tee_shm_alloc failed\n"); + rc = PTR_ERR(device_shm); + goto out_sess; + } + + rc = get_devices(ctx, sess_arg.session, device_shm, &shm_size); + if (rc < 0) + goto out_shm; + + device_uuid = tee_shm_get_va(device_shm, 0); + if (IS_ERR(device_uuid)) { + pr_err("tee_shm_get_va failed\n"); + rc = PTR_ERR(device_uuid); + goto out_shm; + } + + num_devices = shm_size / sizeof(uuid_t); + + for (idx = 0; idx < num_devices; idx++) { + rc = optee_register_device(&device_uuid[idx], idx); + if (rc) + goto out_shm; + } + +out_shm: + tee_shm_free(device_shm); +out_sess: + tee_client_close_session(ctx, sess_arg.session); +out_ctx: + tee_client_close_context(ctx); + + return rc; +} diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index 35e7938..a5e84af 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -28,6 +28,7 @@ #define TEEC_ERROR_BAD_PARAMETERS 0xFFFF0006 #define TEEC_ERROR_COMMUNICATION 0xFFFF000E #define TEEC_ERROR_OUT_OF_MEMORY 0xFFFF000C +#define TEEC_ERROR_SHORT_BUFFER 0xFFFF0010 #define TEEC_ORIGIN_COMMS 0x00000002 @@ -181,6 +182,8 @@ void optee_free_pages_list(void *array, size_t num_entries); void optee_fill_pages_list(u64 *dst, struct page **pages, int num_pages, size_t page_offset); +int optee_enumerate_devices(void); + /* * Small helpers */ From patchwork Thu Jan 24 05:54:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 156454 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1563442jaa; Wed, 23 Jan 2019 21:55:34 -0800 (PST) X-Google-Smtp-Source: ALg8bN4jNeKDV60YQ1bwYw2hAgKqDYb78CJZXTjvQhBf+TRigIMldop1sdQbrmMogP+98Xz5FC72 X-Received: by 2002:a63:c303:: with SMTP id c3mr4771236pgd.268.1548309334619; Wed, 23 Jan 2019 21:55:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548309334; cv=none; d=google.com; s=arc-20160816; b=KaahpEX0atctlrisOe4kQO2nEj9W0XmYWfyGGF9hBGGszPdl6gFo8SYRUtxuEe/g4/ xohEjBojwawcMCN9gcNyDFhW8nf8mX/N1MWFuRtnRCXI9s8lfSuKLNKoJd6xSeacmhCD mc28pjSpXxvTOicIW9duqjQ64VATsSNJaXcMKD3HKHngpihITNReD+BrUMzraeyE0u7J yA3+Qiz9etM4y1s56HlZjPgE3edOVhANqvB+MjEiKF1gGvMgnWQsnTeecF4vjCSppgFF WY3m5qE/zE7CMaElUEh5/9M4ClUoeX/lccjromHp+gjb/aOE2e5FQP5VbauHIi00iJHE pCuQ== 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=UB+824kJL77h2lS4dKLq0h0OL+opJbP1lzg8RMCla+0=; b=SrGC/yp1FJpClY1UVTM5STiHwlMneUx1I/IL/DNBpr/OWMmzOQ0q3FVuImWDhO3h97 D5PHGIroBh+l0//3lKr9uMh8mYHVlxwG+zyfjt+rH5nmU8ADyW66cfZ1M6XtW5j6UufG dgKMS3mF8Foc3ipqMaw7Uv77DdEcJiYfjkaOQnnuYYjicj4R6Ej3uxyQSSB7kOmx5Bg4 +R+f0KOHJD6su+PyjSVGjw+lNfTOS65BUFFip8bk/+e1ddeclCd9JgUzRze1RJ5dz/qc PtzsmwSczJ+9kUE77833iAuYOM2B1sjoitssRbPRioXsF5gPbW4HtCSsO6Vw6s4mr/5C ovQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i1+BPS00; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-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 q4si21159435pfq.56.2019.01.23.21.55.34; Wed, 23 Jan 2019 21:55:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-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=i1+BPS00; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-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 S1727128AbfAXFzd (ORCPT + 3 others); Thu, 24 Jan 2019 00:55:33 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:45848 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726233AbfAXFzd (ORCPT ); Thu, 24 Jan 2019 00:55:33 -0500 Received: by mail-pg1-f194.google.com with SMTP id y4so2175361pgc.12 for ; Wed, 23 Jan 2019 21:55:32 -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=UB+824kJL77h2lS4dKLq0h0OL+opJbP1lzg8RMCla+0=; b=i1+BPS00e2UoU+VZ9Qtxtg1aKiqhEgePjKlQSmkJ6yWx/iiYkHj491z+d4Fe/pJ9VZ cBiPPf7+LaeVsGeozs8p4ufYIRBgkDdQrMHPjOE8/OQopVxQigEyhql/MFZ70bSm1GS0 bRLI31AX1rtUQC4CubMFUuFC55VmduauARyqQ= 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=UB+824kJL77h2lS4dKLq0h0OL+opJbP1lzg8RMCla+0=; b=XxPXdk1SUwljbvHfBzkY6MYvTYDvI7sPnEqsvTKy4sQ+GlE73O+7wID2E6ZCZVpK+M UCSIkMOT9lE+1OXh5oQTwtgQnnbuIm4+MA1T6JgHiNXrcCB00KVnrZ1XeFcHoHgEY2bO uJ8y5dirl7qzV2kHS8689KnhasyWVVICVL+iA/1JViFqn1SKKquF/rGTbzqlFiLU4ixi xxlONi+CIKIWp4ZoDIAowZJ70JynwzLI6klTu0euEEzDJ85iQpgPOwWGJJt33+TJuEsv F5AFHnDfVqwNNSc0VJGksTyonbIBxu+oLe1f5uWEhphT5h3Butqat3gG6xqDinX7UHfa DL9A== X-Gm-Message-State: AJcUukdUiweBZLJC5LTbn3HHEwqrI0tHWr3SgAPmo5LNACtqg4+iUtf+ u0Cpe7MxPczQTRUluZpxE3J6Zg== X-Received: by 2002:a62:cf84:: with SMTP id b126mr5108489pfg.98.1548309332450; Wed, 23 Jan 2019 21:55:32 -0800 (PST) Received: from localhost.localdomain ([117.196.233.31]) by smtp.gmail.com with ESMTPSA id i2sm32297287pfi.66.2019.01.23.21.55.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Jan 2019 21:55:31 -0800 (PST) From: Sumit Garg To: jens.wiklander@linaro.org, herbert@gondor.apana.org.au, ard.biesheuvel@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, yamada.masahiro@socionext.com, michal.lkml@markovi.net, mpm@selenic.com, robh+dt@kernel.org, mark.rutland@arm.com, arnd@arndb.de, gregkh@linuxfoundation.org, daniel.thompson@linaro.org, bhsharma@redhat.com, tee-dev@lists.linaro.org, Sumit Garg Subject: [PATCH v5 4/4] hwrng: add OP-TEE based rng driver Date: Thu, 24 Jan 2019 11:24:39 +0530 Message-Id: <1548309279-5281-5-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548309279-5281-1-git-send-email-sumit.garg@linaro.org> References: <1548309279-5281-1-git-send-email-sumit.garg@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On ARM SoC's with TrustZone enabled, peripherals like entropy sources might not be accessible to normal world (linux in this case) and rather accessible to secure world (OP-TEE in this case) only. So this driver aims to provides a generic interface to OP-TEE based random number generator service. This driver registers on TEE bus to interact with OP-TEE based rng device/service. Signed-off-by: Sumit Garg --- MAINTAINERS | 5 + drivers/char/hw_random/Kconfig | 15 ++ drivers/char/hw_random/Makefile | 1 + drivers/char/hw_random/optee-rng.c | 274 +++++++++++++++++++++++++++++++++++++ 4 files changed, 295 insertions(+) create mode 100644 drivers/char/hw_random/optee-rng.c -- 2.7.4 diff --git a/MAINTAINERS b/MAINTAINERS index 51029a4..dcef7e9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11262,6 +11262,11 @@ M: Jens Wiklander S: Maintained F: drivers/tee/optee/ +OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER +M: Sumit Garg +S: Maintained +F: drivers/char/hw_random/optee-rng.c + OPA-VNIC DRIVER M: Dennis Dalessandro M: Niranjana Vishwanathapura diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index dac895d..25a7d8f 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -424,6 +424,21 @@ config HW_RANDOM_EXYNOS will be called exynos-trng. If unsure, say Y. + +config HW_RANDOM_OPTEE + tristate "OP-TEE based Random Number Generator support" + depends on OPTEE + default HW_RANDOM + help + This driver provides support for OP-TEE based Random Number + Generator on ARM SoCs where hardware entropy sources are not + accessible to normal world (Linux). + + To compile this driver as a module, choose M here: the module + will be called optee-rng. + + If unsure, say Y. + endif # HW_RANDOM config UML_RANDOM diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile index e35ec3c..7c9ef4a 100644 --- a/drivers/char/hw_random/Makefile +++ b/drivers/char/hw_random/Makefile @@ -38,3 +38,4 @@ obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o obj-$(CONFIG_HW_RANDOM_MTK) += mtk-rng.o obj-$(CONFIG_HW_RANDOM_S390) += s390-trng.o obj-$(CONFIG_HW_RANDOM_KEYSTONE) += ks-sa-rng.o +obj-$(CONFIG_HW_RANDOM_OPTEE) += optee-rng.o diff --git a/drivers/char/hw_random/optee-rng.c b/drivers/char/hw_random/optee-rng.c new file mode 100644 index 0000000..4ad0eca --- /dev/null +++ b/drivers/char/hw_random/optee-rng.c @@ -0,0 +1,274 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2018-2019 Linaro Ltd. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define DRIVER_NAME "optee-rng" + +#define TEE_ERROR_HEALTH_TEST_FAIL 0x00000001 + +/* + * TA_CMD_GET_ENTROPY - Get Entropy from RNG + * + * param[0] (inout memref) - Entropy buffer memory reference + * param[1] unused + * param[2] unused + * param[3] unused + * + * Result: + * TEE_SUCCESS - Invoke command success + * TEE_ERROR_BAD_PARAMETERS - Incorrect input param + * TEE_ERROR_NOT_SUPPORTED - Requested entropy size greater than size of pool + * TEE_ERROR_HEALTH_TEST_FAIL - Continuous health testing failed + */ +#define TA_CMD_GET_ENTROPY 0x0 + +/* + * TA_CMD_GET_RNG_INFO - Get RNG information + * + * param[0] (out value) - value.a: RNG data-rate in bytes per second + * value.b: Quality/Entropy per 1024 bit of data + * param[1] unused + * param[2] unused + * param[3] unused + * + * Result: + * TEE_SUCCESS - Invoke command success + * TEE_ERROR_BAD_PARAMETERS - Incorrect input param + */ +#define TA_CMD_GET_RNG_INFO 0x1 + +#define MAX_ENTROPY_REQ_SZ (4 * 1024) + +static struct tee_context *ctx; +static struct tee_shm *entropy_shm_pool; +static u32 ta_rng_data_rate; +static u32 ta_rng_session_id; + +static size_t get_optee_rng_data(void *buf, size_t req_size) +{ + u32 ret = 0; + u8 *rng_data = NULL; + size_t rng_size = 0; + struct tee_ioctl_invoke_arg inv_arg = {0}; + struct tee_param param[4] = {0}; + + /* Invoke TA_CMD_GET_ENTROPY function of Trusted App */ + inv_arg.func = TA_CMD_GET_ENTROPY; + inv_arg.session = ta_rng_session_id; + inv_arg.num_params = 4; + + /* Fill invoke cmd params */ + param[0].attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT; + param[0].u.memref.shm = entropy_shm_pool; + param[0].u.memref.size = req_size; + param[0].u.memref.shm_offs = 0; + + ret = tee_client_invoke_func(ctx, &inv_arg, param); + if ((ret < 0) || (inv_arg.ret != 0)) { + pr_err("TA_CMD_GET_ENTROPY invoke function error: %x\n", + inv_arg.ret); + return 0; + } + + rng_data = tee_shm_get_va(entropy_shm_pool, 0); + if (IS_ERR(rng_data)) { + pr_err("tee_shm_get_va failed\n"); + return 0; + } + + rng_size = param[0].u.memref.size; + memcpy(buf, rng_data, rng_size); + + return rng_size; +} + +static int optee_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait) +{ + u8 *data = buf; + size_t read = 0, rng_size = 0; + int timeout = 1; + + if (max > MAX_ENTROPY_REQ_SZ) + max = MAX_ENTROPY_REQ_SZ; + + while (read == 0) { + rng_size = get_optee_rng_data(data, (max - read)); + + data += rng_size; + read += rng_size; + + if (wait) { + if (timeout-- == 0) + return read; + msleep((1000 * (max - read)) / ta_rng_data_rate); + } else { + return read; + } + } + + return read; +} + +static int optee_rng_init(struct hwrng *rng) +{ + entropy_shm_pool = tee_shm_alloc(ctx, MAX_ENTROPY_REQ_SZ, + TEE_SHM_MAPPED | TEE_SHM_DMA_BUF); + if (IS_ERR(entropy_shm_pool)) { + pr_err("tee_shm_alloc failed\n"); + return PTR_ERR(entropy_shm_pool); + } + + return 0; +} + +static void optee_rng_cleanup(struct hwrng *rng) +{ + tee_shm_free(entropy_shm_pool); +} + +static struct hwrng optee_rng = { + .name = DRIVER_NAME, + .init = optee_rng_init, + .cleanup = optee_rng_cleanup, + .read = optee_rng_read, +}; + +static int get_optee_rng_info(struct device *dev) +{ + u32 ret = 0; + struct tee_ioctl_invoke_arg inv_arg = {0}; + struct tee_param param[4] = {0}; + + /* Invoke TA_CMD_GET_RNG_INFO function of Trusted App */ + inv_arg.func = TA_CMD_GET_RNG_INFO; + inv_arg.session = ta_rng_session_id; + inv_arg.num_params = 4; + + /* Fill invoke cmd params */ + param[0].attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT; + + ret = tee_client_invoke_func(ctx, &inv_arg, param); + if ((ret < 0) || (inv_arg.ret != 0)) { + dev_err(dev, "TA_CMD_GET_RNG_INFO invoke func error: %x\n", + inv_arg.ret); + return -EINVAL; + } + + ta_rng_data_rate = param[0].u.value.a; + optee_rng.quality = param[0].u.value.b; + + return 0; +} + +static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data) +{ + if (ver->impl_id == TEE_IMPL_ID_OPTEE) + return 1; + else + return 0; +} + +static int optee_rng_probe(struct device *dev) +{ + struct tee_client_device *rng_device = to_tee_client_device(dev); + int ret = 0, err = -ENODEV; + struct tee_ioctl_open_session_arg sess_arg = {0}; + + /* Open context with TEE driver */ + ctx = tee_client_open_context(NULL, optee_ctx_match, NULL, NULL); + if (IS_ERR(ctx)) + return -ENODEV; + + /* Open session with hwrng Trusted App */ + memcpy(sess_arg.uuid, rng_device->id.uuid.b, TEE_IOCTL_UUID_LEN); + sess_arg.clnt_login = TEE_IOCTL_LOGIN_PUBLIC; + sess_arg.num_params = 0; + + ret = tee_client_open_session(ctx, &sess_arg, NULL); + if ((ret < 0) || (sess_arg.ret != 0)) { + dev_err(dev, "tee_client_open_session failed, error: %x\n", + sess_arg.ret); + err = -EINVAL; + goto out_ctx; + } + ta_rng_session_id = sess_arg.session; + + err = get_optee_rng_info(dev); + if (err) + goto out_sess; + + err = hwrng_register(&optee_rng); + if (err) { + dev_err(dev, "hwrng registration failed (%d)\n", err); + goto out_sess; + } + + return 0; + +out_sess: + tee_client_close_session(ctx, ta_rng_session_id); +out_ctx: + tee_client_close_context(ctx); + + return err; +} + +static int optee_rng_remove(struct device *dev) +{ + hwrng_unregister(&optee_rng); + tee_client_close_session(ctx, ta_rng_session_id); + tee_client_close_context(ctx); + + return 0; +} + +const struct tee_client_device_id optee_rng_id_table[] = { + {UUID_INIT(0xab7a617c, 0xb8e7, 0x4d8f, + 0x83, 0x01, 0xd0, 0x9b, 0x61, 0x03, 0x6b, 0x64)}, + {} +}; + +MODULE_DEVICE_TABLE(tee, optee_rng_id_table); + +static struct tee_client_driver optee_rng_driver = { + .id_table = optee_rng_id_table, + .driver = { + .name = DRIVER_NAME, + .bus = &tee_bus_type, + .probe = optee_rng_probe, + .remove = optee_rng_remove, + }, +}; + +static int __init optee_rng_mod_init(void) +{ + int rc; + + rc = driver_register(&optee_rng_driver.driver); + if (rc) + pr_warn("driver registration failed, err: %d", rc); + + return rc; +} + +static void __exit optee_rng_mod_exit(void) +{ + driver_unregister(&optee_rng_driver.driver); +} + +module_init(optee_rng_mod_init); +module_exit(optee_rng_mod_exit); + +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Sumit Garg "); +MODULE_DESCRIPTION("OP-TEE based random number generator driver");