From nobody Fri Jul 10 15:43:46 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gxbhz2HYpz6lKDb for ; Fri, 10 Jul 2026 15:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gxbhz1KyYz47kF for ; Fri, 10 Jul 2026 15:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783698227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0Uza98OfsW67VxjzvvjAY68Yoti8SfUJ4o120I9IaA=; b=N9hiIxgi1dltapfurYhITH82Lb5lKOWIAImpsDPK2BM0XTM/RZA6gczHzNfwY7tUyk7PqA FwdE+lM3++9Rrz/ONFPFyfy68vnLKVT33qXMeO6FaZblgwUK/l1Xcm/PLW3lt/3P7MRf2A VYb7xEBlqT/NoyHEHS1kYbUckRWGiQWBbHSGPkB8nGZ4dyNddIgJ7bjuPrjtLsunV1XefR eiDGJ2WWFZLa2GsXzFXCYcP+j1hxnIUsv7ut58nKyXJdA07tbowcAYUVHvEIh2/wNQrVYE eUEPLmLtM6ohhq5qhPIs1cv1Z0k22sTcw/NjrAxKAivxtELvT1tQuT6Ck2N4mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783698227; a=rsa-sha256; cv=none; b=rx86kyUl8Bc0yRzjY+G5n7DEJ5rwAFy2M8zcQRCfuW1LGCzP2lwoMxWYWugR2h4PwCp4c7 nfLpJh6ljA80OG3e3M34nX9AjFA5pzCUd6N5eh4PEr7Nr4UOyL8HzHGq2fQ1q4UMDsUIMI Fh5QMp4r0msa3GtWZ5E7cejnjDgd88eStZ7/RpDYxD1JRNDJeirbQ0+tiYyqas5h06DZay x9u/RqMBFtoIHn5eIZ038Hj+T1Kj/tf+VC2ojuuoQfBb1cBH4G48b3ih3iP711OrA9pR87 TjxSUpxI0qaJOZnNIjoy5losA3nxvrw3kwLR0GdOZqVHIZ8mNaEXYFTJuBSXUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783698227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0Uza98OfsW67VxjzvvjAY68Yoti8SfUJ4o120I9IaA=; b=Pe5lzNffClOsddF9Au/ZtYCuBpG+EjZKEE76WO/0J4y2RAUUHFgOw4BfCBLnQETNtx3xiZ Mj1cZUbWh8K8yBUJQySd9QBoltfcZXs1sHx+iqyT2d/WiYSZdN/5P8vWWF56QDY4r47tfa PwKumEKJQRBCEUbp5nbIbkShfZwA/WZu6BPjBQFnwDgq6Pg9qPzsFag+Lw2rqZ3Q3ok80u ojB5o7xAlUr7i1LxduFESNIEzdSo5hWX/Z61CAS4fL4IRGbQ6Pg2yCrX/YiPC5lNNrObd9 1jQ4JXhbez3bGElc4Z1nkhIkRHohivlgWtSqXme/L11/nxLS9cF1tfFuIvnQqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gxbhy6xk5z120m for ; Fri, 10 Jul 2026 15:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 333ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Jul 2026 15:43:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 08b56f2b173f - stable/15 - riscv: implement kernel ifunc resolution List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 08b56f2b173f20b546056165472eaa075a56cd3d Auto-Submitted: auto-generated Date: Fri, 10 Jul 2026 15:43:46 +0000 Message-Id: <6a511332.333ed.70552058@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=08b56f2b173f20b546056165472eaa075a56cd3d commit 08b56f2b173f20b546056165472eaa075a56cd3d Author: Mitchell Horne AuthorDate: 2026-02-05 16:11:25 +0000 Commit: Mitchell Horne CommitDate: 2026-07-10 15:43:32 +0000 riscv: implement kernel ifunc resolution This completes the set of architectures implementing this feature. Move the calls to sched_instance_select() and link_elf_ireloc() later in initriscv(), after identify_cpu(0). There will be more information available to any resolver functions at this time. Reviewed by: imp, kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55082 (cherry picked from commit cf41d1113377c44be5aad20c2f7ff2c5324ca89f) --- sys/conf/kern.pre.mk | 5 ++--- sys/kern/link_elf.c | 2 -- sys/riscv/include/ifunc.h | 2 -- sys/riscv/riscv/elf_machdep.c | 11 ++++++++--- sys/riscv/riscv/machdep.c | 6 ++++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 455e91f957e7..9a343e5e338c 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -118,10 +118,9 @@ CFLAGS+= ${CONF_CFLAGS} LDFLAGS+= --build-id=sha1 .endif -.if ${MACHINE_CPUARCH} != "riscv" && \ - defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == "" && \ +.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == "" && \ !make(install) -.error amd64/arm/arm64/i386/ppc* kernel requires linker ifunc support +.error kernel requires linker ifunc support .endif .if ${MACHINE_CPUARCH} == "amd64" LDFLAGS+= -z max-page-size=2097152 diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 2a9e2a02709d..4c77f444d961 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -2041,7 +2041,6 @@ link_elf_propagate_vnets(linker_file_t lf) } #endif -#if !defined(__riscv) /* * Use this lookup routine when performing relocations early during boot. * The generic lookup routine depends on kobj, which is not initialized @@ -2104,4 +2103,3 @@ link_elf_late_ireloc(void) relocate_file1(ef, elf_lookup_ifunc, elf_reloc_late, true); } #endif -#endif diff --git a/sys/riscv/include/ifunc.h b/sys/riscv/include/ifunc.h index 0d91014ccce8..0f9747a2aa14 100644 --- a/sys/riscv/include/ifunc.h +++ b/sys/riscv/include/ifunc.h @@ -30,8 +30,6 @@ #ifndef __RISCV_IFUNC_H #define __RISCV_IFUNC_H -#define __DO_NOT_HAVE_SYS_IFUNCS 1 - #define DEFINE_IFUNC(qual, ret_type, name, args) \ static ret_type (*name##_resolver(void))args __used; \ qual ret_type name args __attribute__((ifunc(#name "_resolver"))); \ diff --git a/sys/riscv/riscv/elf_machdep.c b/sys/riscv/riscv/elf_machdep.c index 5bd4af4c15f8..b52050e56a14 100644 --- a/sys/riscv/riscv/elf_machdep.c +++ b/sys/riscv/riscv/elf_machdep.c @@ -271,10 +271,10 @@ reloctype_to_str(int type) } bool -elf_is_ifunc_reloc(Elf_Size r_info __unused) +elf_is_ifunc_reloc(Elf_Size r_info) { - return (false); + return (ELF_R_TYPE(r_info) == R_RISCV_IRELATIVE); } /* @@ -501,7 +501,12 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, (local ? 'l' : 'g'), reloctype_to_str(rtype), before32, *insn32p); break; - + case R_RISCV_IRELATIVE: + addr = relocbase + addend; + val = ((Elf64_Addr (*)(void))addr)(); + if (*where != val) + *where = val; + break; default: printf("kldload: unexpected relocation type %ld, " "symbol index %ld\n", rtype, symidx); diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 366cf1d5703f..3f454bdb1c8f 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -479,8 +479,6 @@ parse_metadata(void) /* Initialize preload_kmdp */ preload_initkmdp(true); - sched_instance_select(); - /* link_elf_ireloc(); */ /* Read the boot metadata */ boothowto = MD_FETCH(preload_kmdp, MODINFOMD_HOWTO, int); @@ -626,6 +624,10 @@ initriscv(struct riscv_bootparams *rvbp) */ identify_cpu(0); + sched_instance_select(); + + link_elf_ireloc(); + /* Do basic tuning, hz etc */ init_param1();