From patchwork Wed Jun 9 06:09:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 456798 Delivered-To: patches@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp4730313jae; Tue, 8 Jun 2021 23:09:20 -0700 (PDT) X-Received: by 2002:a05:6512:218d:: with SMTP id b13mr18124455lft.346.1623218959956; Tue, 08 Jun 2021 23:09:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623218959; cv=none; d=google.com; s=arc-20160816; b=uUmGJPwX20REUCZUz7SN0wAnPnY/H69FsCtE7cV+K/Qw8KFFq8ei1ZQ7WRWMWLjXCR QYxH3gL80UXoczOT021kgiHx0qdhGs/0fuvSJXtylXZfI/N/JAPUhv8Od3h0kWsLWdhd GsO4eX2yin6ySW9EyC3cRZ0Hc1VC6U4UwbH5DKXwsFE5KIC7mmszlPEMX9Na7ErguoUV IU4vBzRun/JByxwcBMuciwBIbipWVs5KnzXaZjiglVInFScPzaBYNJgcYgLsdZ/ExnvV AyRl1mlzf+HWQMRltHV9PFsC9ks+jYHNlgux8CrsQrk/aacBj9jd4+wBcw77n2hRXeaC V6hA== 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=nE0O5cQU8hO3PBDLKhrY8XOB0KUsBuVPprzerF6bl2k=; b=Qam4pdTKdWVa/sTeU9MvZL0X/F1bkczNWghSd5faBLYFKGdOZ38dkjUo+5YMvABqjM NEfW0iEresiTbo3llnhnQw9aWc2mdWi0H24/WbnVK8fvo/nm7Kq3FGFMQDsLUDLsadvi yXkSu97wWsEFo9M3knV5tjEKYo6BjGSzFD6FksgHKpG8u7N8ylaRz636G3fI+v2l/KWp exMl28uCv9f3cttva0gOPlWavzB2qrkrmS2y+pn0sLNekPvMetyI2zXfmWCTi/serfvS PCaSxBIu82xwQBc1EzAHU/UYsyK58GmKOHVxwKojm+eM59OWR/pnaL8A5Puh3uJz8g2o aI7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="J74fga/z"; 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 r26sor838760ljj.52.2021.06.08.23.09.19 for (Google Transport Security); Tue, 08 Jun 2021 23:09:19 -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="J74fga/z"; 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=nE0O5cQU8hO3PBDLKhrY8XOB0KUsBuVPprzerF6bl2k=; b=J74fga/z7TlVhMK6Na5wwQmghWcMwhzIFoe+ZCd9kG9iCmWkcDx82EslEpikoqGc0t ICi+C7P0wei4NTr1oQnNYuR3qEGuK02ma+fambTC1nueLMZBlNIch5VLAlXTf61LcoI2 9LMWmrfq8zeBirMsJIGXIDscwNSr3Ecs9o8NlBLziOhByGwvfS/8VKhx2VJ5awTB/e5A YBnlExfAAxINrnBbRtr6Xp3cMIKHD+KweY2nQ9mwep5acZXhbHOGiB+rkIqxXg3j7B40 GltJKR1OzSgBA0XIJsc+5360S5W0ZTW2Ew++nDg9cgCL+Z9z9MBsUi2No+fQK9ElD/ki A97g== 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=nE0O5cQU8hO3PBDLKhrY8XOB0KUsBuVPprzerF6bl2k=; b=tbNnB84QqxhPGpw3EgpAgqgA0ccz/4aLOVcXdjMbl02vCjqFMIu82z4M5OC86NvebV wxWh4sB2kf638/3ZVN3tlprpL+c8KO3hCD6bf1dLi3Yc8vZ5XFP/P0dxrLYCBLpswcht hdZlX9bg0RJG6zVq2j1Vr/Arcolbywv35yonvXE566KLjR71evzoPeU2mnR5WAbdPsyW CloMNTbQubOMbhgxyCeBGwoKThHz0yK2xauDkFiq236ID0+jMDbW7YCAp8tetLwK5O/B 6fNWbCoPAL4MTYM98uIO0AMmdCFUGQcqx6Lz6jn3d/ct0kFnSbQLZ1JGmgAfD+jA+/q6 i0jg== X-Gm-Message-State: AOAM530iK/+OKFLNUclFGLLwWB+FINaojx8LsG2dLzTyLHNp6qzm3hrw YjfkUtx2MivqpMP5wgdBmJ1s15xR X-Google-Smtp-Source: ABdhPJyvd6YO+nxaZONxLcnWYv/Dvs+Q46kPYvQyG9wnXM2O2vFU8cNnt+LDOdiEB77NEseVcecR4A== X-Received: by 2002:a2e:9cd:: with SMTP id 196mr20309790ljj.457.1623218959561; Tue, 08 Jun 2021 23:09:19 -0700 (PDT) Return-Path: Received: from jade.urgonet (h-79-136-85-3.A175.priv.bahnhof.se. [79.136.85.3]) by smtp.gmail.com with ESMTPSA id l26sm213735ljg.87.2021.06.08.23.09.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 23:09:19 -0700 (PDT) From: Jens Wiklander To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, op-tee@lists.trustedfirmware.org Cc: Jerome Forissier , Etienne Carriere , Sumit Garg , Vincent Guittot , Jens Wiklander Subject: [PATCH 2/4] tee: add tee_dev_open_helper() primitive Date: Wed, 9 Jun 2021 08:09:08 +0200 Message-Id: <20210609060910.1500481-3-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210609060910.1500481-1-jens.wiklander@linaro.org> References: <20210609060910.1500481-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Adds tee_dev_open_helper() and tee_dev_ctx_put() to make it easier to create a driver internal struct tee_context without the usual tee_device_get() on the struct tee_device as that adds a circular reference counter dependency and would prevent the struct tee_device from ever being released again. Signed-off-by: Jens Wiklander --- drivers/tee/tee_core.c | 33 ++++++++++++++++++++++++--------- include/linux/tee_drv.h | 27 +++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 9 deletions(-) -- 2.31.1 diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index f97d95b50773..6d81f6268b99 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -43,14 +43,11 @@ static DEFINE_SPINLOCK(driver_lock); static struct class *tee_class; static dev_t tee_devt; -static struct tee_context *teedev_open(struct tee_device *teedev) +struct tee_context *tee_dev_open_helper(struct tee_device *teedev) { int rc; struct tee_context *ctx; - if (!tee_device_get(teedev)) - return ERR_PTR(-EINVAL); - ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); if (!ctx) { rc = -ENOMEM; @@ -66,10 +63,30 @@ static struct tee_context *teedev_open(struct tee_device *teedev) return ctx; err: kfree(ctx); - tee_device_put(teedev); return ERR_PTR(rc); } +EXPORT_SYMBOL_GPL(tee_dev_open_helper); + +void tee_dev_ctx_put(struct tee_context *ctx) +{ + teedev_ctx_put(ctx); +} +EXPORT_SYMBOL_GPL(tee_dev_ctx_put); + +static struct tee_context *teedev_open(struct tee_device *teedev) +{ + struct tee_context *ctx; + + if (!tee_device_get(teedev)) + return ERR_PTR(-EINVAL); + + ctx = tee_dev_open_helper(teedev); + if (IS_ERR(ctx)) + tee_device_put(teedev); + + return ctx; +} void teedev_ctx_get(struct tee_context *ctx) { @@ -90,10 +107,8 @@ static void teedev_ctx_release(struct kref *ref) void teedev_ctx_put(struct tee_context *ctx) { - if (ctx->releasing) - return; - - kref_put(&ctx->refcount, teedev_ctx_release); + if (ctx && !ctx->releasing) + kref_put(&ctx->refcount, teedev_ctx_release); } static void teedev_close_context(struct tee_context *ctx) diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 54269e47ac9a..f592ba4e9561 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -456,6 +456,33 @@ static inline int tee_shm_get_id(struct tee_shm *shm) */ struct tee_shm *tee_shm_get_from_id(struct tee_context *ctx, int id); +/** + * tee_dev_open_helper() - helper function to make a struct tee_context + * @teedev: Device to open + * + * Creates the struct tee_context without increasing the reference counter + * on @teedev. This is needed for instance when a driver need an internal + * struct tee_context to operate on. By skipping the reference counter + * the circular dependency is broken. + * + * Note that this struct tee_context need special care when freeing in + * order to avoid the normal put on the struct tee_device. + * tee_dev_ctx_put() is the best choice for this. + * + * @returns a pointer 'struct tee_context' on success or an ERR_PTR on failure + */ +struct tee_context *tee_dev_open_helper(struct tee_device *teedev); + +/** + * tee_dev_ctx_put() - helper function to release a struct tee_context + * @ctx: The struct tee_context to release + * + * Note that this function doesn't do a tee_device_put() on the internal + * struct tee_device so this function should normal only be used when + * releasing a struct tee_context obtained with tee_dev_open_helper(). + */ +void tee_dev_ctx_put(struct tee_context *ctx); + /** * tee_client_open_context() - Open a TEE context * @start: if not NULL, continue search after this context