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 8089AC25B45 for ; Mon, 23 Oct 2023 18:54:42 +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:MIME-Version:References:In-Reply-To: Subject:Cc:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=azxNIr8FfB2gLs/Py+6Ottf9fXDopm7Fi+Tev6L4A5o=; b=2e5sQOpTcC351c 6XLCDbuBdBMbr+3Jm3ewbXlmIt1zhkyEpZjMc+DAVJo2k541UOl2lf3gk9G9iBQuCGpUSeVvKLnle QZtnmcSFfg3/9fW0lAgUxOfhXKBXA3uXIvdZwr6Dhu2CUXBfUuShoxD7+chNc+o+3eKJ1mX174xPw clEYMI+vXE1l5Ngco6xvN6Itj9UCXUSmWjEJoJbSJNzz8EHE4fdRyrFyyn9No5J4ry2r5Qsw/tet3 bJDf8x2f4d/5T64MrEbNGa7vD9qxeNmS6ZQj3uTkapZdgEeCsYi3uV36wNJQNUldpdV1fdKvM9kLk ZLDsjGN5M/JUG48XZTjg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qv04B-0087R6-0s; Mon, 23 Oct 2023 18:54:19 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qv047-0087Qj-29 for linux-arm-kernel@lists.infradead.org; Mon, 23 Oct 2023 18:54:17 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 1D968CE283C; Mon, 23 Oct 2023 18:54:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52C31C433C8; Mon, 23 Oct 2023 18:54:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698087253; bh=1c9gJYsSw7pMCNKCyIQjvFzjRE+M3JXriONU7m9w6XY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=BQx3nEw37hN9C1/LsGYM4at/cAVxx+r6Ziw+Mqa5KXmWVyW6+dAj6P5IBxIcO7COL F3ZqMrq65OTFMAOIlhsnoy3ptuAjrHaYaWJm/F1tolDMXZrg+ybxEK68zMcwEeJOW5 FLyKxPljUoJZwAKtYmZLT7NbgCBqxx6P/KWAqIOkR1/uUDj4KoiQzuZ9bc+64TAUe+ Bwsijqlh+DhSQsnZgw89Q/sGn0jftiQ6A873gUp5HNfHv59XbUv2xuDSyP3rdydriK ubAJ0eCKoCcfEwADR7+rX1aVz5I3vniuy86Us7nsOC6ejAQv9t+yeTX9aA5NNPUwAR LdzFEgY1utYiw== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qv043-006xUJ-1Z; Mon, 23 Oct 2023 19:54:11 +0100 Date: Mon, 23 Oct 2023 19:54:10 +0100 Message-ID: <86msw941bh.wl-maz@kernel.org> From: Marc Zyngier To: Catalin Marinas 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 In-Reply-To: <169808242073.1650996.15905284839099941158.b4-ty@arm.com> References: <20230912141549.278777-63-ardb@google.com> <169808242073.1650996.15905284839099941158.b4-ty@arm.com> 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/29.1 (aarch64-unknown-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: catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org, ardb@google.com, will@kernel.org, ardb@kernel.org, mark.rutland@arm.com, ryan.roberts@arm.com, anshuman.khandual@arm.com, keescook@chromium.org, joey.gouly@arm.com, oliver.upton@linux.dev X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231023_115416_068118_9BC34F41 X-CRM114-Status: GOOD ( 32.12 ) 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, 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. Thanks, M. -- Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel