From patchwork Sun May 21 16:04:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 96883 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp951296vqo; Sun, 21 May 2023 09:10:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ474lNyPvpk+HtUw0hD11DoTPWhcn4tNAJmK/8kMok7uYJqB5b0IdVbyH60fRhqBeX8PFbE X-Received: by 2002:a17:902:d50e:b0:1a9:40d5:b0ae with SMTP id b14-20020a170902d50e00b001a940d5b0aemr8778450plg.12.1684685454718; Sun, 21 May 2023 09:10:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684685454; cv=none; d=google.com; s=arc-20160816; b=W0ccj3aVGcC82Dk0UYIItWY3qy+89L2oqwKTbW61cF9OZk3PhDNCKL9eMNpa/+YsFf 4Vj4Uh+DJuNBge+TGiJez3Cksfp70g8Whi4q6x+XpHqJpOPgHS9QXdlOr9ZIMEwDNM84 axjMIe9MmpvOrvlQxnBAL3PEDn8niOlA9nSBF+L7W/Dkn/JX8klZ+bhsa6TGX9V7ExVT e4V9XEsiQK+NP6eN+Z8cLiKZ6+pMp4J41Ec2Dbq0u4WC1TsFMKgtTpQKhPFEe64Qmheh jM26goZoT3IXuGZHD/ZukTPCZ/YgHi7LExvrhfdbQ1lBsVWv/XxyoTnD4ks/yF4YV/Ev PSxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ijK3Ma87MjjP7o+q8mWfo9d4Y8XXerbrBT3xaiZYz+I=; b=TfumL3MZyfI4uNel4TIqO5QNk9YT2Z2kJmqRPoomsTfaXtx5ESTW9R/isPUkAchuBs i0B679yC8G9ZW0ddl8M3191qsEG/ldtrSw25Nmz2XJS6OIifSzieyweZyht4x0iScMZx 7fVhhAB+5PiRpq89NsFBErJlnxFto1uus50nWtn56SNV6S3mWHaaAVInq3oqr8lqKlAt B6kNq40lVYBYJBN9ie0PWVcwxdW3BSic/h8g8J/vuR1vi7Tk7NaR8fskk2rjkyiD0L2v Q0YQEmUwNOabBKFW0bYIjolhh6yuNaYMS9ZsW1/VHIZRXmosT45X0sPjU18YicG6YiiU KkDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="pSSCKgO/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a7-20020a170902ecc700b001ac2ff9fbf8si3189430plh.403.2023.05.21.09.10.39; Sun, 21 May 2023 09:10:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="pSSCKgO/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231177AbjEUQGj (ORCPT + 99 others); Sun, 21 May 2023 12:06:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231174AbjEUQGS (ORCPT ); Sun, 21 May 2023 12:06:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DAB0E78; Sun, 21 May 2023 09:05:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E23BC6179A; Sun, 21 May 2023 16:05:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1114CC4339E; Sun, 21 May 2023 16:05:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684685148; bh=OsDQm9j1PsDhPRuAGeNz8Ube9RFsdeDF2EBPrRh3R00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pSSCKgO/pgmJMYhG5PbEkacPkJY9fJzSjVvsy7mQ6g5XQ01mmRjzRWa0l5QGox1zj Ehse+zJR2r2fCka79ORaDKzj6yVqM5mxK7nXB4Kv/aOXj3iuPLmiBVlzi3wQnkvh/K gl7fj2T9p82yk3Ae/afrvt+jPkYL4dORCwGu1sQa6VhK6y2wsrh5ynhBLLselJ3+Hg jjvrrEfABBLm2CwQ3RWulT3jXzttTWAZ0621MtACF9jyf36m5f6j1yw+WT6t0JU0hl kFHtBhfwGzWb6VLUk9dRfAQCYUN+ISXdzTa2HcU74FcvIx0wsCB04D+sGcjAF+lh0S n+VHiBIAn+Y0w== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Nicolas Schier , Masahiro Yamada Subject: [PATCH v6 19/20] modpost: merge two similar section mismatch warnings Date: Mon, 22 May 2023 01:04:24 +0900 Message-Id: <20230521160426.1881124-20-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230521160426.1881124-1-masahiroy@kernel.org> References: <20230521160426.1881124-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766520735016468988?= X-GMAIL-MSGID: =?utf-8?q?1766520735016468988?= In case of section mismatch, modpost shows slightly different messages. For extable section mismatch: "%s(%s+0x%lx): Section mismatch in reference to the %s:%s\n" For the other cases: "%s: section mismatch in reference: %s (section: %s) -> %s (section: %s)\n" They are similar. Merge them. Signed-off-by: Masahiro Yamada Reviewed-by: Nick Desaulniers --- scripts/mod/modpost.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 852cc164c77e..e7561fa57478 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1135,21 +1135,10 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf, sec_mismatch_count++; - switch (mismatch->mismatch) { - case TEXT_TO_ANY_INIT: - case DATA_TO_ANY_INIT: - case TEXTDATA_TO_ANY_EXIT: - case XXXINIT_TO_SOME_INIT: - case XXXEXIT_TO_SOME_EXIT: - case ANY_INIT_TO_ANY_EXIT: - case ANY_EXIT_TO_ANY_INIT: - warn("%s: section mismatch in reference: %s (section: %s) -> %s (section: %s)\n", - modname, fromsym, fromsec, tosym, tosec); - break; - case EXTABLE_TO_NON_TEXT: - warn("%s(%s+0x%lx): Section mismatch in reference to the %s:%s\n", - modname, fromsec, (long)faddr, tosec, tosym); + warn("%s: section mismatch in reference: %s (section: %s) -> %s (section: %s)\n", + modname, fromsym, fromsec, tosym, tosec); + if (mismatch->mismatch == EXTABLE_TO_NON_TEXT) { if (match(tosec, mismatch->bad_tosec)) fatal("The relocation at %s+0x%lx references\n" "section \"%s\" which is black-listed.\n" @@ -1169,7 +1158,6 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf, else error("%s+0x%lx references non-executable section '%s'\n", fromsec, (long)faddr, tosec); - break; } }