From nobody Sun Nov 16 16:30:42 2025 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=1600861498; cv=none; d=zohomail.com; s=zohoarc; b=I2tDeHx5uRdaqYPM12zHzLB3Cyxt+2l3KIz41yb6XvfsQRwKpNZ0aOqCbgnFlyDxc6iO9Pk1mRlzD0Aq2uFnNG/vPUYiD4AFV/C0qViFTdgPNc4LDljtNv04vy52mTdRV3AAoqXDlLlX+30+uOCURVgQIJElWeBMBIZFun2yvdo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600861498; 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=uW1JAqLt4GRqGGLNCcSxkLCl6MbYNQ6yyMJyBwSaQ6U=; b=RAY3JjIak7ODDtGw8ubuh038ie3XtVYBk+446PWTBODPtNii5auN3hXjyGKu328Pnw38+H9mxpLHoKnMxq/5FPMroZrGV+O9h/7e8IsgUdur86ScSL9xeE7AwVdm7olutYuwtZeRcBE9JuFp6fbADP/ufruOCAgU9CnnmiLgoik= 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 1600861498621501.63673016048244; Wed, 23 Sep 2020 04:44:58 -0700 (PDT) Received: from localhost ([::1]:56320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL3Cj-0004Pi-DH for importer@patchew.org; Wed, 23 Sep 2020 07:44:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL37b-0008QH-RL for qemu-devel@nongnu.org; Wed, 23 Sep 2020 07:39:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39034) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL37V-0006uo-0N for qemu-devel@nongnu.org; Wed, 23 Sep 2020 07:39:39 -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-236-2kZ7HAhROoG-kBTn7Ma3SQ-1; Wed, 23 Sep 2020 07:39:18 -0400 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 266CE427C4; Wed, 23 Sep 2020 11:39:17 +0000 (UTC) Received: from t480s.redhat.com (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C712702E7; Wed, 23 Sep 2020 11:39:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600861159; 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=uW1JAqLt4GRqGGLNCcSxkLCl6MbYNQ6yyMJyBwSaQ6U=; b=hjW1spbKE0lMWgZsOx69VlKqDPsDXyxbZLGBYzQRN2lGpK2Yjzna5pkU1zmwlmFZSFZaiL Cas37h+Wn57ocqpTJp/sxU0kY/1Rw60E8gZ2g6sh3aqoY0r92e4FJZkfVqYD2+8J6p/rTy xtH310PruTQm7mjSRY+SXu7IF67cLTE= X-MC-Unique: 2kZ7HAhROoG-kBTn7Ma3SQ-1 From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v1 5/5] virito-mem: Implement get_min_alignment() Date: Wed, 23 Sep 2020 13:39:00 +0200 Message-Id: <20200923113900.72718-6-david@redhat.com> In-Reply-To: <20200923113900.72718-1-david@redhat.com> References: <20200923113900.72718-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=63.128.21.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 00:53:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -32 X-Spam_score: -3.3 X-Spam_bar: --- X-Spam_report: (-3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.228, 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_H5=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" This allows auto-assignment of a properly aligned address in guest physical address space. For example, when specifying a 2GB block size for a virtio-mem device with 10GB with a memory setup "-m 4G, 20G", we'll no longer fail when realizing. Cc: "Michael S. Tsirkin" Cc: Wei Yang Cc: Dr. David Alan Gilbert Cc: Igor Mammedov Cc: Pankaj Gupta Signed-off-by: David Hildenbrand Reviewed-by: Pankaj Gupta --- hw/virtio/virtio-mem-pci.c | 14 ++++++++++++++ hw/virtio/virtio-mem.c | 8 ++++++++ 2 files changed, 22 insertions(+) diff --git a/hw/virtio/virtio-mem-pci.c b/hw/virtio/virtio-mem-pci.c index 590cec041b..2bfa2474fb 100644 --- a/hw/virtio/virtio-mem-pci.c +++ b/hw/virtio/virtio-mem-pci.c @@ -75,6 +75,19 @@ static void virtio_mem_pci_fill_device_info(const Memory= DeviceState *md, info->type =3D MEMORY_DEVICE_INFO_KIND_VIRTIO_MEM; } =20 +static uint64_t virtio_mem_pci_get_min_alignment(const MemoryDeviceState *= md) +{ + /* + * If no block size was configured, returns the default block size. + * Before the device was realized, this might be smaller than the + * final block size (because it ignores the page size of the memory re= gion). + * However, the alignment of the memory region properly considers the + * page size of the memory region. + */ + return object_property_get_uint(OBJECT(md), VIRTIO_MEM_BLOCK_SIZE_PROP, + &error_abort); +} + static void virtio_mem_pci_size_change_notify(Notifier *notifier, void *da= ta) { VirtIOMEMPCI *pci_mem =3D container_of(notifier, VirtIOMEMPCI, @@ -109,6 +122,7 @@ static void virtio_mem_pci_class_init(ObjectClass *klas= s, void *data) mdc->get_plugged_size =3D virtio_mem_pci_get_plugged_size; mdc->get_memory_region =3D virtio_mem_pci_get_memory_region; mdc->fill_device_info =3D virtio_mem_pci_fill_device_info; + mdc->get_min_alignment =3D virtio_mem_pci_get_min_alignment; } =20 static void virtio_mem_pci_instance_init(Object *obj) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 716eddd792..d8222153cf 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -805,6 +805,14 @@ static void virtio_mem_get_block_size(Object *obj, Vis= itor *v, const char *name, const VirtIOMEM *vmem =3D VIRTIO_MEM(obj); uint64_t value =3D vmem->block_size; =20 + /* + * If not configured by the user (and we're not realized yet), use the + * default block size. + */ + if (!value) { + value =3D virtio_mem_default_block_size(); + } + visit_type_size(v, name, &value, errp); } =20 --=20 2.26.2