From patchwork Sun Jun 11 15:50:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 106121 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2106415vqr; Sun, 11 Jun 2023 09:02:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7vCEGZ16gzP9o+dfmzg2dCHkZhvPI/9QXr+kzQDitUZkX1/wdyX1spmuS87Flnfwoo2lGN X-Received: by 2002:a05:6a20:6e20:b0:106:4197:b7ff with SMTP id go32-20020a056a206e2000b001064197b7ffmr5436241pzb.30.1686499331078; Sun, 11 Jun 2023 09:02:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686499331; cv=none; d=google.com; s=arc-20160816; b=DZPdQVw6Jr/OtCXs3P8xSZwvnS19lSUqE2pir/iGZyTGOjOn2gupo+35HXWclX/IEh 76qH4ObIvhMM5mlumq31A3dj7uLDg35zyrO1de+yF5CaHgwoGqXfLgcIb+an+goGdybv /JpP7QvTsYXSWxPlNAB8ofPvH4qNBmxzmh42bHT5QtefnRCMf9PbPHq8VBM/h4YCjbJx FB13wz1yYgOpFQqkl1TMoVsok0I8LdtHrrxjYHn0+AA1CMKNHI4vRK3eTOjEn7T2xGja e7hRzWneQGrfjHTtXWzy2SkhCBN0iJccvKXI4YYYKiZELJ732iEjDQ/iLtZOdY6hKpxb 8kig== 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=AcGpK71WffxNY75eBdtzYmMCi0kcwoP8Ub3spUakAeE=; b=noB2wvgst0JXBeHLHhwUW3dsT6rRpDAhgdr3fHeR+18k+UE8Q/VNDmBfJYUywsu0sK 1zC5QE8tdhD8mVK3bVHVT5c39XrmaE5juzCPAGJjtj5nn/M/NQYKbFHEIPkPAHsJCtPC IetJw9/PxL80w1FcBx4983qZ8QOovWCAetlUW3gnPIch4Y2Ijrecy1fwcByc5rLl3y/e gviBvBvwwxb9aPD5gCncddUTvUX7sxBHaKaJYj53lO1WJagXfGQSmBQkpdpJjyChHQNl v60AHw++z/C6fJ0CulZmwLCEBzbKxAy1htuaSMFLO4OpNDivaX4LkBeFHmz/gqK52g6m 6cyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="b1F/u7Y0"; 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 d10-20020a63734a000000b00544b88dda2csi5463959pgn.661.2023.06.11.09.01.58; Sun, 11 Jun 2023 09:02:11 -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="b1F/u7Y0"; 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 S233811AbjFKPv4 (ORCPT + 99 others); Sun, 11 Jun 2023 11:51:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233819AbjFKPvq (ORCPT ); Sun, 11 Jun 2023 11:51:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40C96270B; Sun, 11 Jun 2023 08:51:27 -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 5C96561C4F; Sun, 11 Jun 2023 15:51:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 784EEC4339B; Sun, 11 Jun 2023 15:51:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686498685; bh=YZ0l1FqEA6ILtt6BXeqxjkYBaJ3udRyTWz128FAD7M4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b1F/u7Y0bKzhfFMteHGFRkUUrEA2ZknlMBByBZ2Doqo6c9f3LcwVC6uB/5uRN3IU/ ChP+07D283F+4zi/EQfD6nFug/GVCCrics02TBNw+obuU2jbIdFsKAfwmZRbQQA3ub j1x6r8EI0Z3uBc6wuqihdUg4XO7MGUmSuA9iEptxiF9XK4mM0Xo41wAG/kIQfgwOGn m0QpeK4HA/fMHwav6RsVcRmxSuWxW+EwPmYfCNgqXYzuFPDiRjxF17VxT/ThFZaYK2 3b2bC0OM6JBRVtknzjI2AJUmKkQ25tx8xbsZLxgnI2HmbD00Gr3kNSvx4qGZDiF0gL jnA3Jp5Yfh6xA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-snps-arc@lists.infradead.org, Masahiro Yamada Subject: [PATCH v9 09/11] modpost: merge two similar section mismatch warnings Date: Mon, 12 Jun 2023 00:50:58 +0900 Message-Id: <20230611155100.2553804-10-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230611155100.2553804-1-masahiroy@kernel.org> References: <20230611155100.2553804-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1768422722069803226?= X-GMAIL-MSGID: =?utf-8?q?1768422722069803226?= 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 50d950e904a4..0adda14451fa 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1147,21 +1147,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" @@ -1181,7 +1170,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; } }