From nobody Tue May 16 04:11:03 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 4QL2pw0Z3fz4BVM2; Tue, 16 May 2023 04:11:04 +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 4QL2pv5y7Fz3vLv; Tue, 16 May 2023 04:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684210263; 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=35pBopo/9sxhlo5sqXvkCfZurbFe+j/3eQs0+IhIZmI=; b=DZCZceh+pvqfun0ovKfvZ9tUZyLb1jS9LtsQ+p8zVQy/CYQ7ZGGs/RWlpj1RZsjl5HMTxG xOF7xvI4FxZ8mRLlcPMElKrRHKCjO1pWhabihTLD+Ql8c3Gtx3Z7sBch28f1OwJoO+c01A bM8lmOyeEaL26mQypUaMUKIxmUIbtIovB0+hGUtllBIJ+SrkZwKwMO7DiyWgZ7Tq0Jie4U A6zamkpJUtOgRoXljZYejl/+g82zEY3bq79wB15RV4nApvK0bAn4QktXQ8Ecmr6TLOPvk1 /tmndGUqQ9GwIOVfHKvAuEJeO0GZTdBYpKTAaR7z6khE2fnzBgrWeiWSsr2fiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684210263; 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=35pBopo/9sxhlo5sqXvkCfZurbFe+j/3eQs0+IhIZmI=; b=Od1hx1uTzwpszUMEq4tnjTN5cS2K7VMvRJckD+dApYh20XYejcwvphCc6qhGfIon9got8O cftxEhHEhbjjZ54mCS5Xg3REKmK7135RQoVUKSP+PtQe9phdJ5zoXe70QtVy/aq+NR56n+ oGAva9YWPe/DgivX6RtbFs4fvSn9n4sn8ug6q8pTe/no7E3v7NoqNp5eAM0bEsw70wHQwk ItMsoXdyR4812c433ULSv+HjI1TZ9bOlv8v88RK3i8gzFlakDanOQAGufUcOPCMDJ+3Sn8 teg7+qz7I5zONjtw3rdhTCMJVB//LpFSTrmpoJAuIJ4Icfcw5TLVLNhH7lwnog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684210263; a=rsa-sha256; cv=none; b=VltEeU+tXyELoscvCLfl53AjhFXcwKfG7nyoRlTEHJHF4UC9NYXvhtM25kRMLjPCyDe3qV kyqQYrbQR++/1fv9LmHI80JvJnyjuc5JOo5diswU6aoze9jz9+xQ+3VDRguv6me5lJYCP2 JpW+d5CPIbC9GZHr3MNtLj32sk2x9GAncP+LzYAhhyZQRK608ft30W35nM2Ig4/AEWrlv3 3J5s1ab5Ogmj8coAHklzSYx7XSIE0Fe3gqVEGyh+SQj5vCb7UlO+cAqwacy10bEBZK2+uM NFZTysdQu3So6Al5kd1SSrroUmUsWHmn3HNdYF801+/wnhmZZuSsdQNE1nysSA== 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 4QL2pv54Hgz16n0; Tue, 16 May 2023 04:11:03 +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 34G4B3kM002015; Tue, 16 May 2023 04:11:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34G4B3Qg002014; Tue, 16 May 2023 04:11:03 GMT (envelope-from git) Date: Tue, 16 May 2023 04:11:03 GMT Message-Id: <202305160411.34G4B3Qg002014@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: 13e15ac4990c - stable/13 - smp_topo(): correct allocation sizes for trivial topologies 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: 13e15ac4990ca2f725ea10c1d9f74398b737ccc9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=13e15ac4990ca2f725ea10c1d9f74398b737ccc9 commit 13e15ac4990ca2f725ea10c1d9f74398b737ccc9 Author: Konstantin Belousov AuthorDate: 2023-05-09 15:08:22 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-16 04:03:38 +0000 smp_topo(): correct allocation sizes for trivial topologies (cherry picked from commit 361c8f75a61832d9aa3dd4c589a0220f3467466f) --- 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 8d3e398d6b54..fafdc5b65cab 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;