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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 81881C25B46 for ; Mon, 23 Oct 2023 20:45:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=WqiLMPII+7eHgqJO+j4IqXtFoHXOQcfnkung+KDuiPY=; b=nJt/MAl5hxJJql UT/raWgCKB29Ypj4RQOUSt4ASouNpoMUF7N9awY3xuEU90Rky8GRMsEWLTpwtPABj7vAt8onguZeG 0h9OQZNeTEzda4HF6fD0WWgNliujqWOzM5Nzk9n4Y5Be0bHRSItfuvtHRwmmMvnkFyeeVLssOSoio FQw0I6U8TBDuQe/ZNT78N6LvqI/UcMR1VCUNPtrK+nRG/uEufvPz5+Wt/bqp5TGOtaaqMK4INuedj 7GkuiLb2bgwehDEJoUdEv/l7dKwBuDzxnf1ZcKfL85kSlDQ85DCno3hoi3KmKY0Tun1ARuVufRScr 32zlkrMnV9iow2XT8o3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qv1nA-008Fno-07; Mon, 23 Oct 2023 20:44:52 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qv1n7-008FnR-00 for linux-arm-kernel@lists.infradead.org; Mon, 23 Oct 2023 20:44:51 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 852E7CE111F; Mon, 23 Oct 2023 20:44:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3E9CC433C7; Mon, 23 Oct 2023 20:44:43 +0000 (UTC) Date: Mon, 23 Oct 2023 21:44:41 +0100 From: Catalin Marinas To: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Will Deacon , Ard Biesheuvel , Mark Rutland , Ryan Roberts , Anshuman Khandual , Kees Cook , Joey Gouly , oliver.upton@linux.dev Subject: Re: [PATCH v4 00/61] arm64: Add support for LPA2 at stage1 and WXN Message-ID: References: <20230912141549.278777-63-ardb@google.com> <169808242073.1650996.15905284839099941158.b4-ty@arm.com> <86msw941bh.wl-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <86msw941bh.wl-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231023_134449_402837_DE9F35F8 X-CRM114-Status: GOOD ( 33.96 ) 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 Mon, Oct 23, 2023 at 07:54:10PM +0100, Marc Zyngier wrote: > On Mon, 23 Oct 2023 18:45:25 +0100, > Catalin Marinas wrote: > > > > On Tue, 12 Sep 2023 14:15:50 +0000, Ard Biesheuvel wrote: > > > This is a followup to [0], which was sent out more than 6 months ago. > > > Thanks to Ryan and Mark for feedback and review. This series is > > > independent from Ryan's work on adding support for LPA2 to KVM - the > > > only potential source of conflict should be the patch "arm64: kvm: Limit > > > HYP VA and host S2 range to 48 bits when LPA2 is in effect", which could > > > simply be dropped in favour of the KVM changes to make it support LPA2. > > > > > > [...] > > > > I pushed the series to the arm64 for-next/lpa2-stage1 branch. If > > something falls apart badly in -next (other than the typical conflicts), > > I can drop the series before the upcoming merging window. > > > > There are a couple of patches touching KVM, it would be good to get an > > ack from Marc or Oliver (I'll rebase the branch if you do but no worries > > if you don't get around). I think Ard's C++ style comments will > > disappear with Ryan's LPA2 support for stage 2 (whenever that will get > > merged). > > > > https://lore.kernel.org/r/20230912141549.278777-119-ardb@google.com > > https://lore.kernel.org/r/20230912141549.278777-120-ardb@google.com > > > > Talking of KVM, we'll get a conflict with next (depending on which > > branch is picked first by sfr, the polarity may differ). That's my > > resolution of merging Ard's patches into -next: > > > > diff --cc arch/arm64/kvm/hyp/nvhe/mem_protect.c > > index 8d0a5834e883,c20b08cf1f03..34c17ec521c7 > > --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c > > +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > > @@@ -128,9 -128,11 +128,11 @@@ static void prepare_host_vtcr(void > > /* The host stage 2 is id-mapped, so use parange for T0SZ */ > > parange = kvm_get_parange(id_aa64mmfr0_el1_sys_val); > > phys_shift = id_aa64mmfr0_parange_to_phys_shift(parange); > > + if (IS_ENABLED(CONFIG_ARM64_LPA2) && phys_shift > 48) > > + phys_shift = 48; // not implemented yet > > > > - host_mmu.arch.vtcr = kvm_get_vtcr(id_aa64mmfr0_el1_sys_val, > > - id_aa64mmfr1_el1_sys_val, phys_shift); > > + host_mmu.arch.mmu.vtcr = kvm_get_vtcr(id_aa64mmfr0_el1_sys_val, > > + id_aa64mmfr1_el1_sys_val, phys_shift); > > } > > > > static bool host_stage2_force_pte_cb(u64 addr, u64 end, enum kvm_pgtable_prot prot); > > > > So Marc, Oliver, if you want to avoid this, you could merge the > > lpa2-stage1 branch into the KVM tree once I freeze it. > > Yeah, that's probably best (though this looks pretty minor). I'll let > Oliver decide on it, as he's in charge this time around. For some reason git manages to resolve it now without any problem. Not sure what happened when I tried this last week. Let's see if Stephen reports any conflicts. Thanks for the acks. -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel