From nobody Tue Mar 11 14:04:46 2025 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 4ZBwW36V4tz5qc1c; Tue, 11 Mar 2025 14:04: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBwW25dsLz3qrm; Tue, 11 Mar 2025 14:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741701886; 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=eX//KsE//X5xspjB2lGmHIKYA7QvdZNnWgGEGuZT4J0=; b=l6UC/zSFwWx+nyyQpQC1j+22KP8T33Bs6wmjni8bSLBZ/qQ1c7Myo39EYurJR9AQXXMdpd h1uk02b/DCHmLk6wOyVE6JNxFw4dMQxRd6EOChOT7MTyZPddNWn/BLcLLblyx4qayY1GRv S8zeZ+e1KxBl4LssuaAFnhUbTD9skRG28HudDt++Zs2y5HdlYROrW5QMYYJS5ZoBhs1Yv5 P8YforLSDYQXBP+LeT0LvmVnLZZunuZkz8CD1SjC4W2GheW2OPvcS4N7b21JUTAzdHA7Lg K9Dj0ApDmydVhCAcLmkhA6eDWMTA8QUZq+6T6jDS1zdcRdSO9C51Mr1ZnknY3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741701886; a=rsa-sha256; cv=none; b=HhmJRFiCRmwQgZWqcJQidz41dsc4cZA8pdjieoIl5iooHIwarF8yNz7QnR25xod8yoITqT hjZdMNRRNzG8/KSNBcjafBRyvoUmtG3029dPBTU9AcgbRU3uFuCPB207b9uZvSPg2gQQxp ZhReyjdcTAXGD+wSjbLR7SVzH//jSnO5qblfe3MMYHkCN0vDD49srMDRlz/YqnIHNACa7Z rFT/+MjX7m6cQk7MJlYORVpDo1qijweqJO33Et7RPeOWXeFKJLhE+uh4QXcZOSK26tRfyy l5pDScq/q4cORFv8LWEKqQnhWPQCEcgaZk8YBS8h548ufXUmPZ2ihJhZfJ4tbg== 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=1741701886; 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=eX//KsE//X5xspjB2lGmHIKYA7QvdZNnWgGEGuZT4J0=; b=emxpch+ss6jsN8KC58//pbu71OmsSwmIkqOGFGJHo5PsHbjUHYj1t/nTt4dQvRrerrfC+5 D2H697E/PmopGmTUuOmpmBGI3JvWg71sRGZFoJC0Kp72ebmMRB/xv2pTtyrOPZ9g53AUra L8jYw+FQzMkxAqrI9B7X7Pm0uMDmlfcx27oycToWdqH9WbGEqUKufeW4abZCFSMU7oVmnx AVbzeLZrgTbCdeOnEe+rRCT04hw115WBi1KLN86kDGP6UQ1LpPGQMrZ2yXapjqTMXHCp3N mb4heitIIlmxH6Dgzy9XwNgtKjufm4MctZuRkpQ7YY9aAoqvZEN9EdfLK5e/KA== 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 4ZBwW25DgdzD05; Tue, 11 Mar 2025 14:04:46 +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 52BE4knj028905; Tue, 11 Mar 2025 14:04:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BE4ktR028902; Tue, 11 Mar 2025 14:04:46 GMT (envelope-from git) Date: Tue, 11 Mar 2025 14:04:46 GMT Message-Id: <202503111404.52BE4ktR028902@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: c340797e08d8 - main - libsa: smbios: Allow to run smbios_probe() multiple times 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c340797e08d8c20983ea57de88992f988fe7bb9b Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c340797e08d8c20983ea57de88992f988fe7bb9b commit c340797e08d8c20983ea57de88992f988fe7bb9b Author: Olivier Certner AuthorDate: 2025-03-05 10:24:36 +0000 Commit: Olivier Certner CommitDate: 2025-03-11 13:54:09 +0000 libsa: smbios: Allow to run smbios_probe() multiple times This is in preparation for modifying the EFI loader to favor a v3 table if present. As an impact, caller smbios_match() has been changed so that it only calls smbios_probe() with NULL (non-EFI discovery) once. While here, expand the original XXXRP comment in smbios_match(). Reviewed by: imp, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49289 --- stand/libsa/smbios.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index e0531eab01da..c7d9f1074fad 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -139,7 +139,6 @@ SMBIOS_GET64(const caddr_t base, int off) #define SMBIOS_GETSTR(base) ((base) + SMBIOS_GETLEN(base)) struct smbios_attr { - int probed; int is_64bit_ep; caddr_t addr; size_t length; @@ -573,10 +572,6 @@ smbios_probe(const caddr_t addr) int maj_off; int min_off; - if (smbios.probed) - return; - smbios.probed = 1; - /* Search signatures and validate checksums. */ saddr = smbios_sigsearch(addr ? addr : PTOV(SMBIOS_START), SMBIOS_LENGTH); @@ -684,8 +679,21 @@ int smbios_match(const char* bios_vendor, const char* maker, const char* product) { - /* XXXRP currently, only called from non-EFI. */ - smbios_probe(NULL); + static bool probed = false; + + /* + * This routine is called only from non-EFI loaders on determining the + * amount of usable memory. In particular, it is so before malloc() can + * be used, so before smbios_detect() can be called (as it uses + * setenv()). Consequently, since smbios_probe() is not exported, we + * ensure it has been called beforehand to fetch into the static + * 'smbios' structure the metadata that is to be matched. + */ + if (!probed) { + probed = true; + smbios_probe(NULL); + } + return (smbios_match_str(bios_vendor, smbios.bios_vendor) && smbios_match_str(maker, smbios.maker) && smbios_match_str(product, smbios.product));