From patchwork Sat Jan 28 17:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49881 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1438498wrn; Sat, 28 Jan 2023 09:41:06 -0800 (PST) X-Google-Smtp-Source: AK7set8HJYon0XAKHWHBdNrqqdAhxBf3bQuM+A5NknDQSU8zmYraSa0oEaUKcBAfqSPNslGYGDP+ X-Received: by 2002:a05:6a20:1454:b0:bc:c0b9:e0b3 with SMTP id a20-20020a056a20145400b000bcc0b9e0b3mr754224pzi.28.1674927666608; Sat, 28 Jan 2023 09:41:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927666; cv=none; d=google.com; s=arc-20160816; b=HRP8ar/2C+jdkwJ2H+KjAezTnBC+edTrIvo9czvr9A1D+edw6pTmdmr5E0EUWbNACg 6p91HMijZ2o2uxE1VQfDApuHxNG6CTyWT6hnhgtYxX+qGvr9T8MBpqWh+6NUvwxbOpfJ tCftA4RlZYkJ/0dIJb/VefBEWAb2g4MrA9FM2GvMjIhpYDO4lVNzycYOtS3Si83m3mIP aUGbQX+X4C0yfCuzKxhRfqFaqGBSIDENepxhQoQhKsNgKw4SbiwSHDrQSB7CBruiaQUt KODA7d4XNNPtLfWo1beaJk7G51SNW1hRWGqqVG10JLkRwsudIZWfiYFiMS9/p8odTVPA GQmw== 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=H6sQDj4400ruszpM2FDtNnN2i7UQausnIiljs0xsLps=; b=NMiMIEl97hcdEBYB+JXFEdcGc9LOwmmtpWr6hiWJTHECdwkTfFwH0KO62Q9mZ7WJF/ CNAV/0eRMR2Q4KssC3Z1lzAb8ke5GXnFkQtbPG3T3g6PFnlxni9CjPpYmEc4ORcDziaf MhJlN5NkR6H3n4eS8ckJT5225jEg77w4uHC7vnSIC5RtvVXDpbTUrsS7iftnhyMcCgj2 Oee6YjhnPZXGDExR82/nwENMgW1qvyMO1hJI8EC1601nq+ajXVwB7DmIIKSQpZVHjnkg ncLPYSfjLx8vELjMa8t3ecTil9i4gv41QKAdemV8Ms4G+5Wm1P4ol0WDPYgvHWCyqrpb YujA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D2ZxPGo2; 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 v190-20020a622fc7000000b0058e08bde1eesi7697436pfv.144.2023.01.28.09.40.54; Sat, 28 Jan 2023 09:41:06 -0800 (PST) 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=D2ZxPGo2; 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 S234408AbjA1RkV (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234767AbjA1RkS (ORCPT ); Sat, 28 Jan 2023 12:40:18 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7922229E07; Sat, 28 Jan 2023 09:39:46 -0800 (PST) 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 9550360BAA; Sat, 28 Jan 2023 17:39:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7BAA6C4339B; Sat, 28 Jan 2023 17:39:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927584; bh=W6NwJoOq7fauyX3aaR9QaMpoEnd1BqGf85SXKRegHDA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D2ZxPGo26zm2P5Tb+gL6cWHX2PYGm+SMKh0gbzM9WpswULEijQBnsqxEZPRV2dSe5 ANQgIshYHzrzHUvdlX3y3e2+sRBYX4RRcQbhMr9lnUMuZ72wmPOQ9EH1bY3G2ugfQu gbOOTrxfXtktVGPUrjMwe6wQS+XzDFcBSWCYeONW/AKgdnGD/LNS8fka9iCd/j5X0Y vPjCu+T3rQSweeG9d678AQ9p2iZINKAqmHtR8TabklCDjUve5n2eYIFSEVUwu22izt 5dX5ysg9enyznja3ybGMf9CZl/XsxQXMdsEdpfEZQ2pnClwfQILiJBwPdOZ8C88F1F ae4H1/9u4CT6g== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v5 07/13] riscv: module: move find_section to module.h Date: Sun, 29 Jan 2023 01:28:50 +0800 Message-Id: <20230128172856.3814-8-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@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 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?1756288952647483530?= X-GMAIL-MSGID: =?utf-8?q?1756288952647483530?= Move find_section() to module.h so that the implementation can be shared by the alternatives code. This will allow us to use alternatives in the vdso. Reviewed-by: Conor Dooley Reviewed-by: Andrew Jones Signed-off-by: Jisheng Zhang --- arch/riscv/include/asm/module.h | 16 ++++++++++++++++ arch/riscv/kernel/module.c | 15 --------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/arch/riscv/include/asm/module.h b/arch/riscv/include/asm/module.h index 76aa96a9fc08..0f3baaa6a9a8 100644 --- a/arch/riscv/include/asm/module.h +++ b/arch/riscv/include/asm/module.h @@ -5,6 +5,7 @@ #define _ASM_RISCV_MODULE_H #include +#include struct module; unsigned long module_emit_got_entry(struct module *mod, unsigned long val); @@ -111,4 +112,19 @@ static inline struct plt_entry *get_plt_entry(unsigned long val, #endif /* CONFIG_MODULE_SECTIONS */ +static inline const Elf_Shdr *find_section(const Elf_Ehdr *hdr, + const Elf_Shdr *sechdrs, + const char *name) +{ + const Elf_Shdr *s, *se; + const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; + + for (s = sechdrs, se = sechdrs + hdr->e_shnum; s < se; s++) { + if (strcmp(name, secstrs + s->sh_name) == 0) + return s; + } + + return NULL; +} + #endif /* _ASM_RISCV_MODULE_H */ diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c index 91fe16bfaa07..76f4b9c2ec5b 100644 --- a/arch/riscv/kernel/module.c +++ b/arch/riscv/kernel/module.c @@ -429,21 +429,6 @@ void *module_alloc(unsigned long size) } #endif -static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, - const Elf_Shdr *sechdrs, - const char *name) -{ - const Elf_Shdr *s, *se; - const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; - - for (s = sechdrs, se = sechdrs + hdr->e_shnum; s < se; s++) { - if (strcmp(name, secstrs + s->sh_name) == 0) - return s; - } - - return NULL; -} - int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, struct module *me)