From patchwork Fri Mar 17 12:49:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "sundongxu (A)" X-Patchwork-Id: 13179043 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 18F61C74A5B for ; Fri, 17 Mar 2023 12:50:37 +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=FQ6K2dugm1EPd97f8ncFDZZ+W0HBue0Lxc0alk9QbrE=; b=Rv/FImMgmFsqES cYM+XOvPbHMDltAlh09BWv/Da4GgmRhLImObvPeFTBAgQAYIXqv0/3A0rzzXQURm2YF57qvt+eO/A RvPNpPUVHR7bFYRBltQ/CBzHkuFFCf3QKNhFCd7q0tT/A9MZeYzlsk9wkGLafVKsAIBlvyVCuilD1 l4uv3zgrFTJPJInAnFCeizxWgrFz7Cb8JLBhUEme9QjgdjIn27VMDGOGWnz83Wk7CKAhmfQrmL2v7 6UkTb89sHiizCcH+RamBEc+JPGHRk2IWD5T73Jnp6vjCw4MFb4Lb7lGMVMenYwvI3iuIVZxOn7Wxe GiI860NldCn7+JEO2wBg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pd9Wn-002GKe-0h; Fri, 17 Mar 2023 12:49:49 +0000 Received: from szxga02-in.huawei.com ([45.249.212.188]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pd9Wk-002GJ8-00 for linux-arm-kernel@lists.infradead.org; Fri, 17 Mar 2023 12:49:48 +0000 Received: from dggpeml500004.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PdP5G2wYCzSlbv; Fri, 17 Mar 2023 20:46:26 +0800 (CST) Received: from DESKTOP-EJM108K.china.huawei.com (10.174.186.25) by dggpeml500004.china.huawei.com (7.185.36.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Fri, 17 Mar 2023 20:49:44 +0800 From: Dongxu Sun To: , , CC: , , , Dongxu Sun Subject: [PATCH 2/4] arm64/signal: Alloc tpidr2 sigframe after checking system_supports_tpidr2() Date: Fri, 17 Mar 2023 20:49:13 +0800 Message-ID: <20230317124915.1263-3-sundongxu3@huawei.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20230317124915.1263-1-sundongxu3@huawei.com> References: <20230317124915.1263-1-sundongxu3@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.186.25] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500004.china.huawei.com (7.185.36.140) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230317_054946_202450_948C9022 X-CRM114-Status: UNSURE ( 9.38 ) X-CRM114-Notice: Please train this message. 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 Move tpidr2 sigframe allocation from under the checking of system_supports_sme() to the checking of system_supports_tpidr2(). Signed-off-by: Dongxu Sun Reviewed-by: Mark Brown --- arch/arm64/kernel/signal.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 032e97f8cae0..2cfc810d0a5b 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -893,6 +893,13 @@ static int setup_sigframe_layout(struct rt_sigframe_user_layout *user, return err; } + if (system_supports_tpidr2()) { + err = sigframe_alloc(user, &user->tpidr2_offset, + sizeof(struct tpidr2_context)); + if (err) + return err; + } + if (system_supports_sme()) { unsigned int vl; unsigned int vq = 0; @@ -902,11 +909,6 @@ static int setup_sigframe_layout(struct rt_sigframe_user_layout *user, else vl = task_get_sme_vl(current); - err = sigframe_alloc(user, &user->tpidr2_offset, - sizeof(struct tpidr2_context)); - if (err) - return err; - if (thread_za_enabled(¤t->thread)) vq = sve_vq_from_vl(vl);