From: Chintan Pandya <cpandya@codeaurora.org>
To: "Kani, Toshi" <toshi.kani@hpe.com>,
"catalin.marinas@arm.com" <catalin.marinas@arm.com>,
"will.deacon@arm.com" <will.deacon@arm.com>,
"arnd@arndb.de" <arnd@arndb.de>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"ard.biesheuvel@linaro.org" <ard.biesheuvel@linaro.org>,
"tglx@linutronix.de" <tglx@linutronix.de>,
"takahiro.akashi@linaro.org" <takahiro.akashi@linaro.org>,
"james.morse@arm.com" <james.morse@arm.com>,
"kristina.martsenko@arm.com" <kristina.martsenko@arm.com>,
"mark.rutland@arm.com" <mark.rutland@arm.com>,
"akpm@linux-foundation.org" <akpm@linux-foundation.org>,
"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"marc.zyngier@arm.com" <marc.zyngier@arm.com>,
"linux-arch@vger.kernel.org" <linux-arch@vger.kernel.org>
Subject: Re: [PATCH v2 2/4] ioremap: Implement TLB_INV before huge mapping
Date: Fri, 16 Mar 2018 13:10:15 +0530 [thread overview]
Message-ID: <0cec2b79-1668-68d1-32db-531f5a8a9db2@codeaurora.org> (raw)
In-Reply-To: <1521130368.2693.177.camel@hpe.com>
On 3/15/2018 9:42 PM, Kani, Toshi wrote:
> On Thu, 2018-03-15 at 18:15 +0530, Chintan Pandya wrote:
>> Huge mapping changes PMD/PUD which could have
>> valid previous entries. This requires proper
>> TLB maintanance on some architectures, like
>> ARM64.
>>
>> Implent BBM (break-before-make) safe TLB
>> invalidation.
>>
>> Here, I've used flush_tlb_pgtable() instead
>> of flush_kernel_range() because invalidating
>> intermediate page_table entries could have
>> been optimized for specific arch. That's the
>> case with ARM64 at least.
>>
>> Signed-off-by: Chintan Pandya <cpandya@codeaurora.org>
>> ---
>> lib/ioremap.c | 25 +++++++++++++++++++------
>> 1 file changed, 19 insertions(+), 6 deletions(-)
>>
>> diff --git a/lib/ioremap.c b/lib/ioremap.c
>> index 54e5bba..55f8648 100644
>> --- a/lib/ioremap.c
>> +++ b/lib/ioremap.c
>> @@ -13,6 +13,7 @@
>> #include <linux/export.h>
>> #include <asm/cacheflush.h>
>> #include <asm/pgtable.h>
>> +#include <asm-generic/tlb.h>
>>
>> #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
>> static int __read_mostly ioremap_p4d_capable;
>> @@ -80,6 +81,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
>> unsigned long end, phys_addr_t phys_addr, pgprot_t prot)
>> {
>> pmd_t *pmd;
>> + pmd_t old_pmd;
>> unsigned long next;
>>
>> phys_addr -= addr;
>> @@ -91,10 +93,15 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
>>
>> if (ioremap_pmd_enabled() &&
>> ((next - addr) == PMD_SIZE) &&
>> - IS_ALIGNED(phys_addr + addr, PMD_SIZE) &&
>> - pmd_free_pte_page(pmd)) {
>> - if (pmd_set_huge(pmd, phys_addr + addr, prot))
>> + IS_ALIGNED(phys_addr + addr, PMD_SIZE)) {
>> + old_pmd = *pmd;
>> + pmd_clear(pmd);
>
> pmd_clear() is one of the operations pmd_free_pte_page() needs to do.
> See the x86 version.
>
>> + flush_tlb_pgtable(&init_mm, addr);
>
> You can call it in pmd_free_pte_page() on arm64 as well.
>
>> + if (pmd_set_huge(pmd, phys_addr + addr, prot)) {
>> + pmd_free_pte_page(&old_pmd);
>> continue;
>> + } else
>> + set_pmd(pmd, old_pmd);
>
> I do not understand why you needed to make this change.
> pmd_free_pte_page() is defined as an arch-specific function so that you
> can additionally perform TLB purges on arm64. Please try to make proper
> arm64 implementation of this interface. And if you find any issue in
> this interface, please let me know.
TLB ops require VA at least. And this interface passes just the PMD/PUD.
Second is, if we clear the previous table entry inside the arch specific
code and then we fail in pmd/pud_set_huge, we can't fallback (x86 case).
So, we can do something like this (following Mark's suggestion),
if (ioremap_pmd_enabled() &&
((next - addr) == PMD_SIZE) &&
IS_ALIGNED(phys_addr + addr, PMD_SIZE) &&
pmd_can_set_huge(pmd, phys_addr + addr, prot)) {
/*
* Clear existing table entry,
* Invalidate,
* Free the page table
* inside this code
*/
pmd_free_pte_page(pmd, addr, addr + PMD_SIZE);
pmd_set_huge(...) //without fail
continue;
}
>
> Same for pud.
>
> Thanks,
> -Toshi
>
Chintan
--
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center,
Inc. is a member of the Code Aurora Forum, a Linux Foundation
Collaborative Project
next prev parent reply other threads:[~2018-03-16 7:40 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 12:45 [PATCH v2 0/4] Fix issues with huge mapping in ioremap for ARM64 Chintan Pandya
2018-03-15 12:45 ` Chintan Pandya
2018-03-15 12:45 ` [PATCH v2 1/4] asm/tlbflush: Add flush_tlb_pgtable() " Chintan Pandya
2018-03-15 12:45 ` Chintan Pandya
2018-03-15 12:45 ` [PATCH v2 2/4] ioremap: Implement TLB_INV before huge mapping Chintan Pandya
2018-03-15 12:45 ` Chintan Pandya
2018-03-15 13:13 ` Mark Rutland
2018-03-15 13:13 ` Mark Rutland
2018-03-15 13:25 ` Chintan Pandya
2018-03-15 13:25 ` Chintan Pandya
2018-03-15 15:16 ` Mark Rutland
2018-03-15 15:16 ` Mark Rutland
2018-03-16 7:14 ` Chintan Pandya
2018-03-16 7:14 ` Chintan Pandya
2018-03-15 13:31 ` Mark Rutland
2018-03-15 13:31 ` Mark Rutland
2018-03-15 14:19 ` Chintan Pandya
2018-03-15 14:19 ` Chintan Pandya
2018-03-15 15:20 ` Mark Rutland
2018-03-15 15:20 ` Mark Rutland
2018-03-15 16:12 ` Kani, Toshi
2018-03-15 16:12 ` Kani, Toshi
2018-03-16 7:40 ` Chintan Pandya [this message]
2018-03-16 7:40 ` Chintan Pandya
2018-03-16 14:50 ` Kani, Toshi
2018-03-16 14:50 ` Kani, Toshi
2018-03-19 4:26 ` Chintan Pandya
2018-03-19 4:26 ` Chintan Pandya
2018-03-15 12:45 ` [PATCH v2 3/4] arm64: Implement page table free interfaces Chintan Pandya
2018-03-15 12:45 ` Chintan Pandya
2018-03-15 13:18 ` Mark Rutland
2018-03-15 13:18 ` Mark Rutland
2018-03-19 4:29 ` Chintan Pandya
2018-03-19 4:29 ` Chintan Pandya
2018-03-15 12:45 ` [PATCH v2 4/4] Revert "arm64: Enforce BBM for huge IO/VMAP mappings" Chintan Pandya
2018-03-15 12:45 ` Chintan Pandya
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=0cec2b79-1668-68d1-32db-531f5a8a9db2@codeaurora.org \
--to=cpandya@codeaurora.org \
--cc=akpm@linux-foundation.org \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=gregkh@linuxfoundation.org \
--cc=james.morse@arm.com \
--cc=kristina.martsenko@arm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=takahiro.akashi@linaro.org \
--cc=tglx@linutronix.de \
--cc=toshi.kani@hpe.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;
as well as URLs for NNTP newsgroup(s).