From nobody Tue May 09 15:30:17 2023 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 4QG2Cs6sk5z4BKGj; Tue, 9 May 2023 15:30:17 +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 4QG2Cs641Bz3rNW; Tue, 9 May 2023 15:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646217; 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=ToYRS+eJ0x5jnwp9jO9WAHYPNf4l8vLxxKjpmF27PFY=; b=cdXvRa9gjAUb8sXbxm6z/CL3/MjHzfCrlfzQCZIe8jzbwORTggV1MHDdTRog55N8+BjSr6 gbuubCr8Vs0qOZoS4z8UNNWl7vpcdGgwtl0TJZap5zlpjk44qeEa70XNlbMTxgu7o5TBDG ZUIm/+kV+cqXL9hQpH6KMz1o06BOVan/vRr+De4RmOGhsCzLhR07zMeyAt+z+RitWaDCDy mPYkMQOFn1HDwImTQwD9IlUx0Pv0LLm+dfdNRlJc/tfZ2KWQAZdZVIOjMG+ka9oQOK6iIl LS1/oDliZpelXjGnJs8iQXqJGSeNKScbU9a3lgGZszvyCHp8cIOFU3l5mzVY/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646217; 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=ToYRS+eJ0x5jnwp9jO9WAHYPNf4l8vLxxKjpmF27PFY=; b=c39t4lscu5jYn51trheQn1MMhy9d00sGB6gkhPoZExLOidhd5yCCkuUyWBIkTp4I8CfwoL Gp4o24ZGPa0aGKh6jTKGxnSm531QMXP7qZAdgNFbxwkQpDry+ahbpPirf8Y6UgoNIzplTZ cK2hC4JVH8JL5Ml3NmWs4xlQkWZhxdBWK3dGS1RV9qLwFWclm+Gs+eVs+ODsvtcF+DXNK0 9PaVfXqiATeTnyMEWB93BqZZ3HqaIFoDKbW8wxbJCCy5uaH4+EUX7jCz/Il5B5bYz9GJjD N3Xh+hfTeeNKmBiKvoDuldAL/YN3GOD2b6vE7eo/bqws/2TO2z9Ksx4CjARACA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683646217; a=rsa-sha256; cv=none; b=j0ULDQu3IoL5GcHIWIcLOnRrMmVmIx3TyNEPYmqrQaOum5DMmWqaxF102sGeFVUBH1rU3V 5ET5fPuX0dAp2LYMntVUQJA4I5RGxjc9B/4MnmXxhM7EDGHt1aRsSEvRDRjYsQDR7Oy1oe TS/0/cxOEN/yvnnW776nEU3N11OOVGoIeomFxvYbuHWE9Qj3zh4mzPTPgj9OZV4vv32nVG JavWahVR4YJvqeWwvn3RVmvezOoEVIHru0QZdThW8RQHmxJaR3mgquIHNpTygQRBRBM5go J0Pg4Q6vDlPW7cUv0/eJSRz3Q0grCHU3oE5lW9unDCxmaBLFcDcbUPR0UUlpIQ== 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 4QG2Cs52VqzYPx; Tue, 9 May 2023 15:30:17 +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 349FUHiw023734; Tue, 9 May 2023 15:30:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349FUHXO023728; Tue, 9 May 2023 15:30:17 GMT (envelope-from git) Date: Tue, 9 May 2023 15:30:17 GMT Message-Id: <202305091530.349FUHXO023728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 361c8f75a618 - main - smp_topo(): correct allocation sizes for trivial topologies 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 361c8f75a61832d9aa3dd4c589a0220f3467466f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=361c8f75a61832d9aa3dd4c589a0220f3467466f commit 361c8f75a61832d9aa3dd4c589a0220f3467466f Author: Konstantin Belousov AuthorDate: 2023-05-09 15:08:22 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-09 15:30:07 +0000 smp_topo(): correct allocation sizes for trivial topologies This patch should not modify the correctness, only the clarity. Requested and reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39981 --- sys/kern/subr_smp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 5a9aeb5ab04a..5a1013dad65f 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -790,8 +790,8 @@ smp_topo_1level(int share, int count, int flags) int i; cpu = 0; - top = smp_topo_alloc(1); packages = mp_ncpus / count; + top = smp_topo_alloc(1 + packages); top->cg_child = child = top + 1; top->cg_level = CG_SHARE_NONE; for (i = 0; i < packages; i++, child++) @@ -811,7 +811,8 @@ smp_topo_2level(int l2share, int l2count, int l1share, int l1count, int j; cpu = 0; - top = smp_topo_alloc(1); + top = smp_topo_alloc(1 + mp_ncpus / (l2count * l1count) + + mp_ncpus / l1count); l2g = top + 1; top->cg_child = l2g; top->cg_level = CG_SHARE_NONE;