From patchwork Wed Aug 18 10:18:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 498889 Delivered-To: patches@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp521270jab; Wed, 18 Aug 2021 03:19:09 -0700 (PDT) X-Received: by 2002:a2e:9a04:: with SMTP id o4mr7311799lji.296.1629281949063; Wed, 18 Aug 2021 03:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629281949; cv=none; d=google.com; s=arc-20160816; b=gBStiAvS6NvOTUeVWoYPNgi6qVrQUNC83EidL5c85Se12m4vBlefYZRFiM4e4rG0DE F4XNl/pAd1HCbWN+4GlDaoQtvYUrjeYAftPq/7PfX7+GEXnjGKoJfKjUJLs4t9fc7M62 baUIl424q1kEdiTyznvEGGykiV1kWDrEFzrUcDrovnLAdT+Gf4PBeEP5/PEjbvd3kVpU IWBEpmw1ss+hm0crpmJibqfgwS+zbVxYSz3VzgHO3T06/YwVGrOkDABFM9IrAI6QxY8L hDnKLFRuGlELV7N522+KobJWJ3Salqv/PWmFn2lB8ifpoh3zP9Y6HZC+2XzmKBzUSPbz 97lQ== 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=WPLYx23a2mlUDNIPIrmDSM+cSt8akT06mvONQVQY3/s=; b=szbw9Etk4idZCB9M+cGfm9AqnfyKs443pEMTuuONKBBsJjIMmVDykRjLEGMEIGlQOp 2qW19r5uOsU7Jf+qmLWwKiRY/wSN6ut97DvxqPICguEjwW6c1KBMOxoaLfuHlNafwptx CwBodmkclxYkNY13EJReCPoKLQ9wzPOybsbRhCc6bKIWeSbgyB7cvhE6R9bjxNK+wWr9 ouCyTK+rw2TdS2UtrCGkw9uqeMeREACKeZiPW464fQNtqYF9ELkvx3ya64yjL9gYJW17 HNPcgJJKQoBglthaDiQf27/wPI/03hV535hALsDffaPO/M84q+LNzEggWID+NuUVo27Z t3Zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=t8AAX6LY; 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 c36sor2579218ljr.70.2021.08.18.03.19.08 for (Google Transport Security); Wed, 18 Aug 2021 03:19:09 -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=t8AAX6LY; 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=WPLYx23a2mlUDNIPIrmDSM+cSt8akT06mvONQVQY3/s=; b=t8AAX6LYNOEE259Y/aGO34IQ0nH8yhJcnaB0hfHj0FMi/de4/wFtfHQ+1yvo9xObdE YZoRyL7OeIqkSYGLKEZVh6H6BgKk6MF6Bdk7ZLSeWyO1O4BwAQe6R/juEKtuWttdhFTi A+MBFFE5urvibCxvDDcgoO8e3Ao+k5n4dMKayVcTyHWt0UpzVdAmxSL4DTAO2AqEhMwi OrWEeIAbPYlIgvB52C4XiW981lqtc/P7V1SlOJyOB27LqPdKdRUpo1oSoFvyniG0Urwp CyOslBuNCS0yttZWG02wetmYzlKbfhXALGmcBZn+4n5usfI41zqbOfrw/9dXAUULlHNN N7fw== 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=WPLYx23a2mlUDNIPIrmDSM+cSt8akT06mvONQVQY3/s=; b=a8b3dV6jBuBvQlP2VkHBNyYYPoLMiSvFEvAIAUDjT6YYvpw1DfFcGA8GPoy2jLCPTW n3bmftuPb+e3mkYWPZGi+7sPaBuzUJZqBUWCeggSO7pvMO2HD1jbBe2iq4J2aWipgdNL HGb54D6qPq6c2kzAYP7PhnySEqRwvaaGXSNY792eVq2ozcfiD26fWJk1UucdIHjw2VFr ZNm/domeJWvlSRRcqd5wttpVvWGnSJ1eoDtmCoLoj5Ahi40xeF3f7Pha7Mq48UFAE93X FQGxcQloi/Vse7MuHjJ270mA0NKvKOJ52hqqAQb61H8vbHThsvjUartQhRig19Hld2Nf 3VcA== X-Gm-Message-State: AOAM532Oqg9/2l3m54V20Lv1r/uWxvj7//rEt254aw7r10RHm0EPS2FJ VbzeE7wPZInAJdFi9LvaSH9+QFvM X-Google-Smtp-Source: ABdhPJwVuVTZNFKDFRdGX5Eoo/rO4jgyzb/kmtBAj9eNIvU7k9fFTUjeEW7yH9OTVGRnbXYsmb74gg== X-Received: by 2002:a2e:b708:: with SMTP id j8mr7042921ljo.488.1629281948692; Wed, 18 Aug 2021 03:19:08 -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 l27sm451160lfp.245.2021.08.18.03.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 03:19:08 -0700 (PDT) From: Jens Wiklander To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, op-tee@lists.trustedfirmware.org, devicetree@vger.kernel.org, linux-doc@vger.kernel.org Cc: Jerome Forissier , Etienne Carriere , Sumit Garg , Vincent Guittot , Rob Herring , Jonathan Corbet , Ard Biesheuvel , Marc Zyngier , Jens Wiklander Subject: [PATCH v4 4/6] tee: add tee_dev_open_helper() primitive Date: Wed, 18 Aug 2021 12:18:47 +0200 Message-Id: <20210818101849.602257-5-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210818101849.602257-1-jens.wiklander@linaro.org> References: <20210818101849.602257-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 85102d12d716..3beb682684a8 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