From nobody Sat May 4 00:44:06 2024 Delivered-To: importer@patchew.org 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; 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=1585323079; cv=none; d=zohomail.com; s=zohoarc; b=bSSF/utQgddN44AgNuKkbW31yL7zg1Nsw2KSGjhRsPT6/OlfIcU4879IMpGdOYvVfZl7JVSbCuRJfmQjeDXs4P7NpI3epLI5jsvaf4MKWS7O7O9TU0JiQ6QSoaJRn67qUdDRXIYYfI/uxE1OZO9kUH7QBfbcI8vf9Rl1GdrndeY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585323079; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ydnVuGmQYjEbvoFcIok1R+sfGmYkbVA+qVRygdPKL3k=; b=W9hgdIw+Vp055NrcUW4tkFjIU3otYjnjECJWIo0W23QEKilVMon7FACFxGJBK4l0x4XvzG6ox0jnhIYc1axvJM9Q2imS6Hh7J7k8iBBGmACGC4aKQJgUtmegvbdbD1r1Om2UA2f5Teqzmqa0dZzxfnNpuqwcaGduVL1Su6EbGmQ= 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 1585323079547131.35627046640718; Fri, 27 Mar 2020 08:31:19 -0700 (PDT) Received: from localhost ([::1]:43098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqx4-0000TJ-4K for importer@patchew.org; Fri, 27 Mar 2020 11:31:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45332) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqvX-0008Gn-8g for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:29:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHqvU-0000KT-P7 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:29:42 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:38670) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHqvU-0000GH-Hq for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:29:40 -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-474-vd_AsrHuM3ux72jXmb5ZqQ-1; Fri, 27 Mar 2020 11:29:38 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B5256800D5E; Fri, 27 Mar 2020 15:29:36 +0000 (UTC) Received: from t480s.redhat.com (ovpn-112-108.ams2.redhat.com [10.36.112.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BB3060C18; Fri, 27 Mar 2020 15:29:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585322979; 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; bh=ydnVuGmQYjEbvoFcIok1R+sfGmYkbVA+qVRygdPKL3k=; b=JEyI2a7okxChnPuRdlLnfVtiyRE8fUGwetnuH+qc85F+iIo2KeyRW/MgSjy0u6akGAYbKT th7xlYj8vcvKHoDQd5A5GWxFUkDP+UWTUS6oAKWa3UiqMRLUxZaqo8+iIBl9GQzQhmxFlU P0p1t1NrlFxJlGjxXHuAwBVw+cpZdAU= X-MC-Unique: vd_AsrHuM3ux72jXmb5ZqQ-1 From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v1] s390x: Reject unaligned RAM sizes Date: Fri, 27 Mar 2020 16:29:30 +0100 Message-Id: <20200327152930.66636-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= , Thomas Huth , Janosch Frank , David Hildenbrand , Cornelia Huck , Richard Henderson , "Dr . David Alan Gilbert" , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, 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" Historically, we fixed up the RAM size (rounded it down), to fit into storage increments. Since commit 3a12fc61af5c ("390x/s390-virtio-ccw: use memdev for RAM"), we no longer consider the fixed-up size when allcoating the RAM block - which will break migration. Let's simply drop that manual fixup code and let the user supply sane RAM sizes. This will bail out early when trying to migrate (and make an existing guest with e.g., 12345 MB non-migratable), but maybe we should have rejected such RAM sizes right from the beginning. As we no longer fixup maxram_size as well, make other users use ram_size instead. Keep using maxram_size when setting the maximum ram size in KVM, as that will come in handy in the future when supporting memory hotplug (in contrast, storage keys and storage attributes for hotplugged memory will have to be migrated per RAM block in the future). This fixes (or rather rejects early): 1. Migrating older QEMU to upstream QEMU (e.g., with "-m 1235M"), as the RAM block size changed. 2. Migrating upstream QEMU to upstream QEMU (e.g., with "-m 1235M"), as we receive storage attributes for memory we don't expect (as we fixed up ram_size and maxram_size). Fixes: 3a12fc61af5c ("390x/s390-virtio-ccw: use memdev for RAM") Reported-by: Luk=C3=A1=C5=A1 Doktor Cc: Igor Mammedov Cc: Dr. David Alan Gilbert Signed-off-by: David Hildenbrand --- hw/s390x/s390-skeys.c | 4 +--- hw/s390x/s390-stattrib-kvm.c | 7 ++----- hw/s390x/sclp.c | 21 +++++++++++---------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 5da6e5292f..2545b1576b 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -11,7 +11,6 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/boards.h" #include "hw/s390x/storage-keys.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h" @@ -174,9 +173,8 @@ out: static void qemu_s390_skeys_init(Object *obj) { QEMUS390SKeysState *skeys =3D QEMU_S390_SKEYS(obj); - MachineState *machine =3D MACHINE(qdev_get_machine()); =20 - skeys->key_count =3D machine->maxram_size / TARGET_PAGE_SIZE; + skeys->key_count =3D ram_size / TARGET_PAGE_SIZE; skeys->keydata =3D g_malloc0(skeys->key_count); } =20 diff --git a/hw/s390x/s390-stattrib-kvm.c b/hw/s390x/s390-stattrib-kvm.c index c7e1f35524..ae88fbc32e 100644 --- a/hw/s390x/s390-stattrib-kvm.c +++ b/hw/s390x/s390-stattrib-kvm.c @@ -10,7 +10,6 @@ */ =20 #include "qemu/osdep.h" -#include "hw/boards.h" #include "migration/qemu-file.h" #include "hw/s390x/storage-attributes.h" #include "qemu/error-report.h" @@ -84,8 +83,7 @@ static int kvm_s390_stattrib_set_stattr(S390StAttribState= *sa, uint8_t *values) { KVMS390StAttribState *sas =3D KVM_S390_STATTRIB(sa); - MachineState *machine =3D MACHINE(qdev_get_machine()); - unsigned long max =3D machine->maxram_size / TARGET_PAGE_SIZE; + unsigned long max =3D ram_size / TARGET_PAGE_SIZE; =20 if (start_gfn + count > max) { error_report("Out of memory bounds when setting storage attributes= "); @@ -103,8 +101,7 @@ static int kvm_s390_stattrib_set_stattr(S390StAttribSta= te *sa, static void kvm_s390_stattrib_synchronize(S390StAttribState *sa) { KVMS390StAttribState *sas =3D KVM_S390_STATTRIB(sa); - MachineState *machine =3D MACHINE(qdev_get_machine()); - unsigned long max =3D machine->maxram_size / TARGET_PAGE_SIZE; + unsigned long max =3D ram_size / TARGET_PAGE_SIZE; /* We do not need to reach the maximum buffer size allowed */ unsigned long cx, len =3D KVM_S390_SKEYS_MAX / 2; int r; diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index af0bfbc2ec..6af471fb3f 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -326,8 +326,7 @@ out: =20 static void sclp_memory_init(SCLPDevice *sclp) { - MachineState *machine =3D MACHINE(qdev_get_machine()); - ram_addr_t initial_mem =3D machine->ram_size; + uint64_t initial_mem =3D ram_size; int increment_size =3D 20; =20 /* The storage increment size is a multiple of 1M and is a power of 2. @@ -339,15 +338,17 @@ static void sclp_memory_init(SCLPDevice *sclp) } sclp->increment_size =3D increment_size; =20 - /* The core memory area needs to be aligned with the increment size. - * In effect, this can cause the user-specified memory size to be roun= ded - * down to align with the nearest increment boundary. */ + /* + * The core memory area needs to be aligned to the increment size. In + * case it's not aligned, bail out. + */ initial_mem =3D initial_mem >> increment_size << increment_size; - - machine->ram_size =3D initial_mem; - machine->maxram_size =3D initial_mem; - /* let's propagate the changed ram size into the global variable. */ - ram_size =3D initial_mem; + if (initial_mem !=3D ram_size) { + error_report("RAM size not aligned to storage increments." + " Possible aligned RAM size: %" PRIu64 " MB", + initial_mem / MiB); + exit(1); + } } =20 static void sclp_init(Object *obj) --=20 2.25.1