From nobody Wed Jan 15 12:32:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1534237699528573.4463055980411; Tue, 14 Aug 2018 02:08:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D152130024EA; Tue, 14 Aug 2018 09:08:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8D0E73001A5C; Tue, 14 Aug 2018 09:08:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 452B218037F7; Tue, 14 Aug 2018 09:08:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7E985XW023467 for ; Tue, 14 Aug 2018 05:08:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id B99932022EA0; Tue, 14 Aug 2018 09:08:05 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5834B2026D7E for ; Tue, 14 Aug 2018 09:08:05 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 14 Aug 2018 11:07:55 +0200 Message-Id: <20180814090756.20432-7-abologna@redhat.com> In-Reply-To: <20180814090756.20432-1-abologna@redhat.com> References: <20180814090756.20432-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/7] utils: Remove arbitrary limit on socket_id/core_id X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 14 Aug 2018 09:08:17 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" While in most cases the values are going to be much smaller than our arbitrary 4096 limit, there is really no guarantee that would be the case: in fact, a few aarch64 servers have been spotted in the wild with core_id as high as 6216. Take advantage of virBitmap's ability to automatically alter its size at runtime to accomodate such values. Signed-off-by: Andrea Bolognani --- src/util/virhostcpu.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 6e79445abc..2337ad7d61 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -293,9 +293,6 @@ virHostCPUParseNode(const char *node, int *threads, int *offline) { - /* Biggest value we can expect to be used as either socket id - * or core id. Bitmaps will need to be sized accordingly */ - const int ID_MAX =3D 4095; int ret =3D -1; int processors =3D 0; DIR *cpudir =3D NULL; @@ -324,7 +321,7 @@ virHostCPUParseNode(const char *node, goto cleanup; =20 /* enumerate sockets in the node */ - if (!(sockets_map =3D virBitmapNew(ID_MAX + 1))) + if (!(sockets_map =3D virBitmapNewEmpty())) goto cleanup; =20 while ((direrr =3D virDirRead(cpudir, &cpudirent, node)) > 0) { @@ -343,14 +340,8 @@ virHostCPUParseNode(const char *node, =20 if (virHostCPUGetSocket(cpu, &sock) < 0) goto cleanup; - if (sock > ID_MAX) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Socket %d can't be handled (max socket is %d= )"), - sock, ID_MAX); - goto cleanup; - } =20 - if (virBitmapSetBit(sockets_map, sock) < 0) + if (virBitmapSetBitExpand(sockets_map, sock) < 0) goto cleanup; =20 if (sock > sock_max) @@ -367,7 +358,7 @@ virHostCPUParseNode(const char *node, goto cleanup; =20 for (i =3D 0; i < sock_max; i++) - if (!(cores_maps[i] =3D virBitmapNew(ID_MAX + 1))) + if (!(cores_maps[i] =3D virBitmapNewEmpty())) goto cleanup; =20 /* Iterate over all CPUs in the node, in ascending order */ @@ -411,14 +402,8 @@ virHostCPUParseNode(const char *node, if (virHostCPUGetCore(cpu, &core) < 0) goto cleanup; } - if (core > ID_MAX) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Core %d can't be handled (max core is %d)"), - core, ID_MAX); - goto cleanup; - } =20 - if (virBitmapSetBit(cores_maps[sock], core) < 0) + if (virBitmapSetBitExpand(cores_maps[sock], core) < 0) goto cleanup; =20 if (!(siblings =3D virHostCPUCountThreadSiblings(cpu))) --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list