From nobody Tue Apr 8 13:41:10 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 4ZX6fv29T9z5sQJH; Tue, 08 Apr 2025 13:41:11 +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 4ZX6ft1jyyz3DXY; Tue, 08 Apr 2025 13:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119670; 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=Z5u3HobTFLlS6kA4yN1sanL4Gcmmhc6LD2osoUV4tZw=; b=NbpgP52lbn9npMcr6to8Dss/O8NZ55k5XpCBiNw6dnR0sZOglk/NFzK9ObmwfLL0Tzcycs xR4L2MDXq+wKshZwsl0mVwbH4YQjE9ggmaeJIUfsU/Vt1sGjtMmnXqi5gjmdVCHDmvzKAN PIhqmA53MEJ6G+A0U/NTzMn9SNfcioC5Xe1KKKlpXRjEGaRE0Sj4TmOl8AHV+1zCAGGN5p oJsGjCZCeOxmomBP0OfA3JkKJg9OMBMjZQS7Zb2i8za2VnqtYPqhYFEci22WSrwHLWjLIe MoZhnTO9K+jnJw5JxrmdSackJdwB/ZebjvU/6uJKuKpmGasFrbbeZMFvpjHcBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119670; a=rsa-sha256; cv=none; b=YNfsaeatbxvI3xmskvu3MPgM9+N3ebSdLH2uCZUjQ3JOBVJb3qDFIONI2Pis59GYsypOLe rIQHG75j5ceEWm58V2D6zVKmHDsfjNO7JPLKH+4yc07sVPPn3bY4LISvFqEFEZCISA2GbK 74TAkcC4mGoGr/1VcFaV4rfW7RhsRfRo5DTs1JME8JtAb3vsHQlM6PC7qnjkqQW17dCjrj TC5TUT1JRKSvKB/rKy9q8MK3xkhg/GEdhh0VQwtGJzMpnB2kzoY7eHRDQb5q3Iw5ieP120 DUgn7bueT0bx1d9iUPbkMKv0HQjX2+s54viqTu1SBsak4M54UMkX/TecR3BNpw== 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=1744119670; 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=Z5u3HobTFLlS6kA4yN1sanL4Gcmmhc6LD2osoUV4tZw=; b=mWunfM9UI1rWlpL05K/3jm3Ux+QaJy90eV1G+MxflDYhSGNa8rqe+nD7uHAqRTsmtM52jz EzahJo3Sh8zoVlyZUjJdr7AqJSmaQWE6KgEwET5RZrldq2S+nBjlWIXG1nIHuGyx9obYox drV5k2eAIYWYomRwPTtpm9/RYx/fdaUC/dxU21QrAdFxvsirQ79F8Y0os3HcpwIvmL3mDL BHaqGS5pDaIWZ6rB6s+A9rklpOHefw2XQL2O4VK7Vdp1FifUu1l80t8qHMMg6z6UBo0EwZ D+aBg4mtLtsLNTxd6e2Oy1/8xJ//hxU0NOTjNf6Be2GqUNRvefuex94M9IGlZw== 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 4ZX6ft1GlgzbJh; Tue, 08 Apr 2025 13:41:10 +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 538DfA3W034473; Tue, 8 Apr 2025 13:41:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538DfAth034470; Tue, 8 Apr 2025 13:41:10 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:41:10 GMT Message-Id: <202504081341.538DfAth034470@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: 9b8e1558c961 - stable/14 - libsa: smbios: Allow to run smbios_probe() multiple times 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: 9b8e1558c961dd47494519385da4fa96124307e3 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9b8e1558c961dd47494519385da4fa96124307e3 commit 9b8e1558c961dd47494519385da4fa96124307e3 Author: Olivier Certner AuthorDate: 2025-03-05 10:24:36 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:28 +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 (cherry picked from commit c340797e08d8c20983ea57de88992f988fe7bb9b) --- 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));