From nobody Tue May 7 12:06:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629383350; cv=none; d=zohomail.com; s=zohoarc; b=AJZyH0Q03T9jwxoPe6L8O6bcNp8TISkdzXbX6gM/p9s4kf/xGt2AhmmwztCB5jYXMvSakaBGCK2zKi7wKkREg9xKlKJX+ZfDqjMH7YLmKoMNatjeIzplTvNSLm6TexgKVW2Ems/hnHKDZu0nsvZ16xGxH75PoYV9TS7MGWJ5KnU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629383350; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8cj0gtThxAPeLYEPEWpyGX11cCFl6yumVP3iCGd5tCM=; b=eSaPoy46016muMcXhe58UkY2AiWLe4hjwBxhAjwXwf2niNWpf285XKd5A6f/YKouPfyZdUDJ/7SXSLdw1kZwN1RH8nq++Arddf1EWXQB2Wm8qVgeqJ7f6B8UBdidWLAq4AiIeMxb0XyA/wehLHOIIKA4KSyXZeZNGNItB/6PFc8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629383350042695.9627305633871; Thu, 19 Aug 2021 07:29:10 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-387-qwPjOyJIMzCHzFRgAlgldw-1; Thu, 19 Aug 2021 10:29:07 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A77911932484; Thu, 19 Aug 2021 14:29:02 +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 840D961096; Thu, 19 Aug 2021 14:29:02 +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 2B717181A2A6; Thu, 19 Aug 2021 14:29:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17JERB91016891 for ; Thu, 19 Aug 2021 10:27:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id CFAC25C1D1; Thu, 19 Aug 2021 14:27:11 +0000 (UTC) Received: from bart.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 595BA5C1BB for ; Thu, 19 Aug 2021 14:27:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629383349; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8cj0gtThxAPeLYEPEWpyGX11cCFl6yumVP3iCGd5tCM=; b=DP/9SdvJHHfyPqOsLiByZFbr6a3f5QMxmUehCKKcA2vIrp2Opx1V6CobMdGJECpGlAsCPR XgFHsLpXD3Qaugzxghm8MA888alTsX7SEetMFuvucQ8Pn1bX6e7TkONgOs4tV08tQTcjN6 vKCv//4Op0T5+Kge2TtvRhXcY1fjaDo= X-MC-Unique: qwPjOyJIMzCHzFRgAlgldw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/5] conf: Introduce virCapabilitiesHostNUMAGetMaxNode() Date: Thu, 19 Aug 2021 16:27:01 +0200 Message-Id: <1d7ade1592f11a92cdacda4d2246d261ec71afde.1629383171.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629383350796100001 Content-Type: text/plain; charset="utf-8" This is just a small helper that will be used later. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/conf/capabilities.c | 9 +++++++++ src/conf/capabilities.h | 2 ++ src/libvirt_private.syms | 1 + 3 files changed, 12 insertions(+) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 72d4146ac3..a3e68741a9 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1433,6 +1433,15 @@ virCapabilitiesHostNUMAGetCpus(virCapsHostNUMA *caps, } =20 =20 +int +virCapabilitiesHostNUMAGetMaxNode(virCapsHostNUMA *caps) +{ + virCapsHostNUMACell *cell =3D g_ptr_array_index(caps->cells, caps->cel= ls->len - 1); + + return cell->num; +} + + int virCapabilitiesGetNodeInfo(virNodeInfoPtr nodeinfo) { diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 1b99202c9b..701878332c 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -328,6 +328,8 @@ virCapabilitiesFormatXML(virCaps *caps); virBitmap *virCapabilitiesHostNUMAGetCpus(virCapsHostNUMA *caps, virBitmap *nodemask); =20 +int virCapabilitiesHostNUMAGetMaxNode(virCapsHostNUMA *caps); + int virCapabilitiesGetNodeInfo(virNodeInfoPtr nodeinfo); =20 int virCapabilitiesInitPages(virCaps *caps); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fcb02c21b1..9870c5a37c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -69,6 +69,7 @@ virCapabilitiesGetNodeInfo; virCapabilitiesHostInitIOMMU; virCapabilitiesHostNUMAAddCell; virCapabilitiesHostNUMAGetCpus; +virCapabilitiesHostNUMAGetMaxNode; virCapabilitiesHostNUMANew; virCapabilitiesHostNUMANewHost; virCapabilitiesHostNUMARef; --=20 2.31.1 From nobody Tue May 7 12:06:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629383311; cv=none; d=zohomail.com; s=zohoarc; b=QeKjqEQYgQ2zlKferhP3P3mmpRPxzDEQOjLlJEaKEhpITrZ9n6phvLJ+MgPFy/2lXmlefi2gCRd1taW6iAXuSEWRdNVPmJaDf9slrmkk2/6iama6dINkK3dx3Fe0kPfEahbqsHKj3NYboDuq8hLnA+/fgPN5N2rDMVXIzIwXX2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629383311; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=H5V/8Dnqy8CD1ZAzMr/bTfN1diHdH42THHgaeCKKY58=; b=lUxAV2/H9gy9+iNINNPC3suEUBSNcoHlzH7mKi//74B21fVS9j7uk+unQ1E+uItuhKDHuxik4XhymTxeuyijdarNttsJwdoCXh6hlRungX08G1d6wvR1gTzPDf/gEmds5IXSpryY/QzFvUvFUWab848HaJ/OU5KLMy26/K0WIHw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629383311444831.7730509897667; Thu, 19 Aug 2021 07:28:31 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-596-7tIpLQVFNWGtqszmgShIsg-1; Thu, 19 Aug 2021 10:28:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B94F801A92; Thu, 19 Aug 2021 14:28:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1EFFC60C81; Thu, 19 Aug 2021 14:28:22 +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 270524BB7C; Thu, 19 Aug 2021 14:28:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17JERC7E016905 for ; Thu, 19 Aug 2021 10:27:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9DCCF5C1D1; Thu, 19 Aug 2021 14:27:12 +0000 (UTC) Received: from bart.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27B665C1BB for ; Thu, 19 Aug 2021 14:27:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629383310; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=H5V/8Dnqy8CD1ZAzMr/bTfN1diHdH42THHgaeCKKY58=; b=BVDZhHyZdsekQ1mE11uBryTRwZl30a/dNfekDoGS08geJWZYZYmKAwdKsgPun7zl65vbsK 7u1nOktcvw2H8R1aD46y0NNpgM2leMxxxKm8k513zq0SMi+UWhOM0ow34J6ElvzL3iZmxK I/mzArRDminqMwyPf1TkjzliTbcd3bw= X-MC-Unique: 7tIpLQVFNWGtqszmgShIsg-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/5] virhostmem: Let caller pass max NUMA node to virHostMemGetFreePages Date: Thu, 19 Aug 2021 16:27:02 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629383313612100005 Content-Type: text/plain; charset="utf-8" In all three cases (LXC, QEMU and VBox drivers) the caller has access to host capabilities and thus know the maximum NUMA node. This means, that virHostMemGetFreePages() doesn't have to query it. Querying may fail if libvirt was compiled without numactl support. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/lxc/lxc_driver.c | 12 +++++++++++- src/qemu/qemu_driver.c | 12 +++++++++++- src/util/virhostmem.c | 6 ++---- src/util/virhostmem.h | 1 + src/vbox/vbox_common.c | 12 ++++++++++-- 5 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 8f2ca19f44..f720cf968d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -5013,12 +5013,22 @@ lxcNodeGetFreePages(virConnectPtr conn, unsigned long long *counts, unsigned int flags) { + virLXCDriver *driver =3D conn->privateData; + g_autoptr(virCaps) caps =3D NULL; + int lastCell; + virCheckFlags(0, -1); =20 if (virNodeGetFreePagesEnsureACL(conn) < 0) return -1; =20 - return virHostMemGetFreePages(npages, pages, startCell, cellCount, cou= nts); + if (!(caps =3D virLXCDriverGetCapabilities(driver, false))) + return -1; + + lastCell =3D virCapabilitiesHostNUMAGetMaxNode(caps->host.numa); + + return virHostMemGetFreePages(npages, pages, startCell, cellCount, + lastCell, counts); } =20 =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f31e13889e..6a065a9c06 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17428,12 +17428,22 @@ qemuNodeGetFreePages(virConnectPtr conn, unsigned long long *counts, unsigned int flags) { + virQEMUDriver *driver =3D conn->privateData; + g_autoptr(virCaps) caps =3D NULL; + int lastCell; + virCheckFlags(0, -1); =20 if (virNodeGetFreePagesEnsureACL(conn) < 0) return -1; =20 - return virHostMemGetFreePages(npages, pages, startCell, cellCount, cou= nts); + if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) + return -1; + + lastCell =3D virCapabilitiesHostNUMAGetMaxNode(caps->host.numa); + + return virHostMemGetFreePages(npages, pages, startCell, cellCount, + lastCell, counts); } =20 =20 diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 8aa675cb4f..43dd775fd3 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -843,14 +843,12 @@ virHostMemGetFreePages(unsigned int npages, unsigned int *pages, int startCell, unsigned int cellCount, + int lastCell, unsigned long long *counts) { - int cell, lastCell; + int cell; size_t i, ncounts =3D 0; =20 - if ((lastCell =3D virNumaGetMaxNode()) < 0) - return 0; - if (startCell > lastCell) { virReportError(VIR_ERR_INTERNAL_ERROR, _("start cell %d out of range (0-%d)"), diff --git a/src/util/virhostmem.h b/src/util/virhostmem.h index 1369829807..ecfdd71618 100644 --- a/src/util/virhostmem.h +++ b/src/util/virhostmem.h @@ -45,6 +45,7 @@ int virHostMemGetFreePages(unsigned int npages, unsigned int *pages, int startCell, unsigned int cellCount, + int lastCell, unsigned long long *counts); =20 int virHostMemAllocPages(unsigned int npages, diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index ecdcdbe88d..89f74b86d6 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -7598,7 +7598,7 @@ vboxNodeGetFreeMemory(virConnectPtr conn G_GNUC_UNUSE= D) } =20 static int -vboxNodeGetFreePages(virConnectPtr conn G_GNUC_UNUSED, +vboxNodeGetFreePages(virConnectPtr conn, unsigned int npages, unsigned int *pages, int startCell, @@ -7606,9 +7606,17 @@ vboxNodeGetFreePages(virConnectPtr conn G_GNUC_UNUSE= D, unsigned long long *counts, unsigned int flags) { + struct _vboxDriver *driver =3D conn->privateData; + int lastCell; + virCheckFlags(0, -1); =20 - return virHostMemGetFreePages(npages, pages, startCell, cellCount, cou= nts); + virObjectLock(driver); + lastCell =3D virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.numa= ); + virObjectUnlock(driver); + + return virHostMemGetFreePages(npages, pages, startCell, + cellCount, lastCell, counts); } =20 static int --=20 2.31.1 From nobody Tue May 7 12:06:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629383529; cv=none; d=zohomail.com; s=zohoarc; b=kI/nVbRIukFI78orzJlGp4VkR2YqvB9tyBJexpW7+EwcVMh1W+/uHB1ijBIzenbWXdcUJMsH/4HCIqLr/zvH4bWXSEqB8IQI9rLulXjPAthgNDvqhKu/DR7Mq9RzylkShDPJUXtkGi6KM+YLi05vTSV4sC1tRuSNWSXb6BTHHeA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629383529; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TsJhxNXq/wH+/9r7htC0NKHTgubimUAZPvbdP8OtRkk=; b=QTPN5euoiSN+ykfYW3PJALLV9Bq/WdG5G4fAyuiXOnh1VpHJ+CMNahd+CIb35jzSGTIUpATeW5EZCy7ZjByYRxdY57bnI8RvvaQwktmsETGcHv1vnLGK2UF0y9xKTckrWdM/oLnnO/vmTKPEr7ydD4KlGEwxXRtnz8J6WLctoYg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629383529891188.2058497933558; Thu, 19 Aug 2021 07:32:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-288-4rh4b7eaM0KL21QoUjKI0Q-1; Thu, 19 Aug 2021 10:32:07 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE056EC1A4; Thu, 19 Aug 2021 14:32:01 +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 C12CD6A8FD; Thu, 19 Aug 2021 14:32:01 +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 75708181A2A7; Thu, 19 Aug 2021 14:32:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17JERDr0016910 for ; Thu, 19 Aug 2021 10:27:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6C1455C1D1; Thu, 19 Aug 2021 14:27:13 +0000 (UTC) Received: from bart.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA8795C1BB for ; Thu, 19 Aug 2021 14:27:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629383528; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=TsJhxNXq/wH+/9r7htC0NKHTgubimUAZPvbdP8OtRkk=; b=hjqC8H41tG2kAlrNsa97lr0U+v8FOsjExYSdCJwSXfRL6VMJg7nnfdZEqoTYIJK8bGyV68 MNOpyPMSo4AH2zgAg++803AwJUalGuqfBFdkIJZ0zM9cbGDfM6KBs+TC74EAmP9gvd2V4y XtShleGtQXhsAwxaKKbPafd/AvflPV4= X-MC-Unique: 4rh4b7eaM0KL21QoUjKI0Q-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/5] virhostmem: Let caller pass max NUMA node to virHostMemAllocPages Date: Thu, 19 Aug 2021 16:27:03 +0200 Message-Id: <1b4e3d4d261167e4bc1a8ff1ef85a5137d69241f.1629383171.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629383532351100001 Content-Type: text/plain; charset="utf-8" In all three cases (LXC, QEMU and VBox drivers) the caller has access to host capabilities and thus know the maximum NUMA node. This means, that virHostMemAllocPages() doesn't have to query it. Querying may fail if libvirt was compiled without numactl support. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/lxc/lxc_driver.c | 11 ++++++++++- src/qemu/qemu_driver.c | 11 ++++++++++- src/util/virhostmem.c | 6 ++---- src/util/virhostmem.h | 1 + src/vbox/vbox_common.c | 8 +++++++- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index f720cf968d..e2720a6f89 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -5041,6 +5041,9 @@ lxcNodeAllocPages(virConnectPtr conn, unsigned int cellCount, unsigned int flags) { + virLXCDriver *driver =3D conn->privateData; + g_autoptr(virCaps) caps =3D NULL; + int lastCell; bool add =3D !(flags & VIR_NODE_ALLOC_PAGES_SET); =20 virCheckFlags(VIR_NODE_ALLOC_PAGES_SET, -1); @@ -5048,8 +5051,14 @@ lxcNodeAllocPages(virConnectPtr conn, if (virNodeAllocPagesEnsureACL(conn) < 0) return -1; =20 + if (!(caps =3D virLXCDriverGetCapabilities(driver, false))) + return -1; + + lastCell =3D virCapabilitiesHostNUMAGetMaxNode(caps->host.numa); + return virHostMemAllocPages(npages, pageSizes, pageCounts, - startCell, cellCount, add); + startCell, cellCount, + lastCell, add); } =20 =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6a065a9c06..444e9e5cbc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18802,6 +18802,9 @@ qemuNodeAllocPages(virConnectPtr conn, unsigned int cellCount, unsigned int flags) { + virQEMUDriver *driver =3D conn->privateData; + g_autoptr(virCaps) caps =3D NULL; + int lastCell; bool add =3D !(flags & VIR_NODE_ALLOC_PAGES_SET); =20 virCheckFlags(VIR_NODE_ALLOC_PAGES_SET, -1); @@ -18809,8 +18812,14 @@ qemuNodeAllocPages(virConnectPtr conn, if (virNodeAllocPagesEnsureACL(conn) < 0) return -1; =20 + if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) + return -1; + + lastCell =3D virCapabilitiesHostNUMAGetMaxNode(caps->host.numa); + return virHostMemAllocPages(npages, pageSizes, pageCounts, - startCell, cellCount, add); + startCell, cellCount, + lastCell, add); } =20 static int diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 43dd775fd3..8734dafb72 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -885,14 +885,12 @@ virHostMemAllocPages(unsigned int npages, unsigned long long *pageCounts, int startCell, unsigned int cellCount, + int lastCell, bool add) { - int cell, lastCell; + int cell; size_t i, ncounts =3D 0; =20 - if ((lastCell =3D virNumaGetMaxNode()) < 0) - return 0; - if (startCell > lastCell) { virReportError(VIR_ERR_INTERNAL_ERROR, _("start cell %d out of range (0-%d)"), diff --git a/src/util/virhostmem.h b/src/util/virhostmem.h index ecfdd71618..3265215d84 100644 --- a/src/util/virhostmem.h +++ b/src/util/virhostmem.h @@ -53,4 +53,5 @@ int virHostMemAllocPages(unsigned int npages, unsigned long long *pageCounts, int startCell, unsigned int cellCount, + int lastCell, bool add); diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 89f74b86d6..7334254a36 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -7628,12 +7628,18 @@ vboxNodeAllocPages(virConnectPtr conn G_GNUC_UNUSED, unsigned int cellCount, unsigned int flags) { + struct _vboxDriver *driver =3D conn->privateData; + int lastCell; bool add =3D !(flags & VIR_NODE_ALLOC_PAGES_SET); =20 virCheckFlags(VIR_NODE_ALLOC_PAGES_SET, -1); =20 + virObjectLock(driver); + lastCell =3D virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.numa= ); + virObjectUnlock(driver); + return virHostMemAllocPages(npages, pageSizes, pageCounts, - startCell, cellCount, add); + startCell, cellCount, lastCell, add); } =20 static int --=20 2.31.1 From nobody Tue May 7 12:06:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629383354; cv=none; d=zohomail.com; s=zohoarc; b=J4wWm7XjWJiW1lbxCrCr9S78sRtFzkTnBVGlCQtRH1OcADRoNnnU78gefqwcMBLm/SALInMczcUZ6LEiO7Mxowg5hwxiVEYj1j+X6LM3IZkjrWK6CDqLBTwEoOSqQOTpWnDtiGG3umWbfFE731SAr9X5s3rFpH/4d7itzpyGqvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629383354; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=09Rat0e1gMbCf7C1G4SjW7WYLuPx8iDCHtPv3dx73c0=; b=Q0/vnm1PTqkTuesCKm4ZYueujAJJMCvOKDimd0naUSxWr8bH0R/DMN9S451cONfBVx6fQA2uXViZAxVcF8rzU+N6TwO/Pukb4BGcQ7t/XfTP05Kpwt7dxyOlLlClhqm6dirB6Bpaf7OxC+rXxSmpAGbnNyKYjj3dakDahYCcUy8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629383354412998.8995964873801; Thu, 19 Aug 2021 07:29:14 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-578-EzBnmhdrNDeMViZYpbTOpw-1; Thu, 19 Aug 2021 10:29:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 26B4381A41F; Thu, 19 Aug 2021 14:29:06 +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 EF9BB6A910; Thu, 19 Aug 2021 14:29:05 +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 AC5B6181A2A9; Thu, 19 Aug 2021 14:29:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17JEREJ4016919 for ; Thu, 19 Aug 2021 10:27:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 39E9F5C3E0; Thu, 19 Aug 2021 14:27:14 +0000 (UTC) Received: from bart.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id B84285C1D1 for ; Thu, 19 Aug 2021 14:27:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629383353; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=09Rat0e1gMbCf7C1G4SjW7WYLuPx8iDCHtPv3dx73c0=; b=Da7ljCn8WRSNFie4Bc2LGG/gkGKeT1tff3pbn6dcZjNlkVvjR13Up8568T65tgtfIvkbo3 1nAYkZ2kaNFxE3AHHTOOhx4x60dSrf1ldaGO9MFwpQHSdzc46N19ZFAzSHds6T7ZfSyxFB QVjBBLoXKczspvLf5G/YyNBnYkYLmb0= X-MC-Unique: EzBnmhdrNDeMViZYpbTOpw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 4/5] virhostmem: Handle numactl-less build in hugepages allocation/reporting Date: Thu, 19 Aug 2021 16:27:04 +0200 Message-Id: <84a4856aec5f5d947b25720e66e006c7b3651b7a.1629383171.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629383355234100001 Content-Type: text/plain; charset="utf-8" When using 'virsh freepages' or 'virsh allocpages' then virHostMemGetFreePages() or virHostMemAllocPages() is called, respectively. But the following may happen: libvirt was built without numactl support and thus a fake NUMA node was constructed for capabilities, which means that startCell is going to be 0. But we can't blindly pass startCell =3D 0 to virNumaGetPageInfo() nor virNumaSetPagePoolSize() because they would operate over node specific path (/sys/devices/system/node/nodeX) rather than NUMA agnostic path (/sys/kernel/mm/hugepages/) and we are not guaranteed that the former exists (kernel might have been built without NUMA support). Resolves:https://bugzilla.redhat.com/show_bug.cgi?id=3D1978574 Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/util/virhostmem.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 8734dafb72..b13c3fe38e 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -849,6 +849,14 @@ virHostMemGetFreePages(unsigned int npages, int cell; size_t i, ncounts =3D 0; =20 + if (!virNumaIsAvailable() && lastCell =3D=3D 0 && + startCell =3D=3D 0 && cellCount =3D=3D 1) { + /* As a special case, if we were built without numactl and want to + * fetch info on the fake NUMA node set startCell to -1 to make the + * loop below fetch overall info. */ + startCell =3D -1; + } + if (startCell > lastCell) { virReportError(VIR_ERR_INTERNAL_ERROR, _("start cell %d out of range (0-%d)"), @@ -891,6 +899,14 @@ virHostMemAllocPages(unsigned int npages, int cell; size_t i, ncounts =3D 0; =20 + if (!virNumaIsAvailable() && lastCell =3D=3D 0 && + startCell =3D=3D 0 && cellCount =3D=3D 1) { + /* As a special case, if we were built without numactl and want to + * allocate hugepages on the fake NUMA node set startCell to -1 to= make + * the loop below operate on NUMA agnostic sysfs paths. */ + startCell =3D -1; + } + if (startCell > lastCell) { virReportError(VIR_ERR_INTERNAL_ERROR, _("start cell %d out of range (0-%d)"), --=20 2.31.1 From nobody Tue May 7 12:06:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629383534; cv=none; d=zohomail.com; s=zohoarc; b=RMtbnc0wh4fIvglhQ5Kwk8jnb1d7LOfJ1XVfJNRi+3RgyNj5fH1VfIozZ4CS63krLDychaJCABTHjBoPq1a4qIBcG5FLmTh9r8OL0nUXJUOcW+pZvxS/b8a4EEAGEkwMdnCqSrfu+3ojMq7w4EFUQzoSQJxGwJpm1mmwX5xklks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629383534; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Anw+Z+1MzGXpu0Yj3/0zmldQbAvOUmItG7SW2zn4BIU=; b=ehOhaXN3I/V0GK+iU5s6ZzrmzCWYGUoGRCIlggYO5yckIbXx4gWcj8Fh33R1/YiznKOdAs4Wo90fnHlN7rZ9Zt4aOthITcjY9hF+qMfHISsJFf2wIfTCKQQ/e29RNHedZEUA8Wwq80pPRAeaciBWoRpUrBF4+Js8RR4g0xXqN+8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629383534318496.2528635715531; Thu, 19 Aug 2021 07:32:14 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-139-anBWX0mhOa2c_59r7LHK6w-1; Thu, 19 Aug 2021 10:32:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9D51087D542; Thu, 19 Aug 2021 14:32:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7B15961096; Thu, 19 Aug 2021 14:32:06 +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 44FBB4BB7C; Thu, 19 Aug 2021 14:32:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17JERFoG016931 for ; Thu, 19 Aug 2021 10:27:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 080665C1BB; Thu, 19 Aug 2021 14:27:15 +0000 (UTC) Received: from bart.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 860735C1D1 for ; Thu, 19 Aug 2021 14:27:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629383533; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Anw+Z+1MzGXpu0Yj3/0zmldQbAvOUmItG7SW2zn4BIU=; b=ZT/WVzEkAdM40usrebnuvk0sjC45ATsEGnVBOFmYn7AWh138bgCylubGJ/Jscuwlu2Z9jF rixYaEG6+ek1Rgw/GkDJ7JQ8IR/3Bk/OyGBfrpD2XyqcUVFTEuyqraUIkfyEgtBavHn0Jx O77liXXOj9w4ICHEHX24uNtGey1IIE0= X-MC-Unique: anBWX0mhOa2c_59r7LHK6w-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 5/5] rpm: Enable numactl on s390x Date: Thu, 19 Aug 2021 16:27:05 +0200 Message-Id: <0835f61d936bb6bb39258fc24a901931286f0738.1629383171.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629383534667100001 Content-Type: text/plain; charset="utf-8" While s390x doesn't have NUMA nodes it has libnuma which is still helpful as it parses sysfs for us and kernel emulates NUMA#0. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c3f50224cc..b01379d242 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -24,7 +24,7 @@ %define arches_vbox %{arches_x86} %define arches_ceph %{arches_64bit} %define arches_zfs %{arches_x86} %{power64} %{arm} -%define arches_numactl %{arches_x86} %{power64} aarch64 +%define arches_numactl %{arches_x86} %{power64} aarch64 s390x %define arches_numad %{arches_x86} %{power64} aarch64 =20 # The hypervisor drivers that run in libvirtd --=20 2.31.1