Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB111C433ED for ; Wed, 19 May 2021 17:18:01 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 39C6B611BF for ; Wed, 19 May 2021 17:18:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 39C6B611BF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=EMBwu73u0Bf8cxpa19k+KFPgauecJ/ZUeTTxvgAm4Gc=; b=WuTyb68arO3XmvlKkjTcQwCYE3 QSK7jwIK6AkZiMhU4lVzdsyL5O3AqYqYtDK97kwrvG087COPNiX8sfrynIdrRNBo3PV8EyayemTE6 G+XZHdyQJhiaVE3CT9wdAfOcNhoMix6NArYlVwes+2Bz4wDdxMF9WHXoQmvvkHHdF5RJvSDKHFGwJ x7Kzqean6STnNfnIlLEvIcHsh1yPwdgqz2C9cBenRE+4HutoFnAF7n9DoUZLSfFHLp3wwvRucIPLq DTSDrsvQ4cug8cxp0eMimBTbwuJ9qsbnQ8WdB0GodpFpZ8bdrL5GtbTHprWrtI0I/S8X1Wyp3wg7+ CWQJtbOA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1ljPnf-004con-9Q; Wed, 19 May 2021 17:16:03 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljPnc-004coX-1e for linux-arm-kernel@desiato.infradead.org; Wed, 19 May 2021 17:16:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=iBbqCCZk2JwK6m6Msnz+rN78ycr20EDe5Kj29Bkpu78=; b=oQMiHAXE8emZPElM5Q8yH7ghx4 Q1uTvfNsBQaQIC4UEoTJah+1eAnuw2r/Iy5drlLLvsw5UCG1nFlNRDClLJe2NwZ+/QujRFJa0oO80 YATxdXEME7CUysWV6rwvmiWSfOT8r5k2TkXt5p6S3vZRRr7g10I125zWTwwZnbDMGjcv7bnlO94Zx CeWcQ1C8iLJ0MplpmV8ht7qvP7F8JCgV99uY9qiukyyAAj6i4vo8YfqDHvyjy7phXPoDZy75M5ZPA X/l6dHbpskQQxrbbgqI76Fksef3fLIH7doZnXx6l8uSNlk8OCKgZ4aRawrYv0h4ASmFIUK7UWBxs9 9QOzxt/Q==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljPnZ-00Fed0-5O for linux-arm-kernel@lists.infradead.org; Wed, 19 May 2021 17:15:58 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9B98C611BD; Wed, 19 May 2021 17:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621444556; bh=Ohcc3GwjML6Jc3eBYPQlJZvTM/0rF5q4YblxlDxjh2I=; h=From:To:Cc:Subject:Date:From; b=r2jtUK4DvfM2Cq9D143oSXwttoUjz8tS8sDdM8UItC/iBL4db1y8UshTacuwEZ9a3 03ed698Ncr5BikLtIFLVnrOKXuyhqdfdqxmexi9ifvt7cUhJyPDN7035PabLD6HILU +1GOogTuM1+bMO8z8UVKsw39YfEioRloz61MQwKAAvd8FT9nJuVFZXlmVggDFmJY4e qPURrxtMXQb18F72N17MzvXpYtDxJFi6xZ+4+g9xsVzN2TUhjHbGjaGMurt8b+k5BT 3WAs4IV92c+IiEGw4Hl+eVbfobS0BE3TGd9zkyaVb9bvp8TEnY2stzmQ3by680HHHh JqYH5IBvw9Yeg== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Lorenzo Pieralisi , Sudeep Holla , Marc Zyngier , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v3] arm64: smccc: Support SMCCC v1.3 SVE register saving hint Date: Wed, 19 May 2021 18:08:56 +0100 Message-Id: <20210519170856.29728-1-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5800; h=from:subject; bh=Ohcc3GwjML6Jc3eBYPQlJZvTM/0rF5q4YblxlDxjh2I=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBgpUIUEzrkYc+Z/HfgAqFyA7a7GQoOtyXhzaPbReu5 yRM8+Y2JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYKVCFAAKCRAk1otyXVSH0IhZB/ 0bQAb42QN4/ZlVy3cViobCrVN+Zh5G4HifA7yDr9voXtAtoS/vqvJJ8teFIeWfII8xPNhraQGi46z9 lVy+GEKN3Os+6xiyu0d2RKt7W33NBCh4KJUb36MoaPjJZfo3WEP603x9RSXl4227A+l607byPVl0AM 7xnfFaOnknoY2WORvb3IW0B8q0mzgoaoPZLWrK414IcPUJrUjYZ2LkQzR4ZyjuVVrR5w1Cgt2zlzgR 9hwgGo9rnUz9wMsucYWToNp/8x6fJ4FI0WZsgSuYs5pkmQrib6Qp+L/oHYrGTummn99+bKxZVzOxrd A8YuwF8pmQrxqpKtjt7S1sik+pnipq X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210519_101557_290155_FA1E6196 X-CRM114-Status: GOOD ( 21.22 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org SMCCC v1.2 requires that all SVE state be preserved over SMC calls which introduces substantial overhead in the common case where there is no SVE state in the registers. To avoid this SMCCC v1.3 introduces a flag which allows the caller to say that there is no state that needs to be preserved in the registers. Make use of this flag, setting it if the SMCCC version indicates support for it and the TIF_ flags indicate that there is no live SVE state in the registers, this avoids placing any constraints on when SMCCC calls can be done or triggering extra saving and reloading of SVE register state in the kernel. This would be straightforward enough except for the rather entertaining inline assembly we use to do SMCCC v1.1 calls to allow us to take advantage of the limited number of registers it clobbers. Deal with this by having a function which we call immediately before issuing the SMCCC call to make our checks and set the flag. Using alternatives the overhead if SVE is supported but not detected at runtime can be reduced to a single NOP. Signed-off-by: Mark Brown --- arch/arm64/kernel/smccc-call.S | 31 +++++++++++++++++++++++++++++++ drivers/firmware/smccc/smccc.c | 4 ++++ include/linux/arm-smccc.h | 24 ++++++++++++++++++++++-- 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/smccc-call.S b/arch/arm64/kernel/smccc-call.S index d62447964ed9..d6f2e72b7cba 100644 --- a/arch/arm64/kernel/smccc-call.S +++ b/arch/arm64/kernel/smccc-call.S @@ -7,8 +7,39 @@ #include #include +#include + +/* + * If we have SMCCC v1.3 and (as is likely) no SVE state in + * the registers then set the SMCCC hint bit to say there's no + * need to preserve it. Do this by directly adjusting the SMCCC + * function value which is already stored in x0 ready to be called. + * + * Since we need scratch registers but wish to avoid having to handle + * the stack we expect the caller to preserve x16 if needed, the only + * callers are expected to be the call below and the inline asm in + * linux/arm-smccc.h for SMCCC 1.1 and later calls. + */ +SYM_FUNC_START(__smccc_sve_check) + + ldr_l x16, smccc_has_sve_hint + cbz x16, 2f + + get_current_task x16 + ldr x16, [x16, #TSK_TI_FLAGS] + tbnz x16, #TIF_FOREIGN_FPSTATE, 1f // Any live FP state? + tbnz x16, #TIF_SVE, 2f // Does that state include SVE? + +1: orr x0, x0, ARM_SMCCC_1_3_SVE_HINT + +2: ret +SYM_FUNC_END(__smccc_sve_check) +EXPORT_SYMBOL(__smccc_sve_check) .macro SMCCC instr +alternative_if ARM64_SVE + bl __smccc_sve_check +alternative_else_nop_endif \instr #0 ldr x4, [sp] stp x0, x1, [x4, #ARM_SMCCC_RES_X0_OFFS] diff --git a/drivers/firmware/smccc/smccc.c b/drivers/firmware/smccc/smccc.c index 028f81d702cc..9f937b125ab0 100644 --- a/drivers/firmware/smccc/smccc.c +++ b/drivers/firmware/smccc/smccc.c @@ -15,6 +15,7 @@ static u32 smccc_version = ARM_SMCCC_VERSION_1_0; static enum arm_smccc_conduit smccc_conduit = SMCCC_CONDUIT_NONE; bool __ro_after_init smccc_trng_available = false; +u64 __ro_after_init smccc_has_sve_hint = false; void __init arm_smccc_version_init(u32 version, enum arm_smccc_conduit conduit) { @@ -22,6 +23,9 @@ void __init arm_smccc_version_init(u32 version, enum arm_smccc_conduit conduit) smccc_conduit = conduit; smccc_trng_available = smccc_probe_trng(); + if (IS_ENABLED(CONFIG_ARM64_SVE) && + smccc_version >= ARM_SMCCC_VERSION_1_3) + smccc_has_sve_hint = true; } enum arm_smccc_conduit arm_smccc_1_1_get_conduit(void) diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index 6861489a1890..b22966bb174a 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -63,6 +63,9 @@ #define ARM_SMCCC_VERSION_1_0 0x10000 #define ARM_SMCCC_VERSION_1_1 0x10001 #define ARM_SMCCC_VERSION_1_2 0x10002 +#define ARM_SMCCC_VERSION_1_3 0x10003 + +#define ARM_SMCCC_1_3_SVE_HINT 0x10000 #define ARM_SMCCC_VERSION_FUNC_ID \ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ @@ -216,6 +219,8 @@ u32 arm_smccc_get_version(void); void __init arm_smccc_version_init(u32 version, enum arm_smccc_conduit conduit); +extern u64 smccc_has_sve_hint; + /** * struct arm_smccc_res - Result from SMC/HVC call * @a0-a3 result values from registers 0 to 3 @@ -297,6 +302,20 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, #endif +/* nVHE hypervisor doesn't have a current thread so needs separate checks */ +#if defined(CONFIG_ARM64_SVE) && !defined(__KVM_NVHE_HYPERVISOR__) + +#define SMCCC_SVE_CHECK ALTERNATIVE("nop \n", "bl __smccc_sve_check \n", \ + ARM64_SVE) +#define smccc_sve_clobbers "x16", "lr", + +#else + +#define SMCCC_SVE_CHECK +#define smccc_sve_clobbers + +#endif + #define ___count_args(_0, _1, _2, _3, _4, _5, _6, _7, _8, x, ...) x #define __count_args(...) \ @@ -364,7 +383,7 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, #define ___constraints(count) \ : __constraint_read_ ## count \ - : "memory" + : smccc_sve_clobbers "memory" #define __constraints(count) ___constraints(count) /* @@ -379,7 +398,8 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, register unsigned long r2 asm("r2"); \ register unsigned long r3 asm("r3"); \ __declare_args(__count_args(__VA_ARGS__), __VA_ARGS__); \ - asm volatile(inst "\n" : \ + asm volatile(SMCCC_SVE_CHECK \ + inst "\n" : \ "=r" (r0), "=r" (r1), "=r" (r2), "=r" (r3) \ __constraints(__count_args(__VA_ARGS__))); \ if (___res) \ -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel