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 B8F44C25B08 for ; Wed, 17 Aug 2022 18:26:28 +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:References:In-Reply-To: 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: List-Owner; bh=7ehHpzwE+BldzdYrvgvNFzQ4P9I9Op05hrq1oMOAfQA=; b=tsSxGQvi84hKoI 9xlBwsDfiUXMf6INBwOW2JJwxPZz2eAymlAAYRdvV/zfU9M+bJe/t16wgBoDEK5bLe7/LZoSDKerG 756RyEhRx1MrqqXZt9MkFUZkqhjldyMC1Ms65KiXNuoQGG5mDapmGxPP1HR/gTZDMd4J7M+mUv2ne Z0rsejUBhxZpktjDI1tjFAJL7G26A7TxF0nTaDvG9MgZy14NjVMp1U5vkjbZFMSd+H8RsgXRW11dh Ly91VDIx70TSVhpV0VQtWsKT5Y7hTEAec9f8L81P5uWeLicPe89TIqYWMRu/LTZkpojDWMSG1PuNq uJtGzHAdw1O7vnihDfgw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oONj9-004x9X-P0; Wed, 17 Aug 2022 18:25:15 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oONiQ-004wSq-9Q for linux-arm-kernel@lists.infradead.org; Wed, 17 Aug 2022 18:24:32 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 97AC2B81EB3; Wed, 17 Aug 2022 18:24:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50160C43470; Wed, 17 Aug 2022 18:24:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660760665; bh=1eaTPudXdWhu3zoUpYrd7OTAs3kSuNDR4ZqQsbsHSa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u3VGtWR3F1ZOUXISzcbEZ9bXLYvQ+rAmdfuJ4qtec5lBN/PstzkVbgLgb76Z+bX4P 0qgXf2pV2hKFcS5S3bGB8FKiZHBenAC5COLC9fH5+drm3brkviLiEiKP0qNbtSiQz/ xB7TeuwdlJ6MSgw7YidshAD57nfXNMlHk7elE8bUumL+KgWlshvVokjgp+g3hA07vn lJKs33HtqXT8LV23P5/8DZZKxwiN/jhxvU2YVTOAQUk8dkFIQb/iqkvb1Ab4RMwBNL kOdIWZsHQG3dUJuBF+qJ+W9JrIV/AO5JnFOhBvMwn54E+6fo0527300ifSPzo0aCvm 0Q/aISdpoGN2A== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v3 3/4] arm64/sme: Don't flush SVE register state when allocating SME storage Date: Wed, 17 Aug 2022 19:23:23 +0100 Message-Id: <20220817182324.638214-4-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220817182324.638214-1-broonie@kernel.org> References: <20220817182324.638214-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4927; i=broonie@kernel.org; h=from:subject; bh=1eaTPudXdWhu3zoUpYrd7OTAs3kSuNDR4ZqQsbsHSa8=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBi/TIa5w/ckYvA6pUc+HmelKd+jVY/Rs6XizGmVY8Q rhpIO+OJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYv0yGgAKCRAk1otyXVSH0JE/B/ 9gHa1ayT49TE2J9uaBq/cw/k23FLPGnumCGWoDVTA1f9JHGXE3Squ+b6aFNQg9tTN9NOPHleD+DJR/ Xan0fi/J6UZ58NQG7Y1TMCDmV5vezOq1eGiA/tqiW7RqSbH8CWRGt2a7zJ9UEnTf93ukoAu+R7bzj9 EZZZVooCNvM8lbrC+SlB/qQuqVWR3/Mph2eWJC3gw75mZJujhD0xlcrXgcfjIXuk2zbU2rkjNQQvJW J1g0uBLqoHmODX2sqGLKYZFK5yePAn+xUaySOhZU2gNHgElycFGqNei4CIY7wTlhJjQ7RQolYq8mtW CnfwqZvOefpciAELUBCz7U5ak8D/27 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-20220817_112430_679871_6A821020 X-CRM114-Status: GOOD ( 19.37 ) 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 Currently when taking a SME access trap we allocate storage for the SVE register state in order to be able to handle storage of streaming mode SVE. Due to the original usage in a purely SVE context the SVE register state allocation this also flushes the register state for SVE if storage was already allocated but in the SME context this is not desirable. For a SME access trap to be taken the task must not be in streaming mode so either there already is SVE register state present for regular SVE mode which would be corrupted or the task does not have TIF_SVE and the flush is redundant. Fix this by adding a flag to sve_alloc() indicating if we are in a SVE context and need to flush the state. Freshly allocated storage is always zeroed either way. Fixes: 8bd7f91c03d88 ("arm64/sme: Implement traps and syscall handling for SME") Signed-off-by: Mark Brown Reviewed-by: Catalin Marinas --- arch/arm64/include/asm/fpsimd.h | 4 ++-- arch/arm64/kernel/fpsimd.c | 10 ++++++---- arch/arm64/kernel/ptrace.c | 6 +++--- arch/arm64/kernel/signal.c | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h index 9bb1873f5295..6f86b7ab6c28 100644 --- a/arch/arm64/include/asm/fpsimd.h +++ b/arch/arm64/include/asm/fpsimd.h @@ -153,7 +153,7 @@ struct vl_info { #ifdef CONFIG_ARM64_SVE -extern void sve_alloc(struct task_struct *task); +extern void sve_alloc(struct task_struct *task, bool flush); extern void fpsimd_release_task(struct task_struct *task); extern void fpsimd_sync_to_sve(struct task_struct *task); extern void fpsimd_force_sync_to_sve(struct task_struct *task); @@ -256,7 +256,7 @@ size_t sve_state_size(struct task_struct const *task); #else /* ! CONFIG_ARM64_SVE */ -static inline void sve_alloc(struct task_struct *task) { } +static inline void sve_alloc(struct task_struct *task, bool flush) { } static inline void fpsimd_release_task(struct task_struct *task) { } static inline void sve_sync_to_fpsimd(struct task_struct *task) { } static inline void sve_sync_from_fpsimd_zeropad(struct task_struct *task) { } diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index dd63ffc3a2fa..b9ae9827e6e8 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -715,10 +715,12 @@ size_t sve_state_size(struct task_struct const *task) * do_sve_acc() case, there is no ABI requirement to hide stale data * written previously be task. */ -void sve_alloc(struct task_struct *task) +void sve_alloc(struct task_struct *task, bool flush) { if (task->thread.sve_state) { - memset(task->thread.sve_state, 0, sve_state_size(task)); + if (flush) + memset(task->thread.sve_state, 0, + sve_state_size(task)); return; } @@ -1388,7 +1390,7 @@ void do_sve_acc(unsigned long esr, struct pt_regs *regs) return; } - sve_alloc(current); + sve_alloc(current, true); if (!current->thread.sve_state) { force_sig(SIGKILL); return; @@ -1439,7 +1441,7 @@ void do_sme_acc(unsigned long esr, struct pt_regs *regs) return; } - sve_alloc(current); + sve_alloc(current, false); sme_alloc(current); if (!current->thread.sve_state || !current->thread.za_state) { force_sig(SIGKILL); diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 21da83187a60..eb7c08dfb834 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -882,7 +882,7 @@ static int sve_set_common(struct task_struct *target, * state and ensure there's storage. */ if (target->thread.svcr != old_svcr) - sve_alloc(target); + sve_alloc(target, true); } /* Registers: FPSIMD-only case */ @@ -912,7 +912,7 @@ static int sve_set_common(struct task_struct *target, goto out; } - sve_alloc(target); + sve_alloc(target, true); if (!target->thread.sve_state) { ret = -ENOMEM; clear_tsk_thread_flag(target, TIF_SVE); @@ -1082,7 +1082,7 @@ static int za_set(struct task_struct *target, /* Ensure there is some SVE storage for streaming mode */ if (!target->thread.sve_state) { - sve_alloc(target); + sve_alloc(target, false); if (!target->thread.sve_state) { clear_thread_flag(TIF_SME); ret = -ENOMEM; diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 0d28a783a69a..9ad911f1647c 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -310,7 +310,7 @@ static int restore_sve_fpsimd_context(struct user_ctxs *user) fpsimd_flush_task_state(current); /* From now, fpsimd_thread_switch() won't touch thread.sve_state */ - sve_alloc(current); + sve_alloc(current, true); if (!current->thread.sve_state) { clear_thread_flag(TIF_SVE); return -ENOMEM; -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel