From nobody Tue Nov 26 15:24:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1707204191; cv=none; d=zohomail.com; s=zohoarc; b=m/ms+kjDmqhPydbNF0x8eX94rUpVJxAjY1xFa2BGYy35AdzWPhLvOQrD2DjdwSLIgv7sQOK02QdrCyJz1h3E9cGZPYSdqnFTB2JIIu2Yw3dQN+H0za7iRdOq+zVl7OZxHCjEV7mdSyhNrzZP9RzpTSiuDsbRdvOIlJGSPf039Mw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707204191; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yYQLNt3ySIw2/ay8d3vGJbaWL+4EsM3JD4ciODknu9Y=; b=SaXSlitr7xgt+mQozTtYM6BZfwyZdBBGiHOihYfFXthNfCm4HrSxyjAE9kWWy8eGCRRnJTIRv3CjbvTLCQfKMdJU+Zc1kj9/HkuwMojfl+IOpCcYMrHC8Cy4OEL7LiItg+y6MZdzY+kD8bFif1+xZUKDtlCmW/YkmWOXosor7gs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17072041916801001.2957611085519; Mon, 5 Feb 2024 23:23:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXFmu-0002nY-MN; Tue, 06 Feb 2024 02:22:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rXFmr-0002mT-Ce for qemu-devel@nongnu.org; Tue, 06 Feb 2024 02:22:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rXFmp-0006jj-TN for qemu-devel@nongnu.org; Tue, 06 Feb 2024 02:22:33 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-60-3uyxeOMZO6yIxiH672dAvQ-1; Tue, 06 Feb 2024 02:22:29 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 42B5328EC103; Tue, 6 Feb 2024 07:22:29 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8D9E1121312; Tue, 6 Feb 2024 07:22:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707204151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yYQLNt3ySIw2/ay8d3vGJbaWL+4EsM3JD4ciODknu9Y=; b=iZ65P8srerZXZ60nF/CKOdmHTnM/okN2NsJifVlPpDrrQ19Zb0u2KXTJfCY7W950bpqIhc 178rDXC29+FGdlsj3He/2YqU7U86/SG2vsp41vPXPMqEt6SJ3uYk5g5vZTvwIU3iiP6XBL +xtXFDt4m7Ey2uieH0aUb/E9EP2E0Q8= X-MC-Unique: 3uyxeOMZO6yIxiH672dAvQ-1 From: David Hildenbrand To: qemu-devel@nongnu.org Cc: Peter Maydell , Paolo Bonzini , David Hildenbrand , "Maciej S . Szmigiero" Subject: [PULL v3 1/3] hv-balloon: use get_min_alignment() to express 32 GiB alignment Date: Tue, 6 Feb 2024 08:22:23 +0100 Message-ID: <20240206072225.21187-2-david@redhat.com> In-Reply-To: <20240206072225.21187-1-david@redhat.com> References: <20240206072225.21187-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 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=170.10.133.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.285, 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1707204192010100001 Content-Type: text/plain; charset="utf-8" Let's implement the get_min_alignment() callback for memory devices, and copy for the device memory region the alignment of the host memory region. This mimics what virtio-mem does, and allows for re-introducing proper alignment checks for the memory region size (where we don't care about additional device requirements) in memory device core. Message-ID: <20240117135554.787344-2-david@redhat.com> Reviewed-by: Maciej S. Szmigiero Signed-off-by: David Hildenbrand --- hw/hyperv/hv-balloon.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c index 0238365712..ade283335a 100644 --- a/hw/hyperv/hv-balloon.c +++ b/hw/hyperv/hv-balloon.c @@ -1477,22 +1477,7 @@ static void hv_balloon_ensure_mr(HvBalloon *balloon) balloon->mr =3D g_new0(MemoryRegion, 1); memory_region_init(balloon->mr, OBJECT(balloon), TYPE_HV_BALLOON, memory_region_size(hostmem_mr)); - - /* - * The VM can indicate an alignment up to 32 GiB. Memory device core c= an - * usually only handle/guarantee 1 GiB alignment. The user will have to - * specify a larger maxmem eventually. - * - * The memory device core will warn the user in case maxmem might have= to be - * increased and will fail plugging the device if there is not suffici= ent - * space after alignment. - * - * TODO: we could do the alignment ourselves in a slightly bigger regi= on. - * But this feels better, although the warning might be annoying. Maybe - * we can optimize that in the future (e.g., with such a device on the - * cmdline place/size the device memory region differently. - */ - balloon->mr->align =3D MAX(32 * GiB, memory_region_get_alignment(hostm= em_mr)); + balloon->mr->align =3D memory_region_get_alignment(hostmem_mr); } =20 static void hv_balloon_free_mr(HvBalloon *balloon) @@ -1654,6 +1639,25 @@ static MemoryRegion *hv_balloon_md_get_memory_region= (MemoryDeviceState *md, return balloon->mr; } =20 +static uint64_t hv_balloon_md_get_min_alignment(const MemoryDeviceState *m= d) +{ + /* + * The VM can indicate an alignment up to 32 GiB. Memory device core c= an + * usually only handle/guarantee 1 GiB alignment. The user will have to + * specify a larger maxmem eventually. + * + * The memory device core will warn the user in case maxmem might have= to be + * increased and will fail plugging the device if there is not suffici= ent + * space after alignment. + * + * TODO: we could do the alignment ourselves in a slightly bigger regi= on. + * But this feels better, although the warning might be annoying. Maybe + * we can optimize that in the future (e.g., with such a device on the + * cmdline place/size the device memory region differently. + */ + return 32 * GiB; +} + static void hv_balloon_md_fill_device_info(const MemoryDeviceState *md, MemoryDeviceInfo *info) { @@ -1766,5 +1770,6 @@ static void hv_balloon_class_init(ObjectClass *klass,= void *data) mdc->get_memory_region =3D hv_balloon_md_get_memory_region; mdc->decide_memslots =3D hv_balloon_decide_memslots; mdc->get_memslots =3D hv_balloon_get_memslots; + mdc->get_min_alignment =3D hv_balloon_md_get_min_alignment; mdc->fill_device_info =3D hv_balloon_md_fill_device_info; } --=20 2.43.0