From patchwork Wed Jun 16 10:36: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: 461389 Delivered-To: patches@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp487169jae; Wed, 16 Jun 2021 03:37:14 -0700 (PDT) X-Received: by 2002:a2e:8816:: with SMTP id x22mr3901661ljh.181.1623839834322; Wed, 16 Jun 2021 03:37:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623839834; cv=none; d=google.com; s=arc-20160816; b=OlT5UZ0rzv7+QEslsCl79o38H8cuV9KCxX+iL/JR/eItZ+f4Jc8uSu80ugrvuPFZUD +AwfJIGusUT9B7Qhi2X/KffEUUoBTPFeXclb8ffiAQMnsUgIb0hWA8P2LuVQn5avvVzc tgB3mJ1D46ljVtt4qsksw+krCtUOjt56xdpDluIU3bp542BsGFCKqYqubs/eP5V4Vb8X qwY2CJTXvuODop8nETl5iwfowzBcO+rKsaVlUC5SXUO99OwHhY3rODSekJabGgFhf1cX oFJ4mVz0oaWMvoLp/s4rq2ZCnDAVUvbI30SSNXBaAS8SuQFYnbOvdBPslWghQgRXPhZP oTZw== 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=O8oK0toEAtknfj/Dhtwoq/qY6hOJm72lB2oPBKVRYWHG/hBJZWos4FPDFa3mR40FPt Ry5hBLixVwg57NnIlaPqeaDbghmKuzsuNT7F3JWghzJ5pxYldypmS2CyC6uTeNYcjh1c dZY/56tiWO2ZnM6rXsEXRrHC7sSuT07graSxJ+iMlg/rfoyJVfQUpd02NKA8AYJmTXT/ CNeifw1Gzu07YjtsFPm297mRAW6oT/8nNtUhEPVRWDNc2oCrHs5CtV9j1wHhDwyEqLVC GMmHVdFl0c9b+NY5r3Y/Cr4gqjXfpkgGcaaeuPxL0UZ7dNklbwZ25LT6hBgc8Df2Npbl Q2eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=k16li5nO; 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 j21sor370917lfh.92.2021.06.16.03.37.14 for (Google Transport Security); Wed, 16 Jun 2021 03:37:14 -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=k16li5nO; 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=k16li5nOZGgYY0nec0s+jmVsg38V+i0m8AtY6nYedCt27GjPhEsBpnVbd9cbUDHXcX RgX6oEC4IuT9Rgr3PuKZNLnxbGM6FxMxao0YZ/fUkR21YsElDbdQat2DKYAH3abWsIuM aDM26qrvxIYFyR24WBmg7RMTl6CtQY/aIGnViMFbjYPK6Q7vlfInTOg2AZ0MtSzSHPYB s7rQvHakK/3luLxJshDNc+SP7AlT1iFj14HqUoszeAWZJEgGE06H7NDjNuuH/9oXomTA mCxYwXXCGq/q/ZlU5zG9OKEK/oQpUpvGcKaJrdu5T6T+b2kyqAZu+W6zdkkCdMHCr/v2 iDyg== 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=ljpHChH5KqlvIHETGvEvY+4Ns4NEPiN5Lr8RWKMaVOpfbBGQpbgx5sNMWktQu9IlxT MMA2A7JC2EYxk/Hvz0JB+p2gqgKE3emr+3tPfp5DRCK8wR18/3j8cZWf5nONeFYhG51F sBSm1t3vpYoqFOT8TbLkoi2FqTsfxGxD2S24wiqiydHwPOSzRO+s/xUFdumD+A6J2isk lnM18j7BSAzIkq1cwuQG0Gx5pg+m8Zs7Pug1+7q8Suny8RERmbMgAPsKQ4WZqOLDZ+z1 CBU69YQ5SM7JwOgAAusZTAHQ+qyGazABJblI4UMsVPrBBp5hqkCFvdInPzADdIlg91B5 gHIQ== X-Gm-Message-State: AOAM5317HtqUchLm6kX4WaE8Xg5wAPMK5BaEPlFTMbItxG3wa2yZ/oPC P5gHAzQaU9K7itd6jkbiZzKe2k8q X-Google-Smtp-Source: ABdhPJxlGQxPkzYmAgnMySBW3P/4sn8vf4auEa0rSVlvSI7dwnCv9fks3Osl+2ntItuO2whQVGbO5g== X-Received: by 2002:a19:7711:: with SMTP id s17mr3308348lfc.430.1623839833963; Wed, 16 Jun 2021 03:37:13 -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 m17sm205621lfh.288.2021.06.16.03.37.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 03:37:13 -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 v2 5/7] tee: add tee_dev_open_helper() primitive Date: Wed, 16 Jun 2021 12:36:47 +0200 Message-Id: <20210616103649.2662395-6-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616103649.2662395-1-jens.wiklander@linaro.org> References: <20210616103649.2662395-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