From nobody Tue Apr 8 13:41:08 2025 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 4ZX6fs6VFhz5sQJF; Tue, 08 Apr 2025 13:41:09 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZX6fs0VBBz3DXH; Tue, 08 Apr 2025 13:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119669; 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=7yZlf+7wti08veKSJjIftr05bib3oDTy5YzGvIODnH0=; b=CqI1iVodrMppeXYqy30953V9+whD9b9vDpTSmjlqCPbbn0QZ4J+xgtbKMSFxvMt1377+rO kIkG4ex4ChP4ZWzKslKuqqqjcKQUbhdwlvS6aU9WAe2YJkhBEd+SgsA7DFKAdL5IdBOCDI X7svMmn2AMmaXbnh9q9FJbIT3FKrrzio2vpkFgiDOUhyA+hJMmlLSrkEM5qac1S0Sersvu huYYh8xGsJWCoa0BBfGjG5sNLNmnDlDAwaYoF/ZLllkbPKKewxFOGHj1lFLQMOlwImYQrU IDeQpyd+tnZfC5RMouLjLYArfpT/96Rn5Pn5Obe1NemyXGHnSQOvcVqvaW/v1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119669; a=rsa-sha256; cv=none; b=c1Kc2jS/3PWbxZ8o08JUr9rFATb5ThThaoi2tHSOx8APeBgxsXz88m/bG6smiQrPL3oF8a VI2IUXtcBMrZmMm9svJ5dYeX3VoyGX8AFRBtLDaNNFWLbJnNqWpCqnK2XoicD5BtLCLjqd s4vD2DCVVwaqoAkuxTnMOo8ybxd4Eg4V/wtMZVpSaTF8d/oTIZTWaq2d32QrSDOCu7ReB/ Vlo6IFSEdL+6x4NIxfz/TK9jbAdSvDhq/lzEWodSgoWA0mubf58mXwh1tsoZDUs0JSa4ch EgnJ6a74PP8gSi2lFf6cExsQk2bIA5IoGn13KbwMgWig6qJhZFcDajiYPgzVtg== 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=1744119669; 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=7yZlf+7wti08veKSJjIftr05bib3oDTy5YzGvIODnH0=; b=bbEq1paySUTAv4MN9c+LPKAczuF48y7MOTAfIZ86mHQ7sz++F0X5aR0emJowHAAQ0J7jQz vaN0Qv+aAPRODsmi7895kZQfPxSWpYPoMsmxLK+OUfMAxdTQixGuFGejrB6tP6EF27/8gR q8ZpEBI7Nh277jLHO5qNIRK5CKOpeFMXmanO2pOtFZXGtAod6FCuwdIsLzmaKsCauFx/Q1 AKeVMlbrMg2fxZrPIAGU/A1RyNNef5PiyTLy2qMfqSGiduQDJbsKUFFvNybciySFPSE232 MPiTCJ+57w6Y1YmRrqyi6lOnKFoUfN67aFFeCVoTzZpVDWbhzOs1++27hUPgjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZX6fs019mzZxR; Tue, 08 Apr 2025 13:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 538Df8xd033571; Tue, 8 Apr 2025 13:41:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538Df827033568; Tue, 8 Apr 2025 13:41:08 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:41:08 GMT Message-Id: <202504081341.538Df827033568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 7b0350b376c0 - stable/14 - libsa: smbios: Use 64-bit entry point if table below 4GB on non-EFI boot 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b0350b376c073c22e6dd2f129313c6f486421a4 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7b0350b376c073c22e6dd2f129313c6f486421a4 commit 7b0350b376c073c22e6dd2f129313c6f486421a4 Author: Olivier Certner AuthorDate: 2025-03-03 21:10:25 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:28 +0000 libsa: smbios: Use 64-bit entry point if table below 4GB on non-EFI boot On amd64, boot blocks and the non-EFI loader are 32-bit compiled as clients of BTX, so cannot access addresses beyond 4GB. However, the 64-bit entry point may refer to a structure table below 4GB, which we want to use if the BIOS does not provide a 32-bit entry point. The situation is similar for powerpc64. Consequently, always compile-in support for the 64-bit entry point, but ensure that it is not selected on 32-bit-compiled boot loaders if the structure table it points to grows beyond 4GB (as it is then not accessible). PR: 284460 Reviewed by: markj MFC after: 2 weeks Relnotes: yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49288 (cherry picked from commit 7f005c6699f429c2f762b4dd8fb39b3bcf5378e2) --- stand/libsa/smbios.c | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index 2477c0ccf2d3..e0531eab01da 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -29,11 +29,6 @@ #define PTOV(x) ptov(x) -/* Only enable 64-bit entry point if it makes sense */ -#if __SIZEOF_POINTER__ > 4 -#define SMBIOS_64BIT_EP 1 -#endif - /* * Detect SMBIOS and export information about the SMBIOS into the * environment. @@ -145,9 +140,7 @@ SMBIOS_GET64(const caddr_t base, int off) struct smbios_attr { int probed; -#ifdef SMBIOS_64BIT_EP int is_64bit_ep; -#endif caddr_t addr; size_t length; size_t count; @@ -184,7 +177,6 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len) /* Search on 16-byte boundaries. */ for (cp = addr; cp < addr + len; cp += SMBIOS_STEP) { -#ifdef SMBIOS_64BIT_EP /* v3.0, 64-bit Entry point */ if (strncmp(cp, SMBIOS3_SIG, sizeof(SMBIOS3_SIG) - 1) == 0 && /* @@ -195,10 +187,19 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len) */ SMBIOS_GET8(cp, 0x0a) != 0 && smbios_checksum(cp, SMBIOS_GET8(cp, 0x06)) == 0) { +#ifdef __ILP32__ + uint64_t end_addr; + + end_addr = SMBIOS_GET64(cp, 0x10) + /* Start address. */ + SMBIOS_GET32(cp, 0x0c); /* Maximum size. */ + /* Is the table (or part of it) located above 4G? */ + if (end_addr >= (uint64_t)1 << 32) + /* Can't access it with 32-bit addressing. */ + continue; +#endif smbios.is_64bit_ep = 1; return (cp); } -#endif /* v2.1, 32-bit Entry point */ if (strncmp(cp, SMBIOS_SIG, sizeof(SMBIOS_SIG) - 1) == 0 && @@ -207,13 +208,9 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len) smbios_checksum(cp + 0x10, 0x0f) == 0) { /* * Note that we saw this entry point, but don't return - * it right now on SMBIOS_64BIT_EP as we favor the 64-bit - * one if present. + * it right now as we favor the 64-bit one if present. */ v2_p = cp; -#ifndef SMBIOS_64BIT_EP - break; -#endif } } return (v2_p); @@ -586,7 +583,6 @@ smbios_probe(const caddr_t addr) if (saddr == NULL) return; -#ifdef SMBIOS_64BIT_EP if (smbios.is_64bit_ep) { /* Structure Table Length */ smbios.length = SMBIOS_GET32(saddr, 0x0c); @@ -601,9 +597,7 @@ smbios_probe(const caddr_t addr) smbios.ver = 0; maj_off = 0x07; min_off = 0x08; - } else -#endif - { + } else { /* Structure Table Length */ smbios.length = SMBIOS_GET16(saddr, 0x16); /* Structure Table Address */ @@ -661,11 +655,8 @@ smbios_detect(const caddr_t addr) dmi < smbios.addr + smbios.length && i < smbios.count; i++) dmi = smbios_parse_table(dmi); - setenv("smbios.entry_point_type", -#ifdef SMBIOS_64BIT_EP - smbios.is_64bit_ep ? "v3 (64-bit)" : -#endif - "v2.1 (32-bit)", 1); + setenv("smbios.entry_point_type", smbios.is_64bit_ep ? + "v3 (64-bit)" : "v2.1 (32-bit)", 1); sprintf(buf, "%d.%d", smbios.major, smbios.minor); setenv("smbios.version", buf, 1); if (smbios.enabled_memory > 0 || smbios.old_enabled_memory > 0) {