From nobody Sun Feb 8 12:38:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602145959; cv=none; d=zohomail.com; s=zohoarc; b=WOqMjOyDHMe3jvxgdk0aA+9rN1ROc0/Y65btHiN3X3c4htJkH9FdRGkBSOdEJ7skkigOG2++S+n7O6cCGUwVB9Ymb+J+OZrPPQKayov1niK/ExX2J3H6XdLPMiQGJnjUlN2xQUnfw8I6MvGkqgBuuH562BD7fmTB1NcsF3Q0CTw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602145959; 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=znSSftCiTDEJXvd3zETjilAovlbdj+oV9Iiq3iMkwc8=; b=HN+Hn0C+9hzFUicXtoH5UzPpORb5QT+nAWlYv2kURhb44gISeEjEeoN901cLP4sQp7q+oA8+ykXFLsR8noSaV5Gr7sdnCiA0qbYByLULNNfsjvmJh+YHzW2WX/OtmAoNGQLJlBskcxi2m3ZM3ybFCQNG/RL7+ZxjRaTNMNI3vGY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602145959643476.35033583589313; Thu, 8 Oct 2020 01:32:39 -0700 (PDT) Received: from localhost ([::1]:57920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQRLq-0000GK-39 for importer@patchew.org; Thu, 08 Oct 2020 04:32:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQRK8-0007Nh-RW for qemu-devel@nongnu.org; Thu, 08 Oct 2020 04:30:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51177) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQRK7-0006QM-4D for qemu-devel@nongnu.org; Thu, 08 Oct 2020 04:30:52 -0400 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-359-I7UBe0TdNfmZ3Jpi9UoRSQ-1; Thu, 08 Oct 2020 04:30:48 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F6FF101FFA8; Thu, 8 Oct 2020 08:30:47 +0000 (UTC) Received: from t480s.redhat.com (ovpn-114-112.ams2.redhat.com [10.36.114.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4ADC45C1BD; Thu, 8 Oct 2020 08:30:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602145850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=znSSftCiTDEJXvd3zETjilAovlbdj+oV9Iiq3iMkwc8=; b=HL45feDOiP4kBkavm0DPhYCvQ1t7+s+2ZpzskaPRJuicMIKP/RUWuehxTkYimY9j94Xqoe 14WajJS7fxrqWXPV8JJxOiSvP+RgU6/DQKfdokOs34w2CFUtOBwitU3QuhV0pROZuChVKk NMB49ToWHdTlL0tYYrp2k79HQ5RIJxQ= X-MC-Unique: I7UBe0TdNfmZ3Jpi9UoRSQ-1 From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v3 2/6] virtio-mem: Make sure "usable_region_size" is always multiples of the block size Date: Thu, 8 Oct 2020 10:30:25 +0200 Message-Id: <20201008083029.9504-3-david@redhat.com> In-Reply-To: <20201008083029.9504-1-david@redhat.com> References: <20201008083029.9504-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/08 02:56:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.742, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pankaj Gupta , "Michael S. Tsirkin" , David Hildenbrand , "Dr . David Alan Gilbert" , Wei Yang , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The spec states: "The device MUST set addr, region_size, usable_region_size, plugged_size, requested_size to multiples of block_size." With block sizes > 256MB, we currently wouldn't guarantee that for the usable_region_size. Note that we cannot exceed the region_size, as we already enforce the alignment there properly. Fixes: 910b25766b33 ("virtio-mem: Paravirtualized memory hot(un)plug") Cc: "Michael S. Tsirkin" Cc: Wei Yang Cc: Dr. David Alan Gilbert Cc: Igor Mammedov Cc: Pankaj Gupta Signed-off-by: David Hildenbrand --- hw/virtio/virtio-mem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 70200b4eac..461ac68ee8 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -227,6 +227,9 @@ static void virtio_mem_resize_usable_region(VirtIOMEM *= vmem, uint64_t newsize =3D MIN(memory_region_size(&vmem->memdev->mr), requested_size + VIRTIO_MEM_USABLE_EXTENT); =20 + /* The usable region size always has to be multiples of the block size= . */ + newsize =3D QEMU_ALIGN_UP(newsize, vmem->block_size); + if (!requested_size) { newsize =3D 0; } --=20 2.26.2