From patchwork Wed Jun 22 15:48:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Zhongjin X-Patchwork-Id: 12891108 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 E31FFC433EF for ; Wed, 22 Jun 2022 16:09:32 +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=S6x8ZY5z9Iz44umOIHu93/Jo0A0d0sQq1l1RJMvB6ps=; b=t7uI012mm2/RtB JXz/monoI3/u2dEeN/jMF9zxNs3yAMwahqp6lchZwrBMOquFS1lKKia/4X7F5FZ6fIUIRRb81eHLb 6NtUvyeLzvgDLUEKcyNxL9ZaSn3yUjN1fUvbRtxAnrnTSQb3OKVcfUMdfWhx7Wk85IpZqDVejjcvD IHw6tTqelGhB2SUcHOCq8ulmsKCx11Zi1Mfsh35CN6BcbDMPTg8+7QOSB0HgPRPh871HKwIkRyfIL ozFyhY1ltHFOce9fOqNUkh5icLLMgY7acBDkl8jUePLDDUrtgXpSBKxQKWcRU55kUq3J2WSvtF/xY K0l3zJdJ3Mxq/WfZI4Xw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o42tw-00BNyP-Fj; Wed, 22 Jun 2022 16:08:21 +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 1o42fU-00BHyd-7k for linux-arm-kernel@bombadil.infradead.org; Wed, 22 Jun 2022 15:53:24 +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=SolBS5SVSN0F5Szt2vzItiWOWR+JcLSjlA9lWpQK5oE=; b=mkW0LfnZ2eHC41YsA1WoQpMmG0 Ht+G8Yx3iubDzGMLanrUHUJon7s29E9r3hY4lhrRxa3uvSmqQDKdBuor3zl2U966/FlETqV5Y/sFj r+ASP1WQ1jcTF1QVLgmfzRGGdpMuGwYKmXx3HNo66/RrvzEHRdjR9UpO/yzSj/KMt2iuRH9+eOOaU wLq/o+rYXr4AY6mDxCM6xCtMreDe57Tj1LGwSf8mD79nR61yzUPdVIhoU+kWxCNU4Yx3371REaZVL 0+QPzOIdNVebSwEXlfc7NG5ibHoN2t1tXa/JQfXVMgW4L88PsaT2hEIIrats8vRflt/PQ+7as+1rP ol2lldhQ==; Received: from szxga02-in.huawei.com ([45.249.212.188]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o42ev-00B8hX-DR for linux-arm-kernel@lists.infradead.org; Wed, 22 Jun 2022 15:53:21 +0000 Received: from dggpemm500020.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LSnqz30SVzSh51; Wed, 22 Jun 2022 23:49:19 +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.2375.24; Wed, 22 Jun 2022 23:52:43 +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; Wed, 22 Jun 2022 23:52:43 +0800 From: Chen Zhongjin To: , , , , , CC: , , , , , , , , , , , , , Subject: [PATCH v5 10/33] objtool: arm64: Handle supported relocations in alternatives Date: Wed, 22 Jun 2022 23:48:57 +0800 Message-ID: <20220622154920.95075-11-chenzhongjin@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220622154920.95075-1-chenzhongjin@huawei.com> References: <20220622154920.95075-1-chenzhongjin@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.175.36] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) 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-20220622_165318_188318_632867CE X-CRM114-Status: UNSURE ( 8.20 ) 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 Based on get_alt_insn() in arch/arm64/kernel/alternative.c, arm64 alternative code adapts offsets for static branches and adrp instructions. Signed-off-by: Julien Thierry Signed-off-by: Chen Zhongjin --- tools/objtool/arch/arm64/special.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/objtool/arch/arm64/special.c b/tools/objtool/arch/arm64/special.c index 45f283283091..a70b91e8bd7d 100644 --- a/tools/objtool/arch/arm64/special.c +++ b/tools/objtool/arch/arm64/special.c @@ -10,7 +10,11 @@ bool arch_support_alt_relocation(struct special_alt *special_alt, struct instruction *insn, struct reloc *reloc) { - return false; + u32 opcode = *(u32 *)(insn->sec->data->d_buf + insn->offset); + + return aarch64_insn_is_branch_imm(opcode) || + aarch64_insn_is_adrp(opcode) || + !aarch64_insn_uses_literal(opcode); }