From nobody Tue Apr 28 21:45:39 2026 X-Original-To: dev-commits-src-main@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 4g4vBW4Ljzz6c8DS for ; Tue, 28 Apr 2026 21:45:55 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g4vBW0q24z3Tgt for ; Tue, 28 Apr 2026 21:45:55 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; arc=pass ("google.com:s=arc-20240605:i=1"); dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of adrian.chadd@gmail.com designates 209.85.219.44 as permitted sender) smtp.mailfrom=adrian.chadd@gmail.com Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-8a3342d301aso115022236d6.2 for ; Tue, 28 Apr 2026 14:45:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1777412749; cv=none; d=google.com; s=arc-20240605; b=OtsV/x1yrTD3P5AP2urfvMFfp8Ws+bgsFIUIu8FIXqXLStltsn6KexJUM3Lvj+ucmu P2caDd4CJbJCatTRWZlNQnWh2p3bial53TOJ89kBw3Xp5K0oHCyTZ3IeXC2dn0eZB1d2 k4i+59bgUUJEBKRdwnWmXMHFXJkxv2PbzNrgeDPKeBFCOeJKoiItKU/pnxfXKtdMycjx GdLzPp6svXUaWWASXJ3jv5PEC7BPFI6aGwG/SlDpXrllm7HP6LUrv0Tppz0KuhTo6CHZ cXRdGPn/JLhBJQgPGbHb+iOhYhcAKN7UwUXk0TGIGqc7WFmr/FGaudVrpeG5W5PUiwUn eRlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version; bh=MWYAozdVXEoXrtVwJsWFO1aVDp3lRIgXjQrQcn2fdSk=; fh=HKyrwLAkev8QcXoMzYfBDZUjgQAif5BEFTnTGorP+DU=; b=XQl+P9Qj/GzPZo7NAYbm7YD0we6+GeaU6fGhqgb1KBJfF4jEdzkf/n/s7VZh65ZHrg FKPZAOQYRQSflYhMX7z9NfCoJA3iVc3dTT9sML0kdN/a4C+7Iym3fnMpLiD3po3V7D7W DyxkdM6cGVYAQyCik0FnN71VTGFQ0gM4ag5RSzYYst0jzc5vG0G8GWV06V6q3t74rccU jQXxEp50XaFWYIqPhQco3XWftVwrcwYvOL0O5AHnr2sdZcXSOh5GZHR6HxgA06FmAyQr jy1Ug0uyGEdym4TOHVdUqPYCifYckNMOsbGfR2fxqT3KyXRFOwm6haragxN0Rk7E4LZI d8OQ==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777412749; x=1778017549; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=MWYAozdVXEoXrtVwJsWFO1aVDp3lRIgXjQrQcn2fdSk=; b=rQdgN2tS1A1Mna7Qx7PwW+/ishjghmAazD6jQDFEgKpfbW4Tk3cfBD6IErWYAQ9HBh eBUcmk9jjXAdKMyuOH+48U/eKDqfLLgtzLmc5tMk5WIZDGvZB0nQV0vEzYUgB5VY3JI2 /xtZr+iHtYjCkvyCiZow1Ei1IGi1irAxjpee/ZQbbzN2X5rZ07HxkPT6o2aSEDfYl57n ku/dceiwWZZmd9I0ZUdJ/jjCca6J+56vqywYtLlaQLxrdJ/6qAB0XY/+e8EhwoVquowf ofCk0Kx/1mxRvLbCjK+Ru316b3/DxOVg2eGUDcmVlEJw+5GmF/d9d7ilfUq+WJTXjmpq xGVw== X-Forwarded-Encrypted: i=1; AFNElJ/OrftUMVVLA88Irej4IDP3yp7OtnF8tyc4ZrovJZBYiKx+VGNnlY7Gep+A7i8qx3fZIRD027Q75Ei2BlBr3R4/p9ARsg==@freebsd.org X-Gm-Message-State: AOJu0Yw4CkPOMYhYUkhS1lk+dc/MMNZQ9Qg/kDodhrbv3u/3THhaAdCS e+FUrsFfX0cAKHcr/FMvr1SEHnF7Tkue1iWYLZ/dYw8nsb1WGLTVg+ICazN7gpJ8ShAJg2fLaKn UCCf59KHZ+NFj7staXGCS6ids2k1AzUU= X-Gm-Gg: AeBDieuaVSGs9nX9V6+89mqYzAz6cJOhVUkPAid7UExagMSgRiOvxNkR/4uHolwVJi/ q508FOVr/yojW+cnjc7F7lyCbZ5iLbgDETecbP5lk8RvbvSoXNaVZW4mbG3Rn3lKESm82oXsoBX fPOyobs+/FK7lPg3MPv+Et2PHtyx2Wth7OFqIff37UTlmF85YhpwB51QzqlhjA1fhk94MP3RfY+ wpZHn+PWs+CGEnp2jnCr5eSTBI5CBGkq2jgU8B/OCvYKmuHvdFAeXeyRGBVXLkFfxOuFE8WfM9D LWFZjilQF1FhH8qZhm/wrUdSJjc6hmV1MZpakTcSCZM/pEl1raXyoXTdHxIk8CdA8HsE8kOTd0k 0LOAznGpp1OHREjZvxIS9zWm5AiJO5MhOz7qdnw== X-Received: by 2002:a05:6214:230e:b0:8ac:b1ad:3a1f with SMTP id 6a1803df08f44-8b3e308c2a7mr78288346d6.35.1777412749303; Tue, 28 Apr 2026 14:45:49 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <69e37435.3b47e.5048e12@gitrepo.freebsd.org> In-Reply-To: <69e37435.3b47e.5048e12@gitrepo.freebsd.org> From: Adrian Chadd Date: Tue, 28 Apr 2026 14:45:39 -0700 X-Gm-Features: AVHnY4IlW_aD40VE4vTaWwmolx3hUQ7O-hrSZ0WeDcOwLaDZqFftQHB9ZSsfg2U Message-ID: Subject: Re: git: ba94d7574972 - main - stand/common/load_elf: Do kernel module relocations for PPC To: Lexi Winter Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-0.97 / 15.00]; ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=1]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; FORGED_SENDER(0.30)[adrian@freebsd.org,adrianchadd@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; NEURAL_HAM_SHORT(-0.07)[-0.073]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_ONE(0.00)[1]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MISSING_XM_UA(0.00)[]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_HAS_DN(0.00)[]; FROM_NEQ_ENVFROM(0.00)[adrian@freebsd.org,adrianchadd@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.219.44:from]; TAGGED_FROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.219.44:from]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_DKIM_NA(0.00)[] X-Rspamd-Queue-Id: 4g4vBW0q24z3Tgt X-Spamd-Bar: / hi, This somehow breaks booting in pseries VMs in virtualised ppc64 on qemu, both ppc64be and ppc64le. The loader gets through a bunch of kernel loading and then hangs before it jumps into the kernel. -adrian On Sat, 18 Apr 2026 at 05:08, Lexi Winter wrote: > > The branch main has been updated by ivy: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ba94d75749721fae999f756cb227638f9d4398a8 > > commit ba94d75749721fae999f756cb227638f9d4398a8 > Author: Lexi Winter > AuthorDate: 2026-04-18 12:07:10 +0000 > Commit: Lexi Winter > CommitDate: 2026-04-18 12:07:10 +0000 > > stand/common/load_elf: Do kernel module relocations for PPC > > reloc_ptr() skips relocations for the kernel module, because on most > platforms the kernel is ET_EXEC and this is not required. On PPC, > the kernel is ET_DYN and we need to relocate here, otherwise the > module metadata will not be loaded properly and the kernel module > will have an incorrect version, preventing module dependencies from > resolving. > > This fixes loading kernel modules from loader.conf on powerpc. > > Diagnosed by: jrtc27 > Reviewed by: jrtc27, adrian > Sponsored by: https://www.patreon.com/bsdivy > Differential Revision: https://reviews.freebsd.org/D56457 > --- > stand/common/load_elf.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/stand/common/load_elf.c b/stand/common/load_elf.c > index 10131f7ccb88..a6ea60c74b84 100644 > --- a/stand/common/load_elf.c > +++ b/stand/common/load_elf.c > @@ -1282,10 +1282,11 @@ __elfN(reloc_ptr)(struct preloaded_file *mp, elf_file_t ef, > int error; > > /* > - * The kernel is already relocated, but we still want to apply > - * offset adjustments. > + * On most platforms, the kernel is already relocated, but we still > + * want to apply offset adjustments. For PowerPC, the kernel is > + * ET_DYN rather than ET_EXEC and we still need to relocate here. > */ > - if (ef->kernel) > + if (ef->kernel && ef->ehdr->e_type != ET_DYN) > return (EOPNOTSUPP); > > for (n = 0; n < ef->relsz / sizeof(r); n++) { >