From patchwork Thu Aug 26 12:30:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 502857 Delivered-To: patches@linaro.org Received: by 2002:a17:906:f46:0:0:0:0 with SMTP id h6csp162494ejj; Thu, 26 Aug 2021 05:30:44 -0700 (PDT) X-Received: by 2002:a2e:b4b0:: with SMTP id q16mr2949255ljm.184.1629981044206; Thu, 26 Aug 2021 05:30:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629981044; cv=none; d=google.com; s=arc-20160816; b=HL5jbQzzUx/XH7HV8S49cyrzGSNmwQT/KuNBhsCRQ7Yq4Zup8UUgPdyNJjmYKiCOJR fqc6YQzp/aajMlxoc0DMTGuvrg3VKrtAg0lvEuFj+Mf9be9TDIMpUEt0M6HKu7c5C8Fe Kuwh/9+F+n9SxP8dZRTyJl+0zFu6MUdpqauA9uJKHSeCVv4VfMvWFRdikpjI6s9ZZCd9 qfXKKYIRlWGgegrEIWbNgWxhVtsEFj1C74IJWVmO/cNF36UVrCUz8uIZCAIYSfQ2S/tt DSfQk1rZpLR4auA0V7EKOufepyWKKVXCqygnoDFh15ZYk6s89OQcHcX068ovbk3Bsodw LvIQ== 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=1nZh1D/vgfD/yG7MqBv8BFt2r+KBCfUf2rl9x11f65A=; b=OvdGPNWctI/wONFRYcqdJZFE47PtSCskG++sAYiNbvS5Z7Rkrz/fDaXmvq2eVUkLKu manYfEkrXQitMiIjTQ4nKrmRDIvGfEJ3uVfdbyz8jgNedyM0wMqsRz/F1Tda9yeIMpQP HLLuekqIs2DSgL61qdgnqS+pm+ggEzDAbPDcCIPzNUq9A+ydBwaJaKmsjbHG3gSsM7Rj TzkQ/ZjP6+od9WakRxL/yiprl3HqsjruB26omsZGtcP3wAgjd0/FgtNmMmhGF2gdWBK6 Ni4A1kDF8yVNEhAQaos8Lmqwz1ELL5xOdI/SH3ZIpcxDj55jkzck3hOiUK6eOqqp7mJn WouA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kNBNiY4U; 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 a15sor1487632ljk.36.2021.08.26.05.30.44 for (Google Transport Security); Thu, 26 Aug 2021 05:30:44 -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=kNBNiY4U; 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=1nZh1D/vgfD/yG7MqBv8BFt2r+KBCfUf2rl9x11f65A=; b=kNBNiY4UKsmHZRbM99Vhd8h7GG/a9o6r1qngDP9tv1c2c7dYn161AjY9hvR9Wkg1xn B5RbLp9v662Oup9rkPC1iG6jTCQYctTlE+CP6c8SJWkudo6RgocexfxrpQOOczp3d36e iekhWD8PT/0u3JtFStgT83ARy+svf3XZWQYb6f3e+5xKNkRhkROtco7XdXzCnaaZRnCc pf12smkNjNNThPhq8hZq2e/WYQ5vu3MzeYNBhHsVf8VIpbjD6BBo1r37kplxKskrLyTK 1mPsykQL7M23aBamYB3QXlco98GP18j7T0+ed6iIq0biKyLckk5qNbFWiIr8BOGSWOfK upig== 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=1nZh1D/vgfD/yG7MqBv8BFt2r+KBCfUf2rl9x11f65A=; b=MqO0d7549mcSXNmnHh8cCHu0Sd7MfoM9HRYdwIpHVb+GoA4xf/E90NvZcUo3nAb8fX 6Tfvk1ivHv/lMx0OHnYulQIr+Kgali/n8o5rW9MDUoJuPcTQfcsWKxGpYj9nBnkvsXuu 5UAorvQR1scfqgHXJ6JUFIJduEbp2vdNTiBDeueHGzxl/Aw9Y7coPFiu9mEYYiDV3Wb8 tJmzpGdOY4KI8wR5mWD/MMyjMi1DPsec7E9oDOTm1I8yeEiNUotJl2HAsK2kSeIZuqfg j1EHvDItIWww/rEm0BmEblFIOq/xxEUAMPPpo0I1dQ7soxxMXjMsPkbisaKp2iodzEBV X1Fg== X-Gm-Message-State: AOAM531dkz6gNWTq2fDkaH3MjOG+uXKuw4ojGvWFIc6yd9vLPXmiFjUE tfDUmgc7155uMnXnk78TH9EQBA59 X-Google-Smtp-Source: ABdhPJynXFjAEzvIhb7rgJmxnTlvzFE7/PKd9Xj72TVumnAIAtDL6snB6W6EV9yC3qBRMEbKSYXApQ== X-Received: by 2002:a2e:b042:: with SMTP id d2mr2881688ljl.279.1629981043906; Thu, 26 Aug 2021 05:30:43 -0700 (PDT) Return-Path: Received: from jade.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id j21sm332283ljh.87.2021.08.26.05.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 05:30:43 -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 v5 4/6] tee: add tee_dev_open_helper() primitive Date: Thu, 26 Aug 2021 14:30:30 +0200 Message-Id: <20210826123032.1732926-5-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210826123032.1732926-1-jens.wiklander@linaro.org> References: <20210826123032.1732926-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 3ebfea0781f1..00a31ff03049 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -458,6 +458,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