From patchwork Thu Apr 7 12:01:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Zhongjin X-Patchwork-Id: 12805142 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 75748C433FE for ; Thu, 7 Apr 2022 12:07:03 +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=KlVY6j03cPqLeGDiQixVl3b1n14RLPIPOnCL/WiExC8=; b=GWG7kPWpcd9LW7 yhyc9XEBsFkhAAi/xiFyH9UgSGfxVsBMtYbQIc6+rc5q9x5t3Xck0cqrnOxG+0D4Kvz5Huni04b/V JvOuZI2jAiSyx3Kk3ywrsmp+jtrqME5KGMUkBqsUQ3nBymkTZt+wL7YmiMv4eQ3a1IHs5MRFkuRRe gC22UaIl59znyEXDYzpt/GcINmf+oYfApp2Mtgt8HPIeInGqWSSvHbiHkZLz/os12JfjTiFziCl+N kKSgZ618ejtrnYwLQSSiTg3ZO+lkhd6HLlugONblDTU8oAga8Ejh00M8e/ByoTT+8R+L0UnG1RagF 4fxNalKcs+n6OV8yMSWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ncQte-00BjDd-G0; Thu, 07 Apr 2022 12:05:54 +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 1ncQqp-00Bhdd-Q2 for linux-arm-kernel@bombadil.infradead.org; Thu, 07 Apr 2022 12:02:59 +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=f0iezNgJlpZb8Y00EzhSsHOkWl4KnK1sG8XAmwDR2zE=; b=keS/VHb6Rw89Jky1K2F3HhnOk/ 9/mVTYJaajQkrbEdsrUMdjCBubztMv7hlChv7S6KRudOAiiywByy1iciMcSmrmGnc2Mo15ODLPt4d B5oZ1e3cq9w9EdGS2SD2BbG6rv0ZrOu1n/4LBu5c70GQQ4QWzevECXYec25oeaTwd9Wm213jduqpq ua8wLJyfoB7NK4gedBaGoFH4WVIZz3+AIfURchG7h6SvHQZVP83wRplvXai3XnyVU6Nbxkip3rJRG 6tQE5KPOkuLlrqInFPaYlvQv/JeCcRDNA44R6ni2E0RHXkfxwo8iA5NMzkX813GC15IAObEKrmkdf HDjHfmlA==; Received: from szxga08-in.huawei.com ([45.249.212.255]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ncQqg-002Tm5-Qr for linux-arm-kernel@lists.infradead.org; Thu, 07 Apr 2022 12:02:55 +0000 Received: from dggpemm500020.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4KZ0Nt3rWCz1HBdm; Thu, 7 Apr 2022 20:02:06 +0800 (CST) Received: from dggpemm500013.china.huawei.com (7.185.36.172) by dggpemm500020.china.huawei.com (7.185.36.49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Thu, 7 Apr 2022 20:02:34 +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.2308.21; Thu, 7 Apr 2022 20:02:34 +0800 From: Chen Zhongjin To: , CC: , , , , , , , , Subject: [RFC PATCH v3 12/13] objtool: arm64: Ignore replacement section for alternative callback Date: Thu, 7 Apr 2022 20:01:40 +0800 Message-ID: <20220407120141.43801-13-chenzhongjin@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220407120141.43801-1-chenzhongjin@huawei.com> References: <20220407120141.43801-1-chenzhongjin@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.175.36] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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-20220407_130252_001988_C9080306 X-CRM114-Status: GOOD ( 10.73 ) 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 ARM64_CB_PATCH doesn't have static replacement instructions. Skip trying to validate the alternative section. Signed-off-by: Julien Thierry --- tools/objtool/arch/arm64/special.c | 11 +++++++++++ tools/objtool/check.c | 3 +++ 2 files changed, 14 insertions(+) diff --git a/tools/objtool/arch/arm64/special.c b/tools/objtool/arch/arm64/special.c index a70b91e8bd7d..8bb1ebd2132a 100644 --- a/tools/objtool/arch/arm64/special.c +++ b/tools/objtool/arch/arm64/special.c @@ -4,6 +4,17 @@ void arch_handle_alternative(unsigned short feature, struct special_alt *alt) { + /* + * ARM64_CB_PATCH has no alternative instruction. + * a callback is called at alternative replacement time + * to dynamically change the original instructions. + * + * ARM64_CB_PATCH is the last ARM64 feature, it's value changes + * every time a new feature is added. So the orig/alt region + * length are used to detect those alternatives + */ + if (alt->orig_len && !alt->new_len) + alt->skip_alt = true; } bool arch_support_alt_relocation(struct special_alt *special_alt, diff --git a/tools/objtool/check.c b/tools/objtool/check.c index b2135da41f48..596974030382 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -1647,6 +1647,9 @@ static int add_special_section_alts(struct objtool_file *file) continue; } + if (special_alt->skip_alt && !special_alt->new_len) + continue; + ret = handle_group_alt(file, special_alt, orig_insn, &new_insn); if (ret)