From: Marc Zyngier <marc.zyngier@arm.com> To: James Morse <james.morse@arm.com>, kvmarm@lists.cs.columbia.edu Cc: Mark Rutland <mark.rutland@arm.com>, Peter Maydell <peter.maydell@linaro.org>, Andrew Jones <drjones@redhat.com>, Christoffer Dall <cdall@kernel.org>, kvm@vger.kernel.org, Steve Capper <steve.capper@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Kristina Martsenko <kristina.martsenko@arm.com>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v6 10/26] KVM: arm/arm64: Fix idmap size and alignment Date: Fri, 16 Mar 2018 08:55:32 +0000 [thread overview] Message-ID: <6421e60d-1e11-5590-038f-71f09f02af30@arm.com> (raw) In-Reply-To: <5AAAC664.8070400@arm.com> On 15/03/18 19:15, James Morse wrote: > On 14/03/18 16:50, Marc Zyngier wrote: >> Although the idmap section of KVM can only be at most 4kB and >> must be aligned on a 4kB boundary, the rest of the code expects >> it to be page aligned. Things get messy when tearing down the >> HYP page tables when PAGE_SIZE is 64K, and the idmap section isn't >> 64K aligned. >> >> Let's fix this by computing aligned boundaries that the HYP code >> will use. > >> diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c >> index 0e5cfffb4c21..a9e0513868e9 100644 >> --- a/virt/kvm/arm/mmu.c >> +++ b/virt/kvm/arm/mmu.c >> @@ -1815,7 +1815,9 @@ int kvm_mmu_init(void) >> int err; >> >> hyp_idmap_start = kvm_virt_to_phys(__hyp_idmap_text_start); >> + hyp_idmap_start = ALIGN_DOWN(hyp_idmap_start, PAGE_SIZE); >> hyp_idmap_end = kvm_virt_to_phys(__hyp_idmap_text_end); >> + hyp_idmap_end = ALIGN(hyp_idmap_end, PAGE_SIZE); >> hyp_idmap_vector = kvm_virt_to_phys(__kvm_hyp_init); >> >> /* > > > This makes the: > | hyp_idmap_start != (unsigned long)__hyp_idmap_text_start > > check below look funny, but that must be for 32bit which only has 4K pages (I > think), so its behaviour hasn't changed. Yes, that's to handle the 2/2 split on 32bit where some funnies may happen, see d2896d4b55b2 ("arm: KVM: Fix idmap overlap detection when the kernel is idmap'ed"). > Reviewed-by: James Morse <james.morse@arm.com> Thanks, M. -- Jazz is not dead. It just smells funny...
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 10/26] KVM: arm/arm64: Fix idmap size and alignment Date: Fri, 16 Mar 2018 08:55:32 +0000 [thread overview] Message-ID: <6421e60d-1e11-5590-038f-71f09f02af30@arm.com> (raw) In-Reply-To: <5AAAC664.8070400@arm.com> On 15/03/18 19:15, James Morse wrote: > On 14/03/18 16:50, Marc Zyngier wrote: >> Although the idmap section of KVM can only be at most 4kB and >> must be aligned on a 4kB boundary, the rest of the code expects >> it to be page aligned. Things get messy when tearing down the >> HYP page tables when PAGE_SIZE is 64K, and the idmap section isn't >> 64K aligned. >> >> Let's fix this by computing aligned boundaries that the HYP code >> will use. > >> diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c >> index 0e5cfffb4c21..a9e0513868e9 100644 >> --- a/virt/kvm/arm/mmu.c >> +++ b/virt/kvm/arm/mmu.c >> @@ -1815,7 +1815,9 @@ int kvm_mmu_init(void) >> int err; >> >> hyp_idmap_start = kvm_virt_to_phys(__hyp_idmap_text_start); >> + hyp_idmap_start = ALIGN_DOWN(hyp_idmap_start, PAGE_SIZE); >> hyp_idmap_end = kvm_virt_to_phys(__hyp_idmap_text_end); >> + hyp_idmap_end = ALIGN(hyp_idmap_end, PAGE_SIZE); >> hyp_idmap_vector = kvm_virt_to_phys(__kvm_hyp_init); >> >> /* > > > This makes the: > | hyp_idmap_start != (unsigned long)__hyp_idmap_text_start > > check below look funny, but that must be for 32bit which only has 4K pages (I > think), so its behaviour hasn't changed. Yes, that's to handle the 2/2 split on 32bit where some funnies may happen, see d2896d4b55b2 ("arm: KVM: Fix idmap overlap detection when the kernel is idmap'ed"). > Reviewed-by: James Morse <james.morse@arm.com> Thanks, M. -- Jazz is not dead. It just smells funny...
next prev parent reply other threads:[~2018-03-16 8:55 UTC|newest] Thread overview: 124+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-14 16:50 [PATCH v6 00/26] KVM/arm64: Randomise EL2 mappings (variant 3a mitigation) Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 01/26] arm64: alternatives: Add dynamic patching feature Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 02/26] arm64: insn: Add N immediate encoding Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 03/26] arm64: insn: Add encoder for bitwise operations using literals Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 04/26] arm64: KVM: Dynamically patch the kernel/hyp VA mask Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-15 19:15 ` James Morse 2018-03-15 19:15 ` James Morse 2018-03-16 8:52 ` Marc Zyngier 2018-03-16 8:52 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 05/26] arm64: cpufeatures: Drop the ARM64_HYP_OFFSET_LOW feature flag Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 06/26] KVM: arm/arm64: Do not use kern_hyp_va() with kvm_vgic_global_state Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-15 19:16 ` James Morse 2018-03-15 19:16 ` James Morse 2018-03-16 9:31 ` Marc Zyngier 2018-03-16 9:31 ` Marc Zyngier 2018-03-16 11:35 ` Andrew Jones 2018-03-16 11:35 ` Andrew Jones 2018-03-16 11:38 ` Ard Biesheuvel 2018-03-16 11:38 ` Ard Biesheuvel 2018-03-16 11:51 ` Marc Zyngier 2018-03-16 11:51 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 07/26] KVM: arm/arm64: Demote HYP VA range display to being a debug feature Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 08/26] KVM: arm/arm64: Move ioremap calls to create_hyp_io_mappings Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 09/26] KVM: arm/arm64: Keep GICv2 HYP VAs in kvm_vgic_global_state Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 10/26] KVM: arm/arm64: Fix idmap size and alignment Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-15 19:15 ` James Morse 2018-03-15 19:15 ` James Morse 2018-03-16 8:55 ` Marc Zyngier [this message] 2018-03-16 8:55 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 11/26] KVM: arm64: Fix HYP idmap unmap when using 52bit PA Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-16 16:07 ` Catalin Marinas 2018-03-16 16:07 ` Catalin Marinas 2018-03-16 16:47 ` Suzuki K Poulose 2018-03-16 16:47 ` Suzuki K Poulose 2018-03-14 16:50 ` [PATCH v6 12/26] KVM: arm/arm64: Move HYP IO VAs to the "idmap" range Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-15 19:09 ` James Morse 2018-03-15 19:09 ` James Morse 2018-03-16 8:44 ` Marc Zyngier 2018-03-16 8:44 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 13/26] arm64; insn: Add encoder for the EXTR instruction Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 14/26] arm64: insn: Allow ADD/SUB (immediate) with LSL #12 Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 15/26] arm64: KVM: Dynamically compute the HYP VA mask Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 16/26] arm64: KVM: Introduce EL2 VA randomisation Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 17/26] arm64: Update the KVM memory map documentation Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 18/26] arm64: KVM: Move vector offsetting from hyp-init.S to kvm_get_hyp_vector Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 19/26] arm64: KVM: Move stashing of x0/x1 into the vector code itself Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-15 14:39 ` Andrew Jones 2018-03-15 14:39 ` Andrew Jones 2018-03-16 16:22 ` Catalin Marinas 2018-03-16 16:22 ` Catalin Marinas 2018-03-16 16:37 ` Marc Zyngier 2018-03-16 16:37 ` Marc Zyngier 2018-03-16 16:38 ` Marc Zyngier 2018-03-16 16:38 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 20/26] arm64: KVM: Move BP hardening vectors into .hyp.text section Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-15 14:42 ` Andrew Jones 2018-03-15 14:42 ` Andrew Jones 2018-03-16 16:24 ` Catalin Marinas 2018-03-16 16:24 ` Catalin Marinas 2018-03-14 16:50 ` [PATCH v6 21/26] arm64: KVM: Reserve 4 additional instructions in the BPI template Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-15 14:46 ` Andrew Jones 2018-03-15 14:46 ` Andrew Jones 2018-03-16 16:30 ` Catalin Marinas 2018-03-16 16:30 ` Catalin Marinas 2018-03-14 16:50 ` [PATCH v6 22/26] arm64: KVM: Allow far branches from vector slots to the main vectors Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 23/26] arm/arm64: KVM: Introduce EL2-specific executable mappings Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-15 15:03 ` Andrew Jones 2018-03-15 15:03 ` Andrew Jones 2018-03-15 15:53 ` Marc Zyngier 2018-03-15 15:53 ` Marc Zyngier 2018-03-14 16:50 ` [PATCH v6 24/26] arm64: Make BP hardening slot counter available Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-15 15:05 ` Andrew Jones 2018-03-15 15:05 ` Andrew Jones 2018-03-14 16:50 ` [PATCH v6 25/26] arm64: KVM: Allow mapping of vectors outside of the RAM region Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-15 15:54 ` Andrew Jones 2018-03-15 15:54 ` Andrew Jones 2018-03-15 16:17 ` Marc Zyngier 2018-03-15 16:17 ` Marc Zyngier 2018-03-15 17:08 ` Andrew Jones 2018-03-15 17:08 ` Andrew Jones 2018-03-15 18:47 ` Marc Zyngier 2018-03-15 18:47 ` Marc Zyngier 2018-03-16 12:33 ` Andrew Jones 2018-03-16 12:33 ` Andrew Jones 2018-03-14 16:50 ` [PATCH v6 26/26] arm64: Enable ARM64_HARDEN_EL2_VECTORS on Cortex-A57 and A72 Marc Zyngier 2018-03-14 16:50 ` Marc Zyngier 2018-03-15 15:57 ` [PATCH v6 00/26] KVM/arm64: Randomise EL2 mappings (variant 3a mitigation) Andrew Jones 2018-03-15 15:57 ` Andrew Jones 2018-03-15 16:19 ` Marc Zyngier 2018-03-15 16:19 ` Marc Zyngier 2018-03-15 16:40 ` Andrew Jones 2018-03-15 16:40 ` Andrew Jones 2018-03-15 16:52 ` Marc Zyngier 2018-03-15 16:52 ` Marc Zyngier 2018-03-16 17:46 ` Catalin Marinas 2018-03-16 17:46 ` Catalin Marinas 2018-03-16 18:05 ` Marc Zyngier 2018-03-16 18:05 ` Marc Zyngier
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=6421e60d-1e11-5590-038f-71f09f02af30@arm.com \ --to=marc.zyngier@arm.com \ --cc=catalin.marinas@arm.com \ --cc=cdall@kernel.org \ --cc=drjones@redhat.com \ --cc=james.morse@arm.com \ --cc=kristina.martsenko@arm.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=mark.rutland@arm.com \ --cc=peter.maydell@linaro.org \ --cc=steve.capper@arm.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.