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=-14.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 B3BB5C4338F for ; Wed, 28 Jul 2021 09:46:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 917D3600D4 for ; Wed, 28 Jul 2021 09:46:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235724AbhG1JqE (ORCPT ); Wed, 28 Jul 2021 05:46:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:53610 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235610AbhG1JqD (ORCPT ); Wed, 28 Jul 2021 05:46:03 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 04C9D600D4; Wed, 28 Jul 2021 09:46:01 +0000 (UTC) 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 1m8g8V-001V1V-Sj; Wed, 28 Jul 2021 10:46:00 +0100 Date: Wed, 28 Jul 2021 10:45:59 +0100 Message-ID: <874kceeppk.wl-maz@kernel.org> From: Marc Zyngier To: Will Deacon Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, qperret@google.com, dbrazdil@google.com, Srivatsa Vaddagiri , Shanker R Donthineni , James Morse , Suzuki K Poulose , Alexandru Elisei , kernel-team@android.com Subject: Re: [PATCH 02/16] KVM: arm64: Don't issue CMOs when the physical address is invalid In-Reply-To: <20210727181044.GB19173@willie-the-truck> References: <20210715163159.1480168-1-maz@kernel.org> <20210715163159.1480168-3-maz@kernel.org> <20210727181044.GB19173@willie-the-truck> 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=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: will@kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, qperret@google.com, dbrazdil@google.com, vatsa@codeaurora.org, sdonthineni@nvidia.com, james.morse@arm.com, suzuki.poulose@arm.com, alexandru.elisei@arm.com, 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: linux-kernel@vger.kernel.org On Tue, 27 Jul 2021 19:10:45 +0100, Will Deacon wrote: > > On Thu, Jul 15, 2021 at 05:31:45PM +0100, Marc Zyngier wrote: > > Make sure we don't issue CMOs when mapping something that > > is not a memory address in the S2 page tables. > > > > Signed-off-by: Marc Zyngier > > --- > > arch/arm64/kvm/hyp/pgtable.c | 16 ++++++++++------ > > 1 file changed, 10 insertions(+), 6 deletions(-) > > > > diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c > > index 05321f4165e3..a5874ebd0354 100644 > > --- a/arch/arm64/kvm/hyp/pgtable.c > > +++ b/arch/arm64/kvm/hyp/pgtable.c > > @@ -619,12 +619,16 @@ static int stage2_map_walker_try_leaf(u64 addr, u64 end, u32 level, > > } > > > > /* Perform CMOs before installation of the guest stage-2 PTE */ > > - if (mm_ops->dcache_clean_inval_poc && stage2_pte_cacheable(pgt, new)) > > - mm_ops->dcache_clean_inval_poc(kvm_pte_follow(new, mm_ops), > > - granule); > > - > > - if (mm_ops->icache_inval_pou && stage2_pte_executable(new)) > > - mm_ops->icache_inval_pou(kvm_pte_follow(new, mm_ops), granule); > > + if (kvm_phys_is_valid(phys)) { > > + if (mm_ops->dcache_clean_inval_poc && > > + stage2_pte_cacheable(pgt, new)) > > + mm_ops->dcache_clean_inval_poc(kvm_pte_follow(new, > > + mm_ops), > > + granule); > > + if (mm_ops->icache_inval_pou && stage2_pte_executable(new)) > > + mm_ops->icache_inval_pou(kvm_pte_follow(new, mm_ops), > > + granule); > > + } > > Given that this check corresponds to checking the validity of 'new', I > wonder whether we'd be better off pushing the validity checks down into > stage2_pte_{cacheable,executable}()? > > I.e. have stage2_pte_cacheable() return false if !kvm_pte_valid() That would work just as well. I'll update the patch. Thanks, M. -- Without deviation from the norm, progress is not possible.