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 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 95D19C43334 for ; Mon, 13 Jun 2022 21:02:38 +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=ESqcjMkhyF/UAGuti8cfBOZwM+tiWDj5Oh8t+ZEVNm8=; b=L0LWAkfTfj6wiQ owG5BPQ1fBRKsLx+0Ov7MDA2DpzXGbO/hMdIg00OvzHCe1M06phsCNBrHKppbsuIhXhTkmcs4c4Wi izCDTp8M+E1u+tcDm7wpcqnZ+MFzyp5sl6Gy+wkPiJLiU2SONXQ9+idtBcOGeaTLvCsjex2YQvgyk 4JXnlHJ+YMmAcxQTZraT2pdOWIiDZKrvUVB8e8amKBlH1kNMIDrajgGpJi8edNy4vMXhtEJbFxGPF pD9sIHFcoZEGNCoAcAjxDUBu5CllFjGOksZ3YaLn4T/DncV4ETqXQgRQYdIQeC901aXhIsSQsLJ6m fNnD5AITqmvkZPN7+22Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o0rBu-005rB1-BC; Mon, 13 Jun 2022 21:01:42 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o0rBr-005rA5-3q for linux-arm-kernel@lists.infradead.org; Mon, 13 Jun 2022 21:01:40 +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 dfw.source.kernel.org (Postfix) with ESMTPS id 9D2C2612AB; Mon, 13 Jun 2022 21:01:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F176BC34114; Mon, 13 Jun 2022 21:01:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655154098; bh=73mQfAFCNuYe8BH/zpmqALrjt3J8xgDQr5Ibr3aCieE=; h=From:To:Cc:Subject:Date:From; b=KmOQqZqs0qcKHsZiOhu2zOitK34CiknZ/7WOVADR1vzdegC/GzomDfBwaOTjN7mWR wPfk+Bs7NkNAalZDZUwanY9HSHPzNZl3z6eyBQuD2YdBtqyrmnmm/66DMtiNkBT6lX 7lMoVNmktkfruqsvAdtb3o7WYW3hsk928oF3nz9MizvPCAFO3joEBtZwXVm5dANK3V t3fiQawKR2oKbbPsBSYTVn1iM6+ZMLD2LORDWap19xgYTp4/P79UyQ4fjdzQvrinIv cJOzjsCDZ3Ok1S5JEKqZifB0CH3vIWT+blI5iZATgEGnZDP0JR3YQA4zrgjMUwxIjz sANc7wfLTShlQ== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH] arm64/signal: Clean up SVE/SME feature checking inconsistency Date: Mon, 13 Jun 2022 22:01:33 +0100 Message-Id: <20220613210133.1327091-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1370; h=from:subject; bh=73mQfAFCNuYe8BH/zpmqALrjt3J8xgDQr5Ibr3aCieE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBip6V+skn66gLMRtYgHww2x4WcDQi5Uw8ucApF56Xr tsd815qJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYqelfgAKCRAk1otyXVSH0J16B/ 9BCT+O9TBLx6fU5qVW171wcoKy8rj72Rt51BCN7SArnGkDUBlMzoveJwxQxvpArrnLSAN3wJGiMDlq wBJrXPaUEmFhhFQhmCAfxF2wCJeXC5X+xxBShjmGsaGEEBqI9Lej/CXMXdtmq0x5ppW/npuPlk4BfK r2GaPNo3mwxVceWGD+28zJhocKitN2NWdElx6zG3GbnKDR+lBnc4e056PLB0xTCWfuEPqbyj2JN2mw J+OYJNznl0v5Cpof3FDhOoHPhfs8iaP8yqJDBATWceLZHlsuXc0xbY6lAeGstvNxBwX3cM/Q6KlDmS nLI4TQnhd5loBtpxAaWo8LxhkbqVvh 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-20220613_140139_260434_E1EF6648 X-CRM114-Status: GOOD ( 15.12 ) 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 restoring signal state we check to see if SVE is supported in restore_sigframe() but check to see if SVE is supported inside restore_sve_fpsimd_context(). This makes no real difference since SVE is always supported in systems with SME but looks a bit untidy and makes things slightly harder to follow, move the SVE check next to the SME one in restore_sve_fpsimd_context(). Signed-off-by: Mark Brown --- arch/arm64/kernel/signal.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 23dd4c3bcfed..0d5a9eb43085 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -281,6 +281,9 @@ static int restore_sve_fpsimd_context(struct user_ctxs *user) vl = task_get_sme_vl(current); } else { + if (!system_supports_sve()) + return -EINVAL; + vl = task_get_sve_vl(current); } @@ -652,14 +655,10 @@ static int restore_sigframe(struct pt_regs *regs, if (!user.fpsimd) return -EINVAL; - if (user.sve) { - if (!system_supports_sve()) - return -EINVAL; - + if (user.sve) err = restore_sve_fpsimd_context(&user); - } else { + else err = restore_fpsimd_context(user.fpsimd); - } } if (err == 0 && system_supports_sme() && user.za) -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel