From patchwork Thu Dec 19 14:41:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13915249 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 21412E77184 for ; Thu, 19 Dec 2024 16:30:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOJIF-0007Xv-Uy; Thu, 19 Dec 2024 11:22:32 -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 1tOHic-00039s-H5 for qemu-devel@nongnu.org; Thu, 19 Dec 2024 09:41:40 -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 1tOHia-0002NO-UU for qemu-devel@nongnu.org; Thu, 19 Dec 2024 09:41:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734619296; 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=MYii7dt2+ZtXvGWzQ4vYeXf89uLkAK1FjQNWVHIzMe4=; b=Fg253PuIYJPMvge0N7WgjuE1XTEdb4hoflnuInryA34OBX46B6xRCP3OZy4/NZINbcfyaj I4Kc28Kf5t48iuLudse7acdNVCbePM5IMbvOtyv3Yj+ejVYAPGQ408uHqQGwMm/7UwFDSR kSpVk3Nrz549L44+V2BbDQJmIKKAwe4= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-10-OxvOduDzOoii13xu81HQCw-1; Thu, 19 Dec 2024 09:41:33 -0500 X-MC-Unique: OxvOduDzOoii13xu81HQCw-1 X-Mimecast-MFC-AGG-ID: OxvOduDzOoii13xu81HQCw Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4362b9c1641so5081505e9.3 for ; Thu, 19 Dec 2024 06:41:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734619292; x=1735224092; 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=MYii7dt2+ZtXvGWzQ4vYeXf89uLkAK1FjQNWVHIzMe4=; b=fL2g7GXL3Hnh6guPiWfcj38eQXDO7ii/uqATeU5shQCkOR1de1DlhCtgyFup4jZ4At zGGV5xEELFe4oq+16NWRYXujnrmdd9htmy3XOY4mUChZUapJezxvYyOcJ0vD9zEX3MFN RfKfQPTm4y0QwnSDHUEFfmTMYJ2QvRwJvXdUpYNkZjkQhYEhLRJRMwyfEkWCBf03pzjt swiIKsn4kfCNgWMAfobGvuzI/wdChpM29rMzX3xtDpGsDjqoZRCtRcfh/4AJkFHHQEOD 8Zhyi9zJpi+Zvj3LPMvbRjh7VJtcaKhBvmyl64GjBo7IEUXOCQYyD9WKomksTdpPBNqM R4xA== X-Gm-Message-State: AOJu0YzJTkjfhHhjtYoBcqZCT+jy/lzEoEqY8Iz0PgRWXccVMfcMn4Ll O5IqMeWcwlUGFo4v+5wLQvB4YSVqP6daxMBpLvkG/gMA3qsPPqkNEtNMwNr7NUpzjVeoz8fOFKR VJzWBdatmVBhjW+mffluYJSw9XmTr4rBlEDNbgcynhcFGZOumkv/RbEHkTSt1xX6H0dCjUDihcx 0T7yZdRoIc+XCCU+okaTFkmXomvERuJ1Gf5mk= X-Gm-Gg: ASbGnctbPmDEQBzTW8Bl3QAdQQU8tA2IGrkMbrc35lnfZ6ZKS1wObGSTG2Ps7mJ9/XF o6Z5rvaT2A4lT8flwi60koafLRy3jnB30xoNXg0tzqnN8eJ5cy7VxkIREzWHUlfMqouWDx2cIsm QMXRV7tX4vDbNBRK7GwoQT4WEkYTZq9xeCkGz0kCYhjrrtAsjuSsLsKIdORseFuR0mUBrZydKlK /2wlAq1gKdhyWiSe00lpvqv4Y7/Ka82L5ABBaq60203uXahu1Wzb9d3hXLwoVhG6LL+5u8ABpZO +4g+hiEzAlLlM/AeWskwIhECcw/y6qTvpZqElWlh X-Received: by 2002:a05:600c:3b84:b0:436:1b7a:c0b4 with SMTP id 5b1f17b1804b1-43655347f09mr59357195e9.1.1734619291945; Thu, 19 Dec 2024 06:41:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IGOvTcX2DH0l98NnpQo6d96dOrXG0tSWcFdWBJR/og7Qc5DYgKbKa2w1ExcQkSOC3v3XuriAg== X-Received: by 2002:a05:600c:3b84:b0:436:1b7a:c0b4 with SMTP id 5b1f17b1804b1-43655347f09mr59356825e9.1.1734619291576; 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 ffacd0b85a97d-38a1c8b830csm1704090f8f.108.2024.12.19.06.41.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 Dec 2024 06:41:31 -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_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 06/14] s390x: introduce s390_get_memory_limit() Date: Thu, 19 Dec 2024 15:41:07 +0100 Message-ID: <20241219144115.2820241-7-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 Received-SPF: pass client-ip=170.10.133.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Let's add s390_get_memory_limit(), to query what has been successfully set via s390_set_memory_limit(). Allow setting the limit only once. We'll remember the limit in the machine state. Move s390_set_memory_limit() to machine code, merging it into set_memory_limit(), because this really is a machine property. Message-ID: <20241008105455.2302628-7-david@redhat.com> Acked-by: Michael S. Tsirkin Reviewed-by: Thomas Huth Signed-off-by: David Hildenbrand --- hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++----- include/hw/s390x/s390-virtio-ccw.h | 8 ++++++++ target/s390x/cpu-sysemu.c | 8 -------- target/s390x/cpu.h | 1 - 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index a28e615c5a..1c56b70dcd 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -45,6 +45,7 @@ #include "migration/blocker.h" #include "qapi/visitor.h" #include "hw/s390x/cpu-topology.h" +#include "kvm/kvm_s390x.h" #include CONFIG_DEVICES static Error *pv_mig_blocker; @@ -121,12 +122,16 @@ static void subsystem_reset(void) } } -static void set_memory_limit(uint64_t new_limit) +static void s390_set_memory_limit(S390CcwMachineState *s390ms, + uint64_t new_limit) { - uint64_t hw_limit; - int ret; + uint64_t hw_limit = 0; + int ret = 0; - ret = s390_set_memory_limit(new_limit, &hw_limit); + assert(!s390ms->memory_limit && new_limit); + if (kvm_enabled()) { + ret = kvm_s390_set_mem_limit(new_limit, &hw_limit); + } if (ret == -E2BIG) { error_report("host supports a maximum of %" PRIu64 " GB", hw_limit / GiB); @@ -135,10 +140,12 @@ static void set_memory_limit(uint64_t new_limit) error_report("setting the guest size failed"); exit(EXIT_FAILURE); } + s390ms->memory_limit = new_limit; } static void s390_memory_init(MachineState *machine) { + S390CcwMachineState *s390ms = S390_CCW_MACHINE(machine); MemoryRegion *sysmem = get_system_memory(); MemoryRegion *ram = machine->ram; uint64_t ram_size = memory_region_size(ram); @@ -154,7 +161,7 @@ static void s390_memory_init(MachineState *machine) exit(EXIT_FAILURE); } - set_memory_limit(ram_size); + s390_set_memory_limit(s390ms, ram_size); /* Map the initial memory. Must happen after setting the memory limit. */ memory_region_add_subregion(sysmem, 0, ram); diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h index 996864a34e..de04336c5a 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -29,10 +29,18 @@ struct S390CcwMachineState { bool dea_key_wrap; bool pv; uint8_t loadparm[8]; + uint64_t memory_limit; SCLPDevice *sclp; }; +static inline uint64_t s390_get_memory_limit(S390CcwMachineState *s390ms) +{ + /* We expect to be called only after the limit was set. */ + assert(s390ms->memory_limit); + return s390ms->memory_limit; +} + #define S390_PTF_REASON_NONE (0x00 << 8) #define S390_PTF_REASON_DONE (0x01 << 8) #define S390_PTF_REASON_BUSY (0x02 << 8) diff --git a/target/s390x/cpu-sysemu.c b/target/s390x/cpu-sysemu.c index 1cd30c1d84..3118a25fee 100644 --- a/target/s390x/cpu-sysemu.c +++ b/target/s390x/cpu-sysemu.c @@ -255,14 +255,6 @@ unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu) return s390_count_running_cpus(); } -int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit) -{ - if (kvm_enabled()) { - return kvm_s390_set_mem_limit(new_limit, hw_limit); - } - return 0; -} - void s390_set_max_pagesize(uint64_t pagesize, Error **errp) { if (kvm_enabled()) { diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 5ef61b1f75..b4506539f0 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -881,7 +881,6 @@ static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg) /* cpu.c */ void s390_crypto_reset(void); -int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit); void s390_set_max_pagesize(uint64_t pagesize, Error **errp); void s390_cmma_reset(void); void s390_enable_css_support(S390CPU *cpu);