From patchwork Tue Mar 25 12:15:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 14028530 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E991C36005 for ; Tue, 25 Mar 2025 12:20:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB9C6280011; Tue, 25 Mar 2025 08:20:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D683428000C; Tue, 25 Mar 2025 08:20:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C0B48280011; Tue, 25 Mar 2025 08:20:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A243E28000C for ; Tue, 25 Mar 2025 08:20:07 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 75A311C69DB for ; Tue, 25 Mar 2025 12:20:09 +0000 (UTC) X-FDA: 83259980538.29.9A45EF6 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf15.hostedemail.com (Postfix) with ESMTP id 9CF41A0027 for ; Tue, 25 Mar 2025 12:20:07 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=SLdkNpDM; spf=pass (imf15.hostedemail.com: domain of guoren@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=guoren@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742905207; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kXeXs52v1AryQtoRmzECQCeaTW6GG78NsBIKfAYgKNY=; b=ilbbnj+0chaTCaulu1WvY0bjeMGgwubl8IBUeKRVxvS3aAhlQSF3H/koh4J2Nh+Tg0jnsW 3dV43v4L6GqcpfmexCUSwSlyZlvAdTuCuMbjdXqWr23FVNLgUO6IUcZWQpryJIO+7u/GhD 3MyeaGjGPPQNF5DKksdPyBxGEndoNCA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742905207; a=rsa-sha256; cv=none; b=RaC6bcfrGEPqS+Nd58ZfQRadvjrgy9d2552Z9V7hHp/vkuz9lvKPzIKBvl8QzznCevq7fE c+wyt62BdzBSKhA4/VT00vFjfdUAldWgRhTPzxT152njHWAuAUIeS15w2/V/D+NqT3rNjW +fcatoYGhObdFCfyqKlounLw9/+HAYg= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=SLdkNpDM; spf=pass (imf15.hostedemail.com: domain of guoren@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=guoren@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 5C0F443650; Tue, 25 Mar 2025 12:20:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4631C4CEED; Tue, 25 Mar 2025 12:19:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742905206; bh=S5onwW8Rhyiou8sUliJC71k2++Mi5WmKeWwnQHNXJR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SLdkNpDMElfs6JtH93HL2qjB8ooc8njsv/pKcwCApdLyBmrRvX5jPuX625CrCL3KO LLg2i7GO2jiDdmvOrZJHbXmmZ//hxLsMMV2R487NeFcTSsmqjUedkLmuzv7hLlERU6 kiuccu5qk3IkbjYpbkj/s/pT/RPFgjJK5adv7y6A6BEEgO8BBTscDUHE/YjxJcfAd0 ppo9vCiFRV5Tz05przlyIDyBiWv9hSmTIygPLI/aoXi+ZELjeBp9iCTv0eEu9tP+Tz vHMjNE6CxPdHgma3URda2HPkGEEkWTjPcCLQMXFENwL53LrB+OGroHLD8Txjexf9jd 7/iF+KyP6XFLQ== From: guoren@kernel.org To: arnd@arndb.de, gregkh@linuxfoundation.org, torvalds@linux-foundation.org, paul.walmsley@sifive.com, palmer@dabbelt.com, anup@brainfault.org, atishp@atishpatra.org, oleg@redhat.com, kees@kernel.org, tglx@linutronix.de, will@kernel.org, mark.rutland@arm.com, brauner@kernel.org, akpm@linux-foundation.org, rostedt@goodmis.org, edumazet@google.com, unicorn_wang@outlook.com, inochiama@outlook.com, gaohan@iscas.ac.cn, shihua@iscas.ac.cn, jiawei@iscas.ac.cn, wuwei2016@iscas.ac.cn, drew@pdp7.com, prabhakar.mahadev-lad.rj@bp.renesas.com, ctsai390@andestech.com, wefu@redhat.com, kuba@kernel.org, pabeni@redhat.com, josef@toxicpanda.com, dsterba@suse.com, mingo@redhat.com, peterz@infradead.org, boqun.feng@gmail.com, guoren@kernel.org, xiao.w.wang@intel.com, qingfang.deng@siflower.com.cn, leobras@redhat.com, jszhang@kernel.org, conor.dooley@microchip.com, samuel.holland@sifive.com, yongxuan.wang@sifive.com, luxu.kernel@bytedance.com, david@redhat.com, ruanjinjie@huawei.com, cuiyunhui@bytedance.com, wangkefeng.wang@huawei.com, qiaozhe@iscas.ac.cn Cc: ardb@kernel.org, ast@kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-mm@kvack.org, linux-crypto@vger.kernel.org, bpf@vger.kernel.org, linux-input@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-serial@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, maple-tree@lists.infradead.org, linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-atm-general@lists.sourceforge.net, linux-btrfs@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-nfs@vger.kernel.org, linux-sctp@vger.kernel.org, linux-usb@vger.kernel.org, linux-media@vger.kernel.org Subject: [RFC PATCH V3 14/43] rv64ilp32_abi: riscv: Adapt kernel module code Date: Tue, 25 Mar 2025 08:15:55 -0400 Message-Id: <20250325121624.523258-15-guoren@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250325121624.523258-1-guoren@kernel.org> References: <20250325121624.523258-1-guoren@kernel.org> MIME-Version: 1.0 X-Stat-Signature: i5n4k8fk3jzrxtjg8g8zugkjoridnt3w X-Rspam-User: X-Rspamd-Queue-Id: 9CF41A0027 X-Rspamd-Server: rspam08 X-HE-Tag: 1742905207-277624 X-HE-Meta: U2FsdGVkX19R0lnGDkGEzSkPJpGN+DDyDB/IEiEiKwZH44rEKF/8tNjBfKZqD1tT8Nq3OMgQ+Qj2mgV928lpgK5vn7HTXp8P9gcofYd3EVuJIWKNJe8cyXwjHnlHxXD49GutsNlVh+3NQKrKpARbOx1txO2XhPostZWh7tJLxlk1S/QAO9erB0v9FKwOjyhlHWyyuUQukEQ4cLSbuCL9eXC162DvE9pMSKxODhd/koywUnMaodK4V8freyzbOHqpngXM+jXSes4IY+BxRiRjSRKvmU0sbSNKkkqCSS4Eu5hY4cP1zsHvjPaodYwpQv3TdomXdMzPtJZzUE7lPTXJHXMHBPW7ial390Eq7tBbO5qVUS6W3B4/TyfEyGUIGLRFThc1ZTFuMf1KEK2sq0VKhAM5ZUzO2GlAP0idAyQYVFm+v3S0ZzAoEMLMhA+jXeBFIh0XmWNNvpPXlXfnqfoYPmMTc2mYdA+tN5sXTG0pbuNIK7QZO8DxBGK1I6+1v6dkxhHmoS1lhpHV+a3mg1AzNL8aI1Ht6BAlQgHl0Kf21NP+s+OJ1a4CRyEhdJ8MOjiSq1jKj7XL8Mo5DGYMkoUlurhogk69QnsT7cKLG6ErmSGl6yOYp7z7buPA6soTY+99iuP6wJuKBgTjK4NSIhjV9nfOebQSxZwC2W1NZ+jf6lUJf/1JH4Zik2eZtswuBl5/yDUeFms2jKR/PiheF4n6vxVIUNinA4PFa4WHiVvPD5sigUhfgle/4ui5d7iyNkgG7UmiO5KqYhFhZmC+NKku+nq9++3fotHYdi67IPF6gSyBmHmA1kzVCmulC8hKHpVowML9UilwB25CS1uV+q4UAohPCLpq6KsVWrG9zfv5d+AuMLzddvcZHMalkO+J/fqhTHuRMNkXKJ8jlawtDhEVn/sqRLCslGL5c4vQ2JjdM3lbpJlBkyK9bbFUKHKivYlRUhGKOeyICS8gmuhnaGG KM8mg8R+ UYXeUYHixdWJ0rDUBrZGiHM2oD/JfkMPzFXUP1TFXAzkVLMpSJWZGUkUemwkoLxUXI2hXVxn0AvPzIbdFT0OC1qkK1ecTrH0QRPb+S3aWCjng0J4dDidxf8taKebbWpIkqYIdnOnh8T2DTR88upXp1zYHQrfL/XrPvfV0MOEUy6ol/uIMpwjIlmrhIM57WzXYEWrHmbyB9MOfK3sooz7Cb+MHghAGkzjeJFPx+kEDwjeM1cfak2hqztQuplGDPnVfCy3RMAZ1TTOxCdNpns4qEbGFYVc5t9BE4wb3kBLcKPV3yn206ENJ9ujcfjUZiE1Del+yWUEEsH64bWqAMiKO/8vvsqkQmx42ZRUA X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Guo Ren (Alibaba DAMO Academy)" Because riscv_insn_valid_32bit_offset is always true for ILP32, use BITS_PER_LONG instead of CONFIG_64BIT. Signed-off-by: Guo Ren (Alibaba DAMO Academy) --- arch/riscv/kernel/module.c | 2 +- include/asm-generic/module.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c index 47d0ebeec93c..d7360878e618 100644 --- a/arch/riscv/kernel/module.c +++ b/arch/riscv/kernel/module.c @@ -45,7 +45,7 @@ struct relocation_handlers { */ static bool riscv_insn_valid_32bit_offset(ptrdiff_t val) { -#ifdef CONFIG_32BIT +#if BITS_PER_LONG == 32 return true; #else return (-(1L << 31) - (1L << 11)) <= val && val < ((1L << 31) - (1L << 11)); diff --git a/include/asm-generic/module.h b/include/asm-generic/module.h index 98e1541b72b7..f870171b14a8 100644 --- a/include/asm-generic/module.h +++ b/include/asm-generic/module.h @@ -12,7 +12,7 @@ struct mod_arch_specific }; #endif -#ifdef CONFIG_64BIT +#if BITS_PER_LONG == 64 #define Elf_Shdr Elf64_Shdr #define Elf_Phdr Elf64_Phdr #define Elf_Sym Elf64_Sym