From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B648C433EF for ; Mon, 4 Oct 2021 12:23:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F3D276136F for ; Mon, 4 Oct 2021 12:23:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232925AbhJDMZf (ORCPT ); Mon, 4 Oct 2021 08:25:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:39589 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbhJDMZf (ORCPT ); Mon, 4 Oct 2021 08:25:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633350226; h=from:from:reply-to: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=Wl7ICQODkHW0YfDfZWHTQGFAOQQBlguFC3IFpZqYzao=; b=FtUPZu3lbzrFI9E3Oe025T79RPLVjLgGbpLak0UG7zimfoKBxgzqnZcWtKFQ/uCVIyY99s JvFhhP0aaAxdXCJuHnC3y1sHnSzOilf49pnwNg2+VhXseqQUHJEZ+YrSxCMxwAfSqTajUG swUAhKGKY2CS7GfOwI8qkm0CjKX59I8= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-502-GxpYwCHZMbS0jqio7jIMnw-1; Mon, 04 Oct 2021 08:23:45 -0400 X-MC-Unique: GxpYwCHZMbS0jqio7jIMnw-1 Received: by mail-wm1-f72.google.com with SMTP id m9-20020a05600c4f4900b003057c761567so9908905wmq.1 for ; Mon, 04 Oct 2021 05:23:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=Wl7ICQODkHW0YfDfZWHTQGFAOQQBlguFC3IFpZqYzao=; b=rjtvaxJQUxmwD4ufPJlBkTcsyqGStgyDECCKOwoNGWtPC35aUnEoa3WRwqzOxSA+L+ 1vbij1K6Ax/yMhqP/iBubSzUYHNktWSEzx8uADbrY6rffaCLQ7ep1gbngox7VkbnaaXb vkFqpS8anGN5Raz8RqTaoFvNJVdd3xc6pxjnIfD/NsPozrclL7TMnSKq4YoVEp1QfUy6 H3/uqs2DHxrowxH/MGQB4E9rSMkJ8+YglVg42kKCkQCShQcmeqMFdniOJgV2SSJ36quM kUfLtOE2ftSuRCZnMUMYoCQIMeC/fnjqLzaL7AmbHo5Gv3NY9iwIug2SfdNyBkpKoJOL wAvw== X-Gm-Message-State: AOAM533QKWPsZ+jSWUru8fGHGh0MkHPccHf85/cf6j/AQnJR3yDdY4v1 u7R9UhqtgrvlPHGkFQheuHUxS2QfA0j+7PZj2x2ouy5e7hjTJN4NtMYT6F8qWgtQQG5aXUoVrfJ fj9L707lu4r28 X-Received: by 2002:a05:600c:aca:: with SMTP id c10mr18225412wmr.174.1633350223513; Mon, 04 Oct 2021 05:23:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxitcIwPYb5MpA3gCLqjGct65p9PyV+TzRYqXfXifFRuJt7/5ttvdPSHfIcdPnoBpfMalndPA== X-Received: by 2002:a05:600c:aca:: with SMTP id c10mr18225400wmr.174.1633350223347; Mon, 04 Oct 2021 05:23:43 -0700 (PDT) Received: from ?IPv6:2a01:e0a:59e:9d80:527b:9dff:feef:3874? ([2a01:e0a:59e:9d80:527b:9dff:feef:3874]) by smtp.gmail.com with ESMTPSA id f19sm14674493wmf.11.2021.10.04.05.23.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Oct 2021 05:23:42 -0700 (PDT) Reply-To: eric.auger@redhat.com Subject: Re: [PATCH v2 3/5] hw/arm/virt: Honor highmem setting when computing the memory map To: Marc Zyngier , qemu-devel@nongnu.org Cc: Andrew Jones , Peter Maydell , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, kernel-team@android.com References: <20211003164605.3116450-1-maz@kernel.org> <20211003164605.3116450-4-maz@kernel.org> From: Eric Auger Message-ID: Date: Mon, 4 Oct 2021 14:23:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20211003164605.3116450-4-maz@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi Marc, On 10/3/21 6:46 PM, Marc Zyngier wrote: > Even when the VM is configured with highmem=off, the highest_gpa > field includes devices that are above the 4GiB limit. > Similarily, nothing seem to check that the memory is within > the limit set by the highmem=off option. > > This leads to failures in virt_kvm_type() on systems that have > a crippled IPA range, as the reported IPA space is larger than > what it should be. > > Instead, honor the user-specified limit to only use the devices > at the lowest end of the spectrum, and fail if we have memory > crossing the 4GiB limit. > > Signed-off-by: Marc Zyngier > --- > hw/arm/virt.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index bcf58f677d..9d2abdbd5f 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1628,6 +1628,11 @@ static void virt_set_memmap(VirtMachineState *vms) > exit(EXIT_FAILURE); > } > > + if (!vms->highmem && > + vms->memmap[VIRT_MEM].base + ms->maxram_size > 4 * GiB) { > + error_report("highmem=off, but memory crosses the 4GiB limit\n"); > + exit(EXIT_FAILURE); > + } > /* > * We compute the base of the high IO region depending on the > * amount of initial and device memory. The device memory start/size > @@ -1657,7 +1662,9 @@ static void virt_set_memmap(VirtMachineState *vms) > vms->memmap[i].size = size; > base += size; > } > - vms->highest_gpa = base - 1; > + vms->highest_gpa = (vms->highmem ? > + base : > + vms->memmap[VIRT_MEM].base + ms->maxram_size) - 1; I think I would have preferred to have if (vms->highmem) {    for (i = VIRT_LOWMEMMAP_LAST; i < ARRAY_SIZE(extended_memmap); i++) {         hwaddr size = extended_memmap[i].size;         base = ROUND_UP(base, size);         vms->memmap[i].base = base;         vms->memmap[i].size = size;         base += size;     } } as it is useless to execute that code and create new memmap entries in case of !highmem. But nevertheless, this looks correct Eric > if (device_memory_size > 0) { > ms->device_memory = g_malloc0(sizeof(*ms->device_memory)); > ms->device_memory->base = device_memory_base; From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4A4FC433FE for ; Mon, 4 Oct 2021 12:23:49 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 547536124C for ; Mon, 4 Oct 2021 12:23:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 547536124C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id C26014B289; Mon, 4 Oct 2021 08:23:48 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@redhat.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vANQswdxAH76; Mon, 4 Oct 2021 08:23:47 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id C3F9D4B279; Mon, 4 Oct 2021 08:23:47 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 0275D4B276 for ; Mon, 4 Oct 2021 08:23:47 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zq6E3IcvE0ph for ; Mon, 4 Oct 2021 08:23:45 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mm01.cs.columbia.edu (Postfix) with ESMTP id E913F4B26D for ; Mon, 4 Oct 2021 08:23:45 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633350225; h=from:from:reply-to: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=Wl7ICQODkHW0YfDfZWHTQGFAOQQBlguFC3IFpZqYzao=; b=bZYcqv9ZABKO/NIvZXNHmDf6zcYS/6x3VmDDF6fRnfjuy0XsPDFpNDnTXDUuiBbNdT0VpH u/v7yBDnLWduOBE7DyC69Zts0jYOxCGtD3sLJsoeN5MOOC1cw24zDqYr1YvAj0fn9Y7Q/+ PIIWO0lkAtuT7SFxvckz3+1LUve3v1U= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-458-vP__lr2ZPM23p4VEe1UH7w-1; Mon, 04 Oct 2021 08:23:44 -0400 X-MC-Unique: vP__lr2ZPM23p4VEe1UH7w-1 Received: by mail-wm1-f72.google.com with SMTP id u3-20020a7bcb03000000b0030d5228cbbdso4129251wmj.3 for ; Mon, 04 Oct 2021 05:23:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=Wl7ICQODkHW0YfDfZWHTQGFAOQQBlguFC3IFpZqYzao=; b=ZbyUgTetjg/SK4th2wMM4Kzi+QMF174JkpwR0hXUr2IjDdL1PKX4/4ZW09HGmq0oq9 BatpzXaV44o+9Udw5xzkvhQHvmnIS6hWHR0mD0t5E905LP9JPPQxLOSHVhaaok4HUziB dsCRGAUXLVORTHV0Pyp+BTUsi9olrqNdPA6U42VuiXeA8oV0IcqwBpaOA0P5pRTvNPId Jqvpvm5gPNm8GCA9oUp4W3UoE2uuHFkgH9SDOSLX/h7PXe+/tls2RIOu/NKzwFu5qWdj kQEbTKRGfkC0sQXEU/9wrJMON4B/dcEH59AwNimzk3QtXAOX7YxFrEQ6f5IaJJDPnkC6 kJaQ== X-Gm-Message-State: AOAM531izZSdbyWdg4uONYj+QWbIThh9QUq+nlavSCx7gVblBcF2yr4J hN8vjS3rubqSDNscGX0P4AyJmidBwDssF4M2elisSXZqsd5+UxgGwlzORQxsbhJxb15xgHkxaUD XsE4up7VhFcNwZCkAF6PVTKt3 X-Received: by 2002:a05:600c:aca:: with SMTP id c10mr18225427wmr.174.1633350223577; Mon, 04 Oct 2021 05:23:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxitcIwPYb5MpA3gCLqjGct65p9PyV+TzRYqXfXifFRuJt7/5ttvdPSHfIcdPnoBpfMalndPA== X-Received: by 2002:a05:600c:aca:: with SMTP id c10mr18225400wmr.174.1633350223347; Mon, 04 Oct 2021 05:23:43 -0700 (PDT) Received: from ?IPv6:2a01:e0a:59e:9d80:527b:9dff:feef:3874? ([2a01:e0a:59e:9d80:527b:9dff:feef:3874]) by smtp.gmail.com with ESMTPSA id f19sm14674493wmf.11.2021.10.04.05.23.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Oct 2021 05:23:42 -0700 (PDT) Subject: Re: [PATCH v2 3/5] hw/arm/virt: Honor highmem setting when computing the memory map To: Marc Zyngier , qemu-devel@nongnu.org References: <20211003164605.3116450-1-maz@kernel.org> <20211003164605.3116450-4-maz@kernel.org> From: Eric Auger Message-ID: Date: Mon, 4 Oct 2021 14:23:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20211003164605.3116450-4-maz@kernel.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Cc: kernel-team@android.com, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list Reply-To: eric.auger@redhat.com List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu SGkgTWFyYywKCk9uIDEwLzMvMjEgNjo0NiBQTSwgTWFyYyBaeW5naWVyIHdyb3RlOgo+IEV2ZW4g d2hlbiB0aGUgVk0gaXMgY29uZmlndXJlZCB3aXRoIGhpZ2htZW09b2ZmLCB0aGUgaGlnaGVzdF9n cGEKPiBmaWVsZCBpbmNsdWRlcyBkZXZpY2VzIHRoYXQgYXJlIGFib3ZlIHRoZSA0R2lCIGxpbWl0 Lgo+IFNpbWlsYXJpbHksIG5vdGhpbmcgc2VlbSB0byBjaGVjayB0aGF0IHRoZSBtZW1vcnkgaXMg d2l0aGluCj4gdGhlIGxpbWl0IHNldCBieSB0aGUgaGlnaG1lbT1vZmYgb3B0aW9uLgo+Cj4gVGhp cyBsZWFkcyB0byBmYWlsdXJlcyBpbiB2aXJ0X2t2bV90eXBlKCkgb24gc3lzdGVtcyB0aGF0IGhh dmUKPiBhIGNyaXBwbGVkIElQQSByYW5nZSwgYXMgdGhlIHJlcG9ydGVkIElQQSBzcGFjZSBpcyBs YXJnZXIgdGhhbgo+IHdoYXQgaXQgc2hvdWxkIGJlLgo+Cj4gSW5zdGVhZCwgaG9ub3IgdGhlIHVz ZXItc3BlY2lmaWVkIGxpbWl0IHRvIG9ubHkgdXNlIHRoZSBkZXZpY2VzCj4gYXQgdGhlIGxvd2Vz dCBlbmQgb2YgdGhlIHNwZWN0cnVtLCBhbmQgZmFpbCBpZiB3ZSBoYXZlIG1lbW9yeQo+IGNyb3Nz aW5nIHRoZSA0R2lCIGxpbWl0Lgo+Cj4gU2lnbmVkLW9mZi1ieTogTWFyYyBaeW5naWVyIDxtYXpA a2VybmVsLm9yZz4KPiAtLS0KPiAgaHcvYXJtL3ZpcnQuYyB8IDkgKysrKysrKystCj4gIDEgZmls ZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKPgo+IGRpZmYgLS1naXQg YS9ody9hcm0vdmlydC5jIGIvaHcvYXJtL3ZpcnQuYwo+IGluZGV4IGJjZjU4ZjY3N2QuLjlkMmFi ZGJkNWYgMTAwNjQ0Cj4gLS0tIGEvaHcvYXJtL3ZpcnQuYwo+ICsrKyBiL2h3L2FybS92aXJ0LmMK PiBAQCAtMTYyOCw2ICsxNjI4LDExIEBAIHN0YXRpYyB2b2lkIHZpcnRfc2V0X21lbW1hcChWaXJ0 TWFjaGluZVN0YXRlICp2bXMpCj4gICAgICAgICAgZXhpdChFWElUX0ZBSUxVUkUpOwo+ICAgICAg fQo+ICAKPiArICAgIGlmICghdm1zLT5oaWdobWVtICYmCj4gKyAgICAgICAgdm1zLT5tZW1tYXBb VklSVF9NRU1dLmJhc2UgKyBtcy0+bWF4cmFtX3NpemUgPiA0ICogR2lCKSB7Cj4gKyAgICAgICAg ZXJyb3JfcmVwb3J0KCJoaWdobWVtPW9mZiwgYnV0IG1lbW9yeSBjcm9zc2VzIHRoZSA0R2lCIGxp bWl0XG4iKTsKPiArICAgICAgICBleGl0KEVYSVRfRkFJTFVSRSk7Cj4gKyAgICB9Cj4gICAgICAv Kgo+ICAgICAgICogV2UgY29tcHV0ZSB0aGUgYmFzZSBvZiB0aGUgaGlnaCBJTyByZWdpb24gZGVw ZW5kaW5nIG9uIHRoZQo+ICAgICAgICogYW1vdW50IG9mIGluaXRpYWwgYW5kIGRldmljZSBtZW1v cnkuIFRoZSBkZXZpY2UgbWVtb3J5IHN0YXJ0L3NpemUKPiBAQCAtMTY1Nyw3ICsxNjYyLDkgQEAg c3RhdGljIHZvaWQgdmlydF9zZXRfbWVtbWFwKFZpcnRNYWNoaW5lU3RhdGUgKnZtcykKPiAgICAg ICAgICB2bXMtPm1lbW1hcFtpXS5zaXplID0gc2l6ZTsKPiAgICAgICAgICBiYXNlICs9IHNpemU7 Cj4gICAgICB9Cj4gLSAgICB2bXMtPmhpZ2hlc3RfZ3BhID0gYmFzZSAtIDE7Cj4gKyAgICB2bXMt PmhpZ2hlc3RfZ3BhID0gKHZtcy0+aGlnaG1lbSA/Cj4gKyAgICAgICAgICAgICAgICAgICAgICAg IGJhc2UgOgo+ICsgICAgICAgICAgICAgICAgICAgICAgICB2bXMtPm1lbW1hcFtWSVJUX01FTV0u YmFzZSArIG1zLT5tYXhyYW1fc2l6ZSkgLSAxOwpJIHRoaW5rIEkgd291bGQgaGF2ZSBwcmVmZXJy ZWQgdG8gaGF2ZQoKaWYgKHZtcy0+aGlnaG1lbSkgewrCoMKgIGZvciAoaSA9IFZJUlRfTE9XTUVN TUFQX0xBU1Q7IGkgPCBBUlJBWV9TSVpFKGV4dGVuZGVkX21lbW1hcCk7IGkrKykgewrCoMKgwqDC oMKgwqDCoCBod2FkZHIgc2l6ZSA9IGV4dGVuZGVkX21lbW1hcFtpXS5zaXplOwoKwqDCoMKgwqDC oMKgwqAgYmFzZSA9IFJPVU5EX1VQKGJhc2UsIHNpemUpOwrCoMKgwqDCoMKgwqDCoCB2bXMtPm1l bW1hcFtpXS5iYXNlID0gYmFzZTsKwqDCoMKgwqDCoMKgwqAgdm1zLT5tZW1tYXBbaV0uc2l6ZSA9 IHNpemU7CsKgwqDCoMKgwqDCoMKgIGJhc2UgKz0gc2l6ZTsKwqDCoMKgIH0KfQphcyBpdCBpcyB1 c2VsZXNzIHRvIGV4ZWN1dGUgdGhhdCBjb2RlIGFuZCBjcmVhdGUgbmV3IG1lbW1hcCBlbnRyaWVz IGluCmNhc2Ugb2YgIWhpZ2htZW0uCgpCdXQgbmV2ZXJ0aGVsZXNzLCB0aGlzIGxvb2tzIGNvcnJl Y3QKCkVyaWMKPiAgICAgIGlmIChkZXZpY2VfbWVtb3J5X3NpemUgPiAwKSB7Cj4gICAgICAgICAg bXMtPmRldmljZV9tZW1vcnkgPSBnX21hbGxvYzAoc2l6ZW9mKCptcy0+ZGV2aWNlX21lbW9yeSkp Owo+ICAgICAgICAgIG1zLT5kZXZpY2VfbWVtb3J5LT5iYXNlID0gZGV2aWNlX21lbW9yeV9iYXNl OwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18Ka3ZtYXJt IG1haWxpbmcgbGlzdAprdm1hcm1AbGlzdHMuY3MuY29sdW1iaWEuZWR1Cmh0dHBzOi8vbGlzdHMu Y3MuY29sdW1iaWEuZWR1L21haWxtYW4vbGlzdGluZm8va3ZtYXJtCg== From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5B04C433FE for ; Mon, 4 Oct 2021 12:26:03 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7EED66124C for ; Mon, 4 Oct 2021 12:26:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7EED66124C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:35858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXN2g-0005nj-8x for qemu-devel@archiver.kernel.org; Mon, 04 Oct 2021 08:26:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXN0Y-0004GY-71 for qemu-devel@nongnu.org; Mon, 04 Oct 2021 08:23:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXN0V-000189-Kt for qemu-devel@nongnu.org; Mon, 04 Oct 2021 08:23:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633350225; h=from:from:reply-to: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=Wl7ICQODkHW0YfDfZWHTQGFAOQQBlguFC3IFpZqYzao=; b=bZYcqv9ZABKO/NIvZXNHmDf6zcYS/6x3VmDDF6fRnfjuy0XsPDFpNDnTXDUuiBbNdT0VpH u/v7yBDnLWduOBE7DyC69Zts0jYOxCGtD3sLJsoeN5MOOC1cw24zDqYr1YvAj0fn9Y7Q/+ PIIWO0lkAtuT7SFxvckz3+1LUve3v1U= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-307-hEWsA9GCNVqZs48LDMhfmw-1; Mon, 04 Oct 2021 08:23:44 -0400 X-MC-Unique: hEWsA9GCNVqZs48LDMhfmw-1 Received: by mail-wm1-f70.google.com with SMTP id 129-20020a1c1987000000b0030cd1616fbfso9888269wmz.3 for ; Mon, 04 Oct 2021 05:23:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=Wl7ICQODkHW0YfDfZWHTQGFAOQQBlguFC3IFpZqYzao=; b=Mmcxfy5W0TNs5Mp06Dn2kWpA8Qeve9op26YrNZjZwJCRVePvq35Qp1jE3/9YqSzQdf SOi7Jp+1VCGVEuQFeky+zu3q4AsqYGahrRByFpwW+D1PIrjlbtZwu6v7+gKSDd/gHL/y BwFD8/PbP3LNGfwdSB8oFaLQgXVjMvvlF+h0mxBNFE30Y7silFQ8+phorkIaPfOCLSH+ AZBaVZtWekQ0ZiyrxHnUHwI7orz2T8FBdETZBVhxlcY1HfdWTq0TRaIn3kXUGmsg+ikB MLRE38t+yWEAdgDxq32iGdfMV7S5hCubWMrf2IJ5iFI/N8G3iyK5/ABttYY4BWmOCBRI jMHA== X-Gm-Message-State: AOAM5303JKDB+oRjVTNFTN0jMSCfpdGhjpFn0nc3E7iG0/aPU3FH9R0W AFjBD4Mi/4MijbHx8vs8GZ1CwB0zys2gUQXuxqWOD0Yfe1ZtGDSvSEHxvuSRnpoveh/AFfMvZYO oQ2+FieHw4hE4R24= X-Received: by 2002:a05:600c:aca:: with SMTP id c10mr18225428wmr.174.1633350223589; Mon, 04 Oct 2021 05:23:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxitcIwPYb5MpA3gCLqjGct65p9PyV+TzRYqXfXifFRuJt7/5ttvdPSHfIcdPnoBpfMalndPA== X-Received: by 2002:a05:600c:aca:: with SMTP id c10mr18225400wmr.174.1633350223347; Mon, 04 Oct 2021 05:23:43 -0700 (PDT) Received: from ?IPv6:2a01:e0a:59e:9d80:527b:9dff:feef:3874? ([2a01:e0a:59e:9d80:527b:9dff:feef:3874]) by smtp.gmail.com with ESMTPSA id f19sm14674493wmf.11.2021.10.04.05.23.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Oct 2021 05:23:42 -0700 (PDT) Subject: Re: [PATCH v2 3/5] hw/arm/virt: Honor highmem setting when computing the memory map To: Marc Zyngier , qemu-devel@nongnu.org References: <20211003164605.3116450-1-maz@kernel.org> <20211003164605.3116450-4-maz@kernel.org> From: Eric Auger Message-ID: Date: Mon, 4 Oct 2021 14:23:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20211003164605.3116450-4-maz@kernel.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US Received-SPF: pass client-ip=216.205.24.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.066, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: , Reply-To: eric.auger@redhat.com Cc: Peter Maydell , Andrew Jones , kernel-team@android.com, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Marc, On 10/3/21 6:46 PM, Marc Zyngier wrote: > Even when the VM is configured with highmem=off, the highest_gpa > field includes devices that are above the 4GiB limit. > Similarily, nothing seem to check that the memory is within > the limit set by the highmem=off option. > > This leads to failures in virt_kvm_type() on systems that have > a crippled IPA range, as the reported IPA space is larger than > what it should be. > > Instead, honor the user-specified limit to only use the devices > at the lowest end of the spectrum, and fail if we have memory > crossing the 4GiB limit. > > Signed-off-by: Marc Zyngier > --- > hw/arm/virt.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index bcf58f677d..9d2abdbd5f 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1628,6 +1628,11 @@ static void virt_set_memmap(VirtMachineState *vms) > exit(EXIT_FAILURE); > } > > + if (!vms->highmem && > + vms->memmap[VIRT_MEM].base + ms->maxram_size > 4 * GiB) { > + error_report("highmem=off, but memory crosses the 4GiB limit\n"); > + exit(EXIT_FAILURE); > + } > /* > * We compute the base of the high IO region depending on the > * amount of initial and device memory. The device memory start/size > @@ -1657,7 +1662,9 @@ static void virt_set_memmap(VirtMachineState *vms) > vms->memmap[i].size = size; > base += size; > } > - vms->highest_gpa = base - 1; > + vms->highest_gpa = (vms->highmem ? > + base : > + vms->memmap[VIRT_MEM].base + ms->maxram_size) - 1; I think I would have preferred to have if (vms->highmem) {    for (i = VIRT_LOWMEMMAP_LAST; i < ARRAY_SIZE(extended_memmap); i++) {         hwaddr size = extended_memmap[i].size;         base = ROUND_UP(base, size);         vms->memmap[i].base = base;         vms->memmap[i].size = size;         base += size;     } } as it is useless to execute that code and create new memmap entries in case of !highmem. But nevertheless, this looks correct Eric > if (device_memory_size > 0) { > ms->device_memory = g_malloc0(sizeof(*ms->device_memory)); > ms->device_memory->base = device_memory_base;