From nobody Sun Feb 8 17:36:37 2026 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; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1605132472; cv=none; d=zohomail.com; s=zohoarc; b=U6cpi+7HhABRi7b+avc2E8ol5A3yrU+BD6MJ1T2kknMEuC54qLXnZUWLuVUHSkzDuFVomkvy4cfPXTk7aBmT+TAZa5yl0Cp2houa4F/9ezGzIRyOAAmXNYYIz53itE/492U6q/IYE2EFdgjAbMQB6W3fHH4a1K6epU6poIm9ewU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605132472; h=Content-Type:Content-Transfer-Encoding:Cc: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=9zAtBFOfc9OzWhjtZtqXIA+0SFmVBaELZluL78y4Z+M=; b=G3ZA49yBIiNs+bZ4GdoDqheRITgWZRmqD8Ql26fRtBMffN00/sKM6KgG9ouCTP/ri+trPzHPt11YVGCY9VREh535mU8fNXrYIaLJfJheXBVgyuxyk3ad/NAaoAH19TfkOzV52GRumPnYxJspTBBTvReV4vX9zM6nG2OemjTKyf4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= 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 1605132472559824.1065179221584; Wed, 11 Nov 2020 14:07:52 -0800 (PST) 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-185-Oupg7MpsOP-6iYmdtOD_eQ-1; Wed, 11 Nov 2020 17:07:48 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EB5464098; Wed, 11 Nov 2020 22:07:42 +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 6ED5C5B4D0; Wed, 11 Nov 2020 22:07:42 +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 1259744A7E; Wed, 11 Nov 2020 22:07:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ABM7dLZ006066 for ; Wed, 11 Nov 2020 17:07:39 -0500 Received: by smtp.corp.redhat.com (Postfix) id 96E18F00EE; Wed, 11 Nov 2020 22:07:39 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 916FFF00EF for ; Wed, 11 Nov 2020 22:07:37 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4AA8585829F for ; Wed, 11 Nov 2020 22:07:37 +0000 (UTC) Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-493-9-5PEHlsMpayOaI0B4rU1g-1; Wed, 11 Nov 2020 17:07:35 -0500 Received: by mail-qk1-f178.google.com with SMTP id l2so3429315qkf.0 for ; Wed, 11 Nov 2020 14:07:34 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:b9cd:904e:d02:53c4:1c05]) by smtp.gmail.com with ESMTPSA id a200sm3427842qkb.66.2020.11.11.14.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 14:07:33 -0800 (PST) X-MC-Unique: Oupg7MpsOP-6iYmdtOD_eQ-1 X-MC-Unique: 9-5PEHlsMpayOaI0B4rU1g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9zAtBFOfc9OzWhjtZtqXIA+0SFmVBaELZluL78y4Z+M=; b=PGYtZhGzH4cYHZs0r3Azhh2PimdEAeSIDW3++QK1/IJd+1AYTovZ67a+pG/P5TvJTF HWvzzZR/omvL38t3aidSusVNqvM3QYi9276jo8aDM4fm/MafRiO9RwFUOn65TFcs1etv 1BGyHV1A+rKGDqvA68JVWQjlhc8UJj/o8c/e1UnK+xWZqMVeWBH7MMf+EgtA8hisE5IG iQoQdwn/3NYEEmTaaswj3pprDqwSqTh2hPO14Q6emnX0p519+pAlxuqI6UuRmmcWVKh3 lRvTAe8j/PFZo7uDkKRBFQHkrynQocu0rj2sZMGIgU91Vqd+NYT5UtIGjcdkT2fk4Trd 3U2Q== X-Gm-Message-State: AOAM532GcVX/c010vNq8uLs0OW5bnbFdBvlXiFABx4TjVhNpHX1Q0XtF vW7fz73YvaIM9TcYlXvf7Xpl74aT5Nc= X-Google-Smtp-Source: ABdhPJx7SVWhErD8c414gRdXjQYY3XtYMLGAR/zqXYA3lKLN+I8ltygAbetNmILvtrM0mu7XHsNz9A== X-Received: by 2002:a37:9ecc:: with SMTP id h195mr27110747qke.103.1605132454295; Wed, 11 Nov 2020 14:07:34 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 01/10] domain_conf.c: handle all ppc64 dimms in virDomainNVDimmAlignSizePseries Date: Wed, 11 Nov 2020 19:07:16 -0300 Message-Id: <20201111220725.356297-2-danielhb413@gmail.com> In-Reply-To: <20201111220725.356297-1-danielhb413@gmail.com> References: <20201111220725.356297-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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.11 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 Content-Type: text/plain; charset="utf-8" This simplifies the handling of ppc64 alignment in other parts of the code, with a single function to handle all cases for the architecture. No functional changes were made just yet. Function was renamed to reflect the broader scope. Signed-off-by: Daniel Henrique Barboza --- src/conf/domain_conf.c | 15 +++++++++++---- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.c | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a3ca332279..c98e760aa2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5361,7 +5361,7 @@ virDomainMemoryDefPostParse(virDomainMemoryDefPtr mem, */ if (ARCH_IS_PPC64(def->os.arch) && mem->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM && - virDomainNVDimmAlignSizePseries(mem) < 0) + virDomainMemoryDeviceAlignSizePseries(mem) < 0) return -1; =20 return 0; @@ -16851,8 +16851,16 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode, } =20 int -virDomainNVDimmAlignSizePseries(virDomainMemoryDefPtr mem) +virDomainMemoryDeviceAlignSizePseries(virDomainMemoryDefPtr mem) { + unsigned long long ppc64AlignSize =3D 256 * 1024; + unsigned long long guestArea; + + if (mem->model !=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM) { + mem->size =3D VIR_ROUND_UP(mem->size, ppc64AlignSize); + return 0; + } + /* For NVDIMMs in ppc64 in we want to align down the guest * visible space, instead of align up, to avoid writing * beyond the end of file by adding a potential 256MiB @@ -16867,8 +16875,7 @@ virDomainNVDimmAlignSizePseries(virDomainMemoryDefP= tr mem) * * target_size =3D AlignDown(target_size - label_size) + label_size */ - unsigned long long ppc64AlignSize =3D 256 * 1024; - unsigned long long guestArea =3D mem->size - mem->labelsize; + guestArea =3D mem->size - mem->labelsize; =20 /* Align down guest_area. 256MiB is the minimum size. Error * out if target_size is smaller than 256MiB + label_size, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 77656c8ae3..fed451c4d5 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3905,7 +3905,7 @@ virDomainBlockIoTuneInfoEqual(const virDomainBlockIoT= uneInfo *a, const virDomainBlockIoTuneInfo *b); =20 int -virDomainNVDimmAlignSizePseries(virDomainMemoryDefPtr mem); +virDomainMemoryDeviceAlignSizePseries(virDomainMemoryDefPtr mem); =20 bool virHostdevIsSCSIDevice(const virDomainHostdevDef *hostdev) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 491bd5bd87..a44d37924a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -546,7 +546,6 @@ virDomainNetTypeToString; virDomainNetUpdate; virDomainNostateReasonTypeFromString; virDomainNostateReasonTypeToString; -virDomainNVDimmAlignSizePseries; virDomainObjAssignDef; virDomainObjBroadcast; virDomainObjCheckActive; @@ -849,6 +848,7 @@ virDomainCachePolicyTypeFromString; virDomainCachePolicyTypeToString; virDomainMemoryAccessTypeFromString; virDomainMemoryAccessTypeToString; +virDomainMemoryDeviceAlignSizePseries; virDomainMemoryLatencyTypeFromString; virDomainMemoryLatencyTypeToString; virDomainNumaCheckABIStability; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 70896ad80e..375a9e5075 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8105,7 +8105,7 @@ qemuDomainAlignMemorySizes(virDomainDefPtr def) for (i =3D 0; i < def->nmems; i++) { if (def->mems[i]->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM && ARCH_IS_PPC64(def->os.arch)) { - if (virDomainNVDimmAlignSizePseries(def->mems[i]) < 0) + if (virDomainMemoryDeviceAlignSizePseries(def->mems[i]) < 0) return -1; } else { align =3D qemuDomainGetMemoryModuleSizeAlignment(def, def->mem= s[i]); @@ -8142,7 +8142,7 @@ qemuDomainMemoryDeviceAlignSize(virDomainDefPtr def, { if (mem->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM && ARCH_IS_PPC64(def->os.arch)) { - return virDomainNVDimmAlignSizePseries(mem); + return virDomainMemoryDeviceAlignSizePseries(mem); } else { mem->size =3D VIR_ROUND_UP(mem->size, qemuDomainGetMemorySizeAlignment(def)); --=20 2.26.2