From: steve.capper@linaro.org (Steve Capper)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 2/4] ARM: mm: Add support for flushing HugeTLB pages.
Date: Thu, 23 May 2013 16:31:18 +0100 [thread overview]
Message-ID: <1369323080-9673-3-git-send-email-steve.capper@linaro.org> (raw)
In-Reply-To: <1369323080-9673-1-git-send-email-steve.capper@linaro.org>
On ARM we use the __flush_dcache_page function to flush the dcache
of pages when needed; usually when the PG_dcache_clean bit is unset
and we are setting a PTE.
A HugeTLB page is represented as a compound page consisting of an
array of pages. Thus to flush the dcache of a HugeTLB page, one must
flush more than a single page.
This patch modifies __flush_dcache_page such that all constituent
pages of a HugeTLB page are flushed.
Signed-off-by: Steve Capper <steve.capper@linaro.org>
Reviewed-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/mm/flush.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c
index 0d473cc..3706407 100644
--- a/arch/arm/mm/flush.c
+++ b/arch/arm/mm/flush.c
@@ -17,6 +17,7 @@
#include <asm/highmem.h>
#include <asm/smp_plat.h>
#include <asm/tlbflush.h>
+#include <linux/hugetlb.h>
#include "mm.h"
@@ -168,19 +169,23 @@ void __flush_dcache_page(struct address_space *mapping, struct page *page)
* coherent with the kernels mapping.
*/
if (!PageHighMem(page)) {
- __cpuc_flush_dcache_area(page_address(page), PAGE_SIZE);
+ size_t page_size = PAGE_SIZE << compound_order(page);
+ __cpuc_flush_dcache_area(page_address(page), page_size);
} else {
- void *addr;
-
+ unsigned long i;
if (cache_is_vipt_nonaliasing()) {
- addr = kmap_atomic(page);
- __cpuc_flush_dcache_area(addr, PAGE_SIZE);
- kunmap_atomic(addr);
- } else {
- addr = kmap_high_get(page);
- if (addr) {
+ for (i = 0; i < (1 << compound_order(page)); i++) {
+ void *addr = kmap_atomic(page);
__cpuc_flush_dcache_area(addr, PAGE_SIZE);
- kunmap_high(page);
+ kunmap_atomic(addr);
+ }
+ } else {
+ for (i = 0; i < (1 << compound_order(page)); i++) {
+ void *addr = kmap_high_get(page);
+ if (addr) {
+ __cpuc_flush_dcache_area(addr, PAGE_SIZE);
+ kunmap_high(page);
+ }
}
}
}
--
1.8.1.4
next prev parent reply other threads:[~2013-05-23 15:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-23 15:31 [PATCH v2 0/4] ARM: mm: HugeTLB + THP support Steve Capper
2013-05-23 15:31 ` [PATCH v2 1/4] ARM: mm: correct pte_same behaviour for LPAE Steve Capper
2013-05-24 10:59 ` Catalin Marinas
2013-05-23 15:31 ` Steve Capper [this message]
2013-05-24 11:01 ` [PATCH v2 2/4] ARM: mm: Add support for flushing HugeTLB pages Catalin Marinas
2013-05-23 15:31 ` [PATCH v2 3/4] ARM: mm: HugeTLB support for LPAE systems Steve Capper
2013-05-24 11:03 ` Catalin Marinas
2013-05-28 8:59 ` Steve Capper
2013-05-23 15:31 ` [PATCH v2 4/4] ARM: mm: Transparent huge page " Steve Capper
2013-06-03 10:40 ` [PATCH v2 0/4] ARM: mm: HugeTLB + THP support Steve Capper
2013-06-04 12:56 ` Steve Capper
2013-06-04 13:03 ` Will Deacon
2013-06-04 13:13 ` Steve Capper
2013-06-04 14:37 ` Steve Capper
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=1369323080-9673-3-git-send-email-steve.capper@linaro.org \
--to=steve.capper@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).