From: Anshuman Khandual <anshuman.khandual@arm.com>
To: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org,
akpm@linux-foundation.org, will.deacon@arm.com,
catalin.marinas@arm.com
Cc: mhocko@suse.com, mgorman@techsingularity.net,
james.morse@arm.com, mark.rutland@arm.com, robin.murphy@arm.com,
cpandya@codeaurora.org, arunks@codeaurora.org,
dan.j.williams@intel.com, osalvador@suse.de, logang@deltatee.com,
david@redhat.com, cai@lca.pw
Subject: [RFC 2/2] arm64/mm: Enable ZONE_DEVICE for all page configs
Date: Thu, 4 Apr 2019 15:16:50 +0530 [thread overview]
Message-ID: <1554371210-24736-2-git-send-email-anshuman.khandual@arm.com> (raw)
In-Reply-To: <1554371210-24736-1-git-send-email-anshuman.khandual@arm.com>
Now that vmemmap_populate_basepages() supports struct vmem_altmap based
allocations, ZONE_DEVICE can be functional across all page size configs.
Now vmemmap_populate_baepages() takes in actual struct vmem_altmap for
allocation and remove_pagetable() should accommodate such new PTE level
vmemmap mappings. Just remove the ARCH_HAS_ZONE_DEVICE dependency from
ARM64_4K_PAGES.
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/Kconfig | 2 +-
arch/arm64/mm/mmu.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index b5d8cf57e220..4a37a33a4fe5 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -31,7 +31,7 @@ config ARM64
select ARCH_HAS_SYSCALL_WRAPPER
select ARCH_HAS_TEARDOWN_DMA_OPS if IOMMU_SUPPORT
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
- select ARCH_HAS_ZONE_DEVICE if ARM64_4K_PAGES
+ select ARCH_HAS_ZONE_DEVICE
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select ARCH_INLINE_READ_LOCK if !PREEMPT
select ARCH_INLINE_READ_LOCK_BH if !PREEMPT
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 2859aa89cc4a..509ed7e547a3 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -818,8 +818,8 @@ static void __meminit free_pud_table(pud_t *pud_start, pgd_t *pgd, bool direct)
#endif
static void __meminit
-remove_pte_table(pte_t *pte_start, unsigned long addr,
- unsigned long end, bool direct)
+remove_pte_table(pte_t *pte_start, unsigned long addr, unsigned long end,
+ bool direct, struct vmem_altmap *altmap)
{
pte_t *pte;
@@ -829,7 +829,7 @@ remove_pte_table(pte_t *pte_start, unsigned long addr,
continue;
if (!direct)
- free_pagetable(pte_page(*pte), 0);
+ free_huge_pagetable(pte_page(*pte), 0, altmap);
spin_lock(&init_mm.page_table_lock);
pte_clear(&init_mm, addr, pte);
spin_unlock(&init_mm.page_table_lock);
@@ -860,7 +860,7 @@ remove_pmd_table(pmd_t *pmd_start, unsigned long addr, unsigned long end,
continue;
}
pte_base = pte_offset_kernel(pmd, 0UL);
- remove_pte_table(pte_base, addr, next, direct);
+ remove_pte_table(pte_base, addr, next, direct, altmap);
free_pte_table(pte_base, pmd, direct);
}
}
@@ -921,7 +921,7 @@ remove_pagetable(unsigned long start, unsigned long end,
int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
struct vmem_altmap *altmap)
{
- return vmemmap_populate_basepages(start, end, node, NULL);
+ return vmemmap_populate_basepages(start, end, node, altmap);
}
#else /* !ARM64_SWAPPER_USES_SECTION_MAPS */
int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
--
2.20.1
prev parent reply other threads:[~2019-04-04 9:47 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-03 4:30 [PATCH 0/6] arm64/mm: Enable memory hot remove and ZONE_DEVICE Anshuman Khandual
2019-04-03 4:30 ` [PATCH 1/6] arm64/mm: Enable sysfs based memory hot add interface Anshuman Khandual
2019-04-03 8:20 ` David Hildenbrand
2019-04-03 13:12 ` Robin Murphy
2019-04-04 5:21 ` Anshuman Khandual
2019-04-04 5:25 ` Anshuman Khandual
2019-04-04 8:49 ` David Hildenbrand
2019-04-03 4:30 ` [PATCH 2/6] arm64/mm: Enable memory hot remove Anshuman Khandual
2019-04-03 12:37 ` Robin Murphy
2019-04-03 13:15 ` Steven Price
2019-04-04 6:51 ` Anshuman Khandual
2019-04-04 5:39 ` Anshuman Khandual
2019-04-04 11:58 ` Oscar Salvador
2019-04-04 13:03 ` Anshuman Khandual
2019-04-04 15:19 ` Oscar Salvador
2019-04-03 17:32 ` Logan Gunthorpe
2019-04-03 17:57 ` Robin Murphy
2019-04-04 8:23 ` Anshuman Khandual
2019-04-04 7:07 ` Anshuman Khandual
2019-04-04 9:16 ` Steven Price
2019-04-03 4:30 ` [PATCH 3/6] arm64/mm: Enable struct page allocation from device memory Anshuman Khandual
2019-04-03 4:30 ` [PATCH 4/6] mm/hotplug: Reorder arch_remove_memory() call in __remove_memory() Anshuman Khandual
2019-04-03 8:45 ` Oscar Salvador
2019-04-03 9:17 ` Michal Hocko
2019-04-04 8:32 ` Anshuman Khandual
2019-04-03 9:30 ` David Hildenbrand
2019-04-03 4:30 ` [PATCH 5/6] mm/memremap: Rename and consolidate SECTION_SIZE Anshuman Khandual
2019-04-03 9:26 ` Michal Hocko
2019-04-03 9:30 ` David Hildenbrand
2019-04-03 4:30 ` [PATCH 6/6] arm64/mm: Enable ZONE_DEVICE Anshuman Khandual
2019-04-03 13:58 ` Robin Murphy
2019-04-03 16:07 ` Jerome Glisse
2019-04-04 5:03 ` Anshuman Khandual
2019-04-04 4:42 ` Anshuman Khandual
2019-04-04 5:04 ` Dan Williams
2019-04-04 9:46 ` Robin Murphy
2019-04-07 22:11 ` Dan Williams
2019-04-08 4:03 ` Ira Weiny
2019-04-08 6:03 ` Anshuman Khandual
2019-04-03 18:08 ` [PATCH 0/6] arm64/mm: Enable memory hot remove and ZONE_DEVICE Dan Williams
2019-04-04 13:11 ` Anshuman Khandual
2019-04-04 9:46 ` [RFC 1/2] mm/vmemmap: Enable vmem_altmap based base page mapping for vmemmap Anshuman Khandual
2019-04-04 9:46 ` Anshuman Khandual [this message]
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=1554371210-24736-2-git-send-email-anshuman.khandual@arm.com \
--to=anshuman.khandual@arm.com \
--cc=akpm@linux-foundation.org \
--cc=arunks@codeaurora.org \
--cc=cai@lca.pw \
--cc=catalin.marinas@arm.com \
--cc=cpandya@codeaurora.org \
--cc=dan.j.williams@intel.com \
--cc=david@redhat.com \
--cc=james.morse@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=logang@deltatee.com \
--cc=mark.rutland@arm.com \
--cc=mgorman@techsingularity.net \
--cc=mhocko@suse.com \
--cc=osalvador@suse.de \
--cc=robin.murphy@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;
as well as URLs for NNTP newsgroup(s).