From nobody Tue May 16 04:11:02 2023 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 4QL2pv1CL6z4BVRL; Tue, 16 May 2023 04:11: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QL2pt5J1sz3vgF; Tue, 16 May 2023 04:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684210262; 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=oB48UBhlXjAw+WLXt9uKgBdaBm4m6Ki+sZMrZjykWUg=; b=Ia2aqPSRPFN92XhI+9j91rNX8zQSm01YXEnYYZrinrHuvvpLH/t9rp0NSXt7AmXCOJwvyo BIQ+RNda/bSDg/YU7L9FkZtNk8P/lluXE/vpvVt9G+KrdabiIxg2XwDHvqTTXVhneW7ifw OswX61mhobjXb2o2TnPFoEKKcWMYG91xtqjMZ0+tuzJGkGCUtlUQ+AE9uwEtcLvDT1QhVo vKsYIPRHIh37IOOtK/zzxHakWogNXCK2xIT27Er4pHhhwOnrPOQ7l8rcT7tvaBLH3HNpTw xa3CXRiua9Y1zzj71542CwUuBFazXhhhZIU8LxN/QzkPZjmW/qtjRdqxZ7aRSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684210262; 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=oB48UBhlXjAw+WLXt9uKgBdaBm4m6Ki+sZMrZjykWUg=; b=bCsK2pPnjkcK5VgAp/zsES0x/Y6sKJXTrl/0UDYpA8AyLu8Gebn4qqMhOBseMa11dLsV36 bNDxRmiG3SZ3G3s9TY2SDoeiHH7r1aqnWk49g+55DxtRRUV2u4emdQiNe1rw1EjLSItG8i pyU81DOMSWKrmNl4/JCq5ZsvugkC9eB7x96A+Cmak8YGfjqxvl9IYU9aFoBJbKflLyus1a lwBeUZ+vyvxYlzzuCHitWyQkc+F1dCkOU6NU/LmAXq4S/SKR17RHShfiM6r6TPVpZghStf m8I/eailJ/qqQQa3yGkMADg//lSjY01u0I/DT6/ThMPAY0GkcgRwmVGcRz/OJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684210262; a=rsa-sha256; cv=none; b=hySGkdVfr3HUKuuEuKNN373WglFyGa4muQx952100oCbZJBjm/LVjW1mD7R+NXo12el0nB 91a8psyf6CXiTUpxaLBfqQUnpIozzYStPzRhkmRHHvy7OAJr13tLN+RKkrS11TzhofYJwa 6ug1zcr+1Eay1Q4kA+lLdAYge3h6NOw6QYDLaNSUsN7Uvy4m5M96tFTIVn3h9c6ATSHpPB KJruv8VfgoQwBQJ62CX+0eppegTKwnI5imZ9nv5sfsN8xgVvB9a6OppswLyopepfy2Wfwu bIrb8P5QjhBnqd3sNwLaCflGf9Fl9H0ZCKA/xNGcnw3sQPLofH1DAejgEGH93w== 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 4QL2pt4PfVz17Fv; Tue, 16 May 2023 04:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34G4B2Id001996; Tue, 16 May 2023 04:11:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34G4B2MC001994; Tue, 16 May 2023 04:11:02 GMT (envelope-from git) Date: Tue, 16 May 2023 04:11:02 GMT Message-Id: <202305160411.34G4B2MC001994@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f296166d7be4 - stable/13 - smp_topo(): make it idempotent 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/13 X-Git-Reftype: branch X-Git-Commit: f296166d7be49b6105105344980cd45079551a9e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f296166d7be49b6105105344980cd45079551a9e commit f296166d7be49b6105105344980cd45079551a9e Author: Konstantin Belousov AuthorDate: 2023-05-07 18:37:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-16 04:03:37 +0000 smp_topo(): make it idempotent (cherry picked from commit d0f67f97579f7b2febf29264b1874a95056dec06) --- sys/kern/subr_smp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 0ecc13251632..8d3e398d6b54 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -645,7 +645,14 @@ struct cpu_group * smp_topo(void) { char cpusetbuf[CPUSETBUFSIZ], cpusetbuf2[CPUSETBUFSIZ]; - struct cpu_group *top; + static struct cpu_group *top = NULL; + + /* + * The first call to smp_topo() is guaranteed to occur + * during the kernel boot while we are still single-threaded. + */ + if (top != NULL) + return (top); /* * Check for a fake topology request for debugging purposes.