From: Auger Eric <eric.auger@redhat.com> To: Suzuki K Poulose <suzuki.poulose@arm.com>, linux-arm-kernel@lists.infradead.org Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, marc.zyngier@arm.com, cdall@kernel.org, pbonzini@redhat.com, rkrcmar@redhat.com, will.deacon@arm.com, catalin.marinas@arm.com, james.morse@arm.com, dave.martin@arm.com, julien.grall@arm.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 15/18] kvm: arm64: Add 52bit support for PAR to HPFAR conversoin Date: Tue, 25 Sep 2018 11:59:36 +0200 [thread overview] Message-ID: <b6929b5d-e797-6922-a5d2-3a1ded517e1a@redhat.com> (raw) In-Reply-To: <20180917104144.19188-16-suzuki.poulose@arm.com> Hi Suzuki, On 9/17/18 12:41 PM, Suzuki K Poulose wrote: > Add support for handling 52bit addresses in PAR to HPFAR > conversion. Instead of hardcoding the address limits, we > now use PHYS_MASK_SHIFT. > > Cc: Marc Zyngier <marc.zyngier@arm.com> > Cc: Christoffer Dall <cdall@kernel.org> > Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Thanks Eric > --- > arch/arm64/include/asm/kvm_arm.h | 7 +++++++ > arch/arm64/kvm/hyp/switch.c | 2 +- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h > index 0a37c0513ede..241d1622fa19 100644 > --- a/arch/arm64/include/asm/kvm_arm.h > +++ b/arch/arm64/include/asm/kvm_arm.h > @@ -308,6 +308,13 @@ > > /* Hyp Prefetch Fault Address Register (HPFAR/HDFAR) */ > #define HPFAR_MASK (~UL(0xf)) > +/* > + * We have > + * PAR [PA_Shift - 1 : 12] = PA [PA_Shift - 1 : 12] > + * HPFAR [PA_Shift - 9 : 4] = FIPA [PA_Shift - 1 : 12] > + */ > +#define PAR_TO_HPFAR(par) \ > + (((par) & GENMASK_ULL(PHYS_MASK_SHIFT - 1, 12)) >> 8) > > #define kvm_arm_exception_type \ > {0, "IRQ" }, \ > diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c > index 9d5ce1a3039a..7cc175c88a37 100644 > --- a/arch/arm64/kvm/hyp/switch.c > +++ b/arch/arm64/kvm/hyp/switch.c > @@ -263,7 +263,7 @@ static bool __hyp_text __translate_far_to_hpfar(u64 far, u64 *hpfar) > return false; /* Translation failed, back to guest */ > > /* Convert PAR to HPFAR format */ > - *hpfar = ((tmp >> 12) & ((1UL << 36) - 1)) << 4; > + *hpfar = PAR_TO_HPFAR(tmp); > return true; > } > >
WARNING: multiple messages have this Message-ID (diff)
From: eric.auger@redhat.com (Auger Eric) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 15/18] kvm: arm64: Add 52bit support for PAR to HPFAR conversoin Date: Tue, 25 Sep 2018 11:59:36 +0200 [thread overview] Message-ID: <b6929b5d-e797-6922-a5d2-3a1ded517e1a@redhat.com> (raw) In-Reply-To: <20180917104144.19188-16-suzuki.poulose@arm.com> Hi Suzuki, On 9/17/18 12:41 PM, Suzuki K Poulose wrote: > Add support for handling 52bit addresses in PAR to HPFAR > conversion. Instead of hardcoding the address limits, we > now use PHYS_MASK_SHIFT. > > Cc: Marc Zyngier <marc.zyngier@arm.com> > Cc: Christoffer Dall <cdall@kernel.org> > Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Thanks Eric > --- > arch/arm64/include/asm/kvm_arm.h | 7 +++++++ > arch/arm64/kvm/hyp/switch.c | 2 +- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h > index 0a37c0513ede..241d1622fa19 100644 > --- a/arch/arm64/include/asm/kvm_arm.h > +++ b/arch/arm64/include/asm/kvm_arm.h > @@ -308,6 +308,13 @@ > > /* Hyp Prefetch Fault Address Register (HPFAR/HDFAR) */ > #define HPFAR_MASK (~UL(0xf)) > +/* > + * We have > + * PAR [PA_Shift - 1 : 12] = PA [PA_Shift - 1 : 12] > + * HPFAR [PA_Shift - 9 : 4] = FIPA [PA_Shift - 1 : 12] > + */ > +#define PAR_TO_HPFAR(par) \ > + (((par) & GENMASK_ULL(PHYS_MASK_SHIFT - 1, 12)) >> 8) > > #define kvm_arm_exception_type \ > {0, "IRQ" }, \ > diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c > index 9d5ce1a3039a..7cc175c88a37 100644 > --- a/arch/arm64/kvm/hyp/switch.c > +++ b/arch/arm64/kvm/hyp/switch.c > @@ -263,7 +263,7 @@ static bool __hyp_text __translate_far_to_hpfar(u64 far, u64 *hpfar) > return false; /* Translation failed, back to guest */ > > /* Convert PAR to HPFAR format */ > - *hpfar = ((tmp >> 12) & ((1UL << 36) - 1)) << 4; > + *hpfar = PAR_TO_HPFAR(tmp); > return true; > } > >
next prev parent reply other threads:[~2018-09-25 9:59 UTC|newest] Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-17 10:41 [PATCH v5 00/18] kvm: arm64: Dynamic IPA and 52bit IPA Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` [PATCH v5 01/18] kvm: arm/arm64: Fix stage2_flush_memslot for 4 level page table Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` [PATCH v5 02/18] kvm: arm/arm64: Remove spurious WARN_ON Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` [PATCH v5 03/18] kvm: arm64: Add helper for loading the stage2 setting for a VM Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` [PATCH v5 04/18] arm64: Add a helper for PARange to physical shift conversion Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` [PATCH v5 05/18] kvm: arm64: Clean up VTCR_EL2 initialisation Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` [PATCH v5 06/18] kvm: arm/arm64: Allow arch specific configurations for VM Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-20 10:22 ` Auger Eric 2018-09-20 10:22 ` Auger Eric 2018-09-20 10:22 ` Auger Eric 2018-09-17 10:41 ` [PATCH v5 07/18] kvm: arm64: Configure VTCR_EL2 per VM Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-20 10:21 ` Auger Eric 2018-09-20 10:21 ` Auger Eric 2018-09-20 10:38 ` Suzuki K Poulose 2018-09-20 10:38 ` Suzuki K Poulose 2018-09-20 10:38 ` Suzuki K Poulose 2018-09-17 10:41 ` [PATCH v5 08/18] kvm: arm/arm64: Prepare for VM specific stage2 translations Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-20 14:07 ` Auger Eric 2018-09-20 14:07 ` Auger Eric 2018-09-20 14:07 ` Auger Eric 2018-09-17 10:41 ` [PATCH v5 09/18] kvm: arm64: Prepare for dynamic stage2 page table layout Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` [PATCH v5 10/18] kvm: arm64: Make stage2 page table layout dynamic Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-20 14:07 ` Auger Eric 2018-09-20 14:07 ` Auger Eric 2018-09-17 10:41 ` [PATCH v5 11/18] kvm: arm64: Dynamic configuration of VTTBR mask Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-20 14:07 ` Auger Eric 2018-09-20 14:07 ` Auger Eric 2018-09-20 15:22 ` Suzuki K Poulose 2018-09-20 15:22 ` Suzuki K Poulose 2018-09-20 15:22 ` Suzuki K Poulose 2018-09-25 11:56 ` Auger Eric 2018-09-25 11:56 ` Auger Eric 2018-09-17 10:41 ` [PATCH v5 12/18] kvm: arm64: Configure VTCR_EL2.SL0 per VM Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-20 14:25 ` Auger Eric 2018-09-20 14:25 ` Auger Eric 2018-09-20 15:25 ` Suzuki K Poulose 2018-09-20 15:25 ` Suzuki K Poulose 2018-09-20 15:25 ` Suzuki K Poulose 2018-09-17 10:41 ` [PATCH v5 13/18] kvm: arm64: Switch to per VM IPA limit Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` [PATCH v5 14/18] vgic: Add support for 52bit guest physical address Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-21 14:57 ` Auger Eric 2018-09-21 14:57 ` Auger Eric 2018-09-25 10:49 ` Suzuki K Poulose 2018-09-25 10:49 ` Suzuki K Poulose 2018-09-17 10:41 ` [PATCH v5 15/18] kvm: arm64: Add 52bit support for PAR to HPFAR conversoin Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-25 9:59 ` Auger Eric [this message] 2018-09-25 9:59 ` Auger Eric 2018-09-17 10:41 ` [PATCH v5 16/18] kvm: arm64: Set a limit on the IPA size Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-25 9:59 ` Auger Eric 2018-09-25 9:59 ` Auger Eric 2018-09-25 9:59 ` Auger Eric 2018-09-25 11:10 ` Suzuki K Poulose 2018-09-25 11:10 ` Suzuki K Poulose 2018-09-25 11:10 ` Suzuki K Poulose 2018-09-17 10:41 ` [PATCH v5 17/18] kvm: arm64: Limit the minimum number of page table levels Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-25 10:00 ` Auger Eric 2018-09-25 10:00 ` Auger Eric 2018-09-25 10:25 ` Suzuki K Poulose 2018-09-25 10:25 ` Suzuki K Poulose 2018-09-17 10:41 ` [PATCH v5 18/18] kvm: arm64: Allow tuning the physical address size for VM Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 14:20 ` Peter Maydell 2018-09-17 14:20 ` Peter Maydell 2018-09-17 14:43 ` Suzuki K Poulose 2018-09-17 14:43 ` Suzuki K Poulose 2018-09-18 1:55 ` Peter Maydell 2018-09-18 1:55 ` Peter Maydell 2018-09-18 1:55 ` Peter Maydell 2018-09-18 15:16 ` Suzuki K Poulose 2018-09-18 15:16 ` Suzuki K Poulose 2018-09-18 15:36 ` Peter Maydell 2018-09-18 15:36 ` Peter Maydell 2018-09-18 16:27 ` Suzuki K Poulose 2018-09-18 16:27 ` Suzuki K Poulose 2018-09-18 16:27 ` Suzuki K Poulose 2018-09-18 17:15 ` Peter Maydell 2018-09-18 17:15 ` Peter Maydell 2018-09-19 10:03 ` Suzuki K Poulose 2018-09-19 10:03 ` Suzuki K Poulose 2018-09-19 10:03 ` Suzuki K Poulose 2018-09-25 10:00 ` Auger Eric 2018-09-25 10:00 ` Auger Eric 2018-09-25 10:24 ` Suzuki K Poulose 2018-09-25 10:24 ` Suzuki K Poulose 2018-09-25 10:24 ` Suzuki K Poulose 2018-09-17 10:41 ` [kvmtool PATCH v5 19/18] kvmtool: Allow backends to run checks on the KVM device fd Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` [kvmtool PATCH v5 20/18] kvmtool: arm64: Add support for guest physical address size Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` [kvmtool PATCH v5 21/18] kvmtool: arm64: Switch memory layout Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` [kvmtool PATCH v5 22/18] kvmtool: arm: Add support for creating VM with PA size Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose 2018-09-17 10:41 ` Suzuki K Poulose
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=b6929b5d-e797-6922-a5d2-3a1ded517e1a@redhat.com \ --to=eric.auger@redhat.com \ --cc=catalin.marinas@arm.com \ --cc=cdall@kernel.org \ --cc=dave.martin@arm.com \ --cc=james.morse@arm.com \ --cc=julien.grall@arm.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=pbonzini@redhat.com \ --cc=rkrcmar@redhat.com \ --cc=suzuki.poulose@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.