From nobody Tue Dec 24 14:10:50 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=1734626226; cv=none; d=zohomail.com; s=zohoarc; b=R/Fw0mArTS1dNtneEAw0SJFl0aP89iq6ysH+jTl5AdZsenNK5/jKtoYfLO5cBMueF4n5BmexBRIA4Zw18KxEwLd7Xbt/okAECxB76pS3gbnRzVdTtuYLk2uTJadnpz3XWwIv5xqCVNRmoy2xKMFTRNUo30F8j2OFku50g0Bltng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1734626226; 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=96QA+3QUnhA5HLSyZnMcgqoHbzkb3vZ+SomK19wOjd8=; b=MBgrrH0ICEvbcnwxSK5UOjyJyS3BhKgrlzH2r8mOmfywQuOYaqDpysdVQ4/rFU9HjE6mTVgus9McN2CuLHUCHaogro2L+abbblu046TcR93Cck5jz5r8F0IY/t5F4ljBRY2oOAWmefc4dpcEP0FumfYVVwRZ/PdmMk24wusu+Zc= 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 1734626226372907.5375415717158; Thu, 19 Dec 2024 08:37:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOJH5-00054K-9J; Thu, 19 Dec 2024 11:21:24 -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 1tOHia-00039d-0W for qemu-devel@nongnu.org; Thu, 19 Dec 2024 09:41:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tOHiY-0002Ms-Dj for qemu-devel@nongnu.org; Thu, 19 Dec 2024 09:41:35 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-659-x2Zd82l5MhmZ3mVoiYZwYA-1; Thu, 19 Dec 2024 09:41:31 -0500 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4362b9c15d8so5186025e9.3 for ; Thu, 19 Dec 2024 06:41:31 -0800 (PST) Received: from localhost (p200300cbc7496600b73a466ce6100686.dip0.t-ipconnect.de. [2003:cb:c749:6600:b73a:466c:e610:686]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-436612008bcsm19613395e9.16.2024.12.19.06.41.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 Dec 2024 06:41:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734619292; 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=96QA+3QUnhA5HLSyZnMcgqoHbzkb3vZ+SomK19wOjd8=; b=VyQDOEnzApisWwBYedaksydakNeNwdudcL2ngF1b7lxlaQnc0kj/pg6Aix1LFZWB04vp19 CR4R/IdTqUy9gJV4DKaf7VZ31RKNmrH9117O22a+cwftn8O2r0hMlrJioEZKeYvwcphaHn 63/Pg7jwQHzmYeQR2CSo1OpjG6Z2F4g= X-MC-Unique: x2Zd82l5MhmZ3mVoiYZwYA-1 X-Mimecast-MFC-AGG-ID: x2Zd82l5MhmZ3mVoiYZwYA X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734619290; x=1735224090; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=96QA+3QUnhA5HLSyZnMcgqoHbzkb3vZ+SomK19wOjd8=; b=W67IpZBR2zZnHN5flQqRrNpH5f1Eui3Ud8sUCODN+XJ+I7XA8LmtBJ6mxa4hLseK92 XbzusKNzETshHSgrirxzq5ItM7UusiX6y8Pq7qt9n8d65N9nF2s34hIgLEenCVqNu5fi bYB0Ki6jVY2042JB+sx/ql486Chu2ewm0V2nkdp3n3g+vQiIrfaALYBrBuAs5HxSGw/Q BwOIUe72E9Wqbs1D9UxWFbHgAyZBi5mgG1sfTYKplVGIA4qpAl0UhTn4521VeMy9bWfs KNlFv6ZMgJLR44TLZfJU21Urt01XzbD44c1Ee6sxPZz3sriwE+ToNZZDifJN49JMAH5S OQ+A== X-Gm-Message-State: AOJu0Yyy+04zpSFoLKk7BNMKDXhr2F+T4Ajx5h3meGoXboVOO369nnsJ a6NYPp03yok8FEjXoSHCWRlaN55d/f2BX5zWJwk8ya+2a4VHNxq1gUgbApsKzfCrp541PtDfBFK Ac4AqvjyypDO2cEzEhP4eCWWehAwGyGElGpudgaEuv7oUVcS1ruurkqJNsVAzRRE++XgoXFNO8W qGL0A0YSd8v/PlH8wP4hg+t901uZs5AnHgvDQ= X-Gm-Gg: ASbGncvu1SuiXiqVh0MLF4DVJ+b2hVOXIACC2INAm9j74zTUmhCbcDFINtO2qyiyJxR nIsd1pzESjZ+P+u7MhlJ1RG6dmCw187jhPdYM44pKpKr0BWw6zv2vJ+y1yhX2mzNfAj1GOcBoux r7y5rS5Pkbk0ktOD3gzisnGXdiLM09Fzjbe8MDVA5w2qVQS3yyObc0ItkN+bAmwTwrz8fPBownI knSFo0UK5xKHofurcLu8AJdfY0VfyIA4765aOjjlbDDzHeLvpMTbA832COINvcXbLfs3ypiYd0y 0LdGyOv6AQwlQi7iFjk72RypK/univPb83POotzQ X-Received: by 2002:a05:600c:3548:b0:434:a1d3:a30f with SMTP id 5b1f17b1804b1-43655345212mr63790865e9.6.1734619290197; Thu, 19 Dec 2024 06:41:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IFtHMVOBeAxDz6ruff6h7b+APMm7L2hbahpzHmL/60QT5pmnzXrF4aVaL4FomTTosyQOJAwHg== X-Received: by 2002:a05:600c:3548:b0:434:a1d3:a30f with SMTP id 5b1f17b1804b1-43655345212mr63790515e9.6.1734619289785; Thu, 19 Dec 2024 06:41:29 -0800 (PST) From: David Hildenbrand To: qemu-devel@nongnu.org Cc: David Hildenbrand , Paolo Bonzini , Thomas Huth , Halil Pasic , Christian Borntraeger , Eric Farman , Richard Henderson , Nina Schoetterl-Glausch , Heiko Carstens , Ilya Leoshkevich , Janosch Frank , "Michael S. Tsirkin" , Cornelia Huck , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 05/14] s390x/s390-virtio-ccw: move setting the maximum guest size from sclp to machine code Date: Thu, 19 Dec 2024 15:41:06 +0100 Message-ID: <20241219144115.2820241-6-david@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241219144115.2820241-1-david@redhat.com> References: <20241219144115.2820241-1-david@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=dhildenb@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-1.116, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.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: 1734626227427116600 Content-Type: text/plain; charset="utf-8" Nowadays, it feels more natural to have that code located in s390_memory_init(), where we also have direct access to the machine object. While at it, use the actual RAM size, not the maximum RAM size which cannot currently be reached without support for any memory devices. Consequently update s390_pv_vm_try_disable_async() to rely on the RAM size as well, to avoid temporary issues while we further rework that handling. set_memory_limit() is temporary, we'll merge it with s390_set_memory_limit() next. Message-ID: <20241008105455.2302628-6-david@redhat.com> Acked-by: Michael S. Tsirkin Reviewed-by: Thomas Huth Signed-off-by: David Hildenbrand --- hw/s390x/s390-virtio-ccw.c | 28 ++++++++++++++++++++++++---- hw/s390x/sclp.c | 11 ----------- target/s390x/kvm/pv.c | 2 +- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index b0edaa0872..a28e615c5a 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -121,11 +121,29 @@ static void subsystem_reset(void) } } =20 -static void s390_memory_init(MemoryRegion *ram) +static void set_memory_limit(uint64_t new_limit) +{ + uint64_t hw_limit; + int ret; + + ret =3D s390_set_memory_limit(new_limit, &hw_limit); + if (ret =3D=3D -E2BIG) { + error_report("host supports a maximum of %" PRIu64 " GB", + hw_limit / GiB); + exit(EXIT_FAILURE); + } else if (ret) { + error_report("setting the guest size failed"); + exit(EXIT_FAILURE); + } +} + +static void s390_memory_init(MachineState *machine) { MemoryRegion *sysmem =3D get_system_memory(); + MemoryRegion *ram =3D machine->ram; + uint64_t ram_size =3D memory_region_size(ram); =20 - if (!QEMU_IS_ALIGNED(memory_region_size(ram), 1 * MiB)) { + if (!QEMU_IS_ALIGNED(ram_size, 1 * MiB)) { /* * SCLP cannot possibly expose smaller granularity right now and K= VM * cannot handle smaller granularity. As we don't support NUMA, the @@ -136,7 +154,9 @@ static void s390_memory_init(MemoryRegion *ram) exit(EXIT_FAILURE); } =20 - /* allocate RAM for core */ + set_memory_limit(ram_size); + + /* Map the initial memory. Must happen after setting the memory limit.= */ memory_region_add_subregion(sysmem, 0, ram); =20 /* @@ -211,7 +231,7 @@ static void ccw_init(MachineState *machine) qdev_realize_and_unref(DEVICE(ms->sclp), NULL, &error_fatal); =20 /* init memory + setup max page size. Required for the CPU model */ - s390_memory_init(machine->ram); + s390_memory_init(machine); =20 /* init CPUs (incl. CPU model) early so s390_has_feature() works */ s390_init_cpus(machine); diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 8757626b5c..73e88ab4eb 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -376,10 +376,7 @@ void sclp_service_interrupt(uint32_t sccb) /* qemu object creation and initialization functions */ static void sclp_realize(DeviceState *dev, Error **errp) { - MachineState *machine =3D MACHINE(qdev_get_machine()); SCLPDevice *sclp =3D SCLP(dev); - uint64_t hw_limit; - int ret; =20 /* * qdev_device_add searches the sysbus for TYPE_SCLP_EVENTS_BUS. As lo= ng @@ -389,14 +386,6 @@ static void sclp_realize(DeviceState *dev, Error **err= p) if (!sysbus_realize(SYS_BUS_DEVICE(sclp->event_facility), errp)) { return; } - - ret =3D s390_set_memory_limit(machine->maxram_size, &hw_limit); - if (ret =3D=3D -E2BIG) { - error_setg(errp, "host supports a maximum of %" PRIu64 " GB", - hw_limit / GiB); - } else if (ret) { - error_setg(errp, "setting the guest size failed"); - } } =20 static void sclp_memory_init(SCLPDevice *sclp) diff --git a/target/s390x/kvm/pv.c b/target/s390x/kvm/pv.c index dde836d21a..424cce75ca 100644 --- a/target/s390x/kvm/pv.c +++ b/target/s390x/kvm/pv.c @@ -133,7 +133,7 @@ bool s390_pv_vm_try_disable_async(S390CcwMachineState *= ms) * If the feature is not present or if the VM is not larger than 2 GiB, * KVM_PV_ASYNC_CLEANUP_PREPARE fill fail; no point in attempting it. */ - if ((MACHINE(ms)->maxram_size <=3D 2 * GiB) || + if ((MACHINE(ms)->ram_size <=3D 2 * GiB) || !kvm_check_extension(kvm_state, KVM_CAP_S390_PROTECTED_ASYNC_DISAB= LE)) { return false; } --=20 2.47.1