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 X-Spam-Level: X-Spam-Status: No, score=-15.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DE1BC433DB for ; Thu, 4 Mar 2021 19:51:50 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 B81FC64F1C for ; Thu, 4 Mar 2021 19:51:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B81FC64F1C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=DAa+WEzr/lwsmVw5M0EwejhGV985Pwsb/OyNMG/HYnU=; b=GMRLu/z2rqomI74L6Gt8qzeVY cd1I1uUeYOXYUBmsv8cPANB+pWP8TeNgw1XeN/kgab7sZ6BfTHqm5Uu1nIfbcHk3Vuz05jCNE3K2q hMllE6BaWWWfKItrJoCx2Y+OrN8vnHaC62rFrH9VH+/cjMOUom42ZF+lcFBkvja8ItcKbyJYdUT5F 5W0hEOTp+RQ2Ip7qJXG2H4mECPKOnnHTbhRCUge7I2rn5MoiIpZ0hluJ/C8V9qLhhaIu2oWnCUBKb z1r0VKnmgp2W+gsWana6oFZ4X6/La8K+HmN/6rVE1kmd6CE5VDheut8uUBEWaarBO5HRu0Ko04icN tgMIGkCgA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHtz9-009pZL-5K; Thu, 04 Mar 2021 19:50:11 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHtz3-009pYd-1J for linux-arm-kernel@lists.infradead.org; Thu, 04 Mar 2021 19:50:07 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D1A1864EAE; Thu, 4 Mar 2021 19:49:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614887399; bh=rbJBnbip++59oMvemPv0UgOnN48fZ3mavVDtdREo3QA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZWQ7DETmHFsQA6lwmTnfoOa+Q9Irkf5q2C4UmWvL/JHQ1qcalcbNorvEw35hz+pFK 8xBYECCDmudPwtzgrAmwgJM01RAx6E/LJrB2j63eeVfozezpMjmEejrdIhwI+mz06e qsFZL2Nj05tgwwnuoSr4OPQ5L/9dAWEu0qqofN63+Cm+yortNfPgFTx8VFc22FRZ7m KCHjHuhj3rMY3nnoJHdPABwMUgycCUR8/7oHbr9fLK7JwX5Ha5qPzrWEtyNZvLnj03 tBTrUyvzjKvOqBWZzxTVyBfXPVc9km+IZFr70JkBQs5FvYSeXGeKq5Cwf/5Ar3MXBa fZNKsLB56KILg== Date: Thu, 4 Mar 2021 19:49:53 +0000 From: Will Deacon To: Quentin Perret Cc: catalin.marinas@arm.com, maz@kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, android-kvm@google.com, linux-kernel@vger.kernel.org, kernel-team@android.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, tabba@google.com, mark.rutland@arm.com, dbrazdil@google.com, mate.toth-pal@arm.com, seanjc@google.com, robh+dt@kernel.org Subject: Re: [PATCH v3 24/32] KVM: arm64: Reserve memory for host stage 2 Message-ID: <20210304194953.GD21950@willie-the-truck> References: <20210302150002.3685113-1-qperret@google.com> <20210302150002.3685113-25-qperret@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210302150002.3685113-25-qperret@google.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Mar 02, 2021 at 02:59:54PM +0000, Quentin Perret wrote: > Extend the memory pool allocated for the hypervisor to include enough > pages to map all of memory at page granularity for the host stage 2. > While at it, also reserve some memory for device mappings. > > Signed-off-by: Quentin Perret > --- > arch/arm64/kvm/hyp/include/nvhe/mm.h | 23 ++++++++++++++++++++++- > arch/arm64/kvm/hyp/nvhe/setup.c | 12 ++++++++++++ > arch/arm64/kvm/hyp/reserved_mem.c | 2 ++ > 3 files changed, 36 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/kvm/hyp/include/nvhe/mm.h b/arch/arm64/kvm/hyp/include/nvhe/mm.h > index ac0f7fcffd08..411a35db949c 100644 > --- a/arch/arm64/kvm/hyp/include/nvhe/mm.h > +++ b/arch/arm64/kvm/hyp/include/nvhe/mm.h > @@ -53,7 +53,7 @@ static inline unsigned long __hyp_pgtable_max_pages(unsigned long nr_pages) > return total; > } > > -static inline unsigned long hyp_s1_pgtable_pages(void) > +static inline unsigned long __hyp_pgtable_total_pages(void) > { > unsigned long res = 0, i; > > @@ -63,9 +63,30 @@ static inline unsigned long hyp_s1_pgtable_pages(void) > res += __hyp_pgtable_max_pages(reg->size >> PAGE_SHIFT); > } > > + return res; > +} > + > +static inline unsigned long hyp_s1_pgtable_pages(void) > +{ > + unsigned long res; > + > + res = __hyp_pgtable_total_pages(); > + > /* Allow 1 GiB for private mappings */ > res += __hyp_pgtable_max_pages(SZ_1G >> PAGE_SHIFT); > > return res; > } > + > +static inline unsigned long host_s2_mem_pgtable_pages(void) > +{ > + return __hyp_pgtable_total_pages() + 16; Is this 16 due to the possibility of a concatenated pgd? If so, please add a comment to that effect. With that: Acked-by: Will Deacon Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel