From patchwork Wed Jun 22 15:48:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Zhongjin X-Patchwork-Id: 12891135 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 8AAEEC43334 for ; Wed, 22 Jun 2022 16:20:23 +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=xJYZlCGbXu5pMfPD0UlC2Zd6iJ9ERFvi/u1S2TMwrIY=; b=LyKL7FpmdDOq9w 1usmGxQ1uSARvnsNzpqVOwJbXQvaDEKKb6TVTAmf/N7bjJlCTBYoa9GLYHHsCcswQbAsrfmg/e9gg SM4Sd3ADiid11hTLxnLwzIZEjawPYryb9zx3FihrXxt9WK+TyBhy4SsmQJyN24oKRBk1vKJ7ViS8L NwGOhgIGMFPuvmZ5n1w8qQVkCWYGGJVgwYJcP/AeXPiPOY1fo9ZdFFBlllxjn1qZFuGNtI6Iso+/E KAaAJ/gcVG+bQYLhh3qTRDuc55eXto8FX75p9nve9oPGQi6jJWK9/5tQt5dtLVGMyoho5nit9O9w3 FG4oSshI294k83DKLW0w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o434P-00BSTl-99; Wed, 22 Jun 2022 16:19:09 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o42fk-00BI7T-Lg for linux-arm-kernel@bombadil.infradead.org; Wed, 22 Jun 2022 15:53:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=dSRAVXHrthV51Hm6DuVk6FjEHrdTxxMU2WNCRkkaWYE=; b=o1AFqpIbGjVniryWe7llSqdiiC gfGw4q2tyRcDyJdeuLpjmJ3LDkH4e7TuU+a/w0FFlmGwR2o8DVUAAes/yqAez4a3pSMLnmg34GHns Z5YxKiCvp/Pn+XuYbv0QQEGvFitvZbQDibfTRKXklKu0pX7Q/8E9IJHEXEI1BOX9rdgs3kO5xlHgE Ci5ED4TWcmksywK3tGW+wSqREbZolEHRZd68xs0aDCQRgwo3GIHduuRnpXYQrZ4ftZLRWVc50LO9G ahDbjC/FSOfvcpbxaYbJOHv8NQW3MfLKus6l7PkKs3+t04vq22GEXVhZyvLF1oTKuONXT/de29eGu ewsa0pLQ==; Received: from szxga03-in.huawei.com ([45.249.212.189]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o42fh-0077Uc-0r for linux-arm-kernel@lists.infradead.org; Wed, 22 Jun 2022 15:53:39 +0000 Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4LSnvH4T5czDsJm; Wed, 22 Jun 2022 23:52:11 +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; Wed, 22 Jun 2022 23:52:44 +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 11/33] objtool: arm64: Ignore replacement section for alternative callback Date: Wed, 22 Jun 2022 23:48:58 +0800 Message-ID: <20220622154920.95075-12-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_165337_407575_0F1D43F4 X-CRM114-Status: UNSURE ( 9.85 ) 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 ARM64_CB_PATCH doesn't have static replacement instructions. Skip trying to validate the alternative section. Signed-off-by: Julien Thierry Signed-off-by: Chen Zhongjin --- 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 77911ca9cfff..54b736e94ede 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -1686,6 +1686,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)