Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp1210921pxv; Fri, 23 Jul 2021 02:46:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZxbi5eoVClP8+yMWxCXmeKqG/patU81V/4+g7qmc9TYUQxFhBFT18fwllVIbEHz2mMa09 X-Received: by 2002:a05:6638:3824:: with SMTP id i36mr3420045jav.11.1627033574941; Fri, 23 Jul 2021 02:46:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627033574; cv=none; d=google.com; s=arc-20160816; b=XcXcwuqxl54Q0gm3MNcut0gcPRWXALyoOUC7K7Lc2v98NAxnADgPK5vjHjTVq8AaRA M1WzKV5PbiU+jVRaJ7JQZyc0khZAp1+sG+0EzZi3Ii1b8Edj9ihuzn8xgmBPJhJofyXH q/Rf7m6i7fP/cq7YJ/DHVcU39FKJlZSscXfgC5dFv71KnhSlO4JYyR4S+1ekfgPY565y 0OpkXNhYGzJ1YJxnQ8oQsnThTzJnH8GpokqUh56Xt5xAUTzZUeouGqT0jiN+GmepgRAB KfJJoUjefBaj+YoTuj6cfaACO+AS0UKWSY8JSFXOifUAegCuUN0r1DM1Xpmz7W4uvaSw J0jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WPLYx23a2mlUDNIPIrmDSM+cSt8akT06mvONQVQY3/s=; b=In2tRG6X3/COecPAnnKcblKcfNZalvskHvPJ9/FFybSpO00duuPwz37XepwebqjOWW lemHaLXRNusTb7oJTmSbI9pjF2/2I5lg0+h91r1/4jXewOy3z2NIwaH8sPSiOh7Y6iA2 QQT38cC2Jk4Nlp5OfV5ozJAmXbdp5THtwlQDapd/I5IQkMSCfmw6j8LYwoCyajjtCgwV 5tEsnTKytnuoP8Yx5pwNwpmnX2NENoz/8bSHW/tnzKOVvN69XxcAb0N/M8AjcoHHJbOO cxoQPYZHXXV+hP8n0V5S8mkGOfo3jQvauFDBXTrYm8eMQdlm3BuLaZWPaReOAPYsYhT7 sGhw== 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 linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a24si23224772iol.81.2021.07.23.02.46.03; Fri, 23 Jul 2021 02:46:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rCZNiQTt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231680AbhGWJEQ (ORCPT + 99 others); Fri, 23 Jul 2021 05:04:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231273AbhGWJEE (ORCPT ); Fri, 23 Jul 2021 05:04:04 -0400 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A280AC06175F for ; Fri, 23 Jul 2021 02:44:36 -0700 (PDT) Received: by mail-lj1-x22f.google.com with SMTP id h9so964696ljq.8 for ; Fri, 23 Jul 2021 02:44:36 -0700 (PDT) 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=YGrjv/QIKipVABa3gMchoB1HUXBizdjOsYZHOQh1cBuc8YmviRoYmXHzzCcZRB9/Vb DqPr4YX9Obo9kPQu9OLb+wpczwwWFgJ70gCN/3hdE9pDFZYsI0c5fxpW6V5nkmDJgtyp oxkTeTxLKRzP88lzfWGnSFHut6NIOS8ZJTor3cQlPsfJzsv04znZoZRL3YtA11EK0Hr8 SnrOHtCTFflh0go/U9sAIeV5Fr5snpx/M36D1YhUnByRPi4/Bfm47wC0eWlny+7cDuTz dlW3Gp2DIyzEbFSmJjyU3/eqoJ+oeFIOfypmiW6BC0fAUclaYDUdABsmfA7Wj5FbfU2d zpAw== X-Gm-Message-State: AOAM533tfjPje0M6J/th2z9z4bjREuHxsMYih5Iu5WNHK2jdbOmO6ud1 ZHaoyWNOPYOWf/I36JFM8+GvgGPvIf2mXvDU X-Received: by 2002:a2e:b4a8:: with SMTP id q8mr2724250ljm.263.1627033474846; Fri, 23 Jul 2021 02:44:34 -0700 (PDT) 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 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) 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 -- 2.31.1