From patchwork Thu Jul 22 12:17:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 483896 Delivered-To: patches@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp307155jao; Thu, 22 Jul 2021 05:18:08 -0700 (PDT) X-Received: by 2002:a05:651c:1213:: with SMTP id i19mr29232869lja.81.1626956288285; Thu, 22 Jul 2021 05:18:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626956288; cv=none; d=google.com; s=arc-20160816; b=RxhY5zK2+lBTz+QRQIb787vqKxpWOC5SgjOUaRJEZMJh5XseGaG7nb2b98XNxqDwXK LHy0t90xBO/oB+B0pD9CtGhQhLIyTIlDljF65heIO2NtQYIHKf3s1MyiB/4YsQf+HnKr Bf2tdgjvG4EZdVXz4uXGGdBHrFYhAa5xR5UcfudJzQBejlxnvCCG+OdA3o9P0PYgFFdy e5rHAaWqH65wTqP3e47J5ufw0hvHPvC+uRBPz8dcFg+h5B7HWdizY1aaAViOJOqQZlJQ JC3nzZ+6oDtGVRPMi9tFU6sZEIdImrJEQr38cLAW5c1Zl41qeGq+p7lWfDFlNOYV+Ipv KWZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=BSM6ywfPZHuzICpAotpTzsAM8ROQzdG3QQ9aBo5KLWA=; b=WnEH6C56F3PCeRnUQJSIh/pqjPztM42pUNQKBZl7xoMRjyw/K5ywXUiFaWrT3Gq/UE D6Hs1uCffgyUM0J5uiE4gl5/iRl0QLAS6gAHmPf5Sf2AWs+Vtt9nNu9++EgddPcwkKV0 LFQ9dDfZ4XPS83F7X+MAJr8roEsdW4IVBz83X/UMNyYdV/0v1qOWbxm3tZgjZGcw7vs9 K3IfpvvNGKOHFFjPBjhbJ5DTodVIT56jMHCpehJX8ecjvq0YXU93uPtlL9FWvcKKXIw3 RGF3BDTr/fTlllhZiSyKMRh7/OeHkLvC/k6osqtjhlCJy3Dea8DmQf8B3VQGk8mD/YL/ t4XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yGzEq1HO; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id f5sor1324506lfj.171.2021.07.22.05.18.08 for (Google Transport Security); Thu, 22 Jul 2021 05:18:08 -0700 (PDT) Received-SPF: pass (google.com: domain of jens.wiklander@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yGzEq1HO; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=BSM6ywfPZHuzICpAotpTzsAM8ROQzdG3QQ9aBo5KLWA=; b=yGzEq1HO6HYKist5tJtIO6GuPpKizbL1aiJrp3zAh47tP5K7vKPx8rb1Vb1MbexGjg 1uDb/0QES2VYHwwHPKdmayK696Y0VWi2qUcJt/KmZK1POZYovNb3N/iy4O5Jr//aTei1 kngnZKZ+0NYbtAa27/61rKLZVeaBOub6i6ERJtwHsILeU5MemGTxJQi6OsMk9R6fZFx4 cvuwzC63QPRSXwKb3HbxGSgw+Pf+Qm82vaqvyggOtUYaJ/ZPVD2xFeLcRckO/BuelQWT Whiy1V8CRnkD5yd1143ybB3S1ZHndIzL+WgpVIdERe3nYJwbstCHklW1wqE3dB/72bhi KKiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BSM6ywfPZHuzICpAotpTzsAM8ROQzdG3QQ9aBo5KLWA=; b=BkmfaWPfID+KHOdKHxZyRcnUwOvxr+imHgkUcYFWT3kmwK0HJBCKliG0JQnkOFKDAR S09pZcxcU2TYVRwXj5zOrIfIK0wzttcDsCEVgErL+78xxyY+m1SklnYghWZVl8QWm2tu JnjvNW8SZ6TTVxvSSokv/Tgn0J3uH4DUyfFepMEfOYqWjsIb5o7VGq6HSmoEZhmEqi9y hfCuIofeoWde2m+7DGqzJb8mLj90gqpuSn4DiHbbJbflETtlql6NWWWW88601WMyYvUV hTQc6bwEp8QS/hTbeJoxcYQMNyyEkvIJQwzHzyhDEiUG+NZDh3kktEeArb6PhgO0fE0G sRTA== X-Gm-Message-State: AOAM530sVZewzpWmy8scB0hdy/gaaiqGZKpM6Ha2uV/apRMDqoTv9W+S isexadBwqHEM9fJ8TqhfpG+27NTd X-Google-Smtp-Source: ABdhPJyewI7WVG03WZpVAsBO3LVZPI93odEAapLVJaWAG9LsTOdZsEl/crv/gaHZu8oHcEgSR8pM7g== X-Received: by 2002:a05:6512:114f:: with SMTP id m15mr9967529lfg.551.1626956287873; Thu, 22 Jul 2021 05:18:07 -0700 (PDT) Return-Path: Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id b41sm845090ljr.67.2021.07.22.05.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 05:18:07 -0700 (PDT) From: Jens Wiklander To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Sudeep Holla , Marc Bonnici , Jerome Forissier , sughosh.ganu@linaro.org, Jens Wiklander Subject: [PATCH v3 2/5] optee: simplify optee_release() Date: Thu, 22 Jul 2021 14:17:54 +0200 Message-Id: <20210722121757.1944658-3-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722121757.1944658-1-jens.wiklander@linaro.org> References: <20210722121757.1944658-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Simplifies optee_release() with a new helper function, optee_close_session_helper() which has been factored out from optee_close_session(). A separate optee_release_supp() is added for the supplicant device. Signed-off-by: Jens Wiklander --- drivers/tee/optee/call.c | 31 ++++++++++------- drivers/tee/optee/core.c | 55 +++++++++++-------------------- drivers/tee/optee/optee_private.h | 1 + 3 files changed, 39 insertions(+), 48 deletions(-) -- 2.31.1 diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index 6e6eb836e9b6..9d8f5a95e42f 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -288,12 +288,28 @@ int optee_open_session(struct tee_context *ctx, return rc; } -int optee_close_session(struct tee_context *ctx, u32 session) +int optee_close_session_helper(struct tee_context *ctx, u32 session) { - struct optee_context_data *ctxdata = ctx->data; struct tee_shm *shm; struct optee_msg_arg *msg_arg; phys_addr_t msg_parg; + + shm = get_msg_arg(ctx, 0, &msg_arg, &msg_parg); + if (IS_ERR(shm)) + return PTR_ERR(shm); + + msg_arg->cmd = OPTEE_MSG_CMD_CLOSE_SESSION; + msg_arg->session = session; + optee_do_call_with_arg(ctx, msg_parg); + + tee_shm_free(shm); + + return 0; +} + +int optee_close_session(struct tee_context *ctx, u32 session) +{ + struct optee_context_data *ctxdata = ctx->data; struct optee_session *sess; /* Check that the session is valid and remove it from the list */ @@ -306,16 +322,7 @@ int optee_close_session(struct tee_context *ctx, u32 session) return -EINVAL; kfree(sess); - shm = get_msg_arg(ctx, 0, &msg_arg, &msg_parg); - if (IS_ERR(shm)) - return PTR_ERR(shm); - - msg_arg->cmd = OPTEE_MSG_CMD_CLOSE_SESSION; - msg_arg->session = session; - optee_do_call_with_arg(ctx, msg_parg); - - tee_shm_free(shm); - return 0; + return optee_close_session_helper(ctx, session); } int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg, diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index ddb8f9ecf307..949223b214c3 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -263,59 +263,42 @@ static int optee_open(struct tee_context *ctx) return 0; } -static void optee_release(struct tee_context *ctx) +static void optee_release_helper(struct tee_context *ctx, + int (*close_session)(struct tee_context *ctx, + u32 session)) { struct optee_context_data *ctxdata = ctx->data; - struct tee_device *teedev = ctx->teedev; - struct optee *optee = tee_get_drvdata(teedev); - struct tee_shm *shm; - struct optee_msg_arg *arg = NULL; - phys_addr_t parg; struct optee_session *sess; struct optee_session *sess_tmp; if (!ctxdata) return; - shm = tee_shm_alloc(ctx, sizeof(struct optee_msg_arg), TEE_SHM_MAPPED); - if (!IS_ERR(shm)) { - arg = tee_shm_get_va(shm, 0); - /* - * If va2pa fails for some reason, we can't call into - * secure world, only free the memory. Secure OS will leak - * sessions and finally refuse more sessions, but we will - * at least let normal world reclaim its memory. - */ - if (!IS_ERR(arg)) - if (tee_shm_va2pa(shm, arg, &parg)) - arg = NULL; /* prevent usage of parg below */ - } - list_for_each_entry_safe(sess, sess_tmp, &ctxdata->sess_list, list_node) { list_del(&sess->list_node); - if (!IS_ERR_OR_NULL(arg)) { - memset(arg, 0, sizeof(*arg)); - arg->cmd = OPTEE_MSG_CMD_CLOSE_SESSION; - arg->session = sess->session_id; - optee_do_call_with_arg(ctx, parg); - } + close_session(ctx, sess->session_id); kfree(sess); } kfree(ctxdata); + ctx->data = NULL; +} - if (!IS_ERR(shm)) - tee_shm_free(shm); +static void optee_release(struct tee_context *ctx) +{ + optee_release_helper(ctx, optee_close_session_helper); +} - ctx->data = NULL; +static void optee_release_supp(struct tee_context *ctx) +{ + struct optee *optee = tee_get_drvdata(ctx->teedev); - if (teedev == optee->supp_teedev) { - if (optee->scan_bus_wq) { - destroy_workqueue(optee->scan_bus_wq); - optee->scan_bus_wq = NULL; - } - optee_supp_release(&optee->supp); + optee_release_helper(ctx, optee_close_session_helper); + if (optee->scan_bus_wq) { + destroy_workqueue(optee->scan_bus_wq); + optee->scan_bus_wq = NULL; } + optee_supp_release(&optee->supp); } static const struct tee_driver_ops optee_ops = { @@ -339,7 +322,7 @@ static const struct tee_desc optee_desc = { static const struct tee_driver_ops optee_supp_ops = { .get_version = optee_get_version, .open = optee_open, - .release = optee_release, + .release = optee_release_supp, .supp_recv = optee_supp_recv, .supp_send = optee_supp_send, .shm_register = optee_shm_register_supp, diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index e25b216a14ef..2b63b796645e 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -152,6 +152,7 @@ u32 optee_do_call_with_arg(struct tee_context *ctx, phys_addr_t parg); int optee_open_session(struct tee_context *ctx, struct tee_ioctl_open_session_arg *arg, struct tee_param *param); +int optee_close_session_helper(struct tee_context *ctx, u32 session); int optee_close_session(struct tee_context *ctx, u32 session); int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg, struct tee_param *param);