From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13ED8C433F5 for ; Tue, 19 Oct 2021 17:23:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F14CE6135F for ; Tue, 19 Oct 2021 17:23:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234570AbhJSRZu (ORCPT ); Tue, 19 Oct 2021 13:25:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:53928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233460AbhJSRZt (ORCPT ); Tue, 19 Oct 2021 13:25:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 74FAA61212; Tue, 19 Oct 2021 17:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634664217; bh=EY66616TcCrNTtvlQ1iP/Mic6pteYvGPqPysSuGmeik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CrZYGmMJaMIJN3B16WWu8a4K0r1xL8IInvtwbChf67MT9mRuDy8iiQg0bNhox7pcv wTe0YmriFuIsrjrlTOW1qVXCGx5fDepGR263d4emKfq23JtjY6vlRE/HAhPxMgslWG Hrt2nmpO24lkMExhRwYKWdkpoejKjOe0iero+EMHjaTsVyXmCkwmcGegmDKfc8Yl+a ZY/TP+BuV8i28Cq3GwfXtbpOmhzww0VGvfsZspL+0ctEvC5jojE1iBLv8367SiaSez 3eJsYe1pQ8Qq8ZBGPBOxD/y95rX4AMx+vNAekoeE7oEFvxGWcVsqOyNbeK1yh18956 W55HPop797P9g== From: Mark Brown To: Catalin Marinas , Will Deacon , Shuah Khan , Shuah Khan Cc: Alan Hayward , Luis Machado , Salil Akerkar , Basant Kumar Dwivedi , Szabolcs Nagy , linux-arm-kernel@lists.infradead.org, linux-kselftest@vger.kernel.org, Mark Brown Subject: [PATCH v3 01/42] arm64/fp: Reindent fpsimd_save() Date: Tue, 19 Oct 2021 18:22:06 +0100 Message-Id: <20211019172247.3045838-2-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211019172247.3045838-1-broonie@kernel.org> References: <20211019172247.3045838-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1862; h=from:subject; bh=EY66616TcCrNTtvlQ1iP/Mic6pteYvGPqPysSuGmeik=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhbv7EaS6xFJBpyZitL/aQgtPUEypvUI/1s4G82c6X Yc3PXHmJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYW7+xAAKCRAk1otyXVSH0PI6B/ 4/PUYHFsj0uRKgWUHp+lVZRjoE1UNwp8A/2W0svZWjm/u5HDTbZxVNZYB2wmC7dyxRQCKDdFmQ0Sxg 1aH83K9Wxj1W6rJithjdZZHpxdMUeCMUov8Y0TSYYREeOqeDpn+p180Tqla8v7YiiLXQctwkbWYGRV 255pKB8orQwXtSYptefu+MDPsStqsHSwURThdk/cNk6psjgcBBGbh++xRPH9xIo0+F4xEuVjiQB3Ag sfXZEEUY54ZQISb069B8SwZ0Fu458zrqRum4f4cikym8IZM9NnVc97P3GiZVNJ27kdKhQ4pF0VYbSA XWViWRrmfvWJtl69qVxRLa0MRfUqAW X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Currently all the active code in fpsimd_save() is inside a check for TIF_FOREIGN_FPSTATE. Reduce the indentation level by changing to return from the function if TIF_FOREIGN_FPSTATE is set. Signed-off-by: Mark Brown --- arch/arm64/kernel/fpsimd.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index ff4962750b3d..995f8801602b 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -308,24 +308,26 @@ static void fpsimd_save(void) WARN_ON(!system_supports_fpsimd()); WARN_ON(!have_cpu_fpsimd_context()); - if (!test_thread_flag(TIF_FOREIGN_FPSTATE)) { - if (IS_ENABLED(CONFIG_ARM64_SVE) && - test_thread_flag(TIF_SVE)) { - if (WARN_ON(sve_get_vl() != last->sve_vl)) { - /* - * Can't save the user regs, so current would - * re-enter user with corrupt state. - * There's no way to recover, so kill it: - */ - force_signal_inject(SIGKILL, SI_KERNEL, 0, 0); - return; - } - - sve_save_state((char *)last->sve_state + - sve_ffr_offset(last->sve_vl), - &last->st->fpsr); - } else - fpsimd_save_state(last->st); + if (test_thread_flag(TIF_FOREIGN_FPSTATE)) + return; + + if (IS_ENABLED(CONFIG_ARM64_SVE) && + test_thread_flag(TIF_SVE)) { + if (WARN_ON(sve_get_vl() != last->sve_vl)) { + /* + * Can't save the user regs, so current would + * re-enter user with corrupt state. + * There's no way to recover, so kill it: + */ + force_signal_inject(SIGKILL, SI_KERNEL, 0, 0); + return; + } + + sve_save_state((char *)last->sve_state + + sve_ffr_offset(last->sve_vl), + &last->st->fpsr); + } else { + fpsimd_save_state(last->st); } } -- 2.30.2 From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84058C433FE for ; Tue, 19 Oct 2021 17:25:28 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 554A861355 for ; Tue, 19 Oct 2021 17:25:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 554A861355 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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=Rxdd9TG1XTHXeFbkANHZqGbhaelJynHu6hw7Nnt7nKQ=; b=LKELcASsKlUIcb kJ2Mfk/I8nMSFnYGunE6YQ0A7iGOPZNMG7HDcE0pa2wf6AgBNCr9fLNy33r4EwDN74X0D6pYp/gZG k+iRQhOp5Hcc6UCoYxe1Tk5p4SyqbnT7f05VtQ7xbw6vzUNCXbKfcoXCD7zHgm2TGfZibOdOd5WCn DQDOutIqm8+OZd6ohlxd7iRUb0hQQ4WyC6cfJAaRrAEWIHaGOxBSwgjlOmJ1lbeVHETU80839wfWt X/1vC78NxiPIr7+LVWD8OPksrZ/UNsfCNo+PGRDV4jt5eY0x61lBckZ7obZ0WW5Ir5CiI/364hqvm 2dPTL32HKmcZPvdpK8ZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcsq7-00251b-0u; Tue, 19 Oct 2021 17:23:51 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcspt-0024yp-9h for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 17:23:38 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 74FAA61212; Tue, 19 Oct 2021 17:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634664217; bh=EY66616TcCrNTtvlQ1iP/Mic6pteYvGPqPysSuGmeik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CrZYGmMJaMIJN3B16WWu8a4K0r1xL8IInvtwbChf67MT9mRuDy8iiQg0bNhox7pcv wTe0YmriFuIsrjrlTOW1qVXCGx5fDepGR263d4emKfq23JtjY6vlRE/HAhPxMgslWG Hrt2nmpO24lkMExhRwYKWdkpoejKjOe0iero+EMHjaTsVyXmCkwmcGegmDKfc8Yl+a ZY/TP+BuV8i28Cq3GwfXtbpOmhzww0VGvfsZspL+0ctEvC5jojE1iBLv8367SiaSez 3eJsYe1pQ8Qq8ZBGPBOxD/y95rX4AMx+vNAekoeE7oEFvxGWcVsqOyNbeK1yh18956 W55HPop797P9g== From: Mark Brown To: Catalin Marinas , Will Deacon , Shuah Khan , Shuah Khan Cc: Alan Hayward , Luis Machado , Salil Akerkar , Basant Kumar Dwivedi , Szabolcs Nagy , linux-arm-kernel@lists.infradead.org, linux-kselftest@vger.kernel.org, Mark Brown Subject: [PATCH v3 01/42] arm64/fp: Reindent fpsimd_save() Date: Tue, 19 Oct 2021 18:22:06 +0100 Message-Id: <20211019172247.3045838-2-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211019172247.3045838-1-broonie@kernel.org> References: <20211019172247.3045838-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1862; h=from:subject; bh=EY66616TcCrNTtvlQ1iP/Mic6pteYvGPqPysSuGmeik=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhbv7EaS6xFJBpyZitL/aQgtPUEypvUI/1s4G82c6X Yc3PXHmJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYW7+xAAKCRAk1otyXVSH0PI6B/ 4/PUYHFsj0uRKgWUHp+lVZRjoE1UNwp8A/2W0svZWjm/u5HDTbZxVNZYB2wmC7dyxRQCKDdFmQ0Sxg 1aH83K9Wxj1W6rJithjdZZHpxdMUeCMUov8Y0TSYYREeOqeDpn+p180Tqla8v7YiiLXQctwkbWYGRV 255pKB8orQwXtSYptefu+MDPsStqsHSwURThdk/cNk6psjgcBBGbh++xRPH9xIo0+F4xEuVjiQB3Ag sfXZEEUY54ZQISb069B8SwZ0Fu458zrqRum4f4cikym8IZM9NnVc97P3GiZVNJ27kdKhQ4pF0VYbSA XWViWRrmfvWJtl69qVxRLa0MRfUqAW 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-20211019_102337_396193_310A379B X-CRM114-Status: GOOD ( 13.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: , 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 all the active code in fpsimd_save() is inside a check for TIF_FOREIGN_FPSTATE. Reduce the indentation level by changing to return from the function if TIF_FOREIGN_FPSTATE is set. Signed-off-by: Mark Brown --- arch/arm64/kernel/fpsimd.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index ff4962750b3d..995f8801602b 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -308,24 +308,26 @@ static void fpsimd_save(void) WARN_ON(!system_supports_fpsimd()); WARN_ON(!have_cpu_fpsimd_context()); - if (!test_thread_flag(TIF_FOREIGN_FPSTATE)) { - if (IS_ENABLED(CONFIG_ARM64_SVE) && - test_thread_flag(TIF_SVE)) { - if (WARN_ON(sve_get_vl() != last->sve_vl)) { - /* - * Can't save the user regs, so current would - * re-enter user with corrupt state. - * There's no way to recover, so kill it: - */ - force_signal_inject(SIGKILL, SI_KERNEL, 0, 0); - return; - } - - sve_save_state((char *)last->sve_state + - sve_ffr_offset(last->sve_vl), - &last->st->fpsr); - } else - fpsimd_save_state(last->st); + if (test_thread_flag(TIF_FOREIGN_FPSTATE)) + return; + + if (IS_ENABLED(CONFIG_ARM64_SVE) && + test_thread_flag(TIF_SVE)) { + if (WARN_ON(sve_get_vl() != last->sve_vl)) { + /* + * Can't save the user regs, so current would + * re-enter user with corrupt state. + * There's no way to recover, so kill it: + */ + force_signal_inject(SIGKILL, SI_KERNEL, 0, 0); + return; + } + + sve_save_state((char *)last->sve_state + + sve_ffr_offset(last->sve_vl), + &last->st->fpsr); + } else { + fpsimd_save_state(last->st); } } -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel