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 23735C433EF for ; Mon, 10 Jan 2022 15:58:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 9C51F4B191; Mon, 10 Jan 2022 10:58:41 -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 Mrdoysw6eu2L; Mon, 10 Jan 2022 10:58:40 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 548B14B192; Mon, 10 Jan 2022 10:58:40 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id DD90C4B190 for ; Mon, 10 Jan 2022 10:58:38 -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 CQL6DdwRM0bc for ; Mon, 10 Jan 2022 10:58:37 -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 AC7294B161 for ; Mon, 10 Jan 2022 10:58:37 -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 74C9460EF4; Mon, 10 Jan 2022 15:58:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEA0DC36AE5; Mon, 10 Jan 2022 15:58:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1641830315; bh=yy2g18ZmN6V9ofHPGdck09RwOJDBvsPANaHpXOcQECQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=W/cQTf1/z21ABUgAszAEP2BgFPvE9YEgWKljQMwmJ6gJbLqQOSnwQXOV/Q4zNr6yB xHYeV9IlJfEdy4gL8XJtjTYBa2xhAV0k0CWshEwx/bHQkbMu7A3k8UPvBl7hyDUJXz Na6pPAr9QtAHptoMmPRtycpNq8vOnMonKvc8uqUDufPv7uuEz7Lbc9tbXEq1jKswje cjYa9mXir1C+W9JlBKmg2Ee8uSSbQgs+FPFjnjlpSXCEUEgwRegKZTnXT4bF/1tLJ9 sJNGM2S0p0im5T2v/C+RQ95xwa+RooWkSM6EXDRmlmw3hQCtvpooYgY0FdB4aQt5BF MGG8saYejYsKw== Received: from sofa.misterjones.org ([185.219.108.64] helo=why.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 1n6x45-00HAi9-T9; Mon, 10 Jan 2022 15:58:34 +0000 Date: Mon, 10 Jan 2022 15:58:33 +0000 Message-ID: <87ilurtweu.wl-maz@kernel.org> From: Marc Zyngier To: eric.auger@redhat.com Subject: Re: [PATCH v4 4/6] hw/arm/virt: Use the PA range to compute the memory map In-Reply-To: References: <20220107163324.2491209-1-maz@kernel.org> <20220107163324.2491209-5-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, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, kernel-team@android.com, drjones@redhat.com, peter.maydell@linaro.org 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 T24gTW9uLCAxMCBKYW4gMjAyMiAxNTozODo1NiArMDAwMCwKRXJpYyBBdWdlciA8ZXJpYy5hdWdl ckByZWRoYXQuY29tPiB3cm90ZToKPiAKPiBIaSBNYXJjLAo+IAo+IE9uIDEvNy8yMiA1OjMzIFBN LCBNYXJjIFp5bmdpZXIgd3JvdGU6Cj4gPiBUaGUgaGlnaG1lbSBhdHRyaWJ1dGUgaXMgbm90aGlu ZyBidXQgYW5vdGhlciB3YXkgdG8gZXhwcmVzcyB0aGUKPiA+IFBBIHJhbmdlIG9mIGEgVk0uIFRv IHN1cHBvcnQgSFcgdGhhdCBoYXMgYSBzbWFsbGVyIFBBIHJhbmdlIHRoZW4KPiA+IHdoYXQgUUVN VSBhc3N1bWVzLCBwYXNzIHRoaXMgUEEgcmFuZ2UgdG8gdGhlIHZpcnRfc2V0X21lbW1hcCgpCj4g PiBmdW5jdGlvbiwgYWxsb3dpbmcgaXQgdG8gY29ycmVjdGx5IGV4Y2x1ZGUgaGlnaG1lbSBkZXZp Y2VzCj4gPiBpZiB0aGV5IGFyZSBvdXRzaWRlIG9mIHRoZSBQQSByYW5nZS4KPiA+Cj4gPiBTaWdu ZWQtb2ZmLWJ5OiBNYXJjIFp5bmdpZXIgPG1hekBrZXJuZWwub3JnPgo+ID4gLS0tCj4gPiAgaHcv YXJtL3ZpcnQuYyB8IDUzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLQo+ID4gIDEgZmlsZSBjaGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCA3IGRlbGV0 aW9ucygtKQo+ID4KPiA+IGRpZmYgLS1naXQgYS9ody9hcm0vdmlydC5jIGIvaHcvYXJtL3ZpcnQu Ywo+ID4gaW5kZXggNTdjNTVlOGEzNy4uZGI0YjA2MzZlMSAxMDA2NDQKPiA+IC0tLSBhL2h3L2Fy bS92aXJ0LmMKPiA+ICsrKyBiL2h3L2FybS92aXJ0LmMKPiA+IEBAIC0xNjYwLDcgKzE2NjAsNyBA QCBzdGF0aWMgdWludDY0X3QgdmlydF9jcHVfbXBfYWZmaW5pdHkoVmlydE1hY2hpbmVTdGF0ZSAq dm1zLCBpbnQgaWR4KQo+ID4gICAgICByZXR1cm4gYXJtX2NwdV9tcF9hZmZpbml0eShpZHgsIGNs dXN0ZXJzeik7Cj4gPiAgfQo+ID4gIAo+ID4gLXN0YXRpYyB2b2lkIHZpcnRfc2V0X21lbW1hcChW aXJ0TWFjaGluZVN0YXRlICp2bXMpCj4gPiArc3RhdGljIHZvaWQgdmlydF9zZXRfbWVtbWFwKFZp cnRNYWNoaW5lU3RhdGUgKnZtcywgaW50IHBhX2JpdHMpCj4gPiAgewo+ID4gICAgICBNYWNoaW5l U3RhdGUgKm1zID0gTUFDSElORSh2bXMpOwo+ID4gICAgICBod2FkZHIgYmFzZSwgZGV2aWNlX21l bW9yeV9iYXNlLCBkZXZpY2VfbWVtb3J5X3NpemUsIG1lbXRvcDsKPiA+IEBAIC0xNjc4LDYgKzE2 NzgsMTMgQEAgc3RhdGljIHZvaWQgdmlydF9zZXRfbWVtbWFwKFZpcnRNYWNoaW5lU3RhdGUgKnZt cykKPiA+ICAgICAgICAgIGV4aXQoRVhJVF9GQUlMVVJFKTsKPiA+ICAgICAgfQo+ID4gIAo+ID4g KyAgICAvKgo+ID4gKyAgICAgKiAhaGlnaG1lbSBpcyBleGFjdGx5IHRoZSBzYW1lIGFzIGxpbWl0 aW5nIHRoZSBQQSBzcGFjZSB0byAzMmJpdCwKPiA+ICsgICAgICogaXJyZXNwZWN0aXZlIG9mIHRo ZSB1bmRlcmx5aW5nIGNhcGFiaWxpdGllcyBvZiB0aGUgSFcuCj4gPiArICAgICAqLwo+ID4gKyAg ICBpZiAoIXZtcy0+aGlnaG1lbSkKPiA+ICsJICAgIHBhX2JpdHMgPSAzMjsKPiB5b3UgbmVlZCB7 fSBhY2NvcmRpbmcgdG8gdGhlIFFFTVUgY29kaW5nIHN0eWxlLiBXZWxjb21lIHRvIGEgbmV3IHNo aW55Cj4gd29ybGQgOi0pCgpZZWFoLiBCZXR3ZWVuIHRoZSByZWR1Y2VkIGluZGVudGF0aW9uIGFu ZCB0aGUgYXZhbGFuY2hlIG9mIGJyYWNlcywgbXkKYnJhaW4gZmFpbHMgdG8gcGF0dGVybi1tYXRj aCBibG9ja3Mgb2YgY29kZS4gQW11c2luZyBob3cgaW5mbGV4aWJsZQp5b3UgYmVjb21lIGFmdGVy IGEgY291cGxlIG9mIGRlY2FkZXMuLi4KCj4gPiArCj4gPiAgICAgIC8qCj4gPiAgICAgICAqIFdl IGNvbXB1dGUgdGhlIGJhc2Ugb2YgdGhlIGhpZ2ggSU8gcmVnaW9uIGRlcGVuZGluZyBvbiB0aGUK PiA+ICAgICAgICogYW1vdW50IG9mIGluaXRpYWwgYW5kIGRldmljZSBtZW1vcnkuIFRoZSBkZXZp Y2UgbWVtb3J5IHN0YXJ0L3NpemUKPiA+IEBAIC0xNjkxLDggKzE2OTgsOSBAQCBzdGF0aWMgdm9p ZCB2aXJ0X3NldF9tZW1tYXAoVmlydE1hY2hpbmVTdGF0ZSAqdm1zKQo+ID4gIAo+ID4gICAgICAv KiBCYXNlIGFkZHJlc3Mgb2YgdGhlIGhpZ2ggSU8gcmVnaW9uICovCj4gPiAgICAgIG1lbXRvcCA9 IGJhc2UgPSBkZXZpY2VfbWVtb3J5X2Jhc2UgKyBST1VORF9VUChkZXZpY2VfbWVtb3J5X3NpemUs IEdpQik7Cj4gPiAtICAgIGlmICghdm1zLT5oaWdobWVtICYmIG1lbXRvcCA+IDQgKiBHaUIpIHsK PiA+IC0gICAgICAgIGVycm9yX3JlcG9ydCgiaGlnaG1lbT1vZmYsIGJ1dCBtZW1vcnkgY3Jvc3Nl cyB0aGUgNEdpQiBsaW1pdFxuIik7Cj4gPiArICAgIGlmIChtZW10b3AgPiBCSVRfVUxMKHBhX2Jp dHMpKSB7Cj4gPiArCSAgICBlcnJvcl9yZXBvcnQoIkFkZHJlc3NpbmcgbGltaXRlZCB0byAlZCBi aXRzLCBidXQgbWVtb3J5IGV4Y2VlZHMgaXQgYnkgJWxsdSBieXRlc1xuIiwKPiA+ICsJCQkgcGFf Yml0cywgbWVtdG9wIC0gQklUX1VMTChwYV9iaXRzKSk7Cj4gPiAgICAgICAgICBleGl0KEVYSVRf RkFJTFVSRSk7Cj4gPiAgICAgIH0KPiA+ICAgICAgaWYgKGJhc2UgPCBkZXZpY2VfbWVtb3J5X2Jh c2UpIHsKPiA+IEBAIC0xNzExLDcgKzE3MTksMTMgQEAgc3RhdGljIHZvaWQgdmlydF9zZXRfbWVt bWFwKFZpcnRNYWNoaW5lU3RhdGUgKnZtcykKPiA+ICAgICAgICAgIHZtcy0+bWVtbWFwW2ldLnNp emUgPSBzaXplOwo+ID4gICAgICAgICAgYmFzZSArPSBzaXplOwo+ID4gICAgICB9Cj4gPiAtICAg IHZtcy0+aGlnaGVzdF9ncGEgPSAodm1zLT5oaWdobWVtID8gYmFzZSA6IG1lbXRvcCkgLSAxOwo+ ID4gKwo+ID4gKyAgICAvKgo+ID4gKyAgICAgKiBJZiBiYXNlIGZpdHMgd2l0aGluIHBhX2JpdHMs IGFsbCBnb29kLiBJZiBpdCBkb2Vzbid0LCBsaW1pdCBpdAo+ID4gKyAgICAgKiB0byB0aGUgZW5k IG9mIFJBTSwgd2hpY2ggaXMgZ3VhcmFudGVlZCB0byBmaXQgd2l0aGluIHBhX2JpdHMuCj4gPiAr ICAgICAqLwo+ID4gKyAgICB2bXMtPmhpZ2hlc3RfZ3BhID0gKGJhc2UgPD0gQklUX1VMTChwYV9i aXRzKSA/IGJhc2UgOiBtZW10b3ApIC0gMTsKPiA+ICsKPiA+ICAgICAgaWYgKGRldmljZV9tZW1v cnlfc2l6ZSA+IDApIHsKPiA+ICAgICAgICAgIG1zLT5kZXZpY2VfbWVtb3J5ID0gZ19tYWxsb2Mw KHNpemVvZigqbXMtPmRldmljZV9tZW1vcnkpKTsKPiA+ICAgICAgICAgIG1zLT5kZXZpY2VfbWVt b3J5LT5iYXNlID0gZGV2aWNlX21lbW9yeV9iYXNlOwo+ID4gQEAgLTE5MDIsMTIgKzE5MTYsMzgg QEAgc3RhdGljIHZvaWQgbWFjaHZpcnRfaW5pdChNYWNoaW5lU3RhdGUgKm1hY2hpbmUpCj4gPiAg ICAgIHVuc2lnbmVkIGludCBzbXBfY3B1cyA9IG1hY2hpbmUtPnNtcC5jcHVzOwo+ID4gICAgICB1 bnNpZ25lZCBpbnQgbWF4X2NwdXMgPSBtYWNoaW5lLT5zbXAubWF4X2NwdXM7Cj4gTW92ZSB0aGUg Y3B1X3R5cGUgY2hlY2sgYmVmb3JlPwo+IAo+IMKgwqDCoCBpZiAoIWNwdV90eXBlX3ZhbGlkKG1h Y2hpbmUtPmNwdV90eXBlKSkgewo+IMKgwqDCoMKgwqDCoMKgIGVycm9yX3JlcG9ydCgibWFjaC12 aXJ0OiBDUFUgdHlwZSAlcyBub3Qgc3VwcG9ydGVkIiwKPiBtYWNoaW5lLT5jcHVfdHlwZSk7Cj4g wqDCoMKgwqDCoMKgwqAgZXhpdCgxKTsKPiDCoMKgwqAgfQo+ID4KClllcywgdmVyeSBnb29kIHBv aW50LiBJIHdvbmRlciB3aHkgdGhpcyB3YXMgdHVja2VkIGF3YXkgcGFzdApjb21wdXRpbmcgdGhl IG1lbW9yeSBtYXAgYW5kIHRoZSBHSUMgY29uZmlndXJhdGlvbi4uLiBBbnl3YXksIEknbGwKbW92 ZSBpdCB1cC4KClRoYW5rcywKCglNLgoKLS0gCldpdGhvdXQgZGV2aWF0aW9uIGZyb20gdGhlIG5v cm0sIHByb2dyZXNzIGlzIG5vdCBwb3NzaWJsZS4KX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18Ka3ZtYXJtIG1haWxpbmcgbGlzdAprdm1hcm1AbGlzdHMuY3Mu Y29sdW1iaWEuZWR1Cmh0dHBzOi8vbGlzdHMuY3MuY29sdW1iaWEuZWR1L21haWxtYW4vbGlzdGlu Zm8va3ZtYXJtCg== 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 36E7FC433EF for ; Mon, 10 Jan 2022 15:58:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236841AbiAJP6j (ORCPT ); Mon, 10 Jan 2022 10:58:39 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:36070 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236654AbiAJP6i (ORCPT ); Mon, 10 Jan 2022 10:58:38 -0500 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 307B6B811EC for ; Mon, 10 Jan 2022 15:58:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEA0DC36AE5; Mon, 10 Jan 2022 15:58:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1641830315; bh=yy2g18ZmN6V9ofHPGdck09RwOJDBvsPANaHpXOcQECQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=W/cQTf1/z21ABUgAszAEP2BgFPvE9YEgWKljQMwmJ6gJbLqQOSnwQXOV/Q4zNr6yB xHYeV9IlJfEdy4gL8XJtjTYBa2xhAV0k0CWshEwx/bHQkbMu7A3k8UPvBl7hyDUJXz Na6pPAr9QtAHptoMmPRtycpNq8vOnMonKvc8uqUDufPv7uuEz7Lbc9tbXEq1jKswje cjYa9mXir1C+W9JlBKmg2Ee8uSSbQgs+FPFjnjlpSXCEUEgwRegKZTnXT4bF/1tLJ9 sJNGM2S0p0im5T2v/C+RQ95xwa+RooWkSM6EXDRmlmw3hQCtvpooYgY0FdB4aQt5BF MGG8saYejYsKw== Received: from sofa.misterjones.org ([185.219.108.64] helo=why.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 1n6x45-00HAi9-T9; Mon, 10 Jan 2022 15:58:34 +0000 Date: Mon, 10 Jan 2022 15:58:33 +0000 Message-ID: <87ilurtweu.wl-maz@kernel.org> From: Marc Zyngier To: eric.auger@redhat.com Cc: qemu-devel@nongnu.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, kernel-team@android.com, Andrew Jones , Peter Maydell Subject: Re: [PATCH v4 4/6] hw/arm/virt: Use the PA range to compute the memory map In-Reply-To: References: <20220107163324.2491209-1-maz@kernel.org> <20220107163324.2491209-5-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, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, kernel-team@android.com, drjones@redhat.com, peter.maydell@linaro.org 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, 10 Jan 2022 15:38:56 +0000, Eric Auger wrote: >=20 > Hi Marc, >=20 > On 1/7/22 5:33 PM, Marc Zyngier wrote: > > The highmem attribute is nothing but another way to express the > > PA range of a VM. To support HW that has a smaller PA range then > > what QEMU assumes, pass this PA range to the virt_set_memmap() > > function, allowing it to correctly exclude highmem devices > > if they are outside of the PA range. > > > > Signed-off-by: Marc Zyngier > > --- > > hw/arm/virt.c | 53 ++++++++++++++++++++++++++++++++++++++++++++------- > > 1 file changed, 46 insertions(+), 7 deletions(-) > > > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > > index 57c55e8a37..db4b0636e1 100644 > > --- a/hw/arm/virt.c > > +++ b/hw/arm/virt.c > > @@ -1660,7 +1660,7 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineS= tate *vms, int idx) > > return arm_cpu_mp_affinity(idx, clustersz); > > } > > =20 > > -static void virt_set_memmap(VirtMachineState *vms) > > +static void virt_set_memmap(VirtMachineState *vms, int pa_bits) > > { > > MachineState *ms =3D MACHINE(vms); > > hwaddr base, device_memory_base, device_memory_size, memtop; > > @@ -1678,6 +1678,13 @@ static void virt_set_memmap(VirtMachineState *vm= s) > > exit(EXIT_FAILURE); > > } > > =20 > > + /* > > + * !highmem is exactly the same as limiting the PA space to 32bit, > > + * irrespective of the underlying capabilities of the HW. > > + */ > > + if (!vms->highmem) > > + pa_bits =3D 32; > you need {} according to the QEMU coding style. Welcome to a new shiny > world :-) Yeah. Between the reduced indentation and the avalanche of braces, my brain fails to pattern-match blocks of code. Amusing how inflexible you become after a couple of decades... > > + > > /* > > * We compute the base of the high IO region depending on the > > * amount of initial and device memory. The device memory start/si= ze > > @@ -1691,8 +1698,9 @@ static void virt_set_memmap(VirtMachineState *vms) > > =20 > > /* Base address of the high IO region */ > > memtop =3D base =3D device_memory_base + ROUND_UP(device_memory_si= ze, GiB); > > - if (!vms->highmem && memtop > 4 * GiB) { > > - error_report("highmem=3Doff, but memory crosses the 4GiB limit= \n"); > > + if (memtop > BIT_ULL(pa_bits)) { > > + error_report("Addressing limited to %d bits, but memory exceeds i= t by %llu bytes\n", > > + pa_bits, memtop - BIT_ULL(pa_bits)); > > exit(EXIT_FAILURE); > > } > > if (base < device_memory_base) { > > @@ -1711,7 +1719,13 @@ static void virt_set_memmap(VirtMachineState *vm= s) > > vms->memmap[i].size =3D size; > > base +=3D size; > > } > > - vms->highest_gpa =3D (vms->highmem ? base : memtop) - 1; > > + > > + /* > > + * If base fits within pa_bits, all good. If it doesn't, limit it > > + * to the end of RAM, which is guaranteed to fit within pa_bits. > > + */ > > + vms->highest_gpa =3D (base <=3D BIT_ULL(pa_bits) ? base : memtop) = - 1; > > + > > if (device_memory_size > 0) { > > ms->device_memory =3D g_malloc0(sizeof(*ms->device_memory)); > > ms->device_memory->base =3D device_memory_base; > > @@ -1902,12 +1916,38 @@ static void machvirt_init(MachineState *machine) > > unsigned int smp_cpus =3D machine->smp.cpus; > > unsigned int max_cpus =3D machine->smp.max_cpus; > Move the cpu_type check before? >=20 > =C2=A0=C2=A0=C2=A0 if (!cpu_type_valid(machine->cpu_type)) { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 error_report("mach-virt: CPU t= ype %s not supported", > machine->cpu_type); > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 exit(1); > =C2=A0=C2=A0=C2=A0 } > > Yes, very good point. I wonder why this was tucked away past computing the memory map and the GIC configuration... Anyway, I'll move it up. Thanks, M. --=20 Without deviation from the norm, progress is not possible. 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 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 29B93C433EF for ; Mon, 10 Jan 2022 16:03:57 +0000 (UTC) Received: from localhost ([::1]:40730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6x9H-0000s1-4d for qemu-devel@archiver.kernel.org; Mon, 10 Jan 2022 11:03:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6x4D-0005hi-6y for qemu-devel@nongnu.org; Mon, 10 Jan 2022 10:58:41 -0500 Received: from [2604:1380:4641:c500::1] (port=43366 helo=dfw.source.kernel.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6x4A-0004jS-5m for qemu-devel@nongnu.org; Mon, 10 Jan 2022 10:58:40 -0500 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 74C9460EF4; Mon, 10 Jan 2022 15:58:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEA0DC36AE5; Mon, 10 Jan 2022 15:58:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1641830315; bh=yy2g18ZmN6V9ofHPGdck09RwOJDBvsPANaHpXOcQECQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=W/cQTf1/z21ABUgAszAEP2BgFPvE9YEgWKljQMwmJ6gJbLqQOSnwQXOV/Q4zNr6yB xHYeV9IlJfEdy4gL8XJtjTYBa2xhAV0k0CWshEwx/bHQkbMu7A3k8UPvBl7hyDUJXz Na6pPAr9QtAHptoMmPRtycpNq8vOnMonKvc8uqUDufPv7uuEz7Lbc9tbXEq1jKswje cjYa9mXir1C+W9JlBKmg2Ee8uSSbQgs+FPFjnjlpSXCEUEgwRegKZTnXT4bF/1tLJ9 sJNGM2S0p0im5T2v/C+RQ95xwa+RooWkSM6EXDRmlmw3hQCtvpooYgY0FdB4aQt5BF MGG8saYejYsKw== Received: from sofa.misterjones.org ([185.219.108.64] helo=why.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 1n6x45-00HAi9-T9; Mon, 10 Jan 2022 15:58:34 +0000 Date: Mon, 10 Jan 2022 15:58:33 +0000 Message-ID: <87ilurtweu.wl-maz@kernel.org> From: Marc Zyngier To: eric.auger@redhat.com Subject: Re: [PATCH v4 4/6] hw/arm/virt: Use the PA range to compute the memory map In-Reply-To: References: <20220107163324.2491209-1-maz@kernel.org> <20220107163324.2491209-5-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, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, kernel-team@android.com, drjones@redhat.com, peter.maydell@linaro.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-Host-Lookup-Failed: Reverse DNS lookup failed for 2604:1380:4641:c500::1 (failed) Received-SPF: pass client-ip=2604:1380:4641:c500::1; envelope-from=maz@kernel.org; helo=dfw.source.kernel.org X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.597, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RDNS_NONE=0.793, 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: , Cc: Peter Maydell , Andrew Jones , kvm@vger.kernel.org, qemu-devel@nongnu.org, kernel-team@android.com, kvmarm@lists.cs.columbia.edu Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 10 Jan 2022 15:38:56 +0000, Eric Auger wrote: >=20 > Hi Marc, >=20 > On 1/7/22 5:33 PM, Marc Zyngier wrote: > > The highmem attribute is nothing but another way to express the > > PA range of a VM. To support HW that has a smaller PA range then > > what QEMU assumes, pass this PA range to the virt_set_memmap() > > function, allowing it to correctly exclude highmem devices > > if they are outside of the PA range. > > > > Signed-off-by: Marc Zyngier > > --- > > hw/arm/virt.c | 53 ++++++++++++++++++++++++++++++++++++++++++++------- > > 1 file changed, 46 insertions(+), 7 deletions(-) > > > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > > index 57c55e8a37..db4b0636e1 100644 > > --- a/hw/arm/virt.c > > +++ b/hw/arm/virt.c > > @@ -1660,7 +1660,7 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineS= tate *vms, int idx) > > return arm_cpu_mp_affinity(idx, clustersz); > > } > > =20 > > -static void virt_set_memmap(VirtMachineState *vms) > > +static void virt_set_memmap(VirtMachineState *vms, int pa_bits) > > { > > MachineState *ms =3D MACHINE(vms); > > hwaddr base, device_memory_base, device_memory_size, memtop; > > @@ -1678,6 +1678,13 @@ static void virt_set_memmap(VirtMachineState *vm= s) > > exit(EXIT_FAILURE); > > } > > =20 > > + /* > > + * !highmem is exactly the same as limiting the PA space to 32bit, > > + * irrespective of the underlying capabilities of the HW. > > + */ > > + if (!vms->highmem) > > + pa_bits =3D 32; > you need {} according to the QEMU coding style. Welcome to a new shiny > world :-) Yeah. Between the reduced indentation and the avalanche of braces, my brain fails to pattern-match blocks of code. Amusing how inflexible you become after a couple of decades... > > + > > /* > > * We compute the base of the high IO region depending on the > > * amount of initial and device memory. The device memory start/si= ze > > @@ -1691,8 +1698,9 @@ static void virt_set_memmap(VirtMachineState *vms) > > =20 > > /* Base address of the high IO region */ > > memtop =3D base =3D device_memory_base + ROUND_UP(device_memory_si= ze, GiB); > > - if (!vms->highmem && memtop > 4 * GiB) { > > - error_report("highmem=3Doff, but memory crosses the 4GiB limit= \n"); > > + if (memtop > BIT_ULL(pa_bits)) { > > + error_report("Addressing limited to %d bits, but memory exceeds i= t by %llu bytes\n", > > + pa_bits, memtop - BIT_ULL(pa_bits)); > > exit(EXIT_FAILURE); > > } > > if (base < device_memory_base) { > > @@ -1711,7 +1719,13 @@ static void virt_set_memmap(VirtMachineState *vm= s) > > vms->memmap[i].size =3D size; > > base +=3D size; > > } > > - vms->highest_gpa =3D (vms->highmem ? base : memtop) - 1; > > + > > + /* > > + * If base fits within pa_bits, all good. If it doesn't, limit it > > + * to the end of RAM, which is guaranteed to fit within pa_bits. > > + */ > > + vms->highest_gpa =3D (base <=3D BIT_ULL(pa_bits) ? base : memtop) = - 1; > > + > > if (device_memory_size > 0) { > > ms->device_memory =3D g_malloc0(sizeof(*ms->device_memory)); > > ms->device_memory->base =3D device_memory_base; > > @@ -1902,12 +1916,38 @@ static void machvirt_init(MachineState *machine) > > unsigned int smp_cpus =3D machine->smp.cpus; > > unsigned int max_cpus =3D machine->smp.max_cpus; > Move the cpu_type check before? >=20 > =C2=A0=C2=A0=C2=A0 if (!cpu_type_valid(machine->cpu_type)) { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 error_report("mach-virt: CPU t= ype %s not supported", > machine->cpu_type); > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 exit(1); > =C2=A0=C2=A0=C2=A0 } > > Yes, very good point. I wonder why this was tucked away past computing the memory map and the GIC configuration... Anyway, I'll move it up. Thanks, M. --=20 Without deviation from the norm, progress is not possible.