From patchwork Fri Jul 23 09:44:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 484596 Delivered-To: patches@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp1161706jao; Fri, 23 Jul 2021 02:44:35 -0700 (PDT) X-Received: by 2002:a2e:8858:: with SMTP id z24mr2787730ljj.413.1627033475289; Fri, 23 Jul 2021 02:44:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627033475; cv=none; d=google.com; s=arc-20160816; b=HkmshGMSZXnHPQ95sAP/Ax2+rM+T1GGti4vIZmqrJoLDjimEsyG9K+S+9gIphSlGnW 8o6qHzceqrCjGc5ZgQgA9CrgjWu9Jhs53uEeN1wZtwrE8ik6DxvjEJFFywSj8guzyvLH yRTARJ5yHg9ghJKxkq5brC/58Jxw+iU4OIt/9QdTflOa3FTPV/hlrlEL5fm5tsZnrRq1 ilonCLoJTJMEpTVq75ggb9A4PNZMTsvjRkyPPvmg2sHHCtGa+zxkBsRCd0/3wB2YKudW Rij9fn29bgBYfB+GVd4YXEgAIZZUrjWbiFD5+N7fpPRTfQ0NCDDzG5Dqyuxz2Vl29Xf+ RSmQ== 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=aWI5LwYzEk1+SzkMdbQDekL7MO6mbBvmbI38UTT49KYWSmyMqKCNn/RC8iyYkML4og u9b7mqpLPNLmNl64qMInRpB7faNa8hVDxW66IVrd6IdibDq8/K0dENP7JP051NqeY2nn 2Zlx21hLLF6ozm1sKZbfNKjFWAQsSkJaGKQkBpJTMJCXhxR0VE2PSA750ARaZUTzSQrh 1UZYX885LftaBHPjkTACIxIRoQocTzkB3zgRAFBzLgYKwuxXX+z31yBm8gN0jRXdkSeK o1ht5bxo0oRVlk6pBc6t8otS7MvHgl4XQIPnsvO24+KwQAyDYGMZ8hfJR7V7JcZtbvU3 xOsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rCZNiQTt; 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 r28sor4028046ljn.31.2021.07.23.02.44.35 for (Google Transport Security); Fri, 23 Jul 2021 02:44:35 -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=rCZNiQTt; 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=rCZNiQTtlGlnelUgxTWe4qNxD7ZBVpZgUQsXhcEhdRoKuCGWpPiAOXtoTVWlWQpoLC LJRQccJsNRTOJJF2w8+52TBOW9t4f9iXcQL42XbxhkQZNoCXRkgE/5dsDdA+QXtW5QRx o0ZuMJyvGQ7HKHgGUGQRka8rstx+KtyPrioXNrkHPzL0L+lCxstbYcyKBooqzbXKLRll sRi4Kz3HFkHMMt1TqCMacoALTx7DZX4qemcG91xk1Bg4wNOijr2QCs54EFqwuiKDnQma O8ZxOQOh5POr/YMLAsJu5yydL/xt3plOha5Nr1HVox1GWERCHcaxVKE5tEc4W5EY5j2s /jrg== 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=nDYpYjkQzsQ6woo5nVWPMH3VPA5LPELQWZ6KnLGqDrpqwUQpnEp50CcTOxlqQhRtAC U0B8mi2/ajzXK6WBEFxsX21HYkN0EPGwldzIRVnDmPUGlmwY2HzwoxPfnBx8Ai5NeuCa WJF/dGkwcO+TGyUISLaCX4H7r3KDdQnkQctx4yaXSQch9rc07EYKOqnQ/R0jscn5CNdD ONl1Iac+71KbP+ErRX2DmyGWNM8Y75ss5Ovg34wqMxyEguqmAGi7PFnd+GdRw23QyrVy 6BQC4BToN6PIo+kwYf2F/1+A8SnWGSDmkvF/dxDfEs42Uk5udY+2qAqyH9XxIxgUGvaz Eyjw== X-Gm-Message-State: AOAM533BecjhXIooG3mdEO30af775hUnFmL/yd2GSedWOqoy8BQLvg69 n1jFK2rOhl81pALYWHflMfEf/wap X-Google-Smtp-Source: ABdhPJwryV2kGUFQOzaeEnVmeuptMeG5ynwTmIpI2zfA8ANVJqV3rrWwmLtiVSvvMHmHB3bPpncBcQ== X-Received: by 2002:a2e:b4a8:: with SMTP id q8mr2724250ljm.263.1627033474846; Fri, 23 Jul 2021 02:44:34 -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 f2sm403808ljq.131.2021.07.23.02.44.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jul 2021 02:44:34 -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 v3 4/6] tee: add tee_dev_open_helper() primitive Date: Fri, 23 Jul 2021 11:44:20 +0200 Message-Id: <20210723094422.2150313-5-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210723094422.2150313-1-jens.wiklander@linaro.org> References: <20210723094422.2150313-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