From patchwork Thu Jun 23 01:48:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Zhongjin X-Patchwork-Id: 12891689 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 2DDB8C43334 for ; Thu, 23 Jun 2022 02:08:05 +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=l0rYgP1udP4A1i n195y4wosh0dJjK0GGePrjmykEW3FWWCV791ySmuh3cisdEAXR2osVj/MDzy2a4IGmDUmJ8oT3mv/ EfGp+eS96bRysy0B5svdO5vU//JxkFoGr0IYiaiA0yMvPSzM7TU3FgzAFYF3iLb1f6v1i/65BzzwY bhTXXpLTpez2fa8p1Lxmg1TGqbalcPjC3XtIlm7JxEuM6Xzu5V4+WilqEtKyHXA0gN07uEkW+xYOy cX5NfYf90k89F/UymES1ok58M/QhuPp/4ZZA96+FEmc1YIPf7nNXsxjP4vidRozorJAAawtEh2WIy opZYGjOPBgPPg4H09fBg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o4CFJ-00Cr67-3e; Thu, 23 Jun 2022 02:07:01 +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 1o4C3T-00ClXI-Ax for linux-arm-kernel@bombadil.infradead.org; Thu, 23 Jun 2022 01:54:47 +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=pT8MX2nx+AeKRVQ7bAwJMophQq iHQY84nnrWTg3HKh4gxVnZebfP1OY58nkUDk2QAxnk7OpdmzdctKDtZrQPDlX8yXuL4akdJVdcMyd BI2IZn4dSHZWa15ka13wJakVjnXP4ZQ9NVWMXqPzWTDMMVTXk7iuBY6h4odfP0zidoewKmxoVSqPB X7w22zBwzUwv8Kf2cp+z0gzqYiu0DAoWYgP8pCcjFKvVwjMq9Tq901wikVNEdXdlCYbRzR9RI2XX0 1XpdQT7RCaq5jO0BE/cIOaX5z1KxtF8eEUV7zZw5CiDy2SyFZXoa1YhBtD8y4HMYexCvKRavYIRji Z07/u+tQ==; Received: from szxga01-in.huawei.com ([45.249.212.187]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o4C0g-00BTYH-Td for linux-arm-kernel@lists.infradead.org; Thu, 23 Jun 2022 01:52:53 +0000 Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4LT38g4LkBzhYW9; Thu, 23 Jun 2022 09:49:39 +0800 (CST) Received: from dggpemm500013.china.huawei.com (7.185.36.172) by dggpemm500022.china.huawei.com (7.185.36.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 23 Jun 2022 09:51:47 +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; Thu, 23 Jun 2022 09:51:47 +0800 From: Chen Zhongjin To: , , , , , CC: , , , , , , , , , , , , , , Subject: [PATCH v6 10/33] objtool: arm64: Handle supported relocations in alternatives Date: Thu, 23 Jun 2022 09:48:54 +0800 Message-ID: <20220623014917.199563-11-chenzhongjin@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220623014917.199563-1-chenzhongjin@huawei.com> References: <20220623014917.199563-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-20220623_025246_610197_19369A4D X-CRM114-Status: UNSURE ( 8.57 ) 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); }