From: Chintan Pandya <cpandya@codeaurora.org>
To: catalin.marinas@arm.com, will.deacon@arm.com, arnd@arndb.de
Cc: mark.rutland@arm.com, ard.biesheuvel@linaro.org,
marc.zyngier@arm.com, james.morse@arm.com,
kristina.martsenko@arm.com, takahiro.akashi@linaro.org,
gregkh@linuxfoundation.org, tglx@linutronix.de,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
akpm@linux-foundation.org, toshi.kani@hpe.com,
Chintan Pandya <cpandya@codeaurora.org>
Subject: [PATCH v2 3/4] arm64: Implement page table free interfaces
Date: Thu, 15 Mar 2018 18:15:05 +0530 [thread overview]
Message-ID: <1521117906-20107-4-git-send-email-cpandya@codeaurora.org> (raw)
In-Reply-To: <1521117906-20107-1-git-send-email-cpandya@codeaurora.org>
Implement pud_free_pmd_page() and pmd_free_pte_page().
Make sure, that they are indeed a page table before
taking them to free.
Signed-off-by: Chintan Pandya <cpandya@codeaurora.org>
---
arch/arm64/mm/mmu.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 2dbb2c9..6f21a65 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -32,6 +32,7 @@
#include <linux/io.h>
#include <linux/mm.h>
#include <linux/vmalloc.h>
+#include <linux/hugetlb.h>
#include <asm/barrier.h>
#include <asm/cputype.h>
@@ -45,6 +46,7 @@
#include <asm/memblock.h>
#include <asm/mmu_context.h>
#include <asm/ptdump.h>
+#include <asm/page.h>
#define NO_BLOCK_MAPPINGS BIT(0)
#define NO_CONT_MAPPINGS BIT(1)
@@ -975,10 +977,24 @@ int pmd_clear_huge(pmd_t *pmdp)
int pud_free_pmd_page(pud_t *pud)
{
- return pud_none(*pud);
+ pmd_t *pmd;
+ int i;
+
+ pmd = __va(pud_val(*pud));
+ if (pud_val(*pud) && !pud_huge(*pud)) {
+ for (i = 0; i < PTRS_PER_PMD; i++)
+ pmd_free_pte_page(&pmd[i]);
+
+ free_page((unsigned long)pmd);
+ }
+
+ return 1;
}
int pmd_free_pte_page(pmd_t *pmd)
{
- return pmd_none(*pmd);
+ if (pmd_val(*pmd) && !pmd_huge(*pmd))
+ free_page((unsigned long)__va(pmd_val(*pmd)));
+
+ return 1;
}
--
Qualcomm India Private Limited, on behalf of Qualcomm Innovation
Center, Inc., is a member of Code Aurora Forum, a Linux Foundation
Collaborative Project
next prev parent reply other threads:[~2018-03-15 12:45 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
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 ` Chintan Pandya [this message]
2018-03-15 12:45 ` [PATCH v2 3/4] arm64: Implement page table free interfaces 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=1521117906-20107-4-git-send-email-cpandya@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).