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 mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDDC9C433F5 for ; Mon, 27 Dec 2021 16:39:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 36B2D40E3D; Mon, 27 Dec 2021 11:39:09 -0500 (EST) 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=@kernel.org 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 HOS3HwKQkWyW; Mon, 27 Dec 2021 11:39:08 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 16A7740F93; Mon, 27 Dec 2021 11:39:08 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id DFDA640E3D for ; Mon, 27 Dec 2021 11:39:06 -0500 (EST) 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 kcMSL85ligTf for ; Mon, 27 Dec 2021 11:39:05 -0500 (EST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 8B0F540E00 for ; Mon, 27 Dec 2021 11:39:05 -0500 (EST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3625861119; Mon, 27 Dec 2021 16:39:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BFADC36AE7; Mon, 27 Dec 2021 16:39:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1640623143; bh=WEDbpEQhjoWaU0eAWyDEdcLhrsSzaMog2S29Lw9qtmk=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=NtLNIGGxRyIizvSbAaIfsLpFFs/rZX6VaeFRLPoqcQqoMazJzKHgAkEBmEfX4h491 jTvy1DxYyM2mmJt1LIo0dTQ7fsEXlEIcZ+cWs4XW8SCtKtUtN3KFWcX6XR6pw4dDUr Uwg95qbwCJXplo+VqWkimps3L39YkXhn4tbna1elGeNwuC42TGY8I+W1AneODx26w5 /e6ysrQ5PREY8d+RzpLtC8sVYw9oF4tAntYhPky5gYHFM2bpcxGtEg5/yRI57rIDv6 4P74lzUbWSUfq0VsOdLATkkHCF85UIGt5h6ALEtAnkYNLiWhNo0vM7/LqDlIrt25SK TW1iF35u2M6bQ== Received: from cfbb000407.r.cam.camfibre.uk ([185.219.108.64] helo=wait-a-minute.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n1t1Z-00Eawq-JP; Mon, 27 Dec 2021 16:39:01 +0000 Date: Mon, 27 Dec 2021 16:39:01 +0000 Message-ID: <87o852ypcq.wl-maz@kernel.org> From: Marc Zyngier To: eric.auger@redhat.com Subject: Re: [PATCH v2 3/5] hw/arm/virt: Honor highmem setting when computing the memory map In-Reply-To: References: <20211003164605.3116450-1-maz@kernel.org> <20211003164605.3116450-4-maz@kernel.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: eric.auger@redhat.com, qemu-devel@nongnu.org, drjones@redhat.com, peter.maydell@linaro.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, kernel-team@android.com, kvmarm@lists.cs.columbia.edu X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list 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 T24gTW9uLCAwNCBPY3QgMjAyMSAxMzoyMzo0MSArMDEwMCwKRXJpYyBBdWdlciA8ZXJpYy5hdWdl ckByZWRoYXQuY29tPiB3cm90ZToKPiAKPiBIaSBNYXJjLAo+IAo+IE9uIDEwLzMvMjEgNjo0NiBQ TSwgTWFyYyBaeW5naWVyIHdyb3RlOgo+ID4gRXZlbiB3aGVuIHRoZSBWTSBpcyBjb25maWd1cmVk IHdpdGggaGlnaG1lbT1vZmYsIHRoZSBoaWdoZXN0X2dwYQo+ID4gZmllbGQgaW5jbHVkZXMgZGV2 aWNlcyB0aGF0IGFyZSBhYm92ZSB0aGUgNEdpQiBsaW1pdC4KPiA+IFNpbWlsYXJpbHksIG5vdGhp bmcgc2VlbSB0byBjaGVjayB0aGF0IHRoZSBtZW1vcnkgaXMgd2l0aGluCj4gPiB0aGUgbGltaXQg c2V0IGJ5IHRoZSBoaWdobWVtPW9mZiBvcHRpb24uCj4gPgo+ID4gVGhpcyBsZWFkcyB0byBmYWls dXJlcyBpbiB2aXJ0X2t2bV90eXBlKCkgb24gc3lzdGVtcyB0aGF0IGhhdmUKPiA+IGEgY3JpcHBs ZWQgSVBBIHJhbmdlLCBhcyB0aGUgcmVwb3J0ZWQgSVBBIHNwYWNlIGlzIGxhcmdlciB0aGFuCj4g PiB3aGF0IGl0IHNob3VsZCBiZS4KPiA+Cj4gPiBJbnN0ZWFkLCBob25vciB0aGUgdXNlci1zcGVj aWZpZWQgbGltaXQgdG8gb25seSB1c2UgdGhlIGRldmljZXMKPiA+IGF0IHRoZSBsb3dlc3QgZW5k IG9mIHRoZSBzcGVjdHJ1bSwgYW5kIGZhaWwgaWYgd2UgaGF2ZSBtZW1vcnkKPiA+IGNyb3NzaW5n IHRoZSA0R2lCIGxpbWl0Lgo+ID4KPiA+IFNpZ25lZC1vZmYtYnk6IE1hcmMgWnluZ2llciA8bWF6 QGtlcm5lbC5vcmc+Cj4gPiAtLS0KPiA+ICBody9hcm0vdmlydC5jIHwgOSArKysrKysrKy0KPiA+ ICAxIGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCj4gPgo+ID4g ZGlmZiAtLWdpdCBhL2h3L2FybS92aXJ0LmMgYi9ody9hcm0vdmlydC5jCj4gPiBpbmRleCBiY2Y1 OGY2NzdkLi45ZDJhYmRiZDVmIDEwMDY0NAo+ID4gLS0tIGEvaHcvYXJtL3ZpcnQuYwo+ID4gKysr IGIvaHcvYXJtL3ZpcnQuYwo+ID4gQEAgLTE2MjgsNiArMTYyOCwxMSBAQCBzdGF0aWMgdm9pZCB2 aXJ0X3NldF9tZW1tYXAoVmlydE1hY2hpbmVTdGF0ZSAqdm1zKQo+ID4gICAgICAgICAgZXhpdChF WElUX0ZBSUxVUkUpOwo+ID4gICAgICB9Cj4gPiAgCj4gPiArICAgIGlmICghdm1zLT5oaWdobWVt ICYmCj4gPiArICAgICAgICB2bXMtPm1lbW1hcFtWSVJUX01FTV0uYmFzZSArIG1zLT5tYXhyYW1f c2l6ZSA+IDQgKiBHaUIpIHsKPiA+ICsgICAgICAgIGVycm9yX3JlcG9ydCgiaGlnaG1lbT1vZmYs IGJ1dCBtZW1vcnkgY3Jvc3NlcyB0aGUgNEdpQiBsaW1pdFxuIik7Cj4gPiArICAgICAgICBleGl0 KEVYSVRfRkFJTFVSRSk7Cj4gPiArICAgIH0KPiA+ICAgICAgLyoKPiA+ICAgICAgICogV2UgY29t cHV0ZSB0aGUgYmFzZSBvZiB0aGUgaGlnaCBJTyByZWdpb24gZGVwZW5kaW5nIG9uIHRoZQo+ID4g ICAgICAgKiBhbW91bnQgb2YgaW5pdGlhbCBhbmQgZGV2aWNlIG1lbW9yeS4gVGhlIGRldmljZSBt ZW1vcnkgc3RhcnQvc2l6ZQo+ID4gQEAgLTE2NTcsNyArMTY2Miw5IEBAIHN0YXRpYyB2b2lkIHZp cnRfc2V0X21lbW1hcChWaXJ0TWFjaGluZVN0YXRlICp2bXMpCj4gPiAgICAgICAgICB2bXMtPm1l bW1hcFtpXS5zaXplID0gc2l6ZTsKPiA+ICAgICAgICAgIGJhc2UgKz0gc2l6ZTsKPiA+ICAgICAg fQo+ID4gLSAgICB2bXMtPmhpZ2hlc3RfZ3BhID0gYmFzZSAtIDE7Cj4gPiArICAgIHZtcy0+aGln aGVzdF9ncGEgPSAodm1zLT5oaWdobWVtID8KPiA+ICsgICAgICAgICAgICAgICAgICAgICAgICBi YXNlIDoKPiA+ICsgICAgICAgICAgICAgICAgICAgICAgICB2bXMtPm1lbW1hcFtWSVJUX01FTV0u YmFzZSArIG1zLT5tYXhyYW1fc2l6ZSkgLSAxOwo+IEkgdGhpbmsgSSB3b3VsZCBoYXZlIHByZWZl cnJlZCB0byBoYXZlCj4gCj4gaWYgKHZtcy0+aGlnaG1lbSkgewo+IMKgwqAgZm9yIChpID0gVklS VF9MT1dNRU1NQVBfTEFTVDsgaSA8IEFSUkFZX1NJWkUoZXh0ZW5kZWRfbWVtbWFwKTsgaSsrKSB7 Cj4gwqDCoMKgwqDCoMKgwqAgaHdhZGRyIHNpemUgPSBleHRlbmRlZF9tZW1tYXBbaV0uc2l6ZTsK PiAKPiDCoMKgwqDCoMKgwqDCoCBiYXNlID0gUk9VTkRfVVAoYmFzZSwgc2l6ZSk7Cj4gwqDCoMKg wqDCoMKgwqAgdm1zLT5tZW1tYXBbaV0uYmFzZSA9IGJhc2U7Cj4gwqDCoMKgwqDCoMKgwqAgdm1z LT5tZW1tYXBbaV0uc2l6ZSA9IHNpemU7Cj4gwqDCoMKgwqDCoMKgwqAgYmFzZSArPSBzaXplOwo+ IMKgwqDCoCB9Cj4gfQo+IGFzIGl0IGlzIHVzZWxlc3MgdG8gZXhlY3V0ZSB0aGF0IGNvZGUgYW5k IGNyZWF0ZSBuZXcgbWVtbWFwIGVudHJpZXMgaW4KPiBjYXNlIG9mICFoaWdobWVtLgoKSSBhZ3Jl ZSB0aGF0IGl0IGlzIGEgYml0IHVzZWxlc3Mgd2hlbiB3ZSBvbmx5IGhhdmUgaGlnaG1lbS4gQnV0 IHdlCnJlYWxseSB3YW50IHRvIGRlYWwgd2l0aCBhcmJpdHJhcnkgSVBBIHNwYWNlcyAoc2VlIGhv dyB0aGlzIGNoYW5nZXMgaW4KdGhlIGZvbGxvdy11cCBwYXRjaGVzKSwgYW5kIHdlIG5lZWQgdG8g Y2hlY2sgdGhhdCBldmVyeXRoaW5nIGZpdHMgaW4KdGhlIElQQSBzcGFjZSAoYW5kIGZpeCB0aGlu Z3MgdXAgaWYgdGhleSBkb24ndCkuCgo+IAo+IEJ1dCBuZXZlcnRoZWxlc3MsIHRoaXMgbG9va3Mg Y29ycmVjdAoKVGhhbmtzLAoKCU0uCgotLSAKV2l0aG91dCBkZXZpYXRpb24gZnJvbSB0aGUgbm9y bSwgcHJvZ3Jlc3MgaXMgbm90IHBvc3NpYmxlLgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwprdm1hcm0gbWFpbGluZyBsaXN0Cmt2bWFybUBsaXN0cy5jcy5j b2x1bWJpYS5lZHUKaHR0cHM6Ly9saXN0cy5jcy5jb2x1bWJpYS5lZHUvbWFpbG1hbi9saXN0aW5m by9rdm1hcm0K 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A161C433EF for ; Mon, 27 Dec 2021 16:39:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229779AbhL0QjH (ORCPT ); Mon, 27 Dec 2021 11:39:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229755AbhL0QjG (ORCPT ); Mon, 27 Dec 2021 11:39:06 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D461C06173E for ; Mon, 27 Dec 2021 08:39:06 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 18EF8B81022 for ; Mon, 27 Dec 2021 16:39:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BFADC36AE7; Mon, 27 Dec 2021 16:39:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1640623143; bh=WEDbpEQhjoWaU0eAWyDEdcLhrsSzaMog2S29Lw9qtmk=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=NtLNIGGxRyIizvSbAaIfsLpFFs/rZX6VaeFRLPoqcQqoMazJzKHgAkEBmEfX4h491 jTvy1DxYyM2mmJt1LIo0dTQ7fsEXlEIcZ+cWs4XW8SCtKtUtN3KFWcX6XR6pw4dDUr Uwg95qbwCJXplo+VqWkimps3L39YkXhn4tbna1elGeNwuC42TGY8I+W1AneODx26w5 /e6ysrQ5PREY8d+RzpLtC8sVYw9oF4tAntYhPky5gYHFM2bpcxGtEg5/yRI57rIDv6 4P74lzUbWSUfq0VsOdLATkkHCF85UIGt5h6ALEtAnkYNLiWhNo0vM7/LqDlIrt25SK TW1iF35u2M6bQ== Received: from cfbb000407.r.cam.camfibre.uk ([185.219.108.64] helo=wait-a-minute.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n1t1Z-00Eawq-JP; Mon, 27 Dec 2021 16:39:01 +0000 Date: Mon, 27 Dec 2021 16:39:01 +0000 Message-ID: <87o852ypcq.wl-maz@kernel.org> From: Marc Zyngier To: eric.auger@redhat.com Cc: qemu-devel@nongnu.org, Andrew Jones , Peter Maydell , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, kernel-team@android.com Subject: Re: [PATCH v2 3/5] hw/arm/virt: Honor highmem setting when computing the memory map In-Reply-To: References: <20211003164605.3116450-1-maz@kernel.org> <20211003164605.3116450-4-maz@kernel.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: eric.auger@redhat.com, qemu-devel@nongnu.org, drjones@redhat.com, peter.maydell@linaro.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Mon, 04 Oct 2021 13:23:41 +0100, Eric Auger wrote: >=20 > Hi Marc, >=20 > On 10/3/21 6:46 PM, Marc Zyngier wrote: > > Even when the VM is configured with highmem=3Doff, 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=3Doff 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 *vm= s) > > exit(EXIT_FAILURE); > > } > > =20 > > + if (!vms->highmem && > > + vms->memmap[VIRT_MEM].base + ms->maxram_size > 4 * GiB) { > > + error_report("highmem=3Doff, 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/si= ze > > @@ -1657,7 +1662,9 @@ static void virt_set_memmap(VirtMachineState *vms) > > vms->memmap[i].size =3D size; > > base +=3D size; > > } > > - vms->highest_gpa =3D base - 1; > > + vms->highest_gpa =3D (vms->highmem ? > > + base : > > + vms->memmap[VIRT_MEM].base + ms->maxram_size) = - 1; > I think I would have preferred to have >=20 > if (vms->highmem) { > =C2=A0=C2=A0 for (i =3D VIRT_LOWMEMMAP_LAST; i < ARRAY_SIZE(extended_memm= ap); i++) { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 hwaddr size =3D extended_memma= p[i].size; >=20 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 base =3D ROUND_UP(base, size); > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 vms->memmap[i].base =3D base; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 vms->memmap[i].size =3D size; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 base +=3D size; > =C2=A0=C2=A0=C2=A0 } > } > as it is useless to execute that code and create new memmap entries in > case of !highmem. I agree that it is a bit useless when we only have highmem. But we really want to deal with arbitrary IPA spaces (see how this changes in the follow-up patches), and we need to check that everything fits in the IPA space (and fix things up if they don't). >=20 > But nevertheless, this looks correct Thanks, M. --=20 Without deviation from the norm, progress is not possible.