From patchwork Sun Oct 1 05:47:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 147035 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp718564vqb; Sat, 30 Sep 2023 22:47:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGAZt/p2/l8OCG5DjJyeCPxLuY8bw9ID7WNYijPlUwXECyEprE/4QJHttwoK8FQrqdCo24x X-Received: by 2002:a05:622a:134c:b0:416:5ead:6171 with SMTP id w12-20020a05622a134c00b004165ead6171mr10520286qtk.47.1696139272844; Sat, 30 Sep 2023 22:47:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696139272; cv=none; d=google.com; s=arc-20160816; b=xaLsV4A49uD5NL81oTQuRlM0RS65fkAsPlhibzbJbnbyWogkCZqDBSNDzJ2utnGmMF t/t7SOJil/D8fhpA2jnTzpZ5A4e7my5SyrTHzqA9Vbz+A6j5pCMssHtmlkHblJO6w1jA GE2bpOXNdpP24I9Hk5OpljlObmD3pSpNvKyeS3r5ofy2Z8SiPrEZCDRCiXgbAlUmFQTn 6VZa16Xd0IaYtApoCoPIaCpPwaj/XlK885WVcFpPapxDh7FdSvg2McKOTdVa1vzpzbPT 5FjqCzvKro8SHzt6PGrTsZK89qhv4WrKvRgDqwSxEytAWUdFP9+ogVHkhpOfzmxzgqIH 1aUA== 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=alh89S7uK8mbDUkjukvL9cQBz9O9ydD5mm+01OzxrVo=; fh=wKrPioF+0wPaktGqmf0aQvlk8PY4Pc32rTAsBSAiP8I=; b=G3lK5YgKDDxUjaAQzoAl0mh4VN5ZeUDMVzZ0AZgFinjUDyojIUEdPfOxmrmGSffAlk 8SzCSFS6l100u1Qn0yjgkxwImUI1TcnLH7nDMrco1eqXiFIIYHGkQgX39mPQ4y3Mp0u6 2Ia+pvRk9WShKvGW4Xo3x7GKbKVFWte55a4N5UMkkA8BuX3lbaG/f+l2Fyy3wK4s2F8d 43EldlNBEl6s4vL9Yj1cju6CEQQ2LGD5EAC3QixPWHMjwuJXDnRw6CDpufG8esK2QCy0 LY9bk7u8Gr+rS2oN8G0nvAXYTa3NbeN67ZcFEWl1MZdl1B6lcCKufCqxsSv5U7c+MJ1y SL8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="hmQ/1Yoo"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id z17-20020a170903019100b001c6138350b4si19029899plg.431.2023.09.30.22.47.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Sep 2023 22:47:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="hmQ/1Yoo"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2A2EE807592B; Sat, 30 Sep 2023 22:47:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234320AbjJAFru (ORCPT + 18 others); Sun, 1 Oct 2023 01:47:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229455AbjJAFrr (ORCPT ); Sun, 1 Oct 2023 01:47:47 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA651C6; Sat, 30 Sep 2023 22:47:44 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF09CC433C8; Sun, 1 Oct 2023 05:47:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696139264; bh=88KKkoAPRDO23nRFoIefVOhrftazGGYp+0IoLxHUnW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hmQ/1YooZLswpEixBNq286dO6GF8BLA9gFrJZfBsiUw8SWMJTOYaDd7K1wHFVpGDf 0wJrqILpcxhWPakn1KOvo6ewMQ4Q7F9XMdENYBmEO+b/mFM6qFcEj8k9DXSIsv02Js WLoejLmTkxMnFQDAZsL6d89Ku2Tn4yzLGxpngKraRf5gXurOnIOJqC3b+Ynf1E4FNs pX4SwLayvaVM2pzHJgml05npjdbicunDFhv+b8sTxNhP1FgpinUPcVNkVRbKoPkBzg /rqAE/uovPfnn8GzT4dUbEEnfdEg/LhouUleLGO7ZelUVqfqfgyhdEO4fqjjmvr6kX Ns/lX/DRhhA9Q== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 2/2] modpost: factor out the common boilerplate of section_rel(a) Date: Sun, 1 Oct 2023 14:47:36 +0900 Message-Id: <20231001054736.1586001-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231001054736.1586001-1-masahiroy@kernel.org> References: <20231001054736.1586001-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 30 Sep 2023 22:47:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778530934418178559 X-GMAIL-MSGID: 1778530934418178559 The first few lines of section_rel() and section_rela() are the same. They both retrieve the index of the section to which the relocaton applies, and skip known-good sections. This common code should be moved to check_sec_ref(). Avoid ugly casts when computing 'start' and 'stop', and also make the Elf_Rel and Elf_Rela pointers const. Signed-off-by: Masahiro Yamada Reviewed-by: Nick Desaulniers --- scripts/mod/modpost.c | 50 ++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 15d78fe152ac..0e18fe617ed1 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1425,17 +1425,10 @@ static void get_rel_type_and_sym(struct elf_info *elf, uint64_t r_info, } static void section_rela(struct module *mod, struct elf_info *elf, - Elf_Shdr *sechdr) + unsigned int fsecndx, const char *fromsec, + const Elf_Rela *start, const Elf_Rela *stop) { - Elf_Rela *rela; - unsigned int fsecndx = sechdr->sh_info; - const char *fromsec = sec_name(elf, fsecndx); - Elf_Rela *start = (void *)elf->hdr + sechdr->sh_offset; - Elf_Rela *stop = (void *)start + sechdr->sh_size; - - /* if from section (name) is know good then skip it */ - if (match(fromsec, section_white_list)) - return; + const Elf_Rela *rela; for (rela = start; rela < stop; rela++) { Elf_Addr taddr, r_offset; @@ -1465,17 +1458,10 @@ static void section_rela(struct module *mod, struct elf_info *elf, } static void section_rel(struct module *mod, struct elf_info *elf, - Elf_Shdr *sechdr) + unsigned int fsecndx, const char *fromsec, + const Elf_Rel *start, const Elf_Rel *stop) { - Elf_Rel *rel; - unsigned int fsecndx = sechdr->sh_info; - const char *fromsec = sec_name(elf, fsecndx); - Elf_Rel *start = (void *)elf->hdr + sechdr->sh_offset; - Elf_Rel *stop = (void *)start + sechdr->sh_size; - - /* if from section (name) is know good then skip it */ - if (match(fromsec, section_white_list)) - return; + const Elf_Rel *rel; for (rel = start; rel < stop; rel++) { Elf_Sym *tsym; @@ -1530,10 +1516,26 @@ static void check_sec_ref(struct module *mod, struct elf_info *elf) check_section(mod->name, elf, sechdr); /* We want to process only relocation sections and not .init */ - if (sechdr->sh_type == SHT_RELA) - section_rela(mod, elf, sechdr); - else if (sechdr->sh_type == SHT_REL) - section_rel(mod, elf, sechdr); + if (sechdr->sh_type == SHT_REL || sechdr->sh_type == SHT_RELA) { + /* section to which the relocation applies */ + unsigned int secndx = sechdr->sh_info; + const char *secname = sec_name(elf, secndx); + const void *start, *stop; + + /* If the section is known good, skip it */ + if (match(secname, section_white_list)) + continue; + + start = sym_get_data_by_offset(elf, i, 0); + stop = start + sechdr->sh_size; + + if (sechdr->sh_type == SHT_RELA) + section_rela(mod, elf, secndx, secname, + start, stop); + else + section_rel(mod, elf, secndx, secname, + start, stop); + } } }