From nobody Thu Jun 4 14:30:02 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 4gWRmW1bntz6gP5q for ; Thu, 04 Jun 2026 14:30:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gWRmV67gbz3n1X for ; Thu, 04 Jun 2026 14:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780583402; 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=NOxaPdjHJwDl0i68782llfffgDhDacO56nz/mu061aw=; b=XcCbxat9QFviMdHnakgT0qh+phZ7tAZ89UpQvb/SMD5YDA8uQxcTWy+5mg6p2jY4TTub8t zJYdYeNeJYKhRwHqLP8wpzYKf3UFCL1HwzMXYoyL7tmeDVCe1S/mrE48n6QD5h44ig4zTq /cV6XKXW/jQ3gm8KpFCsxv2r1pGeDG6VDQ4XZnuevSuNjeHNFwjDmrvuMl08VPewvd24Wd 88O8hdiSnQhfkhB4L+Ao30BHD0ynQhYzE4J2deXRmpPb0R/QPyvg2o3bcUs1K+rKywp9lb 8wgzxLVj2zfZfQVcyME7neBKSgnGdomKW7lNRXRSR/e2NOUJM8+zebNeAKILrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780583402; a=rsa-sha256; cv=none; b=mgbUwPUmJBRMEGgVl6baudeW0eKo5e53EocTNckADAOk33vZtWZY4I/7BPadKXhwp4atBr PRLryC/GVuAFJZoNCVCf3/Pw1SbeybDYXjJsOZUOx6JQKDNMhbMoXWbNJuNwedEyzBGGDQ mW8XTb5nTlqWlzVa3mtJx+Ndp++ReG7xGHWEIuZOPpJnxyhULGptvI7aO20HvquveuuyTX EXAnbnzk87GQdydAjRcNPUFUcsMEIWJXbJcw+bgU2HIYvcqIKakIW9v6awYLkzPK6EuJvy OJLGt6Wh+X/g+se2sIVa7ot7PMnhneyGflWGYnO5juQ5l0v9YxxTM/0+GDsJ5w== 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=1780583402; 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=NOxaPdjHJwDl0i68782llfffgDhDacO56nz/mu061aw=; b=reIsBZ4dsauIPHI35OodfEBQ3teESD/BJBCsBoIUpSV87ojJBVp6/qcKmWyQd5rVCaLHq8 XdNBq1/zpoxlOViifcppDH4l2Ck8+oSVstxXc0PGwQ84MPU4qDZIRA1A02xDq5HnhdwC/J tx16Kq0a/nA+C19TwX47wTXMMdu++SqQmgwHm5Rthrw2dEdXFB5tB3sMEPVw3Zp/ApRNhm bUqzG3Iyps/SX7Z3ej9JtgKkZP007UrwshmxsPxviyGqfNvAQQ5cTr/3noC61ZK+L+NTtY kO9yqH1CB6jbr57jNkEe/PRtRZWMuwjPyiVqcZE27cfR85HdouT1Anx91VJHvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWRmV5XSZz12LC for ; Thu, 04 Jun 2026 14:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a871 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Jun 2026 14:30:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c6ccef4a32b4 - stable/15 - amd64: there is no reason to copy ucode around in ucode_load_bsp() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c6ccef4a32b4e09927dfdcc0f734af25c6193f5a Auto-Submitted: auto-generated Date: Thu, 04 Jun 2026 14:30:02 +0000 Message-Id: <6a218bea.3a871.37977cac@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c6ccef4a32b4e09927dfdcc0f734af25c6193f5a commit c6ccef4a32b4e09927dfdcc0f734af25c6193f5a Author: Konstantin Belousov AuthorDate: 2026-05-30 15:57:46 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-04 14:29:19 +0000 amd64: there is no reason to copy ucode around in ucode_load_bsp() PR: 294630 (cherry picked from commit 16f21c5af35002b8361ffb2e83ff3c92cd899a3a) --- sys/x86/x86/ucode.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/sys/x86/x86/ucode.c b/sys/x86/x86/ucode.c index 72133de211f8..613a7b03489f 100644 --- a/sys/x86/x86/ucode.c +++ b/sys/x86/x86/ucode.c @@ -361,18 +361,20 @@ ucode_load_ap(int cpu) (void)ucode_loader->load(ucode_data, UNSAFE, NULL, NULL); } -static void * -map_ucode(uintptr_t free, size_t len) +static const void * +map_ucode(const void *match, uintptr_t free, size_t len) { #ifdef __i386__ uintptr_t va; for (va = free; va < free + len; va += PAGE_SIZE) pmap_kenter(va, (vm_paddr_t)va); + memcpy_early(free, match, len); + return ((const void *)free); #else (void)len; + return (match); #endif - return ((void *)free); } static void @@ -405,7 +407,7 @@ ucode_load_bsp(uintptr_t free) char vendor[13]; } cpuid; const uint8_t *fileaddr, *match; - uint8_t *addr; + const uint8_t *addr; char *type; uint64_t nrev, orev; caddr_t file; @@ -440,14 +442,10 @@ ucode_load_bsp(uintptr_t free) len = preload_fetch_size(file); match = ucode_loader->match(fileaddr, &len); if (match != NULL) { - addr = map_ucode(free, len); - /* We can't use memcpy() before ifunc resolution. */ - memcpy_early(addr, match, len); - match = addr; - - error = ucode_loader->load(match, EARLY, &nrev, &orev); + addr = map_ucode(match, free, len); + error = ucode_loader->load(addr, EARLY, &nrev, &orev); if (error == 0) { - ucode_data = early_ucode_data = match; + ucode_data = early_ucode_data = addr; ucode_nrev = nrev; ucode_orev = orev; return (len);