From nobody Sat Feb 7 06:55:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) client-ip=63.128.21.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 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=1585131547; cv=none; d=zohomail.com; s=zohoarc; b=PFOPtLHGj4QysPD7STRjKys8SPxYm2u6cOPnTHeSvZ/liBLWgBNfkHEht+OtdcKGyF6McSsywSr8+/tsx1US3kJaKG6+OAAy6tb+DqqOu315x096Vnf29IassUL2u9f8fFdWBuReEwVQAKTzPTTojItzTW9kFaMfAO+9nQ1KwU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585131547; 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=l1g1xYJm8R08Cg9PV1dTyWMqgSziEMpUPgQmIc5cm9U=; b=iI/g3QXfckn6cwmhc6DP2F0Ei+YCBAtAKLYGcX4UUlGIxtyZDfgfbwzCAWRiQcOUHS8J3eygK4XL5G4tw+/BYZknrIPJSvJcL7nzqtwM4Q0kH/kb68H/9P1CgLwcLAisU1cSg+4YhfRhmRzCrOhIKfUh/49Zqgu/NZjIQWlVBEc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [63.128.21.74]) by mx.zohomail.com with SMTPS id 1585131547214191.79667233952125; Wed, 25 Mar 2020 03:19:07 -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-474-FgIJBiZENnKGT1qQ2r6V6A-1; Wed, 25 Mar 2020 06:19:03 -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 15400149C5; Wed, 25 Mar 2020 10:18:58 +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 D5C9860BF3; Wed, 25 Mar 2020 10:18:57 +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 8E61018089D7; Wed, 25 Mar 2020 10:18:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02PAIMiT000404 for ; Wed, 25 Mar 2020 06:18:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 73D8E46; Wed, 25 Mar 2020 10:18:22 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6FD4194BB for ; Wed, 25 Mar 2020 10:18:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585131545; 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=l1g1xYJm8R08Cg9PV1dTyWMqgSziEMpUPgQmIc5cm9U=; b=fiu1dh9BVrJXsjMckK4X+XI4QcAqEHLOIKauvdqdZtu7ifIJpBECR2Bws0uzWzCJzun7rW NuEzeWugek7ws9QYCK1+82YZ70empVG6Sacv+NnNCXXK3VyCgm9Uv6c6VrvyB8qyMr90vQ sf8bstqyFyekP5UjvaEBET8HUpaF0uE= X-MC-Unique: FgIJBiZENnKGT1qQ2r6V6A-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 7/9] qemu: Make hugepages path generation embed driver aware Date: Wed, 25 Mar 2020 11:18:07 +0100 Message-Id: <1fd816b75192e70c022917338cf0b69b8580cc63.1585130420.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" So far, libvirt generates the following path for hugepages: $mnt/libvirt/qemu/$id-$shortName where $mnt is the mount point of hugetlbfs corresponding to hugepages of desired size (e.g. /dev/hugepages), $id is domain ID and $shortName is shortened version of domain name. So for instance, the generated path may look something like this: /dev/hugepages/libvirt/qemu/1-QEMUGuest But this won't work with embed driver really, because if there are two instances of embed driver, and they both want to start a domain with the same name and with hugepages, both drivers will generate the same path which is not desired. Fortunately, we can reuse the approach for machined name generation (v6.1.0-178-gc9bd08ee35) and include part of hash of the root in the generated path. Note, the important change is in qemuGetBaseHugepagePath(). The rest is needed to pass driver around. Signed-off-by: Michal Privoznik --- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_conf.c | 24 +++++++++++++++++------- src/qemu/qemu_conf.h | 10 ++++++---- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 2 +- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3a772fa3f3..6c21d28510 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3465,7 +3465,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendP= rops, if (!priv->memPrealloc) prealloc =3D true; } else if (useHugepage) { - if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &memPath) <= 0) + if (qemuGetDomainHupageMemPath(priv->driver, def, pagesize, &m= emPath) < 0) return -1; if (!priv->memPrealloc) prealloc =3D true; @@ -7249,7 +7249,7 @@ qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg, if (!pagesize && qemuBuildMemoryGetDefaultPagesize(cfg, &pagesize) < 0) return -1; - if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &mem_path) < 0) + if (qemuGetDomainHupageMemPath(priv->driver, def, pagesize, &mem_p= ath) < 0) return -1; } else if (def->mem.source =3D=3D VIR_DOMAIN_MEMORY_SOURCE_FILE) { if (qemuGetMemoryBackingPath(def, cfg, "ram", &mem_path) < 0) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 6eb655fe21..f2e3111312 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -40,6 +40,7 @@ #include "virxml.h" #include "virlog.h" #include "cpu/cpu.h" +#include "domain_driver.h" #include "domain_nwfilter.h" #include "virfile.h" #include "virsocket.h" @@ -1894,21 +1895,29 @@ qemuTranslateSnapshotDiskSourcePool(virDomainSnapsh= otDiskDefPtr def) } =20 char * -qemuGetBaseHugepagePath(virHugeTLBFSPtr hugepage) +qemuGetBaseHugepagePath(virQEMUDriverPtr driver, + virHugeTLBFSPtr hugepage) { + const char *root =3D virQEMUDriverGetEmbedRoot(driver); char *ret; =20 - ret =3D g_strdup_printf("%s/libvirt/qemu", hugepage->mnt_dir); + if (root) { + g_autofree char * hash =3D virDomainDriverHashRoot(QEMU_DRIVER_NAM= E, root); + ret =3D g_strdup_printf("%s/libvirt/%s", hugepage->mnt_dir, hash); + } else { + ret =3D g_strdup_printf("%s/libvirt/qemu", hugepage->mnt_dir); + } =20 return ret; } =20 =20 char * -qemuGetDomainHugepagePath(const virDomainDef *def, +qemuGetDomainHugepagePath(virQEMUDriverPtr driver, + const virDomainDef *def, virHugeTLBFSPtr hugepage) { - g_autofree char *base =3D qemuGetBaseHugepagePath(hugepage); + g_autofree char *base =3D qemuGetBaseHugepagePath(driver, hugepage); g_autofree char *domPath =3D virDomainDefGetShortName(def); char *ret =3D NULL; =20 @@ -1927,11 +1936,12 @@ qemuGetDomainHugepagePath(const virDomainDef *def, * -1 otherwise. */ int -qemuGetDomainHupageMemPath(const virDomainDef *def, - virQEMUDriverConfigPtr cfg, +qemuGetDomainHupageMemPath(virQEMUDriverPtr driver, + const virDomainDef *def, unsigned long long pagesize, char **memPath) { + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); size_t i =3D 0; =20 if (!cfg->nhugetlbfs) { @@ -1954,7 +1964,7 @@ qemuGetDomainHupageMemPath(const virDomainDef *def, return -1; } =20 - if (!(*memPath =3D qemuGetDomainHugepagePath(def, &cfg->hugetlbfs[i]))) + if (!(*memPath =3D qemuGetDomainHugepagePath(driver, def, &cfg->hugetl= bfs[i]))) return -1; =20 return 0; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 0f0eb60c69..9b282db372 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -388,12 +388,14 @@ virDomainXMLOptionPtr virQEMUDriverCreateXMLConf(virQ= EMUDriverPtr driver, =20 int qemuTranslateSnapshotDiskSourcePool(virDomainSnapshotDiskDefPtr def); =20 -char * qemuGetBaseHugepagePath(virHugeTLBFSPtr hugepage); -char * qemuGetDomainHugepagePath(const virDomainDef *def, +char * qemuGetBaseHugepagePath(virQEMUDriverPtr driver, + virHugeTLBFSPtr hugepage); +char * qemuGetDomainHugepagePath(virQEMUDriverPtr driver, + const virDomainDef *def, virHugeTLBFSPtr hugepage); =20 -int qemuGetDomainHupageMemPath(const virDomainDef *def, - virQEMUDriverConfigPtr cfg, +int qemuGetDomainHupageMemPath(virQEMUDriverPtr driver, + const virDomainDef *def, unsigned long long pagesize, char **memPath); =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 209f8279bd..ac866a923d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -918,7 +918,7 @@ qemuStateInitialize(bool privileged, for (i =3D 0; i < cfg->nhugetlbfs; i++) { g_autofree char *hugepagePath =3D NULL; =20 - hugepagePath =3D qemuGetBaseHugepagePath(&cfg->hugetlbfs[i]); + hugepagePath =3D qemuGetBaseHugepagePath(qemu_driver, &cfg->hugetl= bfs[i]); =20 if (!hugepagePath) goto error; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index fcb47e8596..7035c6d426 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3881,7 +3881,7 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr d= river, if (!build || shouldBuildHP) { for (i =3D 0; i < cfg->nhugetlbfs; i++) { g_autofree char *path =3D NULL; - path =3D qemuGetDomainHugepagePath(vm->def, &cfg->hugetlbfs[i]= ); + path =3D qemuGetDomainHugepagePath(driver, vm->def, &cfg->huge= tlbfs[i]); =20 if (!path) return -1; --=20 2.24.1