From patchwork Fri Oct 13 19:32:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volodymyr Babchuk X-Patchwork-Id: 115827 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1084769qgn; Fri, 13 Oct 2017 12:33:11 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCqmLPg5SMjYsoCqa6KzylntgKatM03rJaMnURC/mV4elIKBo4PaqnQG1CGThXdXqeGqJRQ X-Received: by 10.84.224.195 with SMTP id k3mr2253636pln.403.1507923191740; Fri, 13 Oct 2017 12:33:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507923191; cv=none; d=google.com; s=arc-20160816; b=zOONG/MlFRJ4jtwkUKpbniIrR/o2JxNVw80e4/tlglSC3k4xOYRVyHszz5RsXVmjrn vQm2EX/IPzJXntCPsyLx4n4uSWqMrVzdIOVRHF/stuC5HPWMIwTqwOQvaTizW2ua22GA TKsV36BI4Arxvj8fy4etjTdkzl9BWm2rb7YFUlb90oxvQSvppTCjZkgE9rBc+rITACoK GW/80l0ECJBv6KhAJCK3WaRb729pomYrQvtubw8VVOikgzv3YZru6jRTqEXybSBf3j2W 9ydwFM3dwVeSVifndCd+5Mw8V1xILQZ2WbScxyOUx2mu8shzDMm+DIVCm9rLNqRnI4wN pkKQ== 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=iZi+k3+kTkx4OCmJLCfoAMxvHXdbv50DUKvYGWWi974=; b=ABknDcZejM8nOwymX7NN+Qc9cb/kSnsR6Ney2SpYkxd+8PKY9fhjEBUsr2gjHRGY1G Y7Q0ZWbfuP/rO0BLw+XN8HFyQjaTAhlwmP6c6tDKOQyOdQNio5rcrS5ugDgnY+cz9TO+ 3qyB4WV2TMozzkb09jHQ5n23aiLiulNkALaW1bqrphxjdb2b6fY7n7UV164Okb1dBYJG 5fUcPjc0Yfa9A4Sp56EpvRYXV6Gzx8xGA6KH/1HVGxlTff64ryc79WcqpzG3+fpxlQlT 3XSvKyAuM34qiDCyxP3rfVEMzS4PVaI0vnlNg39Q8y9c73Y7uo5ugk0dH6znfwelDmUh 4cFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@EPAM.onmicrosoft.com header.s=selector1-epam-com header.b=XtCXP8Nc; 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 s16si1031704plp.187.2017.10.13.12.33.11; Fri, 13 Oct 2017 12:33:11 -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=XtCXP8Nc; 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 S1753239AbdJMTdJ (ORCPT + 27 others); Fri, 13 Oct 2017 15:33:09 -0400 Received: from mail-eopbgr50048.outbound.protection.outlook.com ([40.107.5.48]:42538 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752684AbdJMTdF (ORCPT ); Fri, 13 Oct 2017 15:33:05 -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=iZi+k3+kTkx4OCmJLCfoAMxvHXdbv50DUKvYGWWi974=; b=XtCXP8Nc0RYUxRN5R6Ku9XEnofZWAx3XoLFf2e5pgIWnCTxZuDEe+I7poOAZtM/XrO9BMebDIjgFL2DuCtsttZBmcA6Envcey+1PqW0LmJr4zt5J1C7BWo4O/Q4G+Uq7JTlVsluRcHE9B/4emKAe/u+TsoWAw7loDLePmgGgniM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Volodymyr_Babchuk@epam.com; Received: from EPUAKYIW2556.kyiv.epam.com (85.223.209.52) by AM4PR0301MB2129.eurprd03.prod.outlook.com (2603:10a6:200:4d::14) 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:32:59 +0000 Received: by EPUAKYIW2556.kyiv.epam.com (sSMTP sendmail emulation); Fri, 13 Oct 2017 22:32:56 +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 01/14] tee: flexible shared memory pool creation Date: Fri, 13 Oct 2017 22:32:31 +0300 Message-Id: <1507923164-12796-2-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: AM5PR0102CA0036.eurprd01.prod.exchangelabs.com (2603:10a6:206::49) To AM4PR0301MB2129.eurprd03.prod.outlook.com (2603:10a6:200:4d::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77962f1b-ec8f-490a-93ea-08d512713675 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:AM4PR0301MB2129; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0301MB2129; 3:DKTUdZe4REvyvNHUkrfM1vBKYrSLRMSQyleTRsPeRpIySGwM5NPr+5U7U6iL1KU/BPRzb2kpPp8WOpXSw/UpfyUoVU9k0IDc0vH6XFSPCnX7AR/bRvs/zcmJAc+iejOvBnvafQKPU81LQj0uSF2tWIXjIoPQau7Poa1hHpqB2nhUi/4twl+l3E53hEQh/0PjLFE/VxEeImaJ8QZCDJMq83n6CQGcpWTWwg8+VGIThDqYXbIXrW4rhG76QcefxKoe; 25:tZ4OWKpCJz3A9D/jVcCwDXeSuYJXWrtfw+5Z/2KdgDjVPbmeip/FBXDFGsKaV7rzbyl/vvq8s+eiiSFWeJmC9RMQzKxTnHECIbIFYFq+pSktMvBebr7vFiPykE0uQBODMIXjwiOcC2TgrIS6GsE5aF6hu8IV/EEqQWG83+HzgEn+4A1c55nwDJ0T2gBA5zqQzVYVgb4KVJmUVdu5xxB2Y779/C3HBqAbTX8F0OXKugFAj1kucCf7sVrNqEMuKCTBxGDCL1jySqbMIlE14+wFM//MwpWLn/5HxiWXxua1UpkDX9GBEkecKuej/0zmIUm/HglNCEJndQ6f3DCK7XNmfg==; 31:eReQ7xkXjpalfgRmRej+YVchgEyjYeoygaHWcNoKQg4//wtogBeB+8IEteuUTeJLfwuAuXgaIPEhmy4TDEobkXKK7FPX5ciNzDh07lRuX3MI/UsU1A0klvarQXCQxnR/4zbP2rbQRyjbipG0O1i7PTv6IF1iP6SXy1zfpwZ58KG1AXoPV5CsSaHAw3+yYD1Unaj8kRHmR/Ii0uDb6RUBvUfiODzIKL3OAeTu8H0L9vU= X-MS-TrafficTypeDiagnostic: AM4PR0301MB2129: X-Microsoft-Exchange-Diagnostics: 1; AM4PR0301MB2129; 20:sha0DoPwHTxO/W+nAD+tAPFAetrcUSk64G70nyCCFRwbOQwZSNlVvTo76cxaiZFWScbUFG3ny/1jm7MJej6Y6N4aGP7fMvxAtvRw093FVJUkdA73VUknTYXxDzdrIAVEgR6h7qFDS75pJ1dUTS8SIpFWpORrGl1skUjQ34KSSXtAcHWHt3N0jRuxoojE5yvSVhmy0tAbf8KbI+zYqCrAgvdaRyyKGd9vjSMr7fZ0QTnyNuYEffL8RJ70tY/AOPlTrqZTDfil+b03F5PuOs6bip9K6Q8OufVVAlYyhSpHLCoCgDcphg+Mz2eaGQzAblOOPxKkG7jLX3zv171yZIsgGuOUzEaI9Px+6KiqWz39enOmoAVa2dbmyLxaoxhqcBKlAyhHDIWi4CWdfGYGkAwjQqm23K6wsOcWneo0zcyXsjheEyVlMfXA6RA1x5Q2A289pRjDKH3ciO3+FmR1p2GvMzWay0DjvZXw+k0BkAgD/YE+nB1t9eO7jSyaoHfp2tc6; 4:XGobxt1Wf3xRYZdPRssqBiRMpzk+vVHwQcQ/Ej9J31nFe/dvzSmlHx/wofSU+171/EC50NFXlw738PNDJzEu1jAFxzrUq8aDy32lXQcZDPA3ZIQazTiVfujMYT6sn48NRZoYk1fRAkHVgtagVwr6Z3bL320pHimU8EH9BQFnoD3TP5iPjAvh/xFSaB+ifocXSmi2PPcCZy2JQicLWw7IZh3dxRxP/BRgVsP/3VsV9e0X5YNlpvF1dU70DwDzH+5r 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)(100000703101)(100105400095)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123562025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM4PR0301MB2129; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM4PR0301MB2129; X-Forefront-PRVS: 04599F3534 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(6009001)(376002)(346002)(189002)(199003)(33646002)(478600001)(80792005)(2906002)(39060400002)(4326008)(97736004)(76176999)(122856001)(5003940100001)(36756003)(42186006)(16586007)(316002)(101416001)(5660300001)(72206003)(189998001)(50466002)(6116002)(68736007)(3846002)(66066001)(50226002)(86362001)(48376002)(47776003)(8936002)(53936002)(105586002)(8676002)(81166006)(81156014)(106356001)(6916009)(2950100002)(7736002)(50986999)(305945005)(6666003)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR0301MB2129; 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; AM4PR0301MB2129; 23:gXDfcQRN8ZnZzXFj3JgVTimB1/L44CbnXNoXIbkaxj/Ynzp7AooeY/mQP9yDgMNk2YR3mWb0upzzbXGnKmgVD8oNEFosQBxhiA6hVq5aY/RXUgW0kxvePF6Ca54e2aE+RITou+QeYdmR+t3snHqGvXQlpVh7H3gSyiCPq8zPolhuTqsbbcRUMLsczIIysUv4upO1y4k6t1O3Kbqen2RcP4BdudLLEWE1HG1aB0a6oJBMSxAcYkRtWIRe7Z2+R56xgn9nU3RJAqa+crjBANjmy3oh1V0IHt8YkOBnjxMvC32W34EQjZXn9eJkFeFnoyB0lmlANPc5/JDVzyM8SJ1/H/DgRwNsT3Ju1FZKkWdysxX2Nkft8360hhSX7xaSip0HFBntrX7B5NaYEmTiIV4gB4bM+F7C8v9UZhGU3JdamC+h6TsGoWQnInx7MiTtwyloswXXbz4NH1vKXllTS67uOZbwBZVKldB6E/KelpCJIolCxWoAW5JZXly+eM0e1bQuMUi/D7XghujYM68zLflSvGI983UkISgefTaVj2GqOkKLGqmC6SsCjSAu3dnDuJQqrpfD8IPwxp5If32R5mRXMf2Jbda+f8NgNIK7vpxqV0bJQp/CQkekiNigcB9qZmculs8s23MxoB4tKqymfYwgKB1aNciZZOSe2gge3WW6ScGHstXpt3Hl2mdbZZnk2OBOFh+I7GOTwchB50QHxYOoqAD9uoUnNvU5LN2bj5KMSLOGrpnBXKuKYGP1WxWQvvkGQG1OM2BmSyENEDj/KEPW05my1WkRhmL8GjX+BBkov/UdTmoeCbtw3IyHnujeoqtnCCvwKigATlERvLWlGFpzLYIywqVwi78IS+5DUg7XfkwNqFkSjPfKUh1gQ7CXv/hkd/PJcOLjtooFDjUs5rwJ4CrpgqsQYgM8gMtkVb6O2GzxlRZHvwALxJ2h/L6eOh+OzNU3nVqovZH96LnoR9f5/UM4CAVG0XAUpqUVKWAsXCYAJh5dLNOjL9B7B2yCXz+uhBCn7a6lgeiD2lOiwt2ast52urJcWEA02xIguhW0lt1tldTFW55lE2C4r08C6dgug8HGy5NtY0fNFaYAAOl/bBGVzBn0lLsAwZHBZ210z9Jp5BhCOIiO6z53JGlcGZCLJvxandT0W697yFtJTGTS62cMoBay5IRMN5Vo7/DXRQ4= X-Microsoft-Exchange-Diagnostics: 1; AM4PR0301MB2129; 6:eI8hPF5/0iSeMkkIxJV9fkXCJ2408nlK55kovjxdOYJ1Mu8mSem1Dgvf52Q2ltH+S5oFNNI0QRB5ophTs3SBL/3ox/AclBuQirJCvRdEJGRrEcaEHzUXdYSoLmVKxyGnBE+T5oyUIySPE6Wov621wKHHQ7TOiqnNjK21fFswRJlIvCj8/9kPLCbF4Pvs2nTu49nn6QD2z0KUnjCQJbTXl2bBZpFHvVi/RV78cGXcgR6SBQ7+tOmrNXLzMiVppuNpjEh5Xbxch99J2M2Y0qT4EIewolhQYwJILkBWrvDgrxXDX2hy1YjYMdx26H+J5XKshr7JfoMursZQxgJ1wirZTg==; 5:bUYQalB4Bh+Wx/KEE3oZGPR7FdvK5MLs+RpI40mF2GWOHEeCxKx7/JWKBTer/i3zj7l0wMkWF5krD0KmicMpT4APpygRH8KgM25z6zUZYFR+VAkm0VIeGtNlXsHQBkWI8ByknVpFP/mU5lPD9WIblw==; 24:6O6Z9g9pvNHlVg8WRlqhxEFUTQKwLYs4UaOMa7GYxiMmU/YzwQ8mpViC8KE/asWv9kFG4AUxpn9E00HXHFpyT1hwEzs+5vFe5uCZ8BZ1YfM=; 7:ZHqf0ZgiIHTQMH78Px5owNHGcnCe6zl7d9r1F87+JfhFHTyIN6JUPGCi3vvf6Kc3eosIN6QKCF33emoJdiePaA4h0dpl1hAXa8i23y7PC/jmK0IR/YQYwu87DnAzdLy/b2hzRY/oUmlu39HEb3Zl4VqGtJimdLNSu5NYllRU/3IG5Tpoz1Slyi8jt+IYSK3vVUab+sRBw9C+JlEHJGNThsnJlAg8gsXp0MG+UFa6gAw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2017 19:32:59.3322 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b41b72d0-4e9f-4c26-8a69-f949f367c91d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0301MB2129 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jens Wiklander Makes creation of shm pools more flexible by adding new more primitive functions to allocate a shm pool. This makes it easier to add driver specific shm pool management. Signed-off-by: Jens Wiklander Signed-off-by: Volodymyr Babchuk --- drivers/tee/tee_private.h | 57 +--------------- drivers/tee/tee_shm.c | 8 +-- drivers/tee/tee_shm_pool.c | 165 ++++++++++++++++++++++++++++----------------- include/linux/tee_drv.h | 91 +++++++++++++++++++++++++ 4 files changed, 199 insertions(+), 122 deletions(-) -- 2.7.4 diff --git a/drivers/tee/tee_private.h b/drivers/tee/tee_private.h index 21cb6be..2bc2b5a 100644 --- a/drivers/tee/tee_private.h +++ b/drivers/tee/tee_private.h @@ -21,68 +21,15 @@ #include #include -struct tee_device; - -/** - * struct tee_shm - shared memory object - * @teedev: device used to allocate the object - * @ctx: context using the object, if NULL the context is gone - * @link link element - * @paddr: physical address of the shared memory - * @kaddr: virtual address of the shared memory - * @size: size of shared memory - * @dmabuf: dmabuf used to for exporting to user space - * @flags: defined by TEE_SHM_* in tee_drv.h - * @id: unique id of a shared memory object on this device - */ -struct tee_shm { - struct tee_device *teedev; - struct tee_context *ctx; - struct list_head link; - phys_addr_t paddr; - void *kaddr; - size_t size; - struct dma_buf *dmabuf; - u32 flags; - int id; -}; - -struct tee_shm_pool_mgr; - -/** - * struct tee_shm_pool_mgr_ops - shared memory pool manager operations - * @alloc: called when allocating shared memory - * @free: called when freeing shared memory - */ -struct tee_shm_pool_mgr_ops { - int (*alloc)(struct tee_shm_pool_mgr *poolmgr, struct tee_shm *shm, - size_t size); - void (*free)(struct tee_shm_pool_mgr *poolmgr, struct tee_shm *shm); -}; - -/** - * struct tee_shm_pool_mgr - shared memory manager - * @ops: operations - * @private_data: private data for the shared memory manager - */ -struct tee_shm_pool_mgr { - const struct tee_shm_pool_mgr_ops *ops; - void *private_data; -}; - /** * struct tee_shm_pool - shared memory pool * @private_mgr: pool manager for shared memory only between kernel * and secure world * @dma_buf_mgr: pool manager for shared memory exported to user space - * @destroy: called when destroying the pool - * @private_data: private data for the pool */ struct tee_shm_pool { - struct tee_shm_pool_mgr private_mgr; - struct tee_shm_pool_mgr dma_buf_mgr; - void (*destroy)(struct tee_shm_pool *pool); - void *private_data; + struct tee_shm_pool_mgr *private_mgr; + struct tee_shm_pool_mgr *dma_buf_mgr; }; #define TEE_DEVICE_FLAG_REGISTERED 0x1 diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 4bc7956..fdda89e 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -32,9 +32,9 @@ static void tee_shm_release(struct tee_shm *shm) mutex_unlock(&teedev->mutex); if (shm->flags & TEE_SHM_DMA_BUF) - poolm = &teedev->pool->dma_buf_mgr; + poolm = teedev->pool->dma_buf_mgr; else - poolm = &teedev->pool->private_mgr; + poolm = teedev->pool->private_mgr; poolm->ops->free(poolm, shm); kfree(shm); @@ -139,9 +139,9 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags) shm->teedev = teedev; shm->ctx = ctx; if (flags & TEE_SHM_DMA_BUF) - poolm = &teedev->pool->dma_buf_mgr; + poolm = teedev->pool->dma_buf_mgr; else - poolm = &teedev->pool->private_mgr; + poolm = teedev->pool->private_mgr; rc = poolm->ops->alloc(poolm, shm, size); if (rc) { diff --git a/drivers/tee/tee_shm_pool.c b/drivers/tee/tee_shm_pool.c index fb4f852..e6d4b9e 100644 --- a/drivers/tee/tee_shm_pool.c +++ b/drivers/tee/tee_shm_pool.c @@ -44,49 +44,18 @@ static void pool_op_gen_free(struct tee_shm_pool_mgr *poolm, shm->kaddr = NULL; } +static void pool_op_gen_destroy_poolmgr(struct tee_shm_pool_mgr *poolm) +{ + gen_pool_destroy(poolm->private_data); + kfree(poolm); +} + static const struct tee_shm_pool_mgr_ops pool_ops_generic = { .alloc = pool_op_gen_alloc, .free = pool_op_gen_free, + .destroy_poolmgr = pool_op_gen_destroy_poolmgr, }; -static void pool_res_mem_destroy(struct tee_shm_pool *pool) -{ - gen_pool_destroy(pool->private_mgr.private_data); - gen_pool_destroy(pool->dma_buf_mgr.private_data); -} - -static int pool_res_mem_mgr_init(struct tee_shm_pool_mgr *mgr, - struct tee_shm_pool_mem_info *info, - int min_alloc_order) -{ - size_t page_mask = PAGE_SIZE - 1; - struct gen_pool *genpool = NULL; - int rc; - - /* - * Start and end must be page aligned - */ - if ((info->vaddr & page_mask) || (info->paddr & page_mask) || - (info->size & page_mask)) - return -EINVAL; - - genpool = gen_pool_create(min_alloc_order, -1); - if (!genpool) - return -ENOMEM; - - gen_pool_set_algo(genpool, gen_pool_best_fit, NULL); - rc = gen_pool_add_virt(genpool, info->vaddr, info->paddr, info->size, - -1); - if (rc) { - gen_pool_destroy(genpool); - return rc; - } - - mgr->private_data = genpool; - mgr->ops = &pool_ops_generic; - return 0; -} - /** * tee_shm_pool_alloc_res_mem() - Create a shared memory pool from reserved * memory range @@ -104,42 +73,109 @@ struct tee_shm_pool * tee_shm_pool_alloc_res_mem(struct tee_shm_pool_mem_info *priv_info, struct tee_shm_pool_mem_info *dmabuf_info) { - struct tee_shm_pool *pool = NULL; - int ret; - - pool = kzalloc(sizeof(*pool), GFP_KERNEL); - if (!pool) { - ret = -ENOMEM; - goto err; - } + struct tee_shm_pool_mgr *priv_mgr; + struct tee_shm_pool_mgr *dmabuf_mgr; + void *rc; /* * Create the pool for driver private shared memory */ - ret = pool_res_mem_mgr_init(&pool->private_mgr, priv_info, - 3 /* 8 byte aligned */); - if (ret) - goto err; + rc = tee_shm_pool_mgr_alloc_res_mem(priv_info->vaddr, priv_info->paddr, + priv_info->size, + 3 /* 8 byte aligned */); + if (IS_ERR(rc)) + return rc; + priv_mgr = rc; /* * Create the pool for dma_buf shared memory */ - ret = pool_res_mem_mgr_init(&pool->dma_buf_mgr, dmabuf_info, - PAGE_SHIFT); - if (ret) + rc = tee_shm_pool_mgr_alloc_res_mem(dmabuf_info->vaddr, + dmabuf_info->paddr, + dmabuf_info->size, PAGE_SHIFT); + if (IS_ERR(rc)) + goto err_free_priv_mgr; + dmabuf_mgr = rc; + + rc = tee_shm_pool_alloc(priv_mgr, dmabuf_mgr); + if (IS_ERR(rc)) + goto err_free_dmabuf_mgr; + + return rc; + +err_free_dmabuf_mgr: + tee_shm_pool_mgr_destroy(dmabuf_mgr); +err_free_priv_mgr: + tee_shm_pool_mgr_destroy(priv_mgr); + + return rc; +} +EXPORT_SYMBOL_GPL(tee_shm_pool_alloc_res_mem); + +struct tee_shm_pool_mgr *tee_shm_pool_mgr_alloc_res_mem(unsigned long vaddr, + phys_addr_t paddr, + size_t size, + int min_alloc_order) +{ + const size_t page_mask = PAGE_SIZE - 1; + struct tee_shm_pool_mgr *mgr; + int rc; + + /* Start and end must be page aligned */ + if (vaddr & page_mask || paddr & page_mask || size & page_mask) + return ERR_PTR(-EINVAL); + + mgr = kzalloc(sizeof(*mgr), GFP_KERNEL); + if (!mgr) + return ERR_PTR(-ENOMEM); + + mgr->private_data = gen_pool_create(min_alloc_order, -1); + if (!mgr->private_data) { + rc = -ENOMEM; goto err; + } - pool->destroy = pool_res_mem_destroy; - return pool; + gen_pool_set_algo(mgr->private_data, gen_pool_best_fit, NULL); + rc = gen_pool_add_virt(mgr->private_data, vaddr, paddr, size, -1); + if (rc) { + gen_pool_destroy(mgr->private_data); + goto err; + } + + mgr->ops = &pool_ops_generic; + + return mgr; err: - if (ret == -ENOMEM) - pr_err("%s: can't allocate memory for res_mem shared memory pool\n", __func__); - if (pool && pool->private_mgr.private_data) - gen_pool_destroy(pool->private_mgr.private_data); - kfree(pool); - return ERR_PTR(ret); + kfree(mgr); + + return ERR_PTR(rc); } -EXPORT_SYMBOL_GPL(tee_shm_pool_alloc_res_mem); +EXPORT_SYMBOL_GPL(tee_shm_pool_mgr_alloc_res_mem); + +static bool check_mgr_ops(struct tee_shm_pool_mgr *mgr) +{ + return mgr && mgr->ops && mgr->ops->alloc && mgr->ops->free && + mgr->ops->destroy_poolmgr; +} + +struct tee_shm_pool *tee_shm_pool_alloc(struct tee_shm_pool_mgr *priv_mgr, + struct tee_shm_pool_mgr *dmabuf_mgr) +{ + struct tee_shm_pool *pool; + + if (!check_mgr_ops(priv_mgr) || !check_mgr_ops(dmabuf_mgr)) + return ERR_PTR(-EINVAL); + + pool = kzalloc(sizeof(*pool), GFP_KERNEL); + if (!pool) + return ERR_PTR(-ENOMEM); + + pool->private_mgr = priv_mgr; + pool->dma_buf_mgr = dmabuf_mgr; + + return pool; +} +EXPORT_SYMBOL_GPL(tee_shm_pool_alloc); /** * tee_shm_pool_free() - Free a shared memory pool @@ -150,7 +186,10 @@ EXPORT_SYMBOL_GPL(tee_shm_pool_alloc_res_mem); */ void tee_shm_pool_free(struct tee_shm_pool *pool) { - pool->destroy(pool); + if (pool->private_mgr) + tee_shm_pool_mgr_destroy(pool->private_mgr); + if (pool->dma_buf_mgr) + tee_shm_pool_mgr_destroy(pool->dma_buf_mgr); kfree(pool); } EXPORT_SYMBOL_GPL(tee_shm_pool_free); diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index cb889af..e9be4a4 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -150,6 +150,97 @@ int tee_device_register(struct tee_device *teedev); void tee_device_unregister(struct tee_device *teedev); /** + * struct tee_shm - shared memory object + * @teedev: device used to allocate the object + * @ctx: context using the object, if NULL the context is gone + * @link link element + * @paddr: physical address of the shared memory + * @kaddr: virtual address of the shared memory + * @size: size of shared memory + * @offset: offset of buffer in user space + * @pages: locked pages from userspace + * @num_pages: number of locked pages + * @dmabuf: dmabuf used to for exporting to user space + * @flags: defined by TEE_SHM_* in tee_drv.h + * @id: unique id of a shared memory object on this device + * + * This pool is only supposed to be accessed directly from the TEE + * subsystem and from drivers that implements their own shm pool manager. + */ +struct tee_shm { + struct tee_device *teedev; + struct tee_context *ctx; + struct list_head link; + phys_addr_t paddr; + void *kaddr; + size_t size; + unsigned int offset; + struct page **pages; + size_t num_pages; + struct dma_buf *dmabuf; + u32 flags; + int id; +}; + +/** + * struct tee_shm_pool_mgr - shared memory manager + * @ops: operations + * @private_data: private data for the shared memory manager + */ +struct tee_shm_pool_mgr { + const struct tee_shm_pool_mgr_ops *ops; + void *private_data; +}; + +/** + * struct tee_shm_pool_mgr_ops - shared memory pool manager operations + * @alloc: called when allocating shared memory + * @free: called when freeing shared memory + * @destroy_poolmgr: called when destroying the pool manager + */ +struct tee_shm_pool_mgr_ops { + int (*alloc)(struct tee_shm_pool_mgr *poolmgr, struct tee_shm *shm, + size_t size); + void (*free)(struct tee_shm_pool_mgr *poolmgr, struct tee_shm *shm); + void (*destroy_poolmgr)(struct tee_shm_pool_mgr *poolmgr); +}; + +/** + * tee_shm_pool_alloc() - Create a shared memory pool from shm managers + * @priv_mgr: manager for driver private shared memory allocations + * @dmabuf_mgr: manager for dma-buf shared memory allocations + * + * Allocation with the flag TEE_SHM_DMA_BUF set will use the range supplied + * in @dmabuf, others will use the range provided by @priv. + * + * @returns pointer to a 'struct tee_shm_pool' or an ERR_PTR on failure. + */ +struct tee_shm_pool *tee_shm_pool_alloc(struct tee_shm_pool_mgr *priv_mgr, + struct tee_shm_pool_mgr *dmabuf_mgr); + +/* + * tee_shm_pool_mgr_alloc_res_mem() - Create a shm manager for reserved + * memory + * @vaddr: Virtual address of start of pool + * @paddr: Physical address of start of pool + * @size: Size in bytes of the pool + * + * @returns pointer to a 'struct tee_shm_pool_mgr' or an ERR_PTR on failure. + */ +struct tee_shm_pool_mgr *tee_shm_pool_mgr_alloc_res_mem(unsigned long vaddr, + phys_addr_t paddr, + size_t size, + int min_alloc_order); + +/** + * tee_shm_pool_mgr_destroy() - Free a shared memory manager + */ +static inline void tee_shm_pool_mgr_destroy(struct tee_shm_pool_mgr *poolm) +{ + poolm->ops->destroy_poolmgr(poolm); +} + +/** * struct tee_shm_pool_mem_info - holds information needed to create a shared * memory pool * @vaddr: Virtual address of start of pool