From: Suzuki K Poulose <Suzuki.Poulose@arm.com>
To: Punit Agrawal <punit.agrawal@arm.com>, kvmarm@lists.cs.columbia.edu
Cc: linux-arm-kernel@lists.infradead.org, marc.zyngier@arm.com,
christoffer.dall@arm.com, linux-kernel@vger.kernel.org,
Russell King <linux@armlinux.org.uk>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>
Subject: Re: [PATCH v4 4/7] KVM: arm64: Support PUD hugepage in stage2_is_exec()
Date: Thu, 5 Jul 2018 17:48:37 +0100 [thread overview]
Message-ID: <442d0f4b-cb23-9788-1ebd-b14c89c52c45@arm.com> (raw)
In-Reply-To: <20180705140850.5801-5-punit.agrawal@arm.com>
Hi Punit,
On 05/07/18 15:08, Punit Agrawal wrote:
> In preparation for creating PUD hugepages at stage 2, add support for
> detecting execute permissions on PUD page table entries. Faults due to
> lack of execute permissions on page table entries is used to perform
> i-cache invalidation on first execute.
>
> Provide trivial implementations of arm32 helpers to allow sharing of
> code.
>
> Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
> Cc: Christoffer Dall <christoffer.dall@arm.com>
> Cc: Marc Zyngier <marc.zyngier@arm.com>
> Cc: Russell King <linux@armlinux.org.uk>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> ---
> arch/arm/include/asm/kvm_mmu.h | 6 ++++++
> arch/arm64/include/asm/kvm_mmu.h | 5 +++++
> arch/arm64/include/asm/pgtable-hwdef.h | 2 ++
> virt/kvm/arm/mmu.c | 10 +++++++++-
> 4 files changed, 22 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h
> index c23722f75d5c..d05c8986e495 100644
> --- a/arch/arm/include/asm/kvm_mmu.h
> +++ b/arch/arm/include/asm/kvm_mmu.h
> @@ -96,6 +96,12 @@ static inline bool kvm_s2pud_readonly(pud_t *pud)
> }
>
>
> +static inline bool kvm_s2pud_exec(pud_t *pud)
> +{
> + BUG();
> + return false;
> +}
> +
> static inline void kvm_set_pmd(pmd_t *pmd, pmd_t new_pmd)
> {
> *pmd = new_pmd;
> diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
> index 84051930ddfe..15bc1be8f82f 100644
> --- a/arch/arm64/include/asm/kvm_mmu.h
> +++ b/arch/arm64/include/asm/kvm_mmu.h
> @@ -249,6 +249,11 @@ static inline bool kvm_s2pud_readonly(pud_t *pudp)
> return kvm_s2pte_readonly((pte_t *)pudp);
> }
>
> +static inline bool kvm_s2pud_exec(pud_t *pudp)
> +{
> + return !(READ_ONCE(pud_val(*pudp)) & PUD_S2_XN);
> +}
> +
> static inline bool kvm_page_empty(void *ptr)
> {
> struct page *ptr_page = virt_to_page(ptr);
> diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
> index fd208eac9f2a..10ae592b78b8 100644
> --- a/arch/arm64/include/asm/pgtable-hwdef.h
> +++ b/arch/arm64/include/asm/pgtable-hwdef.h
> @@ -193,6 +193,8 @@
> #define PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */
> #define PMD_S2_XN (_AT(pmdval_t, 2) << 53) /* XN[1:0] */
>
> +#define PUD_S2_XN (_AT(pudval_t, 2) << 53) /* XN[1:0] */
> +
The changes above look good to me. Please see below.
> /*
> * Memory Attribute override for Stage-2 (MemAttr[3:0])
> */
> diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c
> index db04b18218c1..ccdea0edabb3 100644
> --- a/virt/kvm/arm/mmu.c
> +++ b/virt/kvm/arm/mmu.c
> @@ -1040,10 +1040,18 @@ static int stage2_set_pmd_huge(struct kvm *kvm, struct kvm_mmu_memory_cache
>
> static bool stage2_is_exec(struct kvm *kvm, phys_addr_t addr)
> {
> + pud_t *pudp;
> pmd_t *pmdp;
> pte_t *ptep;
>
> - pmdp = stage2_get_pmd(kvm, NULL, addr);
> + pudp = stage2_get_pud(kvm, NULL, addr);
> + if (!pudp || pud_none(*pudp) || !pud_present(*pudp))
> + return false;
> +
> + if (pud_huge(*pudp))
> + return kvm_s2pud_exec(pudp);
> +
> + pmdp = stage2_pmd_offset(pudp, addr);
> if (!pmdp || pmd_none(*pmdp) || !pmd_present(*pmdp))
> return false;
I am wondering if we need a slightly better way to deal with this
kind of operation. We seem to duplicate the above operation (here and
in the following patches), i.e, finding the "leaf entry" for a given
address and follow the checks one level up at a time.
So instead of doing, stage2_get_pud() and walking down everywhere this
is needed, how about adding :
/* Returns true if the leaf entry is found and updates the relevant pointer */
found = stage2_get_leaf_entry(kvm, NULL, addr, &pudp, &pmdp, &ptep)
which could set the appropriate entry and we could check the result here.
Cheers
Suzuki
next prev parent reply other threads:[~2018-07-05 16:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-05 14:08 [PATCH v4 0/7] KVM: Support PUD hugepages at stage 2 Punit Agrawal
2018-07-05 14:08 ` [PATCH v4 1/7] KVM: arm/arm64: Share common code in user_mem_abort() Punit Agrawal
2018-07-05 16:24 ` Marc Zyngier
2018-07-05 16:57 ` Punit Agrawal
2018-07-05 14:08 ` [PATCH v4 2/7] KVM: arm/arm64: Introduce helpers to manupulate page table entries Punit Agrawal
2018-07-05 14:08 ` [PATCH v4 3/7] KVM: arm64: Support dirty page tracking for PUD hugepages Punit Agrawal
2018-07-05 14:08 ` [PATCH v4 4/7] KVM: arm64: Support PUD hugepage in stage2_is_exec() Punit Agrawal
2018-07-05 16:48 ` Suzuki K Poulose [this message]
2018-07-06 14:36 ` Punit Agrawal
2018-07-05 14:08 ` [PATCH v4 5/7] KVM: arm64: Support handling access faults for PUD hugepages Punit Agrawal
2018-07-05 14:08 ` [PATCH v4 6/7] KVM: arm64: Update age handlers to support " Punit Agrawal
2018-07-05 14:08 ` [PATCH v4 7/7] KVM: arm64: Add support for creating PUD hugepages at stage 2 Punit Agrawal
2018-07-05 17:11 ` Suzuki K Poulose
2018-07-06 14:12 ` Punit Agrawal
2018-07-06 14:23 ` 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=442d0f4b-cb23-9788-1ebd-b14c89c52c45@arm.com \
--to=suzuki.poulose@arm.com \
--cc=catalin.marinas@arm.com \
--cc=christoffer.dall@arm.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=marc.zyngier@arm.com \
--cc=punit.agrawal@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®