From patchwork Fri Oct 13 19:32:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volodymyr Babchuk X-Patchwork-Id: 115828 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1087372qgn; Fri, 13 Oct 2017 12:36:28 -0700 (PDT) X-Google-Smtp-Source: AOwi7QB5UU1sVwd7mHi1g8HiKLEhorqPDg/B+MQwHsKU405GtRl7h/6c4USfrmEQMnHxsJ7iiy/R X-Received: by 10.101.86.196 with SMTP id w4mr2172156pgs.335.1507923388287; Fri, 13 Oct 2017 12:36:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507923388; cv=none; d=google.com; s=arc-20160816; b=siYZ+XFH89zybpZ0UiI67Fw66GY5C1Zb6HBmvSw17IQtLHOMwSQCNblneO5sUkdjHX mQ9mHGA2QxPk9m7fhClOUZXMo2XrH7gUg5FEnnkRXqf9C3CAvh/55V5g4YiR6HGTGNGB MsUKUAGlxAQ11EuvuSDtXuJQX+K0nBmPozMYyWk22JSPFPr1/lXm5+4deBA9CBFwrF4A NKbN3iKWrkkP+dggK/7rAPyYOy/Cf6s8g3fEx9/BRQZvb7WKMik+FxJtImnoUYpTOCwH 9itFT6lm5Kpqq+Dr0HVg9f4EuPzuIctNvyPuB3MpLjPC1dE7wfOU+MhO+qfbmYgfMqDy kGfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature:arc-authentication-results; bh=502BI4/cdc4/SQWikSTzPb5ItC4sBIJz0AORigqiUdI=; b=NDhUhJHuAhzQ8ni/9YmVwLSE3ORx5IpnduZyJwmQrnBPyxAKLJlFuHHBrd3NgVPQWY dP/IFfI4EwmLGDAciJUONZJHw1lP7i4Dm8n88h6ev2wFnb5IHPqmRfpAPgqGY2xGfCde Kt4OAu39B8In7DdOUA5XmTe3Y9wVn87Cm7b5O9PCtpXgCNnlE5vbMxwvscCQTkWSyqK4 2E7wMjHfbc+J57NgvZoHjKJxb9R4rgfJ2YmGDKq5iUEbWsASDv+KQQd6/586DLUfmP/H aZ7UIJCfQgLwQLuXYi8vf+n6jxzzbx6Tsk7muCMoeeQGLdbLc2917pw0JlIyeStJWtAL aF+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@EPAM.onmicrosoft.com header.s=selector1-epam-com header.b=EoOzx70v; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t8si1003162plz.145.2017.10.13.12.36.28; Fri, 13 Oct 2017 12:36:28 -0700 (PDT) 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=@EPAM.onmicrosoft.com header.s=selector1-epam-com header.b=EoOzx70v; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753419AbdJMTd3 (ORCPT + 27 others); Fri, 13 Oct 2017 15:33:29 -0400 Received: from mail-eopbgr00077.outbound.protection.outlook.com ([40.107.0.77]:23091 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753240AbdJMTdM (ORCPT ); Fri, 13 Oct 2017 15:33:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=EPAM.onmicrosoft.com; s=selector1-epam-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=502BI4/cdc4/SQWikSTzPb5ItC4sBIJz0AORigqiUdI=; b=EoOzx70vSwnZRkHD/2UATNqkRgO1JMKCfRskoWK0weRtMBLQk2ZNd437bC6fAbBnPMEetHBEJb24maj0pkqa/DSvYMNnQ873N5XkA2JaLbr+eVE4+6HBrESmdI/xJPSzrT0gg6BMbdQZPO/fdKTYeUV8zin07C7Z4q6U12DRMSo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Volodymyr_Babchuk@epam.com; Received: from EPUAKYIW2556.kyiv.epam.com (85.223.209.52) by DB6PR0301MB2134.eurprd03.prod.outlook.com (2603:10a6:4:46::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Fri, 13 Oct 2017 19:33:07 +0000 Received: by EPUAKYIW2556.kyiv.epam.com (sSMTP sendmail emulation); Fri, 13 Oct 2017 22:33:01 +0300 From: Volodymyr Babchuk To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, tee-dev@lists.linaro.org, Jens Wiklander Cc: volodymyr_babchuk@epam.com, Volodymyr Babchuk Subject: [PATCH v1 02/14] tee: add register user memory Date: Fri, 13 Oct 2017 22:32:32 +0300 Message-Id: <1507923164-12796-3-git-send-email-volodymyr_babchuk@epam.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507923164-12796-1-git-send-email-volodymyr_babchuk@epam.com> References: <1506621851-6929-1-git-send-email-volodymyr_babchuk@epam.com> <1507923164-12796-1-git-send-email-volodymyr_babchuk@epam.com> MIME-Version: 1.0 X-Originating-IP: [85.223.209.52] X-ClientProxiedBy: DB3PR0202CA0025.eurprd02.prod.outlook.com (2603:10a6:8:1::38) To DB6PR0301MB2134.eurprd03.prod.outlook.com (2603:10a6:4:46::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 46efc6b9-b857-4eb9-e409-08d512713b1b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:DB6PR0301MB2134; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0301MB2134; 3:xnLSvVScB4r1W+hPKhPISrrvGin/v6xS+Gi1N+VgCYznQd3Jq14IHxkrdAxaeQNtMV6xKd6Ira5uXMD0B3zYRMmP1NX2WkL9TFitoIEzZPfWlq24aJMwb1Ykoo7D14pjEAYKyo05CG1nZbREDUTvwARfPO/UBc/tAm0/+2YEJ3zMrovO6jixEWD/ApCdkP9lILBo8v07OQOBFUNGXt8Ehh3sdHddLeX6qUYHAwv8UX2BmTZB6NkKuaa24TVuS3q2; 25:RKfAOYt30NixY2rdgXLpbjvExaWu5pXKz3ihR/2fYONU5VRZ3vjXlaIwHCX8qWxp6D1hvIeQg/rTOWTUaz3LcCl2BAul7bMrilfMFRx6TnYA5M8JWTPcPtrucqDauBi/H6BrM5h+NQNfZfpfojPIDmiKoNKySzUjsmDJ/BG7oz4WrxWW4RiwGEKZoFq2YhYb5HHEAne/exATkGwfKl+aAvP3mfoSBOJxNerawFo2oJNGfWqmNCBi0LtBsXZ2RmI6mf1QBw+rQLjknT9efqSwzmY5KjSMiiLd0SFK46Tca5CpP1K7Fd8hWbBzyay9wC81t5XW4Vdeo85iwLas7v+g0A==; 31:B9C+kAJkEesNOnmYGelKqU+SQhoyRvp2nNhv9wCHOmzB1FvnCuiODFzGCY/K7+VtNVuHj5gkomomKcCoCJRFp5xFub29JOidqsWmvOdKERDIdcT3bIcjzAFmhBa1DEX8fKWGS4dOnlpbvc5ySFLcmUN+DcdCberwrN6N5TIZZxGbwSq+XrN+TReJndOcNqlT057uT7awgWLk8tMmq3SSGp36q4TKtOGVe2TFWaUiho4= X-MS-TrafficTypeDiagnostic: DB6PR0301MB2134: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0301MB2134; 20:h6t3AgjVL2edXHJG+vCDPd4GD5yiQeaCmZQ+JfpiaZlx8dOPA3yA3oCOL32x+/AD919X53yy0Uc9fnGM3CzCNJgQXASxmT6LPQPNmB7pR8W7dCqrHMX+v9hBwQzReWw7agCehC7naL0or5soDCasbQk7tx7Ps8E4stNV/2fvsyyt3qXAWfKA3DR1dcs0XXdNwI19Mb+SiatYPiG4a4JWm8nUGPifGXrWUwwCJugUCXrhU72BALyXsfMjqIIMf8HA8hnO0ce/Iy9WYvrsxYwq04RFZNIv9c6Kp1dYoqcy2Vp/WzwjOoJsysT5oThj/FSr+ZgaQsDrYjOJDK8H9hYRZcwCBWAV+TiqTbOo3WEKuyJcubYV9cxTsRTtVr2+enjcpRA4sOteTdIkNYYgHBadrVMaBa728fY8Imm6XnlT+1Rrjy2YZfxCDjvo4w4IQDysg1bKYfE978EOIpKA5CKJ7DkvLAQmpToG4lGCmlxrxuEsm04gou2ABZlo3ZzpDfT/; 4:CDzZ6RYVJG9zUyOTQ/MoByWJQZKqyxSaexiAe9i3byPOlJwZy4z7o4Wb8oRf27sHJPlPpj19teHBGlmY+niv2tPihRSL627fHQtKhI9p0N8FMAwinv8vs9yedYTtSHI5q9yeyGusUGbcxt00QsSPHXlsNznKp1XChrasqJo1F0wcdhiVsTXdzRcjBgNZxiBF/sWbHp+HK2e46D7UVIvrPH0SArDDRSCjAGvjHBsalcYZqdN5V1yLVNYmw6A24Nii X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(6041248)(20161123562025)(20161123560025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DB6PR0301MB2134; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DB6PR0301MB2134; X-Forefront-PRVS: 04599F3534 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(189002)(199003)(47776003)(4326008)(50466002)(5003940100001)(2906002)(48376002)(6666003)(105586002)(72206003)(478600001)(66066001)(106356001)(39060400002)(80792005)(189998001)(81166006)(97736004)(81156014)(8676002)(8936002)(68736007)(305945005)(7736002)(76176999)(316002)(86362001)(16586007)(122856001)(36756003)(101416001)(42186006)(50986999)(6916009)(50226002)(6116002)(5660300001)(53936002)(2950100002)(3846002)(33646002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0301MB2134; H:EPUAKYIW2556.kyiv.epam.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: epam.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DB6PR0301MB2134; 23:YQcmF/t8s1r1AtsFP8G0Xt7s7o+oI+/uPuI8sKwtaw9exRSKZqbwTRu42SpsNyAWT+LELKdyMbPmQUBTDZF7C5rKC9dkLnikBSHAalWgBkzXfhjaMQWKRiv7c8x+0ltLG8ACA8zG9rnb//LR7hRFpjoHTDS9L3NEqRxHeon8EFrYB56gFzvRZCJsx36rHJHDCIdiFOQIQyiLe0jUX2YuDZfJAHbSExcqfA5x9I95IEzel7WDha7JQivY7ncuk8rPvntT7qnnW4oScoHttsd0WWTsqlZLU6Wn/jm4m4StPmAQWnVCY1AfI0B7X28JJ/1BHfn0Xoii0wCmghWZVMA3COA39vXwaHMvidKZ2dATylYuPhu0d4V9TrKs25b5mIrp/EgfYMGxuuzDhuvSnWflwPppJTgIznMPq61lLfzKwpQxMVYZ1E17rupdPz7/DOuahngsCKqCkebL/fymX+lYYAYegrAK79E+4A1E/UBO0fULj19vrSqcgQUcHyFk2Kd8IKmKzZ8HQG7cDJjNvXgp1kCap3iLXtO3JfOl9LkyD/+2HIxiBfEho7BRK1Zr77rjTAQqHmRGFmFFVTHk38lY1ifoxchAMNpn3zcjJltM2geBAqbIVQl+l3kP3NRi+CL4DPiMhlBozglFDgycM0dqvWb81pzLdS6rF3iai5FRFpRG0np83IlAvNfW0yeTeyehfyvh4X7XNLw5h4CHLPABSTuylXFLcShaA36vu/yrJzWZCn3g5QS4VGbX7IzMJ2BWEP2zjEqoh2zXDrkPr5tse0hjOcFL+GfTfCNxXtYQSAuOOD/5h+sUgmAZ6euZMZF+ST1sV6bCX+UldqGly+HbLp/eu1GCfocHhJFM3L7UzruxOU8XRyWvhx6f9DQUgwzOUhwU8WtJBh/0WChlHemyPAk2kgiSaD7rN2xttQtyH0QKmsatAL6b0tDdPeZVuwVWhwUvijOLQniJwjEJ6lS1B8s0C7rV1PUsrM73DfDTAcwAKnZIenWYrjBw93n3cq3taytEkWrJFXx6cuQTL+ZcGjKjCxtDqPMGSfL8xrkNg5jIDDqDcNO8TxGwxdeyzsDZ X-Microsoft-Exchange-Diagnostics: 1; DB6PR0301MB2134; 6:Y4b5+VhWVYgwhpxoaBFaH0u28mSoGS4BuBrlSfEOjc09ghyQDPi/yD9Uo9VXPrwuPekkrvQW25MefAgmB2EyyGlamzhTIk0YLLg6YjeutO1Z9649MiUDYiQNYvsWXaNZxrDwBaB8RmYqVF/rWR4vJJx89Sy2+SgdiFLRFD4hnXhNshSkNd7/uQzyqYWXnZzp2W0enRkj4rvTWufT0nYT+Ksex1qe4atd0F5lkBvP1+oc32sYjLhWvpzyc+8cwkfslJxMSnfWepriE0O2hy8UsZKqfrXrd9Jsrk2kMSaMwWU8s0zqsButa9gr+llMKWZxfl5BX3bJj4DsntP2QStkyw==; 5:DLZSTVVMEFpY7RGzy9b3AYgAam+03um2LPh0OFzSI8KU+8XSyl2bAsFfXHa3vx5M7eyl/adPZ2FmcaFvAHwkAD15kBI2pzrYL5Er/Jv5iKIJuDudRMOeNL0Wrk5UFs2o7BrAfAWMEDVnJhlSlD6JBPGhJkHSS5qQaZh+GurQgMs=; 24:mp8Gwp+sPgo3dBMvHaramgV/ZkLYElgbXgZyk+TSGhWA3gtiB2s3bXx4JcSUFsRD88sdERML1Ow1Cx2AY+0WaMJ2TBPz8s+0pewAntqcWKw=; 7:gFmymWi/O2RJ1sJv9hGt5o+MGXsgblaD69MHYeZAMcxyB0KHhV9JdjVsECQQf+qrhSnbT2e1GCetmGhYBjsgf6eCG1cHa5rWJhmr0cbHZtHacFh/he5/1wTA1X32Zl0lH2C8bGItAOtvJXEDFsgOcn2ZyNcxfSpgC/jyf2BLN5VuHRyj2K4MTvet4lTXj/ZFQyQ+Zkh6mqJIpEGC8neqJ2asoZM+mBI8bPyDPsKbFfI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2017 19:33:07.0081 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b41b72d0-4e9f-4c26-8a69-f949f367c91d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0301MB2134 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jens Wiklander Added new ioctl to allow users register own buffers as a shared memory. Signed-off-by: Jens Wiklander Signed-off-by: Volodymyr Babchuk --- * Removed dev_err() in cases when this is not exactly an error * tee_shm_register() return ENOTSUPP in cases when registration of memory is not supported. * Fixed nasty mistake with sizeof(struct page) instead of sizeof(struct page*) * tee_shm_is_registered() made inline. In v1 there was separate patch that did this. --- drivers/tee/tee_core.c | 41 +++++++++- drivers/tee/tee_shm.c | 205 +++++++++++++++++++++++++++++++++++++++++------ include/linux/tee_drv.h | 47 ++++++++++- include/uapi/linux/tee.h | 30 +++++++ 4 files changed, 293 insertions(+), 30 deletions(-) -- 2.7.4 diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 58a5009..295910f 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -114,8 +114,6 @@ static int tee_ioctl_shm_alloc(struct tee_context *ctx, if (data.flags) return -EINVAL; - data.id = -1; - shm = tee_shm_alloc(ctx, data.size, TEE_SHM_MAPPED | TEE_SHM_DMA_BUF); if (IS_ERR(shm)) return PTR_ERR(shm); @@ -138,6 +136,43 @@ static int tee_ioctl_shm_alloc(struct tee_context *ctx, return ret; } +static int +tee_ioctl_shm_register(struct tee_context *ctx, + struct tee_ioctl_shm_register_data __user *udata) +{ + long ret; + struct tee_ioctl_shm_register_data data; + struct tee_shm *shm; + + if (copy_from_user(&data, udata, sizeof(data))) + return -EFAULT; + + /* Currently no input flags are supported */ + if (data.flags) + return -EINVAL; + + shm = tee_shm_register(ctx, data.addr, data.length, + TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED); + if (IS_ERR(shm)) + return PTR_ERR(shm); + + data.id = shm->id; + data.flags = shm->flags; + data.length = shm->size; + + if (copy_to_user(udata, &data, sizeof(data))) + ret = -EFAULT; + else + ret = tee_shm_get_fd(shm); + /* + * When user space closes the file descriptor the shared memory + * should be freed or if tee_shm_get_fd() failed then it will + * be freed immediately. + */ + tee_shm_put(shm); + return ret; +} + static int params_from_user(struct tee_context *ctx, struct tee_param *params, size_t num_params, struct tee_ioctl_param __user *uparams) @@ -586,6 +621,8 @@ static long tee_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) return tee_ioctl_version(ctx, uarg); case TEE_IOC_SHM_ALLOC: return tee_ioctl_shm_alloc(ctx, uarg); + case TEE_IOC_SHM_REGISTER: + return tee_ioctl_shm_register(ctx, uarg); case TEE_IOC_OPEN_SESSION: return tee_ioctl_open_session(ctx, uarg); case TEE_IOC_INVOKE: diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index fdda89e..177e341 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -23,7 +23,6 @@ static void tee_shm_release(struct tee_shm *shm) { struct tee_device *teedev = shm->teedev; - struct tee_shm_pool_mgr *poolm; mutex_lock(&teedev->mutex); idr_remove(&teedev->idr, shm->id); @@ -31,12 +30,29 @@ static void tee_shm_release(struct tee_shm *shm) list_del(&shm->link); mutex_unlock(&teedev->mutex); - if (shm->flags & TEE_SHM_DMA_BUF) - poolm = teedev->pool->dma_buf_mgr; - else - poolm = teedev->pool->private_mgr; + if (shm->flags & TEE_SHM_POOL) { + struct tee_shm_pool_mgr *poolm; + + if (shm->flags & TEE_SHM_DMA_BUF) + poolm = teedev->pool->dma_buf_mgr; + else + poolm = teedev->pool->private_mgr; + + poolm->ops->free(poolm, shm); + } else if (shm->flags & TEE_SHM_REGISTER) { + size_t n; + int rc = teedev->desc->ops->shm_unregister(shm->ctx, shm); + + if (rc) + dev_err(teedev->dev.parent, + "unregister shm %p failed: %d", shm, rc); + + for (n = 0; n < shm->num_pages; n++) + put_page(shm->pages[n]); + + kfree(shm->pages); + } - poolm->ops->free(poolm, shm); kfree(shm); tee_device_put(teedev); @@ -76,6 +92,10 @@ static int tee_shm_op_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma) struct tee_shm *shm = dmabuf->priv; size_t size = vma->vm_end - vma->vm_start; + /* Refuse sharing shared memory provided by application */ + if (shm->flags & TEE_SHM_REGISTER) + return -EINVAL; + return remap_pfn_range(vma, vma->vm_start, shm->paddr >> PAGE_SHIFT, size, vma->vm_page_prot); } @@ -89,26 +109,20 @@ static const struct dma_buf_ops tee_shm_dma_buf_ops = { .mmap = tee_shm_op_mmap, }; -/** - * tee_shm_alloc() - Allocate shared memory - * @ctx: Context that allocates the shared memory - * @size: Requested size of shared memory - * @flags: Flags setting properties for the requested shared memory. - * - * Memory allocated as global shared memory is automatically freed when the - * TEE file pointer is closed. The @flags field uses the bits defined by - * TEE_SHM_* in . TEE_SHM_MAPPED must currently always be - * set. If TEE_SHM_DMA_BUF global shared memory will be allocated and - * associated with a dma-buf handle, else driver private memory. - */ -struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags) +struct tee_shm *__tee_shm_alloc(struct tee_context *ctx, + struct tee_device *teedev, + size_t size, u32 flags) { - struct tee_device *teedev = ctx->teedev; struct tee_shm_pool_mgr *poolm = NULL; struct tee_shm *shm; void *ret; int rc; + if (ctx && ctx->teedev != teedev) { + dev_err(teedev->dev.parent, "ctx and teedev mismatch\n"); + return ERR_PTR(-EINVAL); + } + if (!(flags & TEE_SHM_MAPPED)) { dev_err(teedev->dev.parent, "only mapped allocations supported\n"); @@ -135,7 +149,7 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags) goto err_dev_put; } - shm->flags = flags; + shm->flags = flags | TEE_SHM_POOL; shm->teedev = teedev; shm->ctx = ctx; if (flags & TEE_SHM_DMA_BUF) @@ -171,9 +185,12 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags) goto err_rem; } } - mutex_lock(&teedev->mutex); - list_add_tail(&shm->link, &ctx->list_shm); - mutex_unlock(&teedev->mutex); + + if (ctx) { + mutex_lock(&teedev->mutex); + list_add_tail(&shm->link, &ctx->list_shm); + mutex_unlock(&teedev->mutex); + } return shm; err_rem: @@ -188,8 +205,139 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags) tee_device_put(teedev); return ret; } +/** + * tee_shm_alloc() - Allocate shared memory + * @ctx: Context that allocates the shared memory + * @size: Requested size of shared memory + * @flags: Flags setting properties for the requested shared memory. + * + * Memory allocated as global shared memory is automatically freed when the + * TEE file pointer is closed. The @flags field uses the bits defined by + * TEE_SHM_* in . TEE_SHM_MAPPED must currently always be + * set. If TEE_SHM_DMA_BUF global shared memory will be allocated and + * associated with a dma-buf handle, else driver private memory. + */ +struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags) +{ + return __tee_shm_alloc(ctx, ctx->teedev, size, flags); +} EXPORT_SYMBOL_GPL(tee_shm_alloc); +struct tee_shm *tee_shm_priv_alloc(struct tee_device *teedev, size_t size) +{ + return __tee_shm_alloc(NULL, teedev, size, TEE_SHM_MAPPED); +} +EXPORT_SYMBOL_GPL(tee_shm_priv_alloc); + +struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, + size_t length, u32 flags) +{ + struct tee_device *teedev = ctx->teedev; + const u32 req_flags = TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED; + struct tee_shm *shm; + void *ret; + int rc; + int num_pages; + unsigned long start; + + if (flags != req_flags) + return ERR_PTR(-ENOTSUPP); + + if (!tee_device_get(teedev)) + return ERR_PTR(-EINVAL); + + if (!teedev->desc->ops->shm_register || + !teedev->desc->ops->shm_unregister) { + tee_device_put(teedev); + return ERR_PTR(-ENOTSUPP); + } + + shm = kzalloc(sizeof(*shm), GFP_KERNEL); + if (!shm) { + ret = ERR_PTR(-ENOMEM); + goto err; + } + + shm->flags = flags | TEE_SHM_REGISTER; + shm->teedev = teedev; + shm->ctx = ctx; + shm->id = -1; + start = rounddown(addr, PAGE_SIZE); + shm->offset = addr - start; + shm->size = length; + num_pages = (roundup(addr + length, PAGE_SIZE) - start) / PAGE_SIZE; + shm->pages = kcalloc(num_pages, sizeof(*shm->pages), GFP_KERNEL); + if (!shm->pages) { + ret = ERR_PTR(-ENOMEM); + goto err; + } + + rc = get_user_pages_fast(start, num_pages, 1, shm->pages); + if (rc > 0) + shm->num_pages = rc; + if (rc != num_pages) { + if (rc > 0) + rc = -ENOMEM; + ret = ERR_PTR(rc); + goto err; + } + + mutex_lock(&teedev->mutex); + shm->id = idr_alloc(&teedev->idr, shm, 1, 0, GFP_KERNEL); + mutex_unlock(&teedev->mutex); + + if (shm->id < 0) { + ret = ERR_PTR(shm->id); + goto err; + } + + rc = teedev->desc->ops->shm_register(ctx, shm, shm->pages, + shm->num_pages); + if (rc) { + ret = ERR_PTR(rc); + goto err; + } + + if (flags & TEE_SHM_DMA_BUF) { + DEFINE_DMA_BUF_EXPORT_INFO(exp_info); + + exp_info.ops = &tee_shm_dma_buf_ops; + exp_info.size = shm->size; + exp_info.flags = O_RDWR; + exp_info.priv = shm; + + shm->dmabuf = dma_buf_export(&exp_info); + if (IS_ERR(shm->dmabuf)) { + ret = ERR_CAST(shm->dmabuf); + teedev->desc->ops->shm_unregister(ctx, shm); + goto err; + } + } + + mutex_lock(&teedev->mutex); + list_add_tail(&shm->link, &ctx->list_shm); + mutex_unlock(&teedev->mutex); + + return shm; +err: + if (shm) { + size_t n; + + if (shm->id >= 0) { + mutex_lock(&teedev->mutex); + idr_remove(&teedev->idr, shm->id); + mutex_unlock(&teedev->mutex); + } + for (n = 0; n < shm->num_pages; n++) + put_page(shm->pages[n]); + kfree(shm->pages); + } + kfree(shm); + tee_device_put(teedev); + return ret; +} +EXPORT_SYMBOL_GPL(tee_shm_register); + /** * tee_shm_get_fd() - Increase reference count and return file descriptor * @shm: Shared memory handle @@ -197,10 +345,9 @@ EXPORT_SYMBOL_GPL(tee_shm_alloc); */ int tee_shm_get_fd(struct tee_shm *shm) { - u32 req_flags = TEE_SHM_MAPPED | TEE_SHM_DMA_BUF; int fd; - if ((shm->flags & req_flags) != req_flags) + if (!(shm->flags & TEE_SHM_DMA_BUF)) return -EINVAL; fd = dma_buf_fd(shm->dmabuf, O_CLOEXEC); @@ -238,6 +385,8 @@ EXPORT_SYMBOL_GPL(tee_shm_free); */ int tee_shm_va2pa(struct tee_shm *shm, void *va, phys_addr_t *pa) { + if (!(shm->flags & TEE_SHM_MAPPED)) + return -EINVAL; /* Check that we're in the range of the shm */ if ((char *)va < (char *)shm->kaddr) return -EINVAL; @@ -258,6 +407,8 @@ EXPORT_SYMBOL_GPL(tee_shm_va2pa); */ int tee_shm_pa2va(struct tee_shm *shm, phys_addr_t pa, void **va) { + if (!(shm->flags & TEE_SHM_MAPPED)) + return -EINVAL; /* Check that we're in the range of the shm */ if (pa < shm->paddr) return -EINVAL; @@ -284,6 +435,8 @@ EXPORT_SYMBOL_GPL(tee_shm_pa2va); */ void *tee_shm_get_va(struct tee_shm *shm, size_t offs) { + if (!(shm->flags & TEE_SHM_MAPPED)) + return ERR_PTR(-EINVAL); if (offs >= shm->size) return ERR_PTR(-EINVAL); return (char *)shm->kaddr + offs; diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index e9be4a4..70b9c73 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -25,8 +25,12 @@ * specific TEE driver. */ -#define TEE_SHM_MAPPED 0x1 /* Memory mapped by the kernel */ -#define TEE_SHM_DMA_BUF 0x2 /* Memory with dma-buf handle */ +#define TEE_SHM_MAPPED BIT(0) /* Memory mapped by the kernel */ +#define TEE_SHM_DMA_BUF BIT(1) /* Memory with dma-buf handle */ +#define TEE_SHM_EXT_DMA_BUF BIT(2) /* Memory with dma-buf handle */ +#define TEE_SHM_REGISTER BIT(3) /* Memory registered in secure world */ +#define TEE_SHM_USER_MAPPED BIT(4) /* Memory mapped in user space */ +#define TEE_SHM_POOL BIT(5) /* Memory allocated from pool */ struct device; struct tee_device; @@ -76,6 +80,8 @@ struct tee_param { * @cancel_req: request cancel of an ongoing invoke or open * @supp_revc: called for supplicant to get a command * @supp_send: called for supplicant to send a response + * @shm_register: register shared memory buffer in TEE + * @shm_unregister: unregister shared memory buffer in TEE */ struct tee_driver_ops { void (*get_version)(struct tee_device *teedev, @@ -94,6 +100,9 @@ struct tee_driver_ops { struct tee_param *param); int (*supp_send)(struct tee_context *ctx, u32 ret, u32 num_params, struct tee_param *param); + int (*shm_register)(struct tee_context *ctx, struct tee_shm *shm, + struct page **pages, size_t num_pages); + int (*shm_unregister)(struct tee_context *ctx, struct tee_shm *shm); }; /** @@ -302,6 +311,30 @@ void *tee_get_drvdata(struct tee_device *teedev); struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags); /** + * tee_shm_priv_alloc() - Allocate shared memory privately + * @dev: Device that allocates the shared memory + * @size: Requested size of shared memory + * + * Allocates shared memory buffer that is not associated with any client + * context. Such buffers are owned by TEE driver and used for internal calls. + * + * @returns a pointer to 'struct tee_shm' + */ +struct tee_shm *tee_shm_priv_alloc(struct tee_device *teedev, size_t size); + +/** + * tee_shm_register() - Register shared memory buffer + * @ctx: Context that registers the shared memory + * @addr: Address is userspace of the shared buffer + * @length: Length of the shared buffer + * @flags: Flags setting properties for the requested shared memory. + * + * @returns a pointer to 'struct tee_shm' + */ +struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, + size_t length, u32 flags); + +/** * tee_shm_free() - Free shared memory * @shm: Handle to shared memory to free */ @@ -366,4 +399,14 @@ int tee_shm_get_id(struct tee_shm *shm); */ struct tee_shm *tee_shm_get_from_id(struct tee_context *ctx, int id); +/** + * tee_shm_is_registered() - Check if shared memory object in registered in TEE + * @shm: Shared memory handle + * @returns true if object is registered in TEE + */ +static inline bool tee_shm_is_registered(struct tee_shm *shm) +{ + return shm && (shm->flags & TEE_SHM_REGISTER); +} + #endif /*__TEE_DRV_H*/ diff --git a/include/uapi/linux/tee.h b/include/uapi/linux/tee.h index 688782e..d41a07a 100644 --- a/include/uapi/linux/tee.h +++ b/include/uapi/linux/tee.h @@ -50,6 +50,7 @@ #define TEE_GEN_CAP_GP (1 << 0)/* GlobalPlatform compliant TEE */ #define TEE_GEN_CAP_PRIVILEGED (1 << 1)/* Privileged device (for supplicant) */ +#define TEE_GEN_CAP_REG_MEM (1 << 2)/* Supports registering shared memory */ /* * TEE Implementation ID @@ -332,6 +333,35 @@ struct tee_iocl_supp_send_arg { #define TEE_IOC_SUPPL_SEND _IOR(TEE_IOC_MAGIC, TEE_IOC_BASE + 7, \ struct tee_ioctl_buf_data) +/** + * struct tee_ioctl_shm_register_data - Shared memory register argument + * @addr: [in] Start address of shared memory to register + * @length: [in/out] Length of shared memory to register + * @flags: [in/out] Flags to/from registration. + * @id: [out] Identifier of the shared memory + * + * The flags field should currently be zero as input. Updated by the call + * with actual flags as defined by TEE_IOCTL_SHM_* above. + * This structure is used as argument for TEE_IOC_SHM_REGISTER below. + */ +struct tee_ioctl_shm_register_data { + __u64 addr; + __u64 length; + __u32 flags; + __s32 id; +}; + +/** + * TEE_IOC_SHM_REGISTER - Register shared memory argument + * + * Registers shared memory between the user space process and secure OS. + * + * Returns a file descriptor on success or < 0 on failure + * + * The shared memory is unregisterred when the descriptor is closed. + */ +#define TEE_IOC_SHM_REGISTER _IOWR(TEE_IOC_MAGIC, TEE_IOC_BASE + 9, \ + struct tee_ioctl_shm_register_data) /* * Five syscalls are used when communicating with the TEE driver. * open(): opens the device associated with the driver