From: Huang Pei <huangpei@loongson.cn>
To: Joseph Myers <joseph@codesourcery.com>
Cc: libc-alpha <libc-alpha@sourceware.org>,
Huacai Chen <chenhc@lemote.com>,
Chenghua Xu <xuchenghua@loongson.cn>
Subject: [PATCH] MIPS: simplify copy_user_high_page for MIPS64 w/o cache alias
Date: Sun, 15 Aug 2021 12:28:05 +0800 [thread overview]
Message-ID: <20210815042805.796-2-huangpei@loongson.cn> (raw)
In-Reply-To: <20210815042805.796-1-huangpei@loongson.cn>
Borrow from ARM64
MIPS64 CPU has enough direct mapped memory space to access all
physical memory. In case of no cache alias, bypass both k*map_atomic
and k*map_coherent for better real-time performance.
Signed-off-by: Huang Pei <huangpei@loongson.cn>
---
arch/mips/mm/init.c | 40 ++++++++++++++++++++++++++++------------
1 file changed, 28 insertions(+), 12 deletions(-)
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 19347dc6bbf8..22183dc78a40 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -171,21 +171,37 @@ void copy_user_highpage(struct page *to, struct page *from,
{
void *vfrom, *vto;
- vto = kmap_atomic(to);
- if (cpu_has_dc_aliases &&
- page_mapcount(from) && !Page_dcache_dirty(from)) {
- vfrom = kmap_coherent(from, vaddr);
+ if (IS_ENABLED(CONFIG_64BIT) && !cpu_has_dc_aliases) {
+ vfrom = page_address(from);
+ vto = page_address(to);
copy_page(vto, vfrom);
- kunmap_coherent();
+ /*
+ * Even without cache alias, still need to maintain
+ * coherence between icache and dcache
+ */
+ if (!cpu_has_ic_fills_f_dc)
+ flush_data_cache_page((unsigned long)vto);
+
} else {
- vfrom = kmap_atomic(from);
- copy_page(vto, vfrom);
- kunmap_atomic(vfrom);
+ vto = kmap_atomic(to);
+
+ if (cpu_has_dc_aliases &&
+ page_mapcount(from) && !Page_dcache_dirty(from)) {
+ vfrom = kmap_coherent(from, vaddr);
+ copy_page(vto, vfrom);
+ kunmap_coherent();
+ } else {
+ vfrom = kmap_atomic(from);
+ copy_page(vto, vfrom);
+ kunmap_atomic(vfrom);
+ }
+
+ if ((!cpu_has_ic_fills_f_dc) ||
+ pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
+ flush_data_cache_page((unsigned long)vto);
+
+ kunmap_atomic(vto);
}
- if ((!cpu_has_ic_fills_f_dc) ||
- pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
- flush_data_cache_page((unsigned long)vto);
- kunmap_atomic(vto);
/* Make sure this page is cleared on other CPU's too before using it */
smp_wmb();
}
--
2.26.2
prev parent reply other threads:[~2021-08-15 4:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-15 4:28 [PATCH V2] MIPS: simplify copy_user_high_page for MIPS64 w/o cache Huang Pei
2021-08-15 4:28 ` Huang Pei [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=20210815042805.796-2-huangpei@loongson.cn \
--to=huangpei@loongson.cn \
--cc=chenhc@lemote.com \
--cc=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
--cc=xuchenghua@loongson.cn \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).