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 76568C433EF for ; Fri, 26 Nov 2021 19:22:13 +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=3BMa0j1ceY+6/rPKp8qGRGUvAtU4PQ3Y4hwNs0yx3g0=; b=ESFoz7Gz3qjZmr NVlw4G68uWg/I1kVD/qW8hf+5Cv2Dufbiiz7dD8WWw9qZ2pNWfefdM31PaR0Q/xoDQPZJzgXBuRUw FlJwlX1+EYT3Ms+pSni65ZJkV7VElZO5q7x/Q3EYoM41nISOH+Vm+7ATx/5CdkJU18TcwcdqAla/1 iLewj2MrsjivMbDwlchvhalAxyYNsPN42IpMD0EuSdF4Jsa24HEpNosmJCJ6Bgb/g+lTvkyuNAq3b FLPLsC28KRXGvZYkgI0Z62nHZWD90dOzxnbdheWoN5XzBiTaolkazdamiFk0jub4/AzOGU7lItYFS IV8QGSUrdFMpVX+AZhtw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqglz-00Bb6A-Ap; Fri, 26 Nov 2021 19:20:39 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqglv-00Bb5I-F1 for linux-arm-kernel@lists.infradead.org; Fri, 26 Nov 2021 19:20:37 +0000 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 2B9136228F; Fri, 26 Nov 2021 19:20:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AC0CC9305B; Fri, 26 Nov 2021 19:20:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637954433; bh=b4ceXi12eQFeD9SQyB33k+v/3V5HDj3nrFEEY/5rQ7Q=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=mur7Eb9no6YVYgVXz4a4eopodX5xLPlShGoFLKct7JKiR8Mn8/LI4+BdMh+XZr1vq USOoNQFp7bitbLZD5w+Wi4dU2ZeASanoNRy5EO0dOxxo+YD0RxdaszjHhoYjWuP6S9 ZVLzCDdVcTrWRQcfnrU8BvVhpw1bK7FBCj8N8wmF/GQX0Ncgayj0m2kdnkjP4rnv1g 15CH79SpS1UzMz7+nVMQTLgBht4O+XgLYHgXV18Kq8xt8/EPW/isfy+CljZsKp+EnD TaXY3NkleeeDrHq7jQ8qHa/CTSYUebVD8kvL1NkKLKQsDV4P56pFACLvJjBP/AVuv+ QjFZ+WyLMlUpA== 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 1mqglr-008BAX-F7; Fri, 26 Nov 2021 19:20:31 +0000 Date: Fri, 26 Nov 2021 19:20:31 +0000 Message-ID: <87bl26bu68.wl-maz@kernel.org> From: Marc Zyngier To: Ganapatrao Kulkarni Cc: catalin.marinas@arm.com, will@kernel.org, andre.przywara@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, darren@os.amperecomputing.com, D Scott Phillips Subject: Re: [PATCH 2/2] KVM: arm64: nv: fixup! Support multiple nested Stage-2 mmu structures In-Reply-To: References: <20211122095803.28943-1-gankulkarni@os.amperecomputing.com> <20211122095803.28943-3-gankulkarni@os.amperecomputing.com> <877dcwco1m.wl-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: gankulkarni@os.amperecomputing.com, catalin.marinas@arm.com, will@kernel.org, andre.przywara@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, darren@os.amperecomputing.com, scott@os.amperecomputing.com 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-20211126_112035_613328_C983D726 X-CRM114-Status: GOOD ( 35.33 ) 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 [resending after having sorted my email config] On Fri, 26 Nov 2021 05:59:00 +0000, Ganapatrao Kulkarni wrote: > > Hi Marc, > > On 25-11-2021 07:53 pm, Marc Zyngier wrote: > > On Mon, 22 Nov 2021 09:58:03 +0000, > > Ganapatrao Kulkarni wrote: > >> > >> Commit 1776c91346b6 ("KVM: arm64: nv: Support multiple nested Stage-2 mmu > >> structures")[1] added a function kvm_vcpu_init_nested which expands the > >> stage-2 mmu structures array when ever a new vCPU is created. The array > >> is expanded using krealloc() and results in a stale mmu address pointer > >> in pgt->mmu. Adding a fix to update the pointer with the new address after > >> successful krealloc. > >> > >> [1] https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/ > >> branch kvm-arm64/nv-5.13 > >> > >> Signed-off-by: Ganapatrao Kulkarni > >> --- > >> arch/arm64/kvm/nested.c | 9 +++++++++ > >> 1 file changed, 9 insertions(+) > >> > >> diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c > >> index 4ffbc14d0245..57ad8d8f4ee5 100644 > >> --- a/arch/arm64/kvm/nested.c > >> +++ b/arch/arm64/kvm/nested.c > >> @@ -68,6 +68,8 @@ int kvm_vcpu_init_nested(struct kvm_vcpu *vcpu) > >> num_mmus * sizeof(*kvm->arch.nested_mmus), > >> GFP_KERNEL | __GFP_ZERO); > >> if (tmp) { > >> + int i; > >> + > >> if (kvm_init_stage2_mmu(kvm, &tmp[num_mmus - 1]) || > >> kvm_init_stage2_mmu(kvm, &tmp[num_mmus - 2])) { > >> kvm_free_stage2_pgd(&tmp[num_mmus - 1]); > >> @@ -80,6 +82,13 @@ int kvm_vcpu_init_nested(struct kvm_vcpu *vcpu) > >> } > >> kvm->arch.nested_mmus = tmp; > >> + > >> + /* Fixup pgt->mmu after krealloc */ > >> + for (i = 0; i < kvm->arch.nested_mmus_size; i++) { > >> + struct kvm_s2_mmu *mmu = &kvm->arch.nested_mmus[i]; > >> + > >> + mmu->pgt->mmu = mmu; > >> + } > >> } > >> mutex_unlock(&kvm->lock); > > > > Another good catch. I've tweaked a bit to avoid some unnecessary > > repainting, see below. > > > > Thanks again, > > > > M. > > > > diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c > > index a4dfffa1dae0..92b225db59ac 100644 > > --- a/arch/arm64/kvm/nested.c > > +++ b/arch/arm64/kvm/nested.c > > @@ -66,8 +66,19 @@ int kvm_vcpu_init_nested(struct kvm_vcpu *vcpu) > > num_mmus = atomic_read(&kvm->online_vcpus) * 2; > > tmp = krealloc(kvm->arch.nested_mmus, > > num_mmus * sizeof(*kvm->arch.nested_mmus), > > - GFP_KERNEL | __GFP_ZERO); > > + GFP_KERNEL_ACCOUNT | __GFP_ZERO); > > if (tmp) { > > + /* > > + * If we went through a realocation, adjust the MMU > > Is it more precise to say? > > + * back-pointers in the pg_table structures. > * back-pointers in the pg_table structures of previous inits. Yes. I have added something along those lines. > > + */ > > + if (kvm->arch.nested_mmus != tmp) { > > + int i; > > + > > + for (i = 0; i < num_mms - 2; i++) > > + tmp[i].pgt->mmu = &tmp[i]; > > + } > > Thanks for this optimization, it saves 2 redundant iterations. > > + > > if (kvm_init_stage2_mmu(kvm, &tmp[num_mmus - 1]) || > > kvm_init_stage2_mmu(kvm, &tmp[num_mmus - 2])) { > > kvm_free_stage2_pgd(&tmp[num_mmus - 1]); > > > > Feel free to add, > Reviewed-by: Ganapatrao Kulkarni Given that this was a fixup, I haven't taken this tag. I will Cc you on the whole series, and you can give you tag on the whole patch if you are happy with it. BTW, I have now fixed the bug that was preventing L2 userspace from running (bad interaction with the pgtable code which was unhappy about my use of the SW bits when relaxing the permissions). You should now be able to test the whole series. Thanks, M. -- Without deviation from the norm, progress is not possible. -- 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