From patchwork Fri Apr 29 09:43:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Zhongjin X-Patchwork-Id: 12831707 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 DCDD6C433F5 for ; Fri, 29 Apr 2022 10:02:39 +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=5AfDuuWk4e5QU04oMO471okZrTBTQ6hynaPfdBVUtzk=; b=L8GSIB79QV09q4 4njltbqKFWGeSxolR0w/j8e2k/+x9tCtBffxLY56JnO2dsUzCXD9jcnYdUbDOLl4QeQHPiRkQv9hU OrXGD0c8s8S2lJneuWgkkJRn6AJHByGgWwWyFEBWiCZADbJaa/BIxrNqYhKdRDaVaCfPUu+w04l6h VACyAFWUY6LigtkDFW8cBQVd8pn1hjCGmPIDgUf6IfjNoRA1Dpp/dFZougpgsNKw69sojyHj4jzqA vCbeS6QnSqtGpnPjdVSPD0VDrKqLtVPsiEfvqzRlgJJxg2uerYEEIDye5rONpWt+XAxsIG2BnZFMl Oc36gnjv9IdoPECzj0fA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nkNR2-00AaW6-Bu; Fri, 29 Apr 2022 10:01:13 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nkNC1-00ATgB-Le for linux-arm-kernel@bombadil.infradead.org; Fri, 29 Apr 2022 09:45:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=QuQcZCzJkXHhU5KwxAPQeu4rrxzPYyWYfRUVkPiac3U=; b=KSHejiZX/1W+XpicHuQgHoyBJa Z+gy+sRof/pQJqvRU21alLcCRrOhRs02gPRKi+8Go6mTjn25lZGuGaQ+2AJCGwViBddBqz6d7p1Jr s+Th8/X2IUfG1fK7xRCIYVV9MCs/bToSEPXCJmp+tLHnLEU317/N8eta/nhpvMBbK0A+3taLYsH3a XZXscw/ECNakZO2jKqDjwKzmEY+QLdLj//zuwEmYpNpsRCO6dnegaQEoarUPfSVwRddgrae5PBNh3 8c3d4rG6V61mWWgLsUOzNblnHH2Jxlwh0LqjU/DE7Nk+eGLHeT6kp2xVgvJ9W0ls3lCpf1SWY4v8h 8vL7PDpg==; Received: from szxga03-in.huawei.com ([45.249.212.189]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nkNBo-009ZrA-Rh for linux-arm-kernel@lists.infradead.org; Fri, 29 Apr 2022 09:45:39 +0000 Received: from dggpemm500023.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4KqSCV5NPszCsP6; Fri, 29 Apr 2022 17:40:38 +0800 (CST) Received: from dggpemm500013.china.huawei.com (7.185.36.172) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 29 Apr 2022 17:45:13 +0800 Received: from ubuntu1804.huawei.com (10.67.175.36) by dggpemm500013.china.huawei.com (7.185.36.172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 29 Apr 2022 17:45:13 +0800 From: Chen Zhongjin To: , , CC: , , , , , , , , , , , , , , Subject: [RFC PATCH v4 21/37] arm64: kernel: Skip validation of proton-pack.c.c and hibernate.c Date: Fri, 29 Apr 2022 17:43:39 +0800 Message-ID: <20220429094355.122389-22-chenzhongjin@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220429094355.122389-1-chenzhongjin@huawei.com> References: <20220429094355.122389-1-chenzhongjin@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.175.36] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500013.china.huawei.com (7.185.36.172) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220429_104530_031423_63EDD4B6 X-CRM114-Status: UNSURE ( 9.04 ) 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 From: Julien Thierry Julien Said, """ This workaround code is more akin to an ancient incantation than sensible code. And since the function does not call another function than itself, unwinding from instructions in it should be reliable. """ Also add mark for swsusp_arch_resume. It's a noreturn function called by special ABI. Signed-off-by: Julien Thierry Signed-off-by: Chen Zhongjin --- arch/arm64/kernel/hibernate.c | 2 ++ arch/arm64/kernel/proton-pack.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c index 6328308be272..f5422ae77dc6 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -471,6 +472,7 @@ int swsusp_arch_resume(void) return 0; } +STACK_FRAME_NON_STANDARD(swsusp_arch_resume); int hibernate_resume_nonboot_cpu_disable(void) { diff --git a/arch/arm64/kernel/proton-pack.c b/arch/arm64/kernel/proton-pack.c index 40be3a7c2c53..9439e62d4b57 100644 --- a/arch/arm64/kernel/proton-pack.c +++ b/arch/arm64/kernel/proton-pack.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -257,6 +258,7 @@ static noinstr void qcom_link_stack_sanitisation(void) "mov x30, %0 \n" : "=&r" (tmp)); } +STACK_FRAME_NON_STANDARD(qcom_link_stack_sanitisation); static bp_hardening_cb_t spectre_v2_get_sw_mitigation_cb(void) {