From patchwork Tue Jan 24 10:02:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 13113736 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 125B7C25B4E for ; Tue, 24 Jan 2023 10:04:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ZGxQW36kYQD3mMXa758dGOEI2dGgyzRGmshfhiK/vUs=; b=sIPCHRGjJNck9g KIPe10Mc/TUWj5hGRLBtt+e7vR04uQr7eXkTyX1aqUquJlA9N4qgLjhwfMrWUwSs4C6B2UMpO/3Gr q4Rlq7Xa7rMUZxt0j4r3C6r5kjMDN8uU74drtXrGetn8lky0GtXlFER+nr5FOa5McUJmgaZEdFJ9e ULacNJFkbEhyYvH6OCGEHMZczy1AT3Hu8uw184S9EMykreEINiixFPhh4ZnTfiLVvtsUum4hiTTnK aPN1Omv2BofW9s/i0rW+AZkrooAIs/ffLYv3c1Q+Db37TQivPjs7dgdc79anrodNN/DZoB//oEWks U06A9+5Pc7399YpgP7Cg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKG98-00317y-3M; Tue, 24 Jan 2023 10:03:18 +0000 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKG94-00316V-Gh for linux-arm-kernel@lists.infradead.org; Tue, 24 Jan 2023 10:03:16 +0000 Received: by mail-wm1-x333.google.com with SMTP id fl11-20020a05600c0b8b00b003daf72fc844so12447993wmb.0 for ; Tue, 24 Jan 2023 02:03:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=o/kwewCfd7KPibG88EwPMuUuSliJb797L36miTcXHIM=; b=LdTCZ2U3gIkgueDUwVUyBoByDjT7cxM1sbTqu3BPuuC7LFW44PcsyfXwN1Fjkyias/ oZaX20udhBPOrWk5ElKjwCWM9s+PmM9CPcSS3Jzl/ciQbOKvwAFQru+HMbRcJtf6CZGu tyZWeix3Sc4rwTlhjBD0R4FCdgSa6Ch2oVdY25/oCBkH1LzpHjSWn5lOHOqVyhK70Nfl SxlIWktJ0kyX/76WnGDID+CPY2M70bkh6+onU484divcLb/YcxF62MjXrOvPCdvKVhDJ PpQMzg5OUtjmJYX1K+aVso+q8p0CrNHpSOJSKecCiZu6YxV/dRQXq70eAagxhE2eReY8 vBGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=o/kwewCfd7KPibG88EwPMuUuSliJb797L36miTcXHIM=; b=B3wvYT6pZ1M9tqHNDcWltSkuHMlekkK6JjyZL0y3o0WT5nxEs5HxuOuvqFr475m15e lr6Fr1OU4u/QZQJnjsTxFVEJtlm1u1Wr7symHQamCbRj4qnM6Ie3UINrAa1vLdkkySS1 aXGQluBtSZsIA7cJ0t7Xj6qW2dB4cL+mLymsP9Li0hi89DSJrFB027Ik7zk6p9NF4Ttp /gxLMw8QI7L5UE/zduZdbnXbWqifkuwyQVgoowCJjbz2Ksy8N/Lc9GqxeJtJSYS2A7dp rwExlzc1h+pTFct9g8dB2Ot6wC/ax175DkAE4fd/ke4ykPM/y3WzhQen21Yp53oje0aF B0cQ== X-Gm-Message-State: AFqh2kqJozveglDvezeUZy7ISdxvIKQMO1iWy6t92IfFctwBmJvukrk6 Nvg475ytBrUPQC00r8jnQDdEgQ== X-Google-Smtp-Source: AMrXdXsy8fwbtH7evv6gkZN+zzlknd59k0e6s0XzhRHQlG6dalrvkq1kG51eiMSkYq8bcifIjhIYIw== X-Received: by 2002:a05:600c:21c7:b0:3da:939:34e9 with SMTP id x7-20020a05600c21c700b003da093934e9mr26582368wmj.34.1674554591881; Tue, 24 Jan 2023 02:03:11 -0800 (PST) Received: from lmecxl1178.lme.st.com ([80.215.43.103]) by smtp.gmail.com with ESMTPSA id u3-20020a7bc043000000b003d1d5a83b2esm12649914wmc.35.2023.01.24.02.03.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 02:03:10 -0800 (PST) From: Etienne Carriere To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Etienne Carriere , Jens Wiklander , Sumit Garg , Marc Zyngier , Alexandre Torgue Subject: [PATCH v3] optee: add per cpu asynchronous notification Date: Tue, 24 Jan 2023 11:02:15 +0100 Message-Id: <20230124100215.1671472-1-etienne.carriere@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230124_020314_588803_FA16D225 X-CRM114-Status: GOOD ( 20.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Implements use of per-cpu irq for optee asynchronous notification. Existing optee async notif implementation allows OP-TE world to raise an interrupt for which Linux optee driver will query pending events bound to waiting tasks in Linux world or threaded bottom half tasks to be invoked in TEE world. This change allows the signaling interrupt to be a per-cpu interrupt as with Arm GIC PPIs. Cc: Jens Wiklander Cc: Sumit Garg Cc: Marc Zyngier Co-developed-by: Alexandre Torgue Signed-off-by: Alexandre Torgue Signed-off-by: Etienne Carriere --- Changes since v2: - Irq and per-cpu irq no more share the primary same handler function but have a common irq_handler() helper function. - Removed useless spinlocks. - Wrapped lines > 80 char. Changes since v1: - Fixed missing __percpu attribute reported by kernel test robot. - Rephrased commit message and added Cc tags. --- drivers/tee/optee/optee_private.h | 22 +++++++ drivers/tee/optee/smc_abi.c | 97 +++++++++++++++++++++++++++++-- 2 files changed, 115 insertions(+), 4 deletions(-) diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index 04ae58892608..e5bd3548691f 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -94,11 +94,33 @@ struct optee_supp { struct completion reqs_c; }; +/* + * struct optee_pcpu - per cpu notif private struct passed to work functions + * @optee optee device reference + */ +struct optee_pcpu { + struct optee *optee; +}; + +/* + * struct optee_smc - optee smc communication struct + * @invoke_fn handler function to invoke secure monitor + * @memremaped_shm virtual address of memory in shared memory pool + * @sec_caps: secure world capabilities defined by + * OPTEE_SMC_SEC_CAP_* in optee_smc.h + * @notif_irq interrupt used as async notification by OP-TEE or 0 + * @optee_pcpu per_cpu optee instance for per cpu work or NULL + * @notif_pcpu_wq workqueue for per cpu aynchronous notification or NULL + * @notif_pcpu_work work for per cpu asynchronous notification + */ struct optee_smc { optee_invoke_fn *invoke_fn; void *memremaped_shm; u32 sec_caps; unsigned int notif_irq; + struct optee_pcpu __percpu *optee_pcpu; + struct workqueue_struct *notif_pcpu_wq; + struct work_struct notif_pcpu_work; }; /** diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index a1c1fa1a9c28..eff35f66399e 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -991,9 +991,8 @@ static u32 get_async_notif_value(optee_invoke_fn *invoke_fn, bool *value_valid, return res.a1; } -static irqreturn_t notif_irq_handler(int irq, void *dev_id) +static irqreturn_t irq_handler(struct optee *optee) { - struct optee *optee = dev_id; bool do_bottom_half = false; bool value_valid; bool value_pending; @@ -1016,6 +1015,11 @@ static irqreturn_t notif_irq_handler(int irq, void *dev_id) return IRQ_HANDLED; } +static irqreturn_t notif_irq_handler(int irq, void *dev_id) +{ + return irq_handler((struct optee *)dev_id); +} + static irqreturn_t notif_irq_thread_fn(int irq, void *dev_id) { struct optee *optee = dev_id; @@ -1025,7 +1029,7 @@ static irqreturn_t notif_irq_thread_fn(int irq, void *dev_id) return IRQ_HANDLED; } -static int optee_smc_notif_init_irq(struct optee *optee, u_int irq) +static int init_irq(struct optee *optee, u_int irq) { int rc; @@ -1040,12 +1044,97 @@ static int optee_smc_notif_init_irq(struct optee *optee, u_int irq) return 0; } +static irqreturn_t notif_pcpu_irq_handler(int irq, void *dev_id) +{ + struct optee_pcpu __percpu *pcpu = (struct optee_pcpu *)dev_id; + struct optee *optee = pcpu->optee; + + if (irq_handler(optee) == IRQ_WAKE_THREAD) + queue_work(optee->smc.notif_pcpu_wq, + &optee->smc.notif_pcpu_work); + + return IRQ_HANDLED; +} + +static void notif_pcpu_irq_work_fn(struct work_struct *work) +{ + struct optee_smc *optee_smc = container_of(work, struct optee_smc, + notif_pcpu_work); + struct optee *optee = container_of(optee_smc, struct optee, smc); + + optee_smc_do_bottom_half(optee->ctx); +} + +static int init_pcpu_irq(struct optee *optee, u_int irq) +{ + struct optee_pcpu __percpu *optee_pcpu; + int cpu; + int rc; + + optee_pcpu = alloc_percpu(struct optee_pcpu); + if (!optee_pcpu) + return -ENOMEM; + + for_each_present_cpu(cpu) { + struct optee_pcpu __percpu *p = per_cpu_ptr(optee_pcpu, cpu); + + p->optee = optee; + } + + rc = request_percpu_irq(irq, notif_pcpu_irq_handler, + "optee_pcpu_notification", optee_pcpu); + if (rc) + goto err_free_pcpu; + + enable_percpu_irq(irq, 0); + + INIT_WORK(&optee->smc.notif_pcpu_work, notif_pcpu_irq_work_fn); + optee->smc.notif_pcpu_wq = create_workqueue("optee_pcpu_notification"); + if (!optee->smc.notif_pcpu_wq) { + rc = -EINVAL; + goto err_free_pcpu_irq; + } + + optee->smc.optee_pcpu = optee_pcpu; + optee->smc.notif_irq = irq; + + return 0; + +err_free_pcpu_irq: + disable_percpu_irq(irq); + free_percpu_irq(irq, optee_pcpu); +err_free_pcpu: + free_percpu(optee_pcpu); + + return rc; +} + +static int optee_smc_notif_init_irq(struct optee *optee, u_int irq) +{ + if (irq_is_percpu_devid(irq)) + return init_pcpu_irq(optee, irq); + else + return init_irq(optee, irq); +} + +static void uninit_pcpu_irq(struct optee *optee) +{ + disable_percpu_irq(optee->smc.notif_irq); + + free_percpu_irq(optee->smc.notif_irq, optee->smc.optee_pcpu); + free_percpu(optee->smc.optee_pcpu); +} + static void optee_smc_notif_uninit_irq(struct optee *optee) { if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_ASYNC_NOTIF) { optee_smc_stop_async_notif(optee->ctx); if (optee->smc.notif_irq) { - free_irq(optee->smc.notif_irq, optee); + if (irq_is_percpu_devid(optee->smc.notif_irq)) + uninit_pcpu_irq(optee); + else + free_irq(optee->smc.notif_irq, optee); + irq_dispose_mapping(optee->smc.notif_irq); } }