From nobody Tue Jun 30 15:33:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01AFFC433EF for ; Fri, 14 Jan 2022 15:09:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242397AbiANPJF (ORCPT ); Fri, 14 Jan 2022 10:09:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242236AbiANPIm (ORCPT ); Fri, 14 Jan 2022 10:08:42 -0500 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB127C061401 for ; Fri, 14 Jan 2022 07:08:41 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id o12so14499474lfu.12 for ; Fri, 14 Jan 2022 07:08:41 -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 :mime-version:content-transfer-encoding; bh=iBza1mKhlqsg6etHF8D7TfcQzqGCBqmRr7/AGAencgU=; b=mWoA3iCe1z2dOukN3ywIDsVcujjm357N+aSwG6Z5e/kedopn/L0pgeG7yDgY0/rlHH vTswikc5e/ienX62gJsmRVzXS/I9YV7bJSJk+Rgvf36bEvbXRdU3Z7TXqw0YbHJvwzNH sfXwZ4ZsjGqps34yGaDI80H/WccXqvJ2U+IHXhpXp25Gi0fwJUjYMWaOQGb+aTXMoSv5 CVg6nQDlrFt1QVEv8p0S8U96CiszzDk+3sRFpm9C/nTrah0zW8ims+sd9BnJONyt9C3c ha3CKsV3s9mDiR1umRROhqjdWu5lvm80j8brrAuhITfuTBShbFsCGAKMN8eZFsBFfdK3 i8/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iBza1mKhlqsg6etHF8D7TfcQzqGCBqmRr7/AGAencgU=; b=A4K9TzdhWQoj3RYLjZN5fg/LSBiTFF6WUv5n3B0GYJeTi8F77jhe7SpT7/cmxFIWGO JWTCObdTialMUhDX0AcMzCMYZBZPbNobk9BNaeNARRDp00qk3Gbcl+2QySpnumlOsH0I DtVK/6nPPPNx6ZycjVkbFotHyUHhhrNeQpdAh7FQni5HveinGjOV6zDrO51FruYfyZKl 0YcCEq0miaPXYmKVKqZwXTPA8M1Kf8b/k/8ixsarL+xgqtDz2CkG8zeQ/SDNiFwUvKk1 3x3WiRuwnQ+LYtZR4zqttHJ3rtYJ0yOSGARtFurQBdkpv+fUC9F7m0CEwv+OYxHMpC6c Otfw== X-Gm-Message-State: AOAM530SBZr7SwozZcccAEI+jzn7HkRymFbjiwz556i0WyvUBzD0dKew Q1XW0Hfo6jTg8VK4+zLw94nKCGlNqEV11Q== X-Google-Smtp-Source: ABdhPJwMWgsO17BCykpmK5ITtDHSnLFw9U+WsqyXcV83Nc21zW8s5Kf/ZPVKKd2E66k2rzpkPyl9Kg== X-Received: by 2002:a19:f202:: with SMTP id q2mr326004lfh.650.1642172920151; Fri, 14 Jan 2022 07:08:40 -0800 (PST) Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id i31sm40517lfv.67.2022.01.14.07.08.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 07:08:39 -0800 (PST) From: Jens Wiklander To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Devaraj Rangasamy , Rijo Thomas , David Howells , Tyler Hicks , Jens Wiklander Subject: [PATCH v2 01/12] hwrng: optee-rng: use tee_shm_alloc_kernel_buf() Date: Fri, 14 Jan 2022 16:08:13 +0100 Message-Id: <20220114150824.3578829-2-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220114150824.3578829-1-jens.wiklander@linaro.org> References: <20220114150824.3578829-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Uses the new simplified tee_shm_alloc_kernel_buf() function instead of the old deprecated tee_shm_alloc() function which required specific TEE_SHM-flags. Signed-off-by: Jens Wiklander Reviewed-by: Sumit Garg --- drivers/char/hw_random/optee-rng.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/char/hw_random/optee-rng.c b/drivers/char/hw_random/op= tee-rng.c index 135a82590923..a948c0727b2b 100644 --- a/drivers/char/hw_random/optee-rng.c +++ b/drivers/char/hw_random/optee-rng.c @@ -145,10 +145,10 @@ static int optee_rng_init(struct hwrng *rng) struct optee_rng_private *pvt_data =3D to_optee_rng_private(rng); struct tee_shm *entropy_shm_pool =3D NULL; =20 - entropy_shm_pool =3D tee_shm_alloc(pvt_data->ctx, MAX_ENTROPY_REQ_SZ, - TEE_SHM_MAPPED | TEE_SHM_DMA_BUF); + entropy_shm_pool =3D tee_shm_alloc_kernel_buf(pvt_data->ctx, + MAX_ENTROPY_REQ_SZ); if (IS_ERR(entropy_shm_pool)) { - dev_err(pvt_data->dev, "tee_shm_alloc failed\n"); + dev_err(pvt_data->dev, "tee_shm_alloc_kernel_buf failed\n"); return PTR_ERR(entropy_shm_pool); } =20 --=20 2.31.1 From nobody Tue Jun 30 15:33:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03671C433F5 for ; Fri, 14 Jan 2022 15:08:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242270AbiANPIt (ORCPT ); Fri, 14 Jan 2022 10:08:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235794AbiANPIn (ORCPT ); Fri, 14 Jan 2022 10:08:43 -0500 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E7D2C061746 for ; Fri, 14 Jan 2022 07:08:42 -0800 (PST) Received: by mail-lf1-x12f.google.com with SMTP id x11so5463252lfa.2 for ; Fri, 14 Jan 2022 07:08:42 -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 :mime-version:content-transfer-encoding; bh=4dui9+NpX4w52rrVA0g43taTTsULBafA6eRdbjyTa0s=; b=rD4w4QP10UDyrS9EQ5coM1KCAFC9PxRPJ9d9lH+BANBIoZQkYN1mZUCY/MUm5E9Qry 1wLzrMKT0O+F524Qx07gOZCBpDVamGz+r/VWiGT81TyQhXzxeNHVajeaW0jeDtXtbbtY TwrLh0yEEdk1qCV9CVetAJqHRE+rVcDBu5j+YkQhlvqBaXRarqeu/0bhT+oGWsZ9c8xm 8ZoF3e/vx7WE2RM/C0pJac76Qk8t7FVqhQD8MhoniX8t+60HKHL9S5t8SJHqlva2NnDS VXlnotD/BRXqyI4dXsTqLT27BUVFPhMifVhqPTTf9LDyMWnJbFO2P+DQBDZU/FfRTgDb VrMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4dui9+NpX4w52rrVA0g43taTTsULBafA6eRdbjyTa0s=; b=UjX3EOVWKIGWVifq+mBNyQqd0DUXt36rYTQq44aMKfvtQmoEioKgh04wzyaRhTGuTW 65vpYAw5JEb0YKiJbxc7WCegqo8lp4f3h4QdSwmI+RZBhD+3FPS2Ymy6FfnMGq+uTG5V te+fUt5G5kIH0Hb3lBAoOdN6wX5eEbfK7xyWP8vQ5QOa4U6NuawlYZtn6t+1SBfePrA1 Q8h2bUmXqZFckB5W1rIrfmn7jJISRZQhxTCawTVYeKeEUjbWLoRH0CGjt3rW/rsLz6wb EJ/VPNOZlvf48MsR60tidYx7EZGMGZ+IyKnL2irNFGVG3zJyZS1PQFu6G9koG4itevT5 hVZA== X-Gm-Message-State: AOAM530vrdfoOru095cznIWOjMMofXj3Qka4vjmLCNUihdKHkT4BXz6+ 7Mh1rtD2CQW0/HehhWQbNdxM+kBIO7UtLA== X-Google-Smtp-Source: ABdhPJx+G+1RC9jl681kZrchzosFEWuHX+TYTIeHYMiaCzuOta6YAeCce9VzoM9rOK9s44WwJYo+qg== X-Received: by 2002:a2e:9609:: with SMTP id v9mr5847790ljh.45.1642172920876; Fri, 14 Jan 2022 07:08:40 -0800 (PST) Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id i31sm40517lfv.67.2022.01.14.07.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 07:08:40 -0800 (PST) From: Jens Wiklander To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Devaraj Rangasamy , Rijo Thomas , David Howells , Tyler Hicks , Jens Wiklander Subject: [PATCH v2 02/12] tee: remove unused tee_shm_pool_alloc_res_mem() Date: Fri, 14 Jan 2022 16:08:14 +0100 Message-Id: <20220114150824.3578829-3-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220114150824.3578829-1-jens.wiklander@linaro.org> References: <20220114150824.3578829-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" None of the drivers in the TEE subsystem uses tee_shm_pool_alloc_res_mem() so remove the function. Signed-off-by: Jens Wiklander Reviewed-by: Sumit Garg --- drivers/tee/tee_shm_pool.c | 56 -------------------------------------- include/linux/tee_drv.h | 30 -------------------- 2 files changed, 86 deletions(-) diff --git a/drivers/tee/tee_shm_pool.c b/drivers/tee/tee_shm_pool.c index fcbb461fc59c..a9f9d50fd181 100644 --- a/drivers/tee/tee_shm_pool.c +++ b/drivers/tee/tee_shm_pool.c @@ -47,62 +47,6 @@ static const struct tee_shm_pool_mgr_ops pool_ops_generi= c =3D { .destroy_poolmgr =3D pool_op_gen_destroy_poolmgr, }; =20 -/** - * tee_shm_pool_alloc_res_mem() - Create a shared memory pool from reserved - * memory range - * @priv_info: Information for driver private shared memory pool - * @dmabuf_info: Information for dma-buf shared memory pool - * - * Start and end of pools will must be page aligned. - * - * 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_res_mem(struct tee_shm_pool_mem_info *priv_info, - struct tee_shm_pool_mem_info *dmabuf_info) -{ - struct tee_shm_pool_mgr *priv_mgr; - struct tee_shm_pool_mgr *dmabuf_mgr; - void *rc; - - /* - * Create the pool for driver private shared memory - */ - rc =3D 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 =3D rc; - - /* - * Create the pool for dma_buf shared memory - */ - rc =3D 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 =3D rc; - - rc =3D 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 vadd= r, phys_addr_t paddr, size_t size, diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 5e1533ee3785..6b0f0d01ebdf 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -278,36 +278,6 @@ static inline void tee_shm_pool_mgr_destroy(struct tee= _shm_pool_mgr *poolm) poolm->ops->destroy_poolmgr(poolm); } =20 -/** - * struct tee_shm_pool_mem_info - holds information needed to create a sha= red - * memory pool - * @vaddr: Virtual address of start of pool - * @paddr: Physical address of start of pool - * @size: Size in bytes of the pool - */ -struct tee_shm_pool_mem_info { - unsigned long vaddr; - phys_addr_t paddr; - size_t size; -}; - -/** - * tee_shm_pool_alloc_res_mem() - Create a shared memory pool from reserved - * memory range - * @priv_info: Information for driver private shared memory pool - * @dmabuf_info: Information for dma-buf shared memory pool - * - * Start and end of pools will must be page aligned. - * - * 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_res_mem(struct tee_shm_pool_mem_info *priv_info, - struct tee_shm_pool_mem_info *dmabuf_info); - /** * tee_shm_pool_free() - Free a shared memory pool * @pool: The shared memory pool to free --=20 2.31.1 From nobody Tue Jun 30 15:33:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A84C7C433EF for ; Fri, 14 Jan 2022 15:08:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242304AbiANPIw (ORCPT ); Fri, 14 Jan 2022 10:08:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242247AbiANPIn (ORCPT ); Fri, 14 Jan 2022 10:08:43 -0500 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A69DC061574 for ; Fri, 14 Jan 2022 07:08:43 -0800 (PST) Received: by mail-lf1-x12e.google.com with SMTP id o12so14499678lfu.12 for ; Fri, 14 Jan 2022 07:08:43 -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 :mime-version:content-transfer-encoding; bh=kkaQ+ilU28pNJN/7SN9SP94ch7HastDd6BRVCG2d0i4=; b=t4Qxcaw29ddTpIY1GIQo/VNupFBYlv49gkZXf5Z+dchvERgY8PNd135R8OriOBLprv rGc0sZOW8unQcFW6eUw2vgcMsoAVXmHKJibRhubP9ZGRteTP6kMH3DLocCh8WyN7H37R t5uEQ+L/61IRXqV7hbRlTMUBV0mB8mQYHRXEcC2aEUdsS1J7wTjPqAnUzJqsTfnIvtUm L8AKMqGX32sGfvQmxZkKYhwxt8MAKN5MMYYMrrSIQEvR9fiQBa5r5a/bjOZPgh7ZKQEh 0OuPjpEdzJI/U69mBnYnD71ypu47cTqKv07t6UjAj5VF/hO3Tw8cXiVB2OSpqxCB4+qp PuaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kkaQ+ilU28pNJN/7SN9SP94ch7HastDd6BRVCG2d0i4=; b=xn9gNywmdihZIupja+bTlZVMv68eGHO39OzXCkFW7279McxM+CPRE/4AboRXs3zpIi ImmxibJltOVEhstWJyJWVF659UIanf8ExoxUqHyyvXyoGX3QkQwT+Mgz8I7EkJFHOCOZ uS4zB7hdibPJQR8GHb45UKz0EqO0HA7YYUOJG9ZQXusW8XcoQfTepGhrblL/qUAIQ2kx HJ3ITWtMZMw+GUKxu5nTq12QGcpm1vP73aMDlwknnKAroYd0CPDK/G9ZjdVaeE69VXla Envj+ljxkHkznfrPuS6Idf52LWKClY05rRuJt99A3Fkdcs6r7TDBLKHfehUnedqwSsD2 ajSA== X-Gm-Message-State: AOAM533KFJHr/EY8kfF3tlKLlQSdWIVQXekBx9hc5Pq9/8LVHCU0vhDp 1gAbEA6iyhmjSMzJWKr4H/dF4WIVMX+c5w== X-Google-Smtp-Source: ABdhPJxPOJWCHT1fugAixWFFYnPcwdNVZyAgtU5RcZTq8Jve1Q46caSwMBvHnm02PH0pxdrq/0iRqw== X-Received: by 2002:a2e:86c7:: with SMTP id n7mr3943474ljj.102.1642172921646; Fri, 14 Jan 2022 07:08:41 -0800 (PST) Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id i31sm40517lfv.67.2022.01.14.07.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 07:08:41 -0800 (PST) From: Jens Wiklander To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Devaraj Rangasamy , Rijo Thomas , David Howells , Tyler Hicks , Jens Wiklander Subject: [PATCH v2 03/12] tee: add tee_shm_alloc_user_buf() Date: Fri, 14 Jan 2022 16:08:15 +0100 Message-Id: <20220114150824.3578829-4-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220114150824.3578829-1-jens.wiklander@linaro.org> References: <20220114150824.3578829-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Adds a new function tee_shm_alloc_user_buf() or user mode allocations, replacing passing the flags TEE_SHM_MAPPED | TEE_SHM_DMA_BUF to tee_shm_alloc(). Signed-off-by: Jens Wiklander --- drivers/tee/tee_core.c | 2 +- drivers/tee/tee_shm.c | 18 ++++++++++++++++++ drivers/tee/tee_shm_pool.c | 2 +- include/linux/tee_drv.h | 3 ++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 3fc426dad2df..a15812baaeb1 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -297,7 +297,7 @@ static int tee_ioctl_shm_alloc(struct tee_context *ctx, if (data.flags) return -EINVAL; =20 - shm =3D tee_shm_alloc(ctx, data.size, TEE_SHM_MAPPED | TEE_SHM_DMA_BUF); + shm =3D tee_shm_alloc_user_buf(ctx, data.size); if (IS_ERR(shm)) return PTR_ERR(shm); =20 diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 499fccba3d74..b43178986985 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -127,6 +127,24 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx,= size_t size, u32 flags) } EXPORT_SYMBOL_GPL(tee_shm_alloc); =20 +/** + * tee_shm_alloc_user_buf() - Allocate shared memory for user space + * @ctx: Context that allocates the shared memory + * @size: Requested size of shared memory + * + * Memory allocated as user space shared memory is automatically freed when + * the TEE file pointer is closed. The primary usage of this function is + * when the TEE driver doesn't support registering ordinary user space + * memory. + * + * @returns a pointer to 'struct tee_shm' + */ +struct tee_shm *tee_shm_alloc_user_buf(struct tee_context *ctx, size_t siz= e) +{ + return tee_shm_alloc(ctx, size, TEE_SHM_MAPPED | TEE_SHM_DMA_BUF); +} +EXPORT_SYMBOL_GPL(tee_shm_alloc_user_buf); + /** * tee_shm_alloc_kernel_buf() - Allocate shared memory for kernel buffer * @ctx: Context that allocates the shared memory diff --git a/drivers/tee/tee_shm_pool.c b/drivers/tee/tee_shm_pool.c index a9f9d50fd181..0e460347138a 100644 --- a/drivers/tee/tee_shm_pool.c +++ b/drivers/tee/tee_shm_pool.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2015, 2017, 2022 Linaro Limited */ #include #include diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 6b0f0d01ebdf..26b450484ac1 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2015-2016, Linaro Limited + * Copyright (c) 2015-2022 Linaro Limited */ =20 #ifndef __TEE_DRV_H @@ -308,6 +308,7 @@ void *tee_get_drvdata(struct tee_device *teedev); * @returns a pointer to 'struct tee_shm' */ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 fl= ags); +struct tee_shm *tee_shm_alloc_user_buf(struct tee_context *ctx, size_t siz= e); struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t s= ize); =20 /** --=20 2.31.1 From nobody Tue Jun 30 15:33:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17DE3C433F5 for ; Fri, 14 Jan 2022 15:09:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242385AbiANPJE (ORCPT ); Fri, 14 Jan 2022 10:09:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242256AbiANPIp (ORCPT ); Fri, 14 Jan 2022 10:08:45 -0500 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91C56C06161C for ; Fri, 14 Jan 2022 07:08:44 -0800 (PST) Received: by mail-lf1-x132.google.com with SMTP id o15so31108288lfo.11 for ; Fri, 14 Jan 2022 07:08:44 -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 :mime-version:content-transfer-encoding; bh=fB7BH+b7ynFqimAmpj0LHpOz+V6czu40bJT9T1/TNCE=; b=XZ7ijSYElKzJq0bqEp/EWOtT2DNOY/3U3TtFrv36e0mjc5PMgMGyybbST3FLEXtPd9 u+7NoHN8SmZKO07pxLOoswrd83pEhbc6/4LekWoGsKAfw0kkOI3QWc5sc8rFjG3NtCeW uLpX47c/S6cFweIqUQRo5OosQbaLE6udY4sSrIZ4ueHfvEx7knI9ZYwOqiWwSyG19UO0 PxbM1zgw+mP58tFJWteRisMx1OTGu5Jcsgvva2A5jspfQZFvZFPhq9fZ9tZ6ml/zNxOj SxrsGYFVx1rdDzIrhAZrHHgWQgPGDuLMNA2mXrE/Di3h0ezom2xV2KJLK9PhCsWXx58l Sfrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fB7BH+b7ynFqimAmpj0LHpOz+V6czu40bJT9T1/TNCE=; b=PXh7bDeTqMR5LRImKCIzGpP90qXokhRt4f6bYY9+i3PgH9jLAJZZNHvz1p9RUaX5zs jNz2owbFPg3hiBnqR2QYWqgr8XcooRQTB3wVvkHOSIO89Py2wDrHBt0grFK2Ly7uq6Bj mniN4FTQK1Uy6koRGrHHsDAXk5LBVLH2hvMw3J4GO80G5kbe50AeBfhEvgt7EPiq3E+O n5t70jl9gugp83KJqyyKEH3IKo1bMZX+Awl3F5huQ5zfKWKl7MzWkDZRNvy2wOFc611K LGbY1SeY0sufwXCY5LTKUq9nr97eOE3ownK2flK0u3lt5lJMZmyvzJSd1LVqDf6NHo3d zCuA== X-Gm-Message-State: AOAM532dlMvDIhfxH6B7wmiEFo3ch39oZEDr5Sfw8H7nHm3TI7i45eUo +vQNAvSzqN/nbLZe9mz46gFB5AHOf75iyA== X-Google-Smtp-Source: ABdhPJyoxwlEOiJ8SPVK/HMed2EQJ7GZvwmvHY92nszzccA/ijIUwOQnxCRv4EmkYT8IDH426uPFYQ== X-Received: by 2002:a2e:83c6:: with SMTP id s6mr6656329ljh.128.1642172922433; Fri, 14 Jan 2022 07:08:42 -0800 (PST) Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id i31sm40517lfv.67.2022.01.14.07.08.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 07:08:42 -0800 (PST) From: Jens Wiklander To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Devaraj Rangasamy , Rijo Thomas , David Howells , Tyler Hicks , Jens Wiklander Subject: [PATCH v2 04/12] tee: simplify shm pool handling Date: Fri, 14 Jan 2022 16:08:16 +0100 Message-Id: <20220114150824.3578829-5-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220114150824.3578829-1-jens.wiklander@linaro.org> References: <20220114150824.3578829-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Replaces the shared memory pool based on two pools with a single pool. The alloc() function pointer in struct tee_shm_pool_ops gets another parameter, align. This makes it possible to make less than page aligned allocations from the optional reserved shared memory pool while still making user space allocations page aligned. With in practice unchanged behaviour using only a single pool for bookkeeping. The allocation algorithm in the static OP-TEE shared memory pool is changed from best-fit to first-fit since only the latter supports an alignment parameter. The best-fit algorithm was previously the default choice and not a concious one. The optee and amdtee drivers are updated as needed to work with this changed pool handling. This also removes OPTEE_SHM_NUM_PRIV_PAGES which becomes obsolete with this change as the private pages can be mixed with the payload pages. Signed-off-by: Jens Wiklander --- drivers/tee/amdtee/shm_pool.c | 55 +++++----------- drivers/tee/optee/Kconfig | 8 --- drivers/tee/optee/core.c | 11 ++-- drivers/tee/optee/ffa_abi.c | 55 ++++------------ drivers/tee/optee/optee_private.h | 4 +- drivers/tee/optee/smc_abi.c | 100 ++++++---------------------- drivers/tee/tee_private.h | 11 ---- drivers/tee/tee_shm.c | 29 ++++----- drivers/tee/tee_shm_pool.c | 104 ++++++++++-------------------- include/linux/tee_drv.h | 58 ++++++----------- 10 files changed, 126 insertions(+), 309 deletions(-) diff --git a/drivers/tee/amdtee/shm_pool.c b/drivers/tee/amdtee/shm_pool.c index 065854e2db18..f87f96a291c9 100644 --- a/drivers/tee/amdtee/shm_pool.c +++ b/drivers/tee/amdtee/shm_pool.c @@ -8,13 +8,17 @@ #include #include "amdtee_private.h" =20 -static int pool_op_alloc(struct tee_shm_pool_mgr *poolm, struct tee_shm *s= hm, - size_t size) +static int pool_op_alloc(struct tee_shm_pool *pool, struct tee_shm *shm, + size_t size, size_t align) { unsigned int order =3D get_order(size); unsigned long va; int rc; =20 + /* + * Ignore alignment since this is already going to be page aligned + * and there's no need for any larger alignment. + */ va =3D __get_free_pages(GFP_KERNEL | __GFP_ZERO, order); if (!va) return -ENOMEM; @@ -34,7 +38,7 @@ static int pool_op_alloc(struct tee_shm_pool_mgr *poolm, = struct tee_shm *shm, return 0; } =20 -static void pool_op_free(struct tee_shm_pool_mgr *poolm, struct tee_shm *s= hm) +static void pool_op_free(struct tee_shm_pool *pool, struct tee_shm *shm) { /* Unmap the shared memory from TEE */ amdtee_unmap_shmem(shm); @@ -42,52 +46,25 @@ static void pool_op_free(struct tee_shm_pool_mgr *poolm= , struct tee_shm *shm) shm->kaddr =3D NULL; } =20 -static void pool_op_destroy_poolmgr(struct tee_shm_pool_mgr *poolm) +static void pool_op_destroy_pool(struct tee_shm_pool *pool) { - kfree(poolm); + kfree(pool); } =20 -static const struct tee_shm_pool_mgr_ops pool_ops =3D { +static const struct tee_shm_pool_ops pool_ops =3D { .alloc =3D pool_op_alloc, .free =3D pool_op_free, - .destroy_poolmgr =3D pool_op_destroy_poolmgr, + .destroy_pool =3D pool_op_destroy_pool, }; =20 -static struct tee_shm_pool_mgr *pool_mem_mgr_alloc(void) -{ - struct tee_shm_pool_mgr *mgr =3D kzalloc(sizeof(*mgr), GFP_KERNEL); - - if (!mgr) - return ERR_PTR(-ENOMEM); - - mgr->ops =3D &pool_ops; - - return mgr; -} - struct tee_shm_pool *amdtee_config_shm(void) { - struct tee_shm_pool_mgr *priv_mgr; - struct tee_shm_pool_mgr *dmabuf_mgr; - void *rc; + struct tee_shm_pool *pool =3D kzalloc(sizeof(*pool), GFP_KERNEL); =20 - rc =3D pool_mem_mgr_alloc(); - if (IS_ERR(rc)) - return rc; - priv_mgr =3D rc; - - rc =3D pool_mem_mgr_alloc(); - if (IS_ERR(rc)) { - tee_shm_pool_mgr_destroy(priv_mgr); - return rc; - } - dmabuf_mgr =3D rc; + if (!pool) + return ERR_PTR(-ENOMEM); =20 - rc =3D tee_shm_pool_alloc(priv_mgr, dmabuf_mgr); - if (IS_ERR(rc)) { - tee_shm_pool_mgr_destroy(priv_mgr); - tee_shm_pool_mgr_destroy(dmabuf_mgr); - } + pool->ops =3D &pool_ops; =20 - return rc; + return pool; } diff --git a/drivers/tee/optee/Kconfig b/drivers/tee/optee/Kconfig index 3ca71e3812ed..f121c224e682 100644 --- a/drivers/tee/optee/Kconfig +++ b/drivers/tee/optee/Kconfig @@ -7,11 +7,3 @@ config OPTEE help This implements the OP-TEE Trusted Execution Environment (TEE) driver. - -config OPTEE_SHM_NUM_PRIV_PAGES - int "Private Shared Memory Pages" - default 1 - depends on OPTEE - help - This sets the number of private shared memory pages to be - used by OP-TEE TEE driver. diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 1ca320885fad..2a369e346b85 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -18,8 +18,8 @@ #include #include "optee_private.h" =20 -int optee_pool_op_alloc_helper(struct tee_shm_pool_mgr *poolm, - struct tee_shm *shm, size_t size, +int optee_pool_op_alloc_helper(struct tee_shm_pool *pool, struct tee_shm *= shm, + size_t size, size_t align, int (*shm_register)(struct tee_context *ctx, struct tee_shm *shm, struct page **pages, @@ -30,6 +30,10 @@ int optee_pool_op_alloc_helper(struct tee_shm_pool_mgr *= poolm, struct page *page; int rc =3D 0; =20 + /* + * Ignore alignment since this is already going to be page aligned + * and there's no need for any larger alignment. + */ page =3D alloc_pages(GFP_KERNEL | __GFP_ZERO, order); if (!page) return -ENOMEM; @@ -51,7 +55,6 @@ int optee_pool_op_alloc_helper(struct tee_shm_pool_mgr *p= oolm, for (i =3D 0; i < nr_pages; i++) pages[i] =3D page + i; =20 - shm->flags |=3D TEE_SHM_REGISTER; rc =3D shm_register(shm->ctx, shm, pages, nr_pages, (unsigned long)shm->kaddr); kfree(pages); @@ -62,7 +65,7 @@ int optee_pool_op_alloc_helper(struct tee_shm_pool_mgr *p= oolm, return 0; =20 err: - __free_pages(page, order); + free_pages((unsigned long)shm->kaddr, order); return rc; } =20 diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c index 20a1b1a3d965..e690d9420966 100644 --- a/drivers/tee/optee/ffa_abi.c +++ b/drivers/tee/optee/ffa_abi.c @@ -369,14 +369,14 @@ static int optee_ffa_shm_unregister_supp(struct tee_c= ontext *ctx, * The main function is optee_ffa_shm_pool_alloc_pages(). */ =20 -static int pool_ffa_op_alloc(struct tee_shm_pool_mgr *poolm, - struct tee_shm *shm, size_t size) +static int pool_ffa_op_alloc(struct tee_shm_pool *pool, + struct tee_shm *shm, size_t size, size_t align) { - return optee_pool_op_alloc_helper(poolm, shm, size, + return optee_pool_op_alloc_helper(pool, shm, size, align, optee_ffa_shm_register); } =20 -static void pool_ffa_op_free(struct tee_shm_pool_mgr *poolm, +static void pool_ffa_op_free(struct tee_shm_pool *pool, struct tee_shm *shm) { optee_ffa_shm_unregister(shm->ctx, shm); @@ -384,15 +384,15 @@ static void pool_ffa_op_free(struct tee_shm_pool_mgr = *poolm, shm->kaddr =3D NULL; } =20 -static void pool_ffa_op_destroy_poolmgr(struct tee_shm_pool_mgr *poolm) +static void pool_ffa_op_destroy_pool(struct tee_shm_pool *pool) { - kfree(poolm); + kfree(pool); } =20 -static const struct tee_shm_pool_mgr_ops pool_ffa_ops =3D { +static const struct tee_shm_pool_ops pool_ffa_ops =3D { .alloc =3D pool_ffa_op_alloc, .free =3D pool_ffa_op_free, - .destroy_poolmgr =3D pool_ffa_op_destroy_poolmgr, + .destroy_pool =3D pool_ffa_op_destroy_pool, }; =20 /** @@ -401,16 +401,16 @@ static const struct tee_shm_pool_mgr_ops pool_ffa_ops= =3D { * This pool is used with OP-TEE over FF-A. In this case command buffers * and such are allocated from kernel's own memory. */ -static struct tee_shm_pool_mgr *optee_ffa_shm_pool_alloc_pages(void) +static struct tee_shm_pool *optee_ffa_shm_pool_alloc_pages(void) { - struct tee_shm_pool_mgr *mgr =3D kzalloc(sizeof(*mgr), GFP_KERNEL); + struct tee_shm_pool *pool =3D kzalloc(sizeof(*pool), GFP_KERNEL); =20 - if (!mgr) + if (!pool) return ERR_PTR(-ENOMEM); =20 - mgr->ops =3D &pool_ffa_ops; + pool->ops =3D &pool_ffa_ops; =20 - return mgr; + return pool; } =20 /* @@ -691,33 +691,6 @@ static bool optee_ffa_exchange_caps(struct ffa_device = *ffa_dev, return true; } =20 -static struct tee_shm_pool *optee_ffa_config_dyn_shm(void) -{ - struct tee_shm_pool_mgr *priv_mgr; - struct tee_shm_pool_mgr *dmabuf_mgr; - void *rc; - - rc =3D optee_ffa_shm_pool_alloc_pages(); - if (IS_ERR(rc)) - return rc; - priv_mgr =3D rc; - - rc =3D optee_ffa_shm_pool_alloc_pages(); - if (IS_ERR(rc)) { - tee_shm_pool_mgr_destroy(priv_mgr); - return rc; - } - dmabuf_mgr =3D rc; - - rc =3D tee_shm_pool_alloc(priv_mgr, dmabuf_mgr); - if (IS_ERR(rc)) { - tee_shm_pool_mgr_destroy(priv_mgr); - tee_shm_pool_mgr_destroy(dmabuf_mgr); - } - - return rc; -} - static void optee_ffa_get_version(struct tee_device *teedev, struct tee_ioctl_version_data *vers) { @@ -813,7 +786,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev) if (!optee) return -ENOMEM; =20 - optee->pool =3D optee_ffa_config_dyn_shm(); + optee->pool =3D optee_ffa_shm_pool_alloc_pages(); if (IS_ERR(optee->pool)) { rc =3D PTR_ERR(optee->pool); optee->pool =3D NULL; diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_pr= ivate.h index 46f74ab07c7e..df2450921464 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -228,8 +228,8 @@ int optee_cancel_req(struct tee_context *ctx, u32 cance= l_id, u32 session); int optee_enumerate_devices(u32 func); void optee_unregister_devices(void); =20 -int optee_pool_op_alloc_helper(struct tee_shm_pool_mgr *poolm, - struct tee_shm *shm, size_t size, +int optee_pool_op_alloc_helper(struct tee_shm_pool *pool, struct tee_shm *= shm, + size_t size, size_t align, int (*shm_register)(struct tee_context *ctx, struct tee_shm *shm, struct page **pages, diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index 449d6a72d289..b679037ea794 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -42,8 +42,6 @@ * 6. Driver initialization. */ =20 -#define OPTEE_SHM_NUM_PRIV_PAGES CONFIG_OPTEE_SHM_NUM_PRIV_PAGES - /* * 1. Convert between struct tee_param and struct optee_msg_param * @@ -532,20 +530,21 @@ static int optee_shm_unregister_supp(struct tee_conte= xt *ctx, * The main function is optee_shm_pool_alloc_pages(). */ =20 -static int pool_op_alloc(struct tee_shm_pool_mgr *poolm, - struct tee_shm *shm, size_t size) +static int pool_op_alloc(struct tee_shm_pool *pool, + struct tee_shm *shm, size_t size, size_t align) { /* * Shared memory private to the OP-TEE driver doesn't need * to be registered with OP-TEE. */ if (shm->flags & TEE_SHM_PRIV) - return optee_pool_op_alloc_helper(poolm, shm, size, NULL); + return optee_pool_op_alloc_helper(pool, shm, size, align, NULL); =20 - return optee_pool_op_alloc_helper(poolm, shm, size, optee_shm_register); + return optee_pool_op_alloc_helper(pool, shm, size, align, + optee_shm_register); } =20 -static void pool_op_free(struct tee_shm_pool_mgr *poolm, +static void pool_op_free(struct tee_shm_pool *pool, struct tee_shm *shm) { if (!(shm->flags & TEE_SHM_PRIV)) @@ -555,15 +554,15 @@ static void pool_op_free(struct tee_shm_pool_mgr *poo= lm, shm->kaddr =3D NULL; } =20 -static void pool_op_destroy_poolmgr(struct tee_shm_pool_mgr *poolm) +static void pool_op_destroy_pool(struct tee_shm_pool *pool) { - kfree(poolm); + kfree(pool); } =20 -static const struct tee_shm_pool_mgr_ops pool_ops =3D { +static const struct tee_shm_pool_ops pool_ops =3D { .alloc =3D pool_op_alloc, .free =3D pool_op_free, - .destroy_poolmgr =3D pool_op_destroy_poolmgr, + .destroy_pool =3D pool_op_destroy_pool, }; =20 /** @@ -572,16 +571,16 @@ static const struct tee_shm_pool_mgr_ops pool_ops =3D= { * This pool is used when OP-TEE supports dymanic SHM. In this case * command buffers and such are allocated from kernel's own memory. */ -static struct tee_shm_pool_mgr *optee_shm_pool_alloc_pages(void) +static struct tee_shm_pool *optee_shm_pool_alloc_pages(void) { - struct tee_shm_pool_mgr *mgr =3D kzalloc(sizeof(*mgr), GFP_KERNEL); + struct tee_shm_pool *pool =3D kzalloc(sizeof(*pool), GFP_KERNEL); =20 - if (!mgr) + if (!pool) return ERR_PTR(-ENOMEM); =20 - mgr->ops =3D &pool_ops; + pool->ops =3D &pool_ops; =20 - return mgr; + return pool; } =20 /* @@ -1174,33 +1173,6 @@ static bool optee_msg_exchange_capabilities(optee_in= voke_fn *invoke_fn, return true; } =20 -static struct tee_shm_pool *optee_config_dyn_shm(void) -{ - struct tee_shm_pool_mgr *priv_mgr; - struct tee_shm_pool_mgr *dmabuf_mgr; - void *rc; - - rc =3D optee_shm_pool_alloc_pages(); - if (IS_ERR(rc)) - return rc; - priv_mgr =3D rc; - - rc =3D optee_shm_pool_alloc_pages(); - if (IS_ERR(rc)) { - tee_shm_pool_mgr_destroy(priv_mgr); - return rc; - } - dmabuf_mgr =3D rc; - - rc =3D tee_shm_pool_alloc(priv_mgr, dmabuf_mgr); - if (IS_ERR(rc)) { - tee_shm_pool_mgr_destroy(priv_mgr); - tee_shm_pool_mgr_destroy(dmabuf_mgr); - } - - return rc; -} - static struct tee_shm_pool * optee_config_shm_memremap(optee_invoke_fn *invoke_fn, void **memremaped_sh= m) { @@ -1214,10 +1186,7 @@ optee_config_shm_memremap(optee_invoke_fn *invoke_fn= , void **memremaped_shm) phys_addr_t begin; phys_addr_t end; void *va; - struct tee_shm_pool_mgr *priv_mgr; - struct tee_shm_pool_mgr *dmabuf_mgr; void *rc; - const int sz =3D OPTEE_SHM_NUM_PRIV_PAGES * PAGE_SIZE; =20 invoke_fn(OPTEE_SMC_GET_SHM_CONFIG, 0, 0, 0, 0, 0, 0, 0, &res.smccc); if (res.result.status !=3D OPTEE_SMC_RETURN_OK) { @@ -1235,11 +1204,6 @@ optee_config_shm_memremap(optee_invoke_fn *invoke_fn= , void **memremaped_shm) paddr =3D begin; size =3D end - begin; =20 - if (size < 2 * OPTEE_SHM_NUM_PRIV_PAGES * PAGE_SIZE) { - pr_err("too small shared memory area\n"); - return ERR_PTR(-EINVAL); - } - va =3D memremap(paddr, size, MEMREMAP_WB); if (!va) { pr_err("shared memory ioremap failed\n"); @@ -1247,35 +1211,13 @@ optee_config_shm_memremap(optee_invoke_fn *invoke_f= n, void **memremaped_shm) } vaddr =3D (unsigned long)va; =20 - rc =3D tee_shm_pool_mgr_alloc_res_mem(vaddr, paddr, sz, - 3 /* 8 bytes aligned */); - if (IS_ERR(rc)) - goto err_memunmap; - priv_mgr =3D rc; - - vaddr +=3D sz; - paddr +=3D sz; - size -=3D sz; - - rc =3D tee_shm_pool_mgr_alloc_res_mem(vaddr, paddr, size, PAGE_SHIFT); + rc =3D tee_shm_pool_alloc_res_mem(vaddr, paddr, size, + 9 /* 512 bytes aligned */); if (IS_ERR(rc)) - goto err_free_priv_mgr; - dmabuf_mgr =3D rc; - - rc =3D tee_shm_pool_alloc(priv_mgr, dmabuf_mgr); - if (IS_ERR(rc)) - goto err_free_dmabuf_mgr; - - *memremaped_shm =3D va; - - return rc; + memunmap(va); + else + *memremaped_shm =3D va; =20 -err_free_dmabuf_mgr: - tee_shm_pool_mgr_destroy(dmabuf_mgr); -err_free_priv_mgr: - tee_shm_pool_mgr_destroy(priv_mgr); -err_memunmap: - memunmap(va); return rc; } =20 @@ -1396,7 +1338,7 @@ static int optee_probe(struct platform_device *pdev) * Try to use dynamic shared memory if possible */ if (sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM) - pool =3D optee_config_dyn_shm(); + pool =3D optee_shm_pool_alloc_pages(); =20 /* * If dynamic shared memory is not available or failed - try static one diff --git a/drivers/tee/tee_private.h b/drivers/tee/tee_private.h index e55204df31ce..72376cf38bc0 100644 --- a/drivers/tee/tee_private.h +++ b/drivers/tee/tee_private.h @@ -12,17 +12,6 @@ #include #include =20 -/** - * 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 - */ -struct tee_shm_pool { - struct tee_shm_pool_mgr *private_mgr; - struct tee_shm_pool_mgr *dma_buf_mgr; -}; - #define TEE_DEVICE_FLAG_REGISTERED 0x1 #define TEE_MAX_DEV_NAME_LEN 32 =20 diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index b43178986985..2c8ce0c6801a 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -31,14 +31,7 @@ static void release_registered_pages(struct tee_shm *shm) static void tee_shm_release(struct tee_device *teedev, struct tee_shm *shm) { if (shm->flags & TEE_SHM_POOL) { - struct tee_shm_pool_mgr *poolm; - - if (shm->flags & TEE_SHM_DMA_BUF) - poolm =3D teedev->pool->dma_buf_mgr; - else - poolm =3D teedev->pool->private_mgr; - - poolm->ops->free(poolm, shm); + teedev->pool->ops->free(teedev->pool, shm); } else if (shm->flags & TEE_SHM_REGISTER) { int rc =3D teedev->desc->ops->shm_unregister(shm->ctx, shm); =20 @@ -59,8 +52,8 @@ static void tee_shm_release(struct tee_device *teedev, st= ruct tee_shm *shm) struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 fl= ags) { struct tee_device *teedev =3D ctx->teedev; - struct tee_shm_pool_mgr *poolm =3D NULL; struct tee_shm *shm; + size_t align; void *ret; int rc; =20 @@ -93,12 +86,18 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, = size_t size, u32 flags) refcount_set(&shm->refcount, 1); shm->flags =3D flags | TEE_SHM_POOL; shm->ctx =3D ctx; - if (flags & TEE_SHM_DMA_BUF) - poolm =3D teedev->pool->dma_buf_mgr; - else - poolm =3D teedev->pool->private_mgr; + if (flags & TEE_SHM_DMA_BUF) { + align =3D PAGE_SIZE; + /* + * Request to register the shm in the pool allocator below + * if supported. + */ + shm->flags |=3D TEE_SHM_REGISTER; + } else { + align =3D 2 * sizeof(long); + } =20 - rc =3D poolm->ops->alloc(poolm, shm, size); + rc =3D teedev->pool->ops->alloc(teedev->pool, shm, size, align); if (rc) { ret =3D ERR_PTR(rc); goto err_kfree; @@ -118,7 +117,7 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, = size_t size, u32 flags) =20 return shm; err_pool_free: - poolm->ops->free(poolm, shm); + teedev->pool->ops->free(teedev->pool, shm); err_kfree: kfree(shm); err_dev_put: diff --git a/drivers/tee/tee_shm_pool.c b/drivers/tee/tee_shm_pool.c index 0e460347138a..71e0f8ae69aa 100644 --- a/drivers/tee/tee_shm_pool.c +++ b/drivers/tee/tee_shm_pool.c @@ -9,14 +9,16 @@ #include #include "tee_private.h" =20 -static int pool_op_gen_alloc(struct tee_shm_pool_mgr *poolm, - struct tee_shm *shm, size_t size) +static int pool_op_gen_alloc(struct tee_shm_pool *pool, struct tee_shm *sh= m, + size_t size, size_t align) { unsigned long va; - struct gen_pool *genpool =3D poolm->private_data; - size_t s =3D roundup(size, 1 << genpool->min_alloc_order); + struct gen_pool *genpool =3D pool->private_data; + size_t a =3D max_t(size_t, align, BIT(genpool->min_alloc_order)); + struct genpool_data_align data =3D { .align =3D a }; + size_t s =3D roundup(size, a); =20 - va =3D gen_pool_alloc(genpool, s); + va =3D gen_pool_alloc_algo(genpool, s, gen_pool_first_fit_align, &data); if (!va) return -ENOMEM; =20 @@ -24,107 +26,67 @@ static int pool_op_gen_alloc(struct tee_shm_pool_mgr *= poolm, shm->kaddr =3D (void *)va; shm->paddr =3D gen_pool_virt_to_phys(genpool, va); shm->size =3D s; + /* + * This is from a static shared memory pool so no need to register + * each chunk, and no need to unregister later either. + */ + shm->flags &=3D ~TEE_SHM_REGISTER; return 0; } =20 -static void pool_op_gen_free(struct tee_shm_pool_mgr *poolm, - struct tee_shm *shm) +static void pool_op_gen_free(struct tee_shm_pool *pool, struct tee_shm *sh= m) { - gen_pool_free(poolm->private_data, (unsigned long)shm->kaddr, + gen_pool_free(pool->private_data, (unsigned long)shm->kaddr, shm->size); shm->kaddr =3D NULL; } =20 -static void pool_op_gen_destroy_poolmgr(struct tee_shm_pool_mgr *poolm) +static void pool_op_gen_destroy_pool(struct tee_shm_pool *pool) { - gen_pool_destroy(poolm->private_data); - kfree(poolm); + gen_pool_destroy(pool->private_data); + kfree(pool); } =20 -static const struct tee_shm_pool_mgr_ops pool_ops_generic =3D { +static const struct tee_shm_pool_ops pool_ops_generic =3D { .alloc =3D pool_op_gen_alloc, .free =3D pool_op_gen_free, - .destroy_poolmgr =3D pool_op_gen_destroy_poolmgr, + .destroy_pool =3D pool_op_gen_destroy_pool, }; =20 -struct tee_shm_pool_mgr *tee_shm_pool_mgr_alloc_res_mem(unsigned long vadd= r, - phys_addr_t paddr, - size_t size, - int min_alloc_order) +struct tee_shm_pool *tee_shm_pool_alloc_res_mem(unsigned long vaddr, + phys_addr_t paddr, size_t size, + int min_alloc_order) { const size_t page_mask =3D PAGE_SIZE - 1; - struct tee_shm_pool_mgr *mgr; + struct tee_shm_pool *pool; int rc; =20 /* Start and end must be page aligned */ if (vaddr & page_mask || paddr & page_mask || size & page_mask) return ERR_PTR(-EINVAL); =20 - mgr =3D kzalloc(sizeof(*mgr), GFP_KERNEL); - if (!mgr) + pool =3D kzalloc(sizeof(*pool), GFP_KERNEL); + if (!pool) return ERR_PTR(-ENOMEM); =20 - mgr->private_data =3D gen_pool_create(min_alloc_order, -1); - if (!mgr->private_data) { + pool->private_data =3D gen_pool_create(min_alloc_order, -1); + if (!pool->private_data) { rc =3D -ENOMEM; goto err; } =20 - gen_pool_set_algo(mgr->private_data, gen_pool_best_fit, NULL); - rc =3D gen_pool_add_virt(mgr->private_data, vaddr, paddr, size, -1); + rc =3D gen_pool_add_virt(pool->private_data, vaddr, paddr, size, -1); if (rc) { - gen_pool_destroy(mgr->private_data); + gen_pool_destroy(pool->private_data); goto err; } =20 - mgr->ops =3D &pool_ops_generic; + pool->ops =3D &pool_ops_generic; =20 - return mgr; + return pool; err: - kfree(mgr); + kfree(pool); =20 return ERR_PTR(rc); } -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 =3D kzalloc(sizeof(*pool), GFP_KERNEL); - if (!pool) - return ERR_PTR(-ENOMEM); - - pool->private_mgr =3D priv_mgr; - pool->dma_buf_mgr =3D dmabuf_mgr; - - return pool; -} -EXPORT_SYMBOL_GPL(tee_shm_pool_alloc); - -/** - * tee_shm_pool_free() - Free a shared memory pool - * @pool: The shared memory pool to free - * - * There must be no remaining shared memory allocated from this pool when - * this function is called. - */ -void tee_shm_pool_free(struct tee_shm_pool *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); +EXPORT_SYMBOL_GPL(tee_shm_pool_alloc_res_mem); diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 26b450484ac1..808aa23308c2 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -221,62 +221,39 @@ struct tee_shm { }; =20 /** - * struct tee_shm_pool_mgr - shared memory manager + * struct tee_shm_pool - shared memory pool * @ops: operations * @private_data: private data for the shared memory manager */ -struct tee_shm_pool_mgr { - const struct tee_shm_pool_mgr_ops *ops; +struct tee_shm_pool { + const struct tee_shm_pool_ops *ops; void *private_data; }; =20 /** - * struct tee_shm_pool_mgr_ops - shared memory pool manager operations + * struct tee_shm_pool_ops - shared memory pool operations * @alloc: called when allocating shared memory * @free: called when freeing shared memory - * @destroy_poolmgr: called when destroying the pool manager + * @destroy_pool: called when destroying the pool */ -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); +struct tee_shm_pool_ops { + int (*alloc)(struct tee_shm_pool *pool, struct tee_shm *shm, + size_t size, size_t align); + void (*free)(struct tee_shm_pool *pool, struct tee_shm *shm); + void (*destroy_pool)(struct tee_shm_pool *pool); }; =20 -/** - * 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 + * tee_shm_pool_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 failur= e. - */ -struct tee_shm_pool_mgr *tee_shm_pool_mgr_alloc_res_mem(unsigned long vadd= r, - phys_addr_t paddr, - size_t size, - int min_alloc_order); - -/** - * tee_shm_pool_mgr_destroy() - Free a shared memory manager + * @returns pointer to a 'struct tee_shm_pool' or an ERR_PTR on failure. */ -static inline void tee_shm_pool_mgr_destroy(struct tee_shm_pool_mgr *poolm) -{ - poolm->ops->destroy_poolmgr(poolm); -} +struct tee_shm_pool *tee_shm_pool_alloc_res_mem(unsigned long vaddr, + phys_addr_t paddr, size_t size, + int min_alloc_order); =20 /** * tee_shm_pool_free() - Free a shared memory pool @@ -285,7 +262,10 @@ static inline void tee_shm_pool_mgr_destroy(struct tee= _shm_pool_mgr *poolm) * The must be no remaining shared memory allocated from this pool when * this function is called. */ -void tee_shm_pool_free(struct tee_shm_pool *pool); +static inline void tee_shm_pool_free(struct tee_shm_pool *pool) +{ + pool->ops->destroy_pool(pool); +} =20 /** * tee_get_drvdata() - Return driver_data pointer --=20 2.31.1 From nobody Tue Jun 30 15:33:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51990C433F5 for ; Fri, 14 Jan 2022 15:09:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242345AbiANPI5 (ORCPT ); Fri, 14 Jan 2022 10:08:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242233AbiANPIp (ORCPT ); Fri, 14 Jan 2022 10:08:45 -0500 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43C9EC061574 for ; Fri, 14 Jan 2022 07:08:45 -0800 (PST) Received: by mail-lf1-x12a.google.com with SMTP id br17so31190855lfb.6 for ; Fri, 14 Jan 2022 07:08:45 -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 :mime-version:content-transfer-encoding; bh=95djvJwQmGN4QP2pKlfIXqtuuD+v4MbXGaa6QJVPkOg=; b=PwfcN+GB6v/mufTrOZZHi9IDIgA29oDnM3ZvRe6LV0DQCroGsD4pdVj2JcF2Kyj/PN gberymRqwa8ROmxpqPp25y8l5lLne85HQLIm1L1cDSXRerdvOZLTkTmmHpsEDo8EXIVm 3fckkFsznm/dBM/mjpC8WrynHqD7/DzM1Y3GWFDCc2aF0rEiTsTnRvCdUYvLxbWepzRi ae2U33+EszRfpcWstp8q1wudDeor7slb51dT0P/MwQH+yxN2ZLOXLykkdPMJw3YTro10 0ouf/BeK6vUXm0y9GQ8KbSGHeFUwixfYfat3ywqFNHt/7r9aR/XvNyPO01WLiu482q8Y +cuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=95djvJwQmGN4QP2pKlfIXqtuuD+v4MbXGaa6QJVPkOg=; b=WNriKC3VvPfECAxpa7c3uHdL9Y1dBp6nAtWuAyM8aX5njb6SQ+8hGhYwFfc8zHvX5N wUhydB6ABomOFbqz+sDHjZ+7xmjn/7yATAApsRKx/K5bfBJXyBdePZww4Q5MiNaUfRcv T6CppmInYkXP0V9IYS1nIDx1NA8I2SA4r4oF+sUcdWOk493n+/SeD0OkSiFPT2tPy2C8 UUgnQOhhcs2m1JKJPnOPFoF18EIfHs8/I0SsXbUEzKmLxLQBlnXhpzUQ1P2+OcbWYEyy 8j9JPi6rFA+nf/LoczoYE0Po68KcKBT3CFrlkqFkdYmjVqxdvRJAUZmp6rb1NZ3cUL7q xd5A== X-Gm-Message-State: AOAM531WTXdlQZqcrgL/CI+RXGQ2OaGt+lV9n/ADWSsygn7ADjcY9CnF 4TfUsi6qwykkwureB+Weiq3gPHXQXNBx1g== X-Google-Smtp-Source: ABdhPJxXXbZp25W8Rxg0PtC4sTVGBG7S3FJLI1boAHY0uPVZY/SbpoO9k3O1eul55u03eAk++Gq0fg== X-Received: by 2002:a2e:a782:: with SMTP id c2mr6513423ljf.143.1642172923374; Fri, 14 Jan 2022 07:08:43 -0800 (PST) Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id i31sm40517lfv.67.2022.01.14.07.08.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 07:08:42 -0800 (PST) From: Jens Wiklander To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Devaraj Rangasamy , Rijo Thomas , David Howells , Tyler Hicks , Jens Wiklander Subject: [PATCH v2 05/12] tee: replace tee_shm_alloc() Date: Fri, 14 Jan 2022 16:08:17 +0100 Message-Id: <20220114150824.3578829-6-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220114150824.3578829-1-jens.wiklander@linaro.org> References: <20220114150824.3578829-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" tee_shm_alloc() is replaced by three new functions, tee_shm_alloc_user_buf() - for user mode allocations, replacing passing the flags TEE_SHM_MAPPED | TEE_SHM_DMA_BUF tee_shm_alloc_kernel_buf() - for kernel mode allocations, slightly optimized compared to using the flags TEE_SHM_MAPPED | TEE_SHM_DMA_BUF. tee_shm_alloc_priv_kernel_buf() - primarily for TEE driver internal use. This also makes the interface easier to use as we can get rid of the somewhat hard to use flags parameter. The TEE subsystem and the TEE drivers are updated to use the new functions instead. Signed-off-by: Jens Wiklander --- drivers/tee/optee/call.c | 2 +- drivers/tee/optee/device.c | 5 +- drivers/tee/optee/ffa_abi.c | 4 +- drivers/tee/optee/smc_abi.c | 5 +- drivers/tee/tee_shm.c | 109 +++++++++++++++++++++++------------- include/linux/tee_drv.h | 17 +----- 6 files changed, 78 insertions(+), 64 deletions(-) diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index b25cc1fac945..fd6ad7d6fbee 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -120,7 +120,7 @@ struct tee_shm *optee_get_msg_arg(struct tee_context *c= tx, size_t num_params, if (optee->rpc_arg_count) sz +=3D OPTEE_MSG_GET_ARG_SIZE(optee->rpc_arg_count); =20 - shm =3D tee_shm_alloc(ctx, sz, TEE_SHM_MAPPED | TEE_SHM_PRIV); + shm =3D tee_shm_alloc_priv_kernel_buf(ctx, sz); if (IS_ERR(shm)) return shm; =20 diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c index 128a2d2a50a1..f3947be13e2e 100644 --- a/drivers/tee/optee/device.c +++ b/drivers/tee/optee/device.c @@ -121,10 +121,9 @@ static int __optee_enumerate_devices(u32 func) if (rc < 0 || !shm_size) goto out_sess; =20 - device_shm =3D tee_shm_alloc(ctx, shm_size, - TEE_SHM_MAPPED | TEE_SHM_DMA_BUF); + device_shm =3D tee_shm_alloc_kernel_buf(ctx, shm_size); if (IS_ERR(device_shm)) { - pr_err("tee_shm_alloc failed\n"); + pr_err("tee_shm_alloc_kernel_buf failed\n"); rc =3D PTR_ERR(device_shm); goto out_sess; } diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c index e690d9420966..18963f7e4d48 100644 --- a/drivers/tee/optee/ffa_abi.c +++ b/drivers/tee/optee/ffa_abi.c @@ -439,8 +439,8 @@ static void handle_ffa_rpc_func_cmd_shm_alloc(struct te= e_context *ctx, shm =3D optee_rpc_cmd_alloc_suppl(ctx, arg->params[0].u.value.b); break; case OPTEE_RPC_SHM_TYPE_KERNEL: - shm =3D tee_shm_alloc(ctx, arg->params[0].u.value.b, - TEE_SHM_MAPPED | TEE_SHM_PRIV); + shm =3D tee_shm_alloc_priv_kernel_buf(ctx, + arg->params[0].u.value.b); break; default: arg->ret =3D TEEC_ERROR_BAD_PARAMETERS; diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index b679037ea794..196cd4316d7d 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -650,7 +650,7 @@ static void handle_rpc_func_cmd_shm_alloc(struct tee_co= ntext *ctx, shm =3D optee_rpc_cmd_alloc_suppl(ctx, sz); break; case OPTEE_RPC_SHM_TYPE_KERNEL: - shm =3D tee_shm_alloc(ctx, sz, TEE_SHM_MAPPED | TEE_SHM_PRIV); + shm =3D tee_shm_alloc_priv_kernel_buf(ctx, sz); break; default: arg->ret =3D TEEC_ERROR_BAD_PARAMETERS; @@ -775,8 +775,7 @@ static void optee_handle_rpc(struct tee_context *ctx, =20 switch (OPTEE_SMC_RETURN_GET_RPC_FUNC(param->a0)) { case OPTEE_SMC_RPC_FUNC_ALLOC: - shm =3D tee_shm_alloc(ctx, param->a1, - TEE_SHM_MAPPED | TEE_SHM_PRIV); + shm =3D tee_shm_alloc_priv_kernel_buf(ctx, param->a1); if (!IS_ERR(shm) && !tee_shm_get_pa(shm, 0, &pa)) { reg_pair_from_64(¶m->a1, ¶m->a2, pa); reg_pair_from_64(¶m->a4, ¶m->a5, diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 2c8ce0c6801a..d51bf97ce7e5 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -49,25 +49,14 @@ static void tee_shm_release(struct tee_device *teedev, = struct tee_shm *shm) tee_device_put(teedev); } =20 -struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 fl= ags) +static struct tee_shm *shm_alloc_helper(struct tee_context *ctx, size_t si= ze, + size_t align, u32 flags, int id) { struct tee_device *teedev =3D ctx->teedev; struct tee_shm *shm; - size_t align; void *ret; int rc; =20 - if (!(flags & TEE_SHM_MAPPED)) { - dev_err(teedev->dev.parent, - "only mapped allocations supported\n"); - return ERR_PTR(-EINVAL); - } - - if ((flags & ~(TEE_SHM_MAPPED | TEE_SHM_DMA_BUF | TEE_SHM_PRIV))) { - dev_err(teedev->dev.parent, "invalid shm flags 0x%x", flags); - return ERR_PTR(-EINVAL); - } - if (!tee_device_get(teedev)) return ERR_PTR(-EINVAL); =20 @@ -84,18 +73,16 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, = size_t size, u32 flags) } =20 refcount_set(&shm->refcount, 1); - shm->flags =3D flags | TEE_SHM_POOL; + shm->flags =3D flags; + shm->id =3D id; + + /* + * We're assigning this as it is needed if the shm is to be + * registered. If this function returns OK then the caller expected + * to call teedev_ctx_get() or clear shm->ctx in case it's not + * needed any longer. + */ shm->ctx =3D ctx; - if (flags & TEE_SHM_DMA_BUF) { - align =3D PAGE_SIZE; - /* - * Request to register the shm in the pool allocator below - * if supported. - */ - shm->flags |=3D TEE_SHM_REGISTER; - } else { - align =3D 2 * sizeof(long); - } =20 rc =3D teedev->pool->ops->alloc(teedev->pool, shm, size, align); if (rc) { @@ -103,28 +90,14 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx,= size_t size, u32 flags) goto err_kfree; } =20 - if (flags & TEE_SHM_DMA_BUF) { - mutex_lock(&teedev->mutex); - shm->id =3D idr_alloc(&teedev->idr, shm, 1, 0, GFP_KERNEL); - mutex_unlock(&teedev->mutex); - if (shm->id < 0) { - ret =3D ERR_PTR(shm->id); - goto err_pool_free; - } - } - teedev_ctx_get(ctx); - return shm; -err_pool_free: - teedev->pool->ops->free(teedev->pool, shm); err_kfree: kfree(shm); err_dev_put: tee_device_put(teedev); return ret; } -EXPORT_SYMBOL_GPL(tee_shm_alloc); =20 /** * tee_shm_alloc_user_buf() - Allocate shared memory for user space @@ -140,7 +113,36 @@ EXPORT_SYMBOL_GPL(tee_shm_alloc); */ struct tee_shm *tee_shm_alloc_user_buf(struct tee_context *ctx, size_t siz= e) { - return tee_shm_alloc(ctx, size, TEE_SHM_MAPPED | TEE_SHM_DMA_BUF); + u32 flags =3D TEE_SHM_MAPPED | TEE_SHM_DMA_BUF | TEE_SHM_REGISTER | + TEE_SHM_POOL; + struct tee_device *teedev =3D ctx->teedev; + struct tee_shm *shm; + void *ret; + int id; + + mutex_lock(&teedev->mutex); + id =3D idr_alloc(&teedev->idr, NULL, 1, 0, GFP_KERNEL); + mutex_unlock(&teedev->mutex); + if (id < 0) + return ERR_PTR(id); + + shm =3D shm_alloc_helper(ctx, size, PAGE_SIZE, flags, id); + if (IS_ERR(shm)) { + mutex_lock(&teedev->mutex); + idr_remove(&teedev->idr, id); + mutex_unlock(&teedev->mutex); + return shm; + } + + mutex_lock(&teedev->mutex); + ret =3D idr_replace(&teedev->idr, shm, id); + mutex_unlock(&teedev->mutex); + if (IS_ERR(ret)) { + tee_shm_free(shm); + return ret; + } + + return shm; } EXPORT_SYMBOL_GPL(tee_shm_alloc_user_buf); =20 @@ -158,10 +160,37 @@ EXPORT_SYMBOL_GPL(tee_shm_alloc_user_buf); */ struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t s= ize) { - return tee_shm_alloc(ctx, size, TEE_SHM_MAPPED); + u32 flags =3D TEE_SHM_MAPPED | TEE_SHM_REGISTER | TEE_SHM_POOL; + + return shm_alloc_helper(ctx, size, PAGE_SIZE, flags, -1); } EXPORT_SYMBOL_GPL(tee_shm_alloc_kernel_buf); =20 +/** + * tee_shm_alloc_priv_kernel_buf() - Allocate shared memory for a privatly + * shared kernel buffer + * @ctx: Context that allocates the shared memory + * @size: Requested size of shared memory + * + * This function returns similar shared memory as + * tee_shm_alloc_kernel_buf(), but with the difference that the memory + * might not be registered in secure world in case the driver supports + * passing memory not registered in advance. + * + * This function should normally only be used internally in the TEE + * drivers. + * + * @returns a pointer to 'struct tee_shm' + */ +struct tee_shm *tee_shm_alloc_priv_kernel_buf(struct tee_context *ctx, + size_t size) +{ + u32 flags =3D TEE_SHM_MAPPED | TEE_SHM_PRIV | TEE_SHM_POOL; + + return shm_alloc_helper(ctx, size, sizeof(long) * 2, flags, -1); +} +EXPORT_SYMBOL_GPL(tee_shm_alloc_priv_kernel_buf); + struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long ad= dr, size_t length, u32 flags) { diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 808aa23308c2..e71cb0411e9c 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -273,22 +273,9 @@ static inline void tee_shm_pool_free(struct tee_shm_po= ol *pool) */ void *tee_get_drvdata(struct tee_device *teedev); =20 -/** - * 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_* above. 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. - * - * @returns a pointer to 'struct tee_shm' - */ -struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 fl= ags); struct tee_shm *tee_shm_alloc_user_buf(struct tee_context *ctx, size_t siz= e); +struct tee_shm *tee_shm_alloc_priv_kernel_buf(struct tee_context *ctx, + size_t size); struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t s= ize); =20 /** --=20 2.31.1 From nobody Tue Jun 30 15:33:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6973C433F5 for ; Fri, 14 Jan 2022 15:09:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242438AbiANPJQ (ORCPT ); Fri, 14 Jan 2022 10:09:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242265AbiANPIq (ORCPT ); Fri, 14 Jan 2022 10:08:46 -0500 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2701CC06161C for ; Fri, 14 Jan 2022 07:08:46 -0800 (PST) Received: by mail-lf1-x131.google.com with SMTP id e3so28422212lfc.9 for ; Fri, 14 Jan 2022 07:08:46 -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 :mime-version:content-transfer-encoding; bh=KN7qXjKhA52PIsKQ0A6z33AObhJCPkdVrcqrafr2Wr0=; b=SRUR5l9oQUHXTx4GzCwMVHbPbkCx8hx1KmKGImVsAB/PfTe0VT+LoFNce/Gkmo1td8 a/PRus3yLDmqRywIhIv8eLkHvQGzW27Ti8iw43NW3V2yQKOgPmUDYSWqKUrQEqSsmLk/ gLPXX8luSqbbh0/QvgF9LovDXwAJqNBTYkFFK7GroTuZemjh5qnyTCq6j7jWteHaFxto +0vpffuuAUPEra6WSqOEPPTaYEXxN7UkKAixGQa8EZQmeqWVdkwrd8mZ7SMeJEEqO5B6 Ol3Ax4tEgNZfmBjccp9H3kGVA2icnXbEK1dDTbY4Sr1nmhQCBXE/08Dw0IdbNh6AlnHo YyEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KN7qXjKhA52PIsKQ0A6z33AObhJCPkdVrcqrafr2Wr0=; b=YmJKXeV7xN0qYbs9x5V5Uh6lg7SGmoxJWCyfjbUkzcUIDSVHn8qBAofMn+FJ/8p8M0 BAG9DX99OgiNR2onqRuxtD8Xt7Dfn1x3O47m/o10kFDxwMY15YwCLq0CRkT7fqt/vvZJ iiWyB5TDli4jNV8FQJU91/pdoh4WyOh2ALYJXl9EL8mKKFYmeX6u3gh/VzSbk23GG9xB 5ia45GhmfCLe71f/CRP1hxu1sdAth1wPtSqv8peH/M92WlJ6lbz+ES0noyf4OkFEHqB2 zv9Se2ENZ8OiQ2Z0eCBoA/6MQ9NFRa+WkqmwGzz4ESX6efToz4/xq3R/45AgVvAf8L3T 06tg== X-Gm-Message-State: AOAM532F5/Dd1KtLNJQ0UFO86eKFzYVuToA0pglKlI9yokQPPuurUKfL sRvSUtWbIRLnenorezNtfYDUWMcNOa1mZQ== X-Google-Smtp-Source: ABdhPJyEJLX6Fs8y/sCIDdrHydKHyVBQpCDNNHwHIJyELjZicEOLVxpqAWF8cyPi5xdk4tZ0UkGaxA== X-Received: by 2002:a2e:9093:: with SMTP id l19mr6278461ljg.231.1642172924324; Fri, 14 Jan 2022 07:08:44 -0800 (PST) Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id i31sm40517lfv.67.2022.01.14.07.08.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 07:08:43 -0800 (PST) From: Jens Wiklander To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Devaraj Rangasamy , Rijo Thomas , David Howells , Tyler Hicks , Jens Wiklander Subject: [PATCH v2 06/12] optee: add driver private tee_context Date: Fri, 14 Jan 2022 16:08:18 +0100 Message-Id: <20220114150824.3578829-7-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220114150824.3578829-1-jens.wiklander@linaro.org> References: <20220114150824.3578829-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Adds a driver private tee_context by moving the tee_context in struct optee_notif to struct optee. This tee_context is used when doing internal calls to secure world to deliver notification and later also when sharing driver private memory with secure world. Signed-off-by: Jens Wiklander --- drivers/tee/optee/core.c | 1 + drivers/tee/optee/ffa_abi.c | 61 ++++++++++++++++++------------- drivers/tee/optee/optee_private.h | 5 ++- drivers/tee/optee/smc_abi.c | 40 ++++++-------------- 4 files changed, 51 insertions(+), 56 deletions(-) diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 2a369e346b85..f4bccb5f0e93 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -161,6 +161,7 @@ void optee_remove_common(struct optee *optee) optee_unregister_devices(); =20 optee_notif_uninit(optee); + teedev_close_context(optee->ctx); /* * The two devices have to be unregistered before we can free the * other resources. diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c index 18963f7e4d48..88a028d4fb7b 100644 --- a/drivers/tee/optee/ffa_abi.c +++ b/drivers/tee/optee/ffa_abi.c @@ -766,7 +766,9 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev) { const struct ffa_dev_ops *ffa_ops; unsigned int rpc_arg_count; + struct tee_shm_pool *pool; struct tee_device *teedev; + struct tee_context *ctx; struct optee *optee; int rc; =20 @@ -786,12 +788,12 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev) if (!optee) return -ENOMEM; =20 - optee->pool =3D optee_ffa_shm_pool_alloc_pages(); - if (IS_ERR(optee->pool)) { - rc =3D PTR_ERR(optee->pool); - optee->pool =3D NULL; - goto err; + pool =3D optee_ffa_shm_pool_alloc_pages(); + if (IS_ERR(pool)) { + rc =3D PTR_ERR(pool); + goto err_free_optee; } + optee->pool =3D pool; =20 optee->ops =3D &optee_ffa_ops; optee->ffa.ffa_dev =3D ffa_dev; @@ -802,7 +804,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev) optee); if (IS_ERR(teedev)) { rc =3D PTR_ERR(teedev); - goto err; + goto err_free_pool; } optee->teedev =3D teedev; =20 @@ -810,50 +812,57 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev) optee); if (IS_ERR(teedev)) { rc =3D PTR_ERR(teedev); - goto err; + goto err_unreg_teedev; } optee->supp_teedev =3D teedev; =20 rc =3D tee_device_register(optee->teedev); if (rc) - goto err; + goto err_unreg_supp_teedev; =20 rc =3D tee_device_register(optee->supp_teedev); if (rc) - goto err; + goto err_unreg_supp_teedev; =20 rc =3D rhashtable_init(&optee->ffa.global_ids, &shm_rhash_params); if (rc) - goto err; + goto err_unreg_supp_teedev; mutex_init(&optee->ffa.mutex); mutex_init(&optee->call_queue.mutex); INIT_LIST_HEAD(&optee->call_queue.waiters); optee_supp_init(&optee->supp); ffa_dev_set_drvdata(ffa_dev, optee); + ctx =3D teedev_open(optee->teedev); + if (IS_ERR(ctx)) + goto err_rhashtable_free; + optee->ctx =3D ctx; rc =3D optee_notif_init(optee, OPTEE_DEFAULT_MAX_NOTIF_VALUE); - if (rc) { - optee_ffa_remove(ffa_dev); - return rc; - } + if (rc) + goto err_close_ctx; =20 rc =3D optee_enumerate_devices(PTA_CMD_GET_DEVICES); - if (rc) { - optee_ffa_remove(ffa_dev); - return rc; - } + if (rc) + goto err_unregister_devices; =20 pr_info("initialized driver\n"); return 0; -err: - /* - * tee_device_unregister() is safe to call even if the - * devices hasn't been registered with - * tee_device_register() yet. - */ + +err_unregister_devices: + optee_unregister_devices(); + optee_notif_uninit(optee); +err_close_ctx: + teedev_close_context(ctx); +err_rhashtable_free: + rhashtable_free_and_destroy(&optee->ffa.global_ids, rh_free_fn, NULL); + optee_supp_uninit(&optee->supp); + mutex_destroy(&optee->call_queue.mutex); +err_unreg_supp_teedev: tee_device_unregister(optee->supp_teedev); +err_unreg_teedev: tee_device_unregister(optee->teedev); - if (optee->pool) - tee_shm_pool_free(optee->pool); +err_free_pool: + tee_shm_pool_free(pool); +err_free_optee: kfree(optee); return rc; } diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_pr= ivate.h index df2450921464..df3a483bbf46 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -53,7 +53,6 @@ struct optee_call_queue { =20 struct optee_notif { u_int max_key; - struct tee_context *ctx; /* Serializes access to the elements below in this struct */ spinlock_t lock; struct list_head db; @@ -134,9 +133,10 @@ struct optee_ops { /** * struct optee - main service struct * @supp_teedev: supplicant device + * @teedev: client device * @ops: internal callbacks for different ways to reach secure * world - * @teedev: client device + * @ctx: driver internal TEE context * @smc: specific to SMC ABI * @ffa: specific to FF-A ABI * @call_queue: queue of threads waiting to call @invoke_fn @@ -152,6 +152,7 @@ struct optee { struct tee_device *supp_teedev; struct tee_device *teedev; const struct optee_ops *ops; + struct tee_context *ctx; union { struct optee_smc smc; struct optee_ffa ffa; diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index 196cd4316d7d..1dbb13b08381 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -952,57 +952,34 @@ static irqreturn_t notif_irq_thread_fn(int irq, void = *dev_id) { struct optee *optee =3D dev_id; =20 - optee_smc_do_bottom_half(optee->notif.ctx); + optee_smc_do_bottom_half(optee->ctx); =20 return IRQ_HANDLED; } =20 static int optee_smc_notif_init_irq(struct optee *optee, u_int irq) { - struct tee_context *ctx; int rc; =20 - ctx =3D teedev_open(optee->teedev); - if (IS_ERR(ctx)) - return PTR_ERR(ctx); - - optee->notif.ctx =3D ctx; rc =3D request_threaded_irq(irq, notif_irq_handler, notif_irq_thread_fn, 0, "optee_notification", optee); if (rc) - goto err_close_ctx; + return rc; =20 optee->smc.notif_irq =3D irq; =20 return 0; - -err_close_ctx: - teedev_close_context(optee->notif.ctx); - optee->notif.ctx =3D NULL; - - return rc; } =20 static void optee_smc_notif_uninit_irq(struct optee *optee) { - if (optee->notif.ctx) { - optee_smc_stop_async_notif(optee->notif.ctx); + if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_ASYNC_NOTIF) { + optee_smc_stop_async_notif(optee->ctx); if (optee->smc.notif_irq) { free_irq(optee->smc.notif_irq, optee); irq_dispose_mapping(optee->smc.notif_irq); } - - /* - * The thread normally working with optee->notif.ctx was - * stopped with free_irq() above. - * - * Note we're not using teedev_close_context() or - * tee_client_close_context() since we have already called - * tee_device_put() while initializing to avoid a circular - * reference counting. - */ - teedev_close_context(optee->notif.ctx); } } =20 @@ -1307,6 +1284,7 @@ static int optee_probe(struct platform_device *pdev) struct optee *optee =3D NULL; void *memremaped_shm =3D NULL; struct tee_device *teedev; + struct tee_context *ctx; u32 max_notif_value; u32 sec_caps; int rc; @@ -1387,9 +1365,13 @@ static int optee_probe(struct platform_device *pdev) optee->pool =3D pool; =20 platform_set_drvdata(pdev, optee); + ctx =3D teedev_open(optee->teedev); + if (IS_ERR(ctx)) + goto err_supp_uninit; + optee->ctx =3D ctx; rc =3D optee_notif_init(optee, max_notif_value); if (rc) - goto err_supp_uninit; + goto err_close_ctx; =20 if (sec_caps & OPTEE_SMC_SEC_CAP_ASYNC_NOTIF) { unsigned int irq; @@ -1437,6 +1419,8 @@ static int optee_probe(struct platform_device *pdev) optee_unregister_devices(); err_notif_uninit: optee_notif_uninit(optee); +err_close_ctx: + teedev_close_context(ctx); err_supp_uninit: optee_supp_uninit(&optee->supp); mutex_destroy(&optee->call_queue.mutex); --=20 2.31.1 From nobody Tue Jun 30 15:33:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78345C433F5 for ; Fri, 14 Jan 2022 15:09:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242453AbiANPJR (ORCPT ); Fri, 14 Jan 2022 10:09:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242273AbiANPIr (ORCPT ); Fri, 14 Jan 2022 10:08:47 -0500 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5BA6C06173E for ; Fri, 14 Jan 2022 07:08:46 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id x11so5463884lfa.2 for ; Fri, 14 Jan 2022 07:08:46 -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 :mime-version:content-transfer-encoding; bh=OtN0NK8H68RvtV1DUCOaMv7wLfC2kxbWO3RbKAx6JAo=; b=vMje8KFNPRAamdH6/q4NYp/LtdTyAgv8Yd3+M08wCU8FfZLzjYS6RGjekqX/X67HJQ HCqGWOmMdIEErsj15iT7ZtMFS6pyFpHHZdn6tMS5SLyKZTp2RxF0MuM5vUBVZblSLu5Q JPoe9xz8ExoOIHV14sTaQES7O3OIfmqCesMg10d3VsfavpTWXKvduaWPrUr8zHrwEyqX c/t/voU3yaJZMe5hCotVZYN2GPnfLG3kGDKpKhVxeJVxvymWLqBWxBR5txoIBdvpBOBo zxs+Ug7xCL+SfYzseBwUvyVKhkGV+FkKkuVycbg+J8APrXpFXMqB3koqNj4ScifOJqr8 P0qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OtN0NK8H68RvtV1DUCOaMv7wLfC2kxbWO3RbKAx6JAo=; b=5GlvIGavuHfxTwc0E4LuV/kzlYeyOdV9jRHVV8AlLnqigW8OTq4ijtTvVT5/NwEgRD h2r3bsLwAaqiA7UA78DHEPZM89cG5gbhXsWG1Dchxg37X2MvGPl9RSXHw36hTO3xUUXI iAfYakrZVjU9gJtgk6amgS3SJhkbLM1HfN562oNpNvqREpmRJRELkJI7n43Xvj9dhWO1 pRieaZI/TJqRnkVfIRmNM68Y6m6UgYD1PHSwE5lMP7wpw0SNwT5QKmlcuIgkLkoq+xfN nwpoPnnVuEVHbPBaqvKSl8OgJkdcE6/vAhdE0In5aWri0G7UI8UKhwelQ1P4F8pjQr/g RS5Q== X-Gm-Message-State: AOAM531863nRLZk1lfPppNwV2zKvATkmDj5KGf1BXF6euFfRBCuHV4US yGtXIxfKqLKuu2oswppqR3NXRK720GhhTA== X-Google-Smtp-Source: ABdhPJy00T4Ymu3vn1vX4t4VhUcoBRtNhKDHrTvvWRPLiqjzCjmT9JDZpB4GN+9v8QV+mRq6d29WzQ== X-Received: by 2002:a05:651c:198b:: with SMTP id bx11mr6757950ljb.379.1642172925132; Fri, 14 Jan 2022 07:08:45 -0800 (PST) Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id i31sm40517lfv.67.2022.01.14.07.08.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 07:08:44 -0800 (PST) From: Jens Wiklander To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Devaraj Rangasamy , Rijo Thomas , David Howells , Tyler Hicks , Jens Wiklander Subject: [PATCH v2 07/12] optee: use driver internal tee_contex for some rpc Date: Fri, 14 Jan 2022 16:08:19 +0100 Message-Id: <20220114150824.3578829-8-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220114150824.3578829-1-jens.wiklander@linaro.org> References: <20220114150824.3578829-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Uses the new driver internal tee_context when allocating driver private shared memory. This decouples the shared memory object from its original tee_context. This is needed when the life time of such a memory allocation outlives the client tee_context. Signed-off-by: Jens Wiklander --- drivers/tee/optee/ffa_abi.c | 16 ++++++++-------- drivers/tee/optee/smc_abi.c | 7 ++++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c index 88a028d4fb7b..5ec484b42432 100644 --- a/drivers/tee/optee/ffa_abi.c +++ b/drivers/tee/optee/ffa_abi.c @@ -424,6 +424,7 @@ static struct tee_shm_pool *optee_ffa_shm_pool_alloc_pa= ges(void) */ =20 static void handle_ffa_rpc_func_cmd_shm_alloc(struct tee_context *ctx, + struct optee *optee, struct optee_msg_arg *arg) { struct tee_shm *shm; @@ -439,7 +440,7 @@ static void handle_ffa_rpc_func_cmd_shm_alloc(struct te= e_context *ctx, shm =3D optee_rpc_cmd_alloc_suppl(ctx, arg->params[0].u.value.b); break; case OPTEE_RPC_SHM_TYPE_KERNEL: - shm =3D tee_shm_alloc_priv_kernel_buf(ctx, + shm =3D tee_shm_alloc_priv_kernel_buf(optee->ctx, arg->params[0].u.value.b); break; default: @@ -493,14 +494,13 @@ static void handle_ffa_rpc_func_cmd_shm_free(struct t= ee_context *ctx, } =20 static void handle_ffa_rpc_func_cmd(struct tee_context *ctx, + struct optee *optee, struct optee_msg_arg *arg) { - struct optee *optee =3D tee_get_drvdata(ctx->teedev); - arg->ret_origin =3D TEEC_ORIGIN_COMMS; switch (arg->cmd) { case OPTEE_RPC_CMD_SHM_ALLOC: - handle_ffa_rpc_func_cmd_shm_alloc(ctx, arg); + handle_ffa_rpc_func_cmd_shm_alloc(ctx, optee, arg); break; case OPTEE_RPC_CMD_SHM_FREE: handle_ffa_rpc_func_cmd_shm_free(ctx, optee, arg); @@ -510,12 +510,12 @@ static void handle_ffa_rpc_func_cmd(struct tee_contex= t *ctx, } } =20 -static void optee_handle_ffa_rpc(struct tee_context *ctx, u32 cmd, - struct optee_msg_arg *arg) +static void optee_handle_ffa_rpc(struct tee_context *ctx, struct optee *op= tee, + u32 cmd, struct optee_msg_arg *arg) { switch (cmd) { case OPTEE_FFA_YIELDING_CALL_RETURN_RPC_CMD: - handle_ffa_rpc_func_cmd(ctx, arg); + handle_ffa_rpc_func_cmd(ctx, optee, arg); break; case OPTEE_FFA_YIELDING_CALL_RETURN_INTERRUPT: /* Interrupt delivered by now */ @@ -582,7 +582,7 @@ static int optee_ffa_yielding_call(struct tee_context *= ctx, * above. */ cond_resched(); - optee_handle_ffa_rpc(ctx, data->data1, rpc_arg); + optee_handle_ffa_rpc(ctx, optee, data->data1, rpc_arg); cmd =3D OPTEE_FFA_YIELDING_CALL_RESUME; data->data0 =3D cmd; data->data1 =3D 0; diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index 1dbb13b08381..f2ef76451443 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -621,6 +621,7 @@ static void handle_rpc_func_cmd_shm_free(struct tee_con= text *ctx, } =20 static void handle_rpc_func_cmd_shm_alloc(struct tee_context *ctx, + struct optee *optee, struct optee_msg_arg *arg, struct optee_call_ctx *call_ctx) { @@ -650,7 +651,7 @@ static void handle_rpc_func_cmd_shm_alloc(struct tee_co= ntext *ctx, shm =3D optee_rpc_cmd_alloc_suppl(ctx, sz); break; case OPTEE_RPC_SHM_TYPE_KERNEL: - shm =3D tee_shm_alloc_priv_kernel_buf(ctx, sz); + shm =3D tee_shm_alloc_priv_kernel_buf(optee->ctx, sz); break; default: arg->ret =3D TEEC_ERROR_BAD_PARAMETERS; @@ -746,7 +747,7 @@ static void handle_rpc_func_cmd(struct tee_context *ctx= , struct optee *optee, switch (arg->cmd) { case OPTEE_RPC_CMD_SHM_ALLOC: free_pages_list(call_ctx); - handle_rpc_func_cmd_shm_alloc(ctx, arg, call_ctx); + handle_rpc_func_cmd_shm_alloc(ctx, optee, arg, call_ctx); break; case OPTEE_RPC_CMD_SHM_FREE: handle_rpc_func_cmd_shm_free(ctx, arg); @@ -775,7 +776,7 @@ static void optee_handle_rpc(struct tee_context *ctx, =20 switch (OPTEE_SMC_RETURN_GET_RPC_FUNC(param->a0)) { case OPTEE_SMC_RPC_FUNC_ALLOC: - shm =3D tee_shm_alloc_priv_kernel_buf(ctx, param->a1); + shm =3D tee_shm_alloc_priv_kernel_buf(optee->ctx, param->a1); if (!IS_ERR(shm) && !tee_shm_get_pa(shm, 0, &pa)) { reg_pair_from_64(¶m->a1, ¶m->a2, pa); reg_pair_from_64(¶m->a4, ¶m->a5, --=20 2.31.1 From nobody Tue Jun 30 15:33:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9471C433F5 for ; Fri, 14 Jan 2022 15:09:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242357AbiANPJV (ORCPT ); Fri, 14 Jan 2022 10:09:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242228AbiANPIs (ORCPT ); Fri, 14 Jan 2022 10:08:48 -0500 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C458AC061574 for ; Fri, 14 Jan 2022 07:08:47 -0800 (PST) Received: by mail-lf1-x12b.google.com with SMTP id b14so12738648lff.3 for ; Fri, 14 Jan 2022 07:08:47 -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 :mime-version:content-transfer-encoding; bh=z+PMrt9ZoFFUyS+nI8cuBydf4l/fJgxfwN4fEj0TGMU=; b=lzW8KWNoC1fqc7SLWfi4NlHlo4piN1ZDgKk2ofcWfVdLPQ2kIaUFYEvGPHI3gowT6E 13RCNdmP7OKfdix2j61FC129j/LIGiSpc5HHvQpRE47x/GEvx0QjB7Z1v2/463iz5G3O ZXZBcht1c8rYbiJHJScCXvSf1D7x/IuPbikVm6yboktWlyGKY/LVUQWDRM7GUewbPsbK F4/Yl5XhZWfofuVVACdLi5heb0iPMOrltKZjKhtDbBbM/sMUbPMZ5Js3sVPp1ufGXTg/ 8eC+ktqhOG3mi7+UqQZPyCx/lOGxJjr6RALVDKVQ1FZB2eNP3nXZDSZRM4RR8uEkzcgR Zo2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z+PMrt9ZoFFUyS+nI8cuBydf4l/fJgxfwN4fEj0TGMU=; b=DCxZT+omLDxls9SlKFXd9GCNBPrz+gxE6vTkc2GNTIUaupPynIoINsDSjRDL6DtJ+l a1dAKqRdzcjvMAC73fYfV+Cs3uNdAYO9G+IpAs0RQYjAYMCKuqg2TXBYC4GgD9xDaSsy o3DNqd5/b/rFMUh8qgpojbl38Tg+Y8BN5MJhC3Aof3etckKQVQ6Grn29XZzJ0welfVX2 zd/ErVtUDWeY1puCoJKzurk0zPZ/8lVKDxdCWWFGWV9fSWpOFv2hdmrKO2I3LSpsow6L hGSW+4VXio7VzOd1K8tYRkaNX1m5FWTYmPXPGy5ASsZmMjSmHCn7CoIRtwnpSx2YoFk2 2q3w== X-Gm-Message-State: AOAM533t3lHCpAQ0XJiD7BjiKcUrtcE6aFs0M94tBIKlIF6gdNXpYqaX qtrd6xgkQwYo/sJZupymnY4V+65zc+T+mQ== X-Google-Smtp-Source: ABdhPJw4fN0F/Y5WwdJ22CSUtFiug4nes1etBlslC/SO1RTgBbbw6W4pXxWHWNGQhD34PYFAyPSTVg== X-Received: by 2002:a2e:9bcd:: with SMTP id w13mr6721364ljj.360.1642172925879; Fri, 14 Jan 2022 07:08:45 -0800 (PST) Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id i31sm40517lfv.67.2022.01.14.07.08.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 07:08:45 -0800 (PST) From: Jens Wiklander To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Devaraj Rangasamy , Rijo Thomas , David Howells , Tyler Hicks , Jens Wiklander Subject: [PATCH v2 08/12] optee: add optee_pool_op_free_helper() Date: Fri, 14 Jan 2022 16:08:20 +0100 Message-Id: <20220114150824.3578829-9-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220114150824.3578829-1-jens.wiklander@linaro.org> References: <20220114150824.3578829-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Adds a common helper function to free a tee_shm allocated using the helper function optee_pool_op_alloc_helper(). Signed-off-by: Jens Wiklander --- drivers/tee/optee/core.c | 10 ++++++++++ drivers/tee/optee/ffa_abi.c | 4 +--- drivers/tee/optee/optee_private.h | 3 +++ drivers/tee/optee/smc_abi.c | 7 +++---- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index f4bccb5f0e93..daf947e98d14 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -69,6 +69,16 @@ int optee_pool_op_alloc_helper(struct tee_shm_pool *pool= , struct tee_shm *shm, return rc; } =20 +void optee_pool_op_free_helper(struct tee_shm_pool *pool, struct tee_shm *= shm, + int (*shm_unregister)(struct tee_context *ctx, + struct tee_shm *shm)) +{ + if (shm_unregister) + shm_unregister(shm->ctx, shm); + free_pages((unsigned long)shm->kaddr, get_order(shm->size)); + shm->kaddr =3D NULL; +} + static void optee_bus_scan(struct work_struct *work) { WARN_ON(optee_enumerate_devices(PTA_CMD_GET_DEVICES_SUPP)); diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c index 5ec484b42432..4cbc45035f92 100644 --- a/drivers/tee/optee/ffa_abi.c +++ b/drivers/tee/optee/ffa_abi.c @@ -379,9 +379,7 @@ static int pool_ffa_op_alloc(struct tee_shm_pool *pool, static void pool_ffa_op_free(struct tee_shm_pool *pool, struct tee_shm *shm) { - optee_ffa_shm_unregister(shm->ctx, shm); - free_pages((unsigned long)shm->kaddr, get_order(shm->size)); - shm->kaddr =3D NULL; + optee_pool_op_free_helper(pool, shm, optee_ffa_shm_unregister); } =20 static void pool_ffa_op_destroy_pool(struct tee_shm_pool *pool) diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_pr= ivate.h index df3a483bbf46..e77765c78878 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -236,6 +236,9 @@ int optee_pool_op_alloc_helper(struct tee_shm_pool *poo= l, struct tee_shm *shm, struct page **pages, size_t num_pages, unsigned long start)); +void optee_pool_op_free_helper(struct tee_shm_pool *pool, struct tee_shm *= shm, + int (*shm_unregister)(struct tee_context *ctx, + struct tee_shm *shm)); =20 =20 void optee_remove_common(struct optee *optee); diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index f2ef76451443..0b27688d1e97 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -548,10 +548,9 @@ static void pool_op_free(struct tee_shm_pool *pool, struct tee_shm *shm) { if (!(shm->flags & TEE_SHM_PRIV)) - optee_shm_unregister(shm->ctx, shm); - - free_pages((unsigned long)shm->kaddr, get_order(shm->size)); - shm->kaddr =3D NULL; + optee_pool_op_free_helper(pool, shm, optee_shm_unregister); + else + optee_pool_op_free_helper(pool, shm, NULL); } =20 static void pool_op_destroy_pool(struct tee_shm_pool *pool) --=20 2.31.1 From nobody Tue Jun 30 15:33:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 195FFC433EF for ; Fri, 14 Jan 2022 15:09:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242316AbiANPJY (ORCPT ); Fri, 14 Jan 2022 10:09:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242257AbiANPIt (ORCPT ); Fri, 14 Jan 2022 10:08:49 -0500 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7834C06173E for ; Fri, 14 Jan 2022 07:08:48 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id m3so17174810lfu.0 for ; Fri, 14 Jan 2022 07:08:48 -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 :mime-version:content-transfer-encoding; bh=BMWnTZVzVzGElJzU5xNhyaOzPG95n804pR9dUD0UpSM=; b=sVLNnZCk9v2uts1VfyjtyPuUOiD7rH1nXPNLXPa5/tQOdmj2DQU3+bQTWb+BAuFGlr VVC6BJP2Fe/uhcwCMCh0y4NxqXHs9uApS0Fqe/SeCl7wh9bF4COVPu9vsN55gSGCUEmF jIovWSaoItjipFLRJP1fzQ8HKS4f6ywI1oGO/0/9KtM5ZBlultFFJ5nUC73TIxulCUS1 OPiAuFGLlaNavNsZViuRDNwnczbRedoFobsOCqa4LQ68XqoHrxVU1EjWAHZD7owNUuzR 1qJmpt+/qV+BRfZ+GTN74Q3xhXBoqvL7NE+uvptIhOZrGQxckaaGegsGQAOSkHR3jIZs Hogg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BMWnTZVzVzGElJzU5xNhyaOzPG95n804pR9dUD0UpSM=; b=rTa516sGAAyDV/cbOuhuamUL41JJyT5XtJXwIikR7TT8HYGkjGTqx9KXcp2JnbZJhM ROkstZagy55YUVyqhIrZPUCXEoifU5x1aJFisnRgtGbjScr6/pvk1jaePAO+RbJ0mk7I qIMhs64r232GD1ayuHyVrdWEhMf2J3KCKNScCH+JJhavCO/Rt4cPKZeY5Xpw9i45S9wn 4jux96ZtZA0ovyloKN1zMoN45kBbAAI+Bnj9OoNaXsMj0eI1LwpmwsM2zQvtbueMnaJi G3quqjsfDRgXWZJUOQcMpC3xAf5p8i5gJkQ9YXPTXRkfS2m5RLbvveAnrMWPg3IY38wJ gK6Q== X-Gm-Message-State: AOAM533rZQggGWwtbbEEBmTgMMcT+sbVtMgFyCWmmUPqQPxU//eHKXo9 nS1hv3uSw7lj6xRWRvv8xrodHBmaONNAwQ== X-Google-Smtp-Source: ABdhPJzNNelaOvKCjbTz781HW+mCw6BOTdGWUPuqwyazCvQa+Y9odiI9bj86aLnmytCbAevWYtcKXg== X-Received: by 2002:a05:651c:508:: with SMTP id o8mr6440057ljp.99.1642172926707; Fri, 14 Jan 2022 07:08:46 -0800 (PST) Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id i31sm40517lfv.67.2022.01.14.07.08.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 07:08:46 -0800 (PST) From: Jens Wiklander To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Devaraj Rangasamy , Rijo Thomas , David Howells , Tyler Hicks , Jens Wiklander Subject: [PATCH v2 09/12] tee: add tee_shm_register_{user,kernel}_buf() Date: Fri, 14 Jan 2022 16:08:21 +0100 Message-Id: <20220114150824.3578829-10-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220114150824.3578829-1-jens.wiklander@linaro.org> References: <20220114150824.3578829-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Adds the two new functions tee_shm_register_user_buf() and tee_shm_register_kernel_buf() which should be used instead of the old tee_shm_register(). This avoids having the caller supplying the flags parameter which exposes a bit more than desired of the internals of the TEE subsystem. Signed-off-by: Jens Wiklander --- drivers/tee/tee_core.c | 3 +-- drivers/tee/tee_shm.c | 34 ++++++++++++++++++++++++++++++++++ include/linux/tee_drv.h | 4 ++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index a15812baaeb1..8aa1a4836b92 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -334,8 +334,7 @@ tee_ioctl_shm_register(struct tee_context *ctx, if (data.flags) return -EINVAL; =20 - shm =3D tee_shm_register(ctx, data.addr, data.length, - TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED); + shm =3D tee_shm_register_user_buf(ctx, data.addr, data.length); if (IS_ERR(shm)) return PTR_ERR(shm); =20 diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index d51bf97ce7e5..6a1dbce75616 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -301,6 +301,40 @@ struct tee_shm *tee_shm_register(struct tee_context *c= tx, unsigned long addr, } EXPORT_SYMBOL_GPL(tee_shm_register); =20 +/** + * tee_shm_register_user_buf() - Register a userspace shared memory buffer + * @ctx: Context that registers the shared memory + * @addr: The userspace address of the shared buffer + * @length: Length of the shared buffer + * + * @returns a pointer to 'struct tee_shm' + */ +struct tee_shm *tee_shm_register_user_buf(struct tee_context *ctx, + unsigned long addr, size_t length) +{ + return tee_shm_register(ctx, addr, length, + TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED); +} +EXPORT_SYMBOL_GPL(tee_shm_register_user_buf); + +/** + * tee_shm_register_kernel_buf() - Register kernel memory to be shared with + * secure world + * @ctx: Context that registers the shared memory + * @addr: The buffer + * @length: Length of the buffer + * + * @returns a pointer to 'struct tee_shm' + */ + +struct tee_shm *tee_shm_register_kernel_buf(struct tee_context *ctx, + void *addr, size_t length) +{ + return tee_shm_register(ctx, (unsigned long)addr, length, + TEE_SHM_DMA_BUF | TEE_SHM_KERNEL_MAPPED); +} +EXPORT_SYMBOL_GPL(tee_shm_register_kernel_buf); + static int tee_shm_fop_release(struct inode *inode, struct file *filp) { tee_shm_put(filp->private_data); diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index e71cb0411e9c..029c9a0590cc 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -289,6 +289,10 @@ struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_co= ntext *ctx, size_t size); */ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long ad= dr, size_t length, u32 flags); +struct tee_shm *tee_shm_register_user_buf(struct tee_context *ctx, + unsigned long addr, size_t length); +struct tee_shm *tee_shm_register_kernel_buf(struct tee_context *ctx, + void *addr, size_t length); =20 /** * tee_shm_is_registered() - Check if shared memory object in registered i= n TEE --=20 2.31.1 From nobody Tue Jun 30 15:33:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A3C8C433F5 for ; Fri, 14 Jan 2022 15:09:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242373AbiANPJZ (ORCPT ); Fri, 14 Jan 2022 10:09:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242269AbiANPIt (ORCPT ); Fri, 14 Jan 2022 10:08:49 -0500 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 655D8C061574 for ; Fri, 14 Jan 2022 07:08:49 -0800 (PST) Received: by mail-lf1-x134.google.com with SMTP id p27so19520847lfa.1 for ; Fri, 14 Jan 2022 07:08:49 -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 :mime-version:content-transfer-encoding; bh=CwI8FoTifdXWAKhHzqpeiPhswUT20WDuLw+g3B+0PMQ=; b=fCNXkPpRYTo9IliKsoHIH0v2yU8zmgF6CPFJYwbbBPkEKVsa4rxyP3BVCiFFZgquYX z3wddR87WVCQJ0Bt+kqhP4uIDPBIdIYw6MQUPSg1sMm++qSZfx7SJ/LaKBTqLhiZtwDY PzG1fq8zGi3Uiyr7ivRGjb2lt3whrN1nE/umpIwNUrFAvs03YU5TnI720Jx+B1Ub/kR2 r0o7YrxH58DyoeZ3dzEIiPnqshjgGTJ2y3Ec44qwM8XmkRQYbnn7Rf8liXG8pUb1IWAJ VfCJJ/cvMYD8hj7wr+lRZ5/uYpzoMmtXgwAxH0dPGPEJ4sGxV2dK4dfI0Din8z/4Dk0Y 4ELQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CwI8FoTifdXWAKhHzqpeiPhswUT20WDuLw+g3B+0PMQ=; b=a3uOzI59Mw56i5rTBGd2ctKrp9v5SUn2XQYuvOtzoSosEGKiAPYUoZmrY9+0NnTTOO UikJMWbYeJTRid4Az7vJid+Cx95+8Z11QC7qlgPQeLcJB8nTKlxcsu1m1VqW2lnV8Zt+ ykNpYoqU/klucpqTT9kuPSDZnJU/1oanIvQXcSo+H5i6fCCQaughBwP9QTaBiC799eZe 8hImU/jhjZymIToHvwXxhxqfFa1NjgKBtBk6RejXLMUB5y4RW3C9sl7bitA/TMrMTgvF stnNA1gGV8tpIiRoPYoFsXHVY3smQPH8f7vPh8VT55FXZO9S6wQ7ovPe/bFxBBumUARH 8PqA== X-Gm-Message-State: AOAM5338cKlYszTkj9NfJ5FEamqjv36BPE+e+U7nFPe+abNhhFkOz9Ob mYMwqXtkdPaDL0g+/c8KADJPyvmDDhV2XA== X-Google-Smtp-Source: ABdhPJwlW7g5gOBkY5CQKML6bw18bvndNjFy+WzHTbQYGsJGbfmWYCzB3RAbnzHB60u5+yVKiJaUwQ== X-Received: by 2002:a05:6512:1088:: with SMTP id j8mr6885781lfg.220.1642172927674; Fri, 14 Jan 2022 07:08:47 -0800 (PST) Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id i31sm40517lfv.67.2022.01.14.07.08.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 07:08:47 -0800 (PST) From: Jens Wiklander To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Devaraj Rangasamy , Rijo Thomas , David Howells , Tyler Hicks , Jens Wiklander Subject: [PATCH v2 10/12] KEYS: trusted: tee: use tee_shm_register_kernel_buf() Date: Fri, 14 Jan 2022 16:08:22 +0100 Message-Id: <20220114150824.3578829-11-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220114150824.3578829-1-jens.wiklander@linaro.org> References: <20220114150824.3578829-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Uses the new simplified tee_shm_register_kernel_buf() function instead of the old tee_shm_alloc() function which required specific TEE_SHM-flags Signed-off-by: Jens Wiklander --- security/keys/trusted-keys/trusted_tee.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/security/keys/trusted-keys/trusted_tee.c b/security/keys/trust= ed-keys/trusted_tee.c index 2ce66c199e1d..c8626686ee1b 100644 --- a/security/keys/trusted-keys/trusted_tee.c +++ b/security/keys/trusted-keys/trusted_tee.c @@ -70,17 +70,15 @@ static int trusted_tee_seal(struct trusted_key_payload = *p, char *datablob) memset(&inv_arg, 0, sizeof(inv_arg)); memset(¶m, 0, sizeof(param)); =20 - reg_shm_in =3D tee_shm_register(pvt_data.ctx, (unsigned long)p->key, - p->key_len, TEE_SHM_DMA_BUF | - TEE_SHM_KERNEL_MAPPED); + reg_shm_in =3D tee_shm_register_kernel_buf(pvt_data.ctx, p->key, + p->key_len); if (IS_ERR(reg_shm_in)) { dev_err(pvt_data.dev, "key shm register failed\n"); return PTR_ERR(reg_shm_in); } =20 - reg_shm_out =3D tee_shm_register(pvt_data.ctx, (unsigned long)p->blob, - sizeof(p->blob), TEE_SHM_DMA_BUF | - TEE_SHM_KERNEL_MAPPED); + reg_shm_out =3D tee_shm_register_kernel_buf(pvt_data.ctx, p->blob, + sizeof(p->blob)); if (IS_ERR(reg_shm_out)) { dev_err(pvt_data.dev, "blob shm register failed\n"); ret =3D PTR_ERR(reg_shm_out); @@ -131,17 +129,15 @@ static int trusted_tee_unseal(struct trusted_key_payl= oad *p, char *datablob) memset(&inv_arg, 0, sizeof(inv_arg)); memset(¶m, 0, sizeof(param)); =20 - reg_shm_in =3D tee_shm_register(pvt_data.ctx, (unsigned long)p->blob, - p->blob_len, TEE_SHM_DMA_BUF | - TEE_SHM_KERNEL_MAPPED); + reg_shm_in =3D tee_shm_register_kernel_buf(pvt_data.ctx, p->blob, + p->blob_len); if (IS_ERR(reg_shm_in)) { dev_err(pvt_data.dev, "blob shm register failed\n"); return PTR_ERR(reg_shm_in); } =20 - reg_shm_out =3D tee_shm_register(pvt_data.ctx, (unsigned long)p->key, - sizeof(p->key), TEE_SHM_DMA_BUF | - TEE_SHM_KERNEL_MAPPED); + reg_shm_out =3D tee_shm_register_kernel_buf(pvt_data.ctx, p->key, + sizeof(p->key)); if (IS_ERR(reg_shm_out)) { dev_err(pvt_data.dev, "key shm register failed\n"); ret =3D PTR_ERR(reg_shm_out); @@ -192,8 +188,7 @@ static int trusted_tee_get_random(unsigned char *key, s= ize_t key_len) memset(&inv_arg, 0, sizeof(inv_arg)); memset(¶m, 0, sizeof(param)); =20 - reg_shm =3D tee_shm_register(pvt_data.ctx, (unsigned long)key, key_len, - TEE_SHM_DMA_BUF | TEE_SHM_KERNEL_MAPPED); + reg_shm =3D tee_shm_register_kernel_buf(pvt_data.ctx, key, key_len); if (IS_ERR(reg_shm)) { dev_err(pvt_data.dev, "key shm register failed\n"); return PTR_ERR(reg_shm); --=20 2.31.1 From nobody Tue Jun 30 15:33:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A863C433F5 for ; Fri, 14 Jan 2022 15:09:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235794AbiANPJ3 (ORCPT ); Fri, 14 Jan 2022 10:09:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242283AbiANPIv (ORCPT ); Fri, 14 Jan 2022 10:08:51 -0500 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E7B6C061401 for ; Fri, 14 Jan 2022 07:08:50 -0800 (PST) Received: by mail-lf1-x12e.google.com with SMTP id x7so31181523lfu.8 for ; Fri, 14 Jan 2022 07:08:50 -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 :mime-version:content-transfer-encoding; bh=lelFyeI0Hlo2H4BqExX4eucwovYbO0If2EaOhEho04Y=; b=KGJXd2rTnJV9pwu3LFrpOS8NehmSMDqgdieojdBxRQe1mr9Kb2SNGvNERwWj1eeqQZ aC25AU45U9r0+Ro46J2veHfDGglcQFUI9WpvhTJDLhoYJpeDcaxXeOyyPyk4oqHGo8Gp dcHadoTBMugq989z5vxos579grbLWRQX698NjZhi3kGnSN6AITs+GTjFl5gzVMuh4UCp TaVOgpIqYbeNZz7WYsxH68Ms0vw35AM1LLGKa8FPbNI6pYdwmktALbogU3iQ8Fdm3k7f t7SPhR+0JSfE4PjpoBmJIHkzlgRgyHNI3FBzI04YoY+f5fjz7IhGPBAb6H4CYyJpCNIg FfVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lelFyeI0Hlo2H4BqExX4eucwovYbO0If2EaOhEho04Y=; b=nyYdVZcvpiTJnkPDmXsBdg3kxQ0C2kdABCrnhtyBIG3p7xvUTzOfMqnaLtoygUYzZZ XKgUrrcB6HcdDelkEMr8+2/1sBjMVddzXnT8TJ8d6Nh5y8h+a+URSWRPnPd631LRZGPw hvhU01oWv8N7QALkFVO0oRytOebR7rZA8TfRNwFaTqMmPSQ8qkU5Ns8dTz6EcNv/i5cf oZGlASJINh4LRlyPBYMgflTBWW4ZVDQDyBCBlh8YzoYMYemFenS/xp+Qiwd9x4xkwXlZ ADsqLCj3vE/gqxNPLXdtEoeK5dwdXQvlzKZDZMe6oBCIo3ifsS4m5YtvdBLRU3dLsSUZ 90Jg== X-Gm-Message-State: AOAM531QL8l73YdWADV6d+NePEKbk/f7UgDfnCOTFqcS3zRtgC+L4ict GVo3jlNKQmD7p5BzcZHxOV75SPGFq3bAAQ== X-Google-Smtp-Source: ABdhPJzI4YZc6yhE2VX4MiClgbiV8kuPD9/cbVO4HOElnZODOR2c3SEtrDHnVcegJ1R/0vzftrHsXw== X-Received: by 2002:a2e:a7c7:: with SMTP id x7mr2350905ljp.226.1642172928579; Fri, 14 Jan 2022 07:08:48 -0800 (PST) Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id i31sm40517lfv.67.2022.01.14.07.08.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 07:08:48 -0800 (PST) From: Jens Wiklander To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Devaraj Rangasamy , Rijo Thomas , David Howells , Tyler Hicks , Jens Wiklander Subject: [PATCH v2 11/12] tee: replace tee_shm_register() Date: Fri, 14 Jan 2022 16:08:23 +0100 Message-Id: <20220114150824.3578829-12-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220114150824.3578829-1-jens.wiklander@linaro.org> References: <20220114150824.3578829-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" tee_shm_register() is replaced by the previously introduced functions tee_shm_register_user_buf() and tee_shm_register_kernel_buf(). Since there are not external callers left we can remove tee_shm_register() and refactor the remains. Signed-off-by: Jens Wiklander --- drivers/tee/tee_shm.c | 157 +++++++++++++++++++++++----------------- include/linux/tee_drv.h | 11 --- 2 files changed, 91 insertions(+), 77 deletions(-) diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 6a1dbce75616..fe3e5977dd7c 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -12,17 +12,43 @@ #include #include "tee_private.h" =20 +static void shm_put_kernel_pages(struct page **pages, unsigned long npages) +{ + unsigned long n; + + for (n =3D 0; n < npages; n++) + put_page(pages[n]); +} + +static int shm_get_kernel_pages(unsigned long start, int page_count, + struct page **pages) +{ + struct kvec *kiov; + unsigned int n; + int rc; + + kiov =3D kcalloc(page_count, sizeof(*kiov), GFP_KERNEL); + if (!kiov) + return -ENOMEM; + + for (n =3D 0; n < page_count; n++) { + kiov[n].iov_base =3D (void *)(start + n * PAGE_SIZE); + kiov[n].iov_len =3D PAGE_SIZE; + } + + rc =3D get_kernel_pages(kiov, page_count, 0, pages); + kfree(kiov); + + return rc; +} + static void release_registered_pages(struct tee_shm *shm) { if (shm->pages) { - if (shm->flags & TEE_SHM_USER_MAPPED) { + if (shm->flags & TEE_SHM_USER_MAPPED) unpin_user_pages(shm->pages, shm->num_pages); - } else { - size_t n; - - for (n =3D 0; n < shm->num_pages; n++) - put_page(shm->pages[n]); - } + else + shm_put_kernel_pages(shm->pages, shm->num_pages); =20 kfree(shm->pages); } @@ -191,28 +217,24 @@ struct tee_shm *tee_shm_alloc_priv_kernel_buf(struct = tee_context *ctx, } EXPORT_SYMBOL_GPL(tee_shm_alloc_priv_kernel_buf); =20 -struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long ad= dr, - size_t length, u32 flags) +static struct tee_shm * +register_shm_helper(struct tee_context *ctx, unsigned long addr, + size_t length, u32 flags, int id) { struct tee_device *teedev =3D ctx->teedev; - const u32 req_user_flags =3D TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED; - const u32 req_kernel_flags =3D TEE_SHM_DMA_BUF | TEE_SHM_KERNEL_MAPPED; struct tee_shm *shm; + unsigned long start; + int num_pages; void *ret; int rc; - int num_pages; - unsigned long start; - - if (flags !=3D req_user_flags && flags !=3D req_kernel_flags) - return ERR_PTR(-ENOTSUPP); =20 if (!tee_device_get(teedev)) return ERR_PTR(-EINVAL); =20 if (!teedev->desc->ops->shm_register || !teedev->desc->ops->shm_unregister) { - tee_device_put(teedev); - return ERR_PTR(-ENOTSUPP); + ret =3D ERR_PTR(-ENOTSUPP); + goto err_dev_put; } =20 teedev_ctx_get(ctx); @@ -220,13 +242,13 @@ struct tee_shm *tee_shm_register(struct tee_context *= ctx, unsigned long addr, shm =3D kzalloc(sizeof(*shm), GFP_KERNEL); if (!shm) { ret =3D ERR_PTR(-ENOMEM); - goto err; + goto err_ctx_put; } =20 refcount_set(&shm->refcount, 1); - shm->flags =3D flags | TEE_SHM_REGISTER; + shm->flags =3D flags; shm->ctx =3D ctx; - shm->id =3D -1; + shm->id =3D id; addr =3D untagged_addr(addr); start =3D rounddown(addr, PAGE_SIZE); shm->offset =3D addr - start; @@ -235,71 +257,45 @@ struct tee_shm *tee_shm_register(struct tee_context *= ctx, unsigned long addr, shm->pages =3D kcalloc(num_pages, sizeof(*shm->pages), GFP_KERNEL); if (!shm->pages) { ret =3D ERR_PTR(-ENOMEM); - goto err; + goto err_free_shm; } =20 - if (flags & TEE_SHM_USER_MAPPED) { + if (flags & TEE_SHM_USER_MAPPED) rc =3D pin_user_pages_fast(start, num_pages, FOLL_WRITE, shm->pages); - } else { - struct kvec *kiov; - int i; - - kiov =3D kcalloc(num_pages, sizeof(*kiov), GFP_KERNEL); - if (!kiov) { - ret =3D ERR_PTR(-ENOMEM); - goto err; - } - - for (i =3D 0; i < num_pages; i++) { - kiov[i].iov_base =3D (void *)(start + i * PAGE_SIZE); - kiov[i].iov_len =3D PAGE_SIZE; - } - - rc =3D get_kernel_pages(kiov, num_pages, 0, shm->pages); - kfree(kiov); - } + else + rc =3D shm_get_kernel_pages(start, num_pages, shm->pages); if (rc > 0) shm->num_pages =3D rc; if (rc !=3D num_pages) { if (rc >=3D 0) rc =3D -ENOMEM; ret =3D ERR_PTR(rc); - goto err; - } - - mutex_lock(&teedev->mutex); - shm->id =3D idr_alloc(&teedev->idr, shm, 1, 0, GFP_KERNEL); - mutex_unlock(&teedev->mutex); - - if (shm->id < 0) { - ret =3D ERR_PTR(shm->id); - goto err; + goto err_put_shm_pages; } =20 rc =3D teedev->desc->ops->shm_register(ctx, shm, shm->pages, shm->num_pages, start); if (rc) { ret =3D ERR_PTR(rc); - goto err; + goto err_put_shm_pages; } =20 return shm; -err: - if (shm) { - if (shm->id >=3D 0) { - mutex_lock(&teedev->mutex); - idr_remove(&teedev->idr, shm->id); - mutex_unlock(&teedev->mutex); - } - release_registered_pages(shm); - } +err_put_shm_pages: + if (flags & TEE_SHM_USER_MAPPED) + unpin_user_pages(shm->pages, shm->num_pages); + else + shm_put_kernel_pages(shm->pages, shm->num_pages); + kfree(shm->pages); +err_free_shm: kfree(shm); +err_ctx_put: teedev_ctx_put(ctx); +err_dev_put: tee_device_put(teedev); return ret; } -EXPORT_SYMBOL_GPL(tee_shm_register); =20 /** * tee_shm_register_user_buf() - Register a userspace shared memory buffer @@ -312,8 +308,36 @@ EXPORT_SYMBOL_GPL(tee_shm_register); struct tee_shm *tee_shm_register_user_buf(struct tee_context *ctx, unsigned long addr, size_t length) { - return tee_shm_register(ctx, addr, length, - TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED); + u32 f =3D TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED | TEE_SHM_REGISTER; + struct tee_device *teedev =3D ctx->teedev; + struct tee_shm *shm; + void *ret; + int id; + + mutex_lock(&teedev->mutex); + id =3D idr_alloc(&teedev->idr, NULL, 1, 0, GFP_KERNEL); + mutex_unlock(&teedev->mutex); + + if (id < 0) + return ERR_PTR(id); + + shm =3D register_shm_helper(ctx, addr, length, f, id); + if (IS_ERR(shm)) { + mutex_lock(&teedev->mutex); + idr_remove(&teedev->idr, id); + mutex_unlock(&teedev->mutex); + return shm; + } + + mutex_lock(&teedev->mutex); + ret =3D idr_replace(&teedev->idr, shm, id); + mutex_unlock(&teedev->mutex); + if (IS_ERR(ret)) { + tee_shm_free(shm); + return ret; + } + + return shm; } EXPORT_SYMBOL_GPL(tee_shm_register_user_buf); =20 @@ -330,8 +354,9 @@ EXPORT_SYMBOL_GPL(tee_shm_register_user_buf); struct tee_shm *tee_shm_register_kernel_buf(struct tee_context *ctx, void *addr, size_t length) { - return tee_shm_register(ctx, (unsigned long)addr, length, - TEE_SHM_DMA_BUF | TEE_SHM_KERNEL_MAPPED); + u32 f =3D TEE_SHM_REGISTER | TEE_SHM_KERNEL_MAPPED; + + return register_shm_helper(ctx, (unsigned long)addr, length, f, -1); } EXPORT_SYMBOL_GPL(tee_shm_register_kernel_buf); =20 diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 029c9a0590cc..e4f32885e273 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -278,17 +278,6 @@ struct tee_shm *tee_shm_alloc_priv_kernel_buf(struct t= ee_context *ctx, size_t size); struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t s= ize); =20 -/** - * 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 ad= dr, - size_t length, u32 flags); struct tee_shm *tee_shm_register_user_buf(struct tee_context *ctx, unsigned long addr, size_t length); struct tee_shm *tee_shm_register_kernel_buf(struct tee_context *ctx, --=20 2.31.1 From nobody Tue Jun 30 15:33:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D96FC433FE for ; Fri, 14 Jan 2022 15:09:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242517AbiANPJb (ORCPT ); Fri, 14 Jan 2022 10:09:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242324AbiANPIz (ORCPT ); Fri, 14 Jan 2022 10:08:55 -0500 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55955C061746 for ; Fri, 14 Jan 2022 07:08:51 -0800 (PST) Received: by mail-lf1-x130.google.com with SMTP id m1so31238369lfq.4 for ; Fri, 14 Jan 2022 07:08:51 -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 :mime-version:content-transfer-encoding; bh=jG7fiUopbaHgZ4zj3qqzJPw9k1rMqqi/8umZ0a4bcus=; b=Bx/dXl81N+nUo+4hKLcHeqRngJUkB4fbLg3IsDpv8Ejnz7N51sfmwNw9exuiBbujxg YeKjzVx1u5szAXKTRBla385ndiqGBMJQoNxXb2DBpDbKwE996tf68MevqujOfyXBPN0i AJpyLZkUHX7k2FRURoJ1X08CCZdiegZ6diTHWLtyvzF9g99Xw/uD/Ks1BA1JQ5Fl0Sf+ NJ1A4YSpekrTPuk2v+WEblQocc/2mNckPP7SmegMK0MX8rRdxgEv4H//EOHw7zUHS3+8 8mhTZFSywtnGrF7IVu9BW3h5Nntsvd/A8045o+EoS2x9b22+/N6e6dN7ryzHlxRnOu47 qlpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jG7fiUopbaHgZ4zj3qqzJPw9k1rMqqi/8umZ0a4bcus=; b=hK2kNMEee0jKrGGQAfo+NVt9lfGcBWj384Q1hHM9OW7PJQ6DX3KuC2OAojXkCgN5hV 91VUPNJZV/P1SZYzoEAkiLDofXDnLfz8ZZhrG2bC/dRyiwYiJ8sl9Fx5BsnsRKIBKTpf Ka/kLgAstEOL6hVIG5zTuRIzE90AkvbKOxcfzi0N6/wU/ApxA6fp902Tyd7Wv3oPGl5b jGq/JlCqcluNGV4DYpZlPdzo+eg/qBA4lCJWJGQ6F84+2EyOe6cEYAawdeij9efXK61Y jBBgFNxtH/K87H+EsQPDPP0+344SvP4WLFXoYLqayLo01sOJWdLSZQtbFmLg5P2+oQaD ipWQ== X-Gm-Message-State: AOAM533D2g+iQQvIBlksAzp9aiNvfkY/xtgpUWFdT9RXaNt5RsCtoRYm Idsi/7quFr7yml57Hx5WiWM1+1lVhdbIRQ== X-Google-Smtp-Source: ABdhPJwfecM8rUPFbZSZvfIz1Ske84Jrf1qOUStfkI1v1rmSNKgiij5SkbAy7cbpKbfAU+r3WU36NQ== X-Received: by 2002:a05:6512:b15:: with SMTP id w21mr7180451lfu.11.1642172929432; Fri, 14 Jan 2022 07:08:49 -0800 (PST) Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id i31sm40517lfv.67.2022.01.14.07.08.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 07:08:49 -0800 (PST) From: Jens Wiklander To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Devaraj Rangasamy , Rijo Thomas , David Howells , Tyler Hicks , Jens Wiklander Subject: [PATCH v2 12/12] tee: refactor TEE_SHM_* flags Date: Fri, 14 Jan 2022 16:08:24 +0100 Message-Id: <20220114150824.3578829-13-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220114150824.3578829-1-jens.wiklander@linaro.org> References: <20220114150824.3578829-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Removes the redundant TEE_SHM_DMA_BUF, TEE_SHM_EXT_DMA_BUF, TEE_SHM_MAPPED and TEE_SHM_KERNEL_MAPPED flags. Assigns new values to the remaining flags to void gaps. Signed-off-by: Jens Wiklander --- drivers/tee/tee_shm.c | 21 ++++++++++----------- include/linux/tee_drv.h | 12 ++++-------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index fe3e5977dd7c..9945bdec086b 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -139,8 +139,7 @@ static struct tee_shm *shm_alloc_helper(struct tee_cont= ext *ctx, size_t size, */ struct tee_shm *tee_shm_alloc_user_buf(struct tee_context *ctx, size_t siz= e) { - u32 flags =3D TEE_SHM_MAPPED | TEE_SHM_DMA_BUF | TEE_SHM_REGISTER | - TEE_SHM_POOL; + u32 flags =3D TEE_SHM_REGISTER | TEE_SHM_POOL; struct tee_device *teedev =3D ctx->teedev; struct tee_shm *shm; void *ret; @@ -186,7 +185,7 @@ EXPORT_SYMBOL_GPL(tee_shm_alloc_user_buf); */ struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t s= ize) { - u32 flags =3D TEE_SHM_MAPPED | TEE_SHM_REGISTER | TEE_SHM_POOL; + u32 flags =3D TEE_SHM_REGISTER | TEE_SHM_POOL; =20 return shm_alloc_helper(ctx, size, PAGE_SIZE, flags, -1); } @@ -211,7 +210,7 @@ EXPORT_SYMBOL_GPL(tee_shm_alloc_kernel_buf); struct tee_shm *tee_shm_alloc_priv_kernel_buf(struct tee_context *ctx, size_t size) { - u32 flags =3D TEE_SHM_MAPPED | TEE_SHM_PRIV | TEE_SHM_POOL; + u32 flags =3D TEE_SHM_PRIV | TEE_SHM_POOL; =20 return shm_alloc_helper(ctx, size, sizeof(long) * 2, flags, -1); } @@ -308,7 +307,7 @@ register_shm_helper(struct tee_context *ctx, unsigned l= ong addr, struct tee_shm *tee_shm_register_user_buf(struct tee_context *ctx, unsigned long addr, size_t length) { - u32 f =3D TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED | TEE_SHM_REGISTER; + u32 f =3D TEE_SHM_USER_MAPPED | TEE_SHM_REGISTER; struct tee_device *teedev =3D ctx->teedev; struct tee_shm *shm; void *ret; @@ -354,7 +353,7 @@ EXPORT_SYMBOL_GPL(tee_shm_register_user_buf); struct tee_shm *tee_shm_register_kernel_buf(struct tee_context *ctx, void *addr, size_t length) { - u32 f =3D TEE_SHM_REGISTER | TEE_SHM_KERNEL_MAPPED; + u32 f =3D TEE_SHM_REGISTER; =20 return register_shm_helper(ctx, (unsigned long)addr, length, f, -1); } @@ -398,7 +397,7 @@ int tee_shm_get_fd(struct tee_shm *shm) { int fd; =20 - if (!(shm->flags & TEE_SHM_DMA_BUF)) + if (shm->id < 0) return -EINVAL; =20 /* matched by tee_shm_put() in tee_shm_op_release() */ @@ -428,7 +427,7 @@ 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)) + if (!shm->kaddr) return -EINVAL; /* Check that we're in the range of the shm */ if ((char *)va < (char *)shm->kaddr) @@ -450,7 +449,7 @@ 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)) + if (!shm->kaddr) return -EINVAL; /* Check that we're in the range of the shm */ if (pa < shm->paddr) @@ -478,7 +477,7 @@ EXPORT_SYMBOL_GPL(tee_shm_pa2va); */ void *tee_shm_get_va(struct tee_shm *shm, size_t offs) { - if (!(shm->flags & TEE_SHM_MAPPED)) + if (!shm->kaddr) return ERR_PTR(-EINVAL); if (offs >=3D shm->size) return ERR_PTR(-EINVAL); @@ -553,7 +552,7 @@ void tee_shm_put(struct tee_shm *shm) * the refcount_inc() in tee_shm_get_from_id() never starts * from 0. */ - if (shm->flags & TEE_SHM_DMA_BUF) + if (shm->id >=3D 0) idr_remove(&teedev->idr, shm->id); do_release =3D true; } diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index e4f32885e273..dcc7a55e1128 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -20,14 +20,10 @@ * specific TEE driver. */ =20 -#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 */ -#define TEE_SHM_KERNEL_MAPPED BIT(6) /* Memory mapped in kernel space */ -#define TEE_SHM_PRIV BIT(7) /* Memory private to TEE driver */ +#define TEE_SHM_REGISTER BIT(0) /* Memory registered in secure world */ +#define TEE_SHM_USER_MAPPED BIT(1) /* Memory mapped in user space */ +#define TEE_SHM_POOL BIT(2) /* Memory allocated from pool */ +#define TEE_SHM_PRIV BIT(3) /* Memory private to TEE driver */ =20 struct device; struct tee_device; --=20 2.31.1