From: tip-bot for Alex Shi <alex.shi@intel.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
alex.shi@intel.com, tglx@linutronix.de
Subject: [tip:x86/mm] x86/tlb: fall back to flush all when meet a THP large page
Date: Tue, 26 Jun 2012 08:14:45 -0700 [thread overview]
Message-ID: <tip-fd460eec063227223e9b1151e36c846e2a87b619@git.kernel.org> (raw)
In-Reply-To: <1340604507-11214-4-git-send-email-alex.shi@intel.com>
Commit-ID: fd460eec063227223e9b1151e36c846e2a87b619
Gitweb: http://git.kernel.org/tip/fd460eec063227223e9b1151e36c846e2a87b619
Author: Alex Shi <alex.shi@intel.com>
AuthorDate: Mon, 25 Jun 2012 14:08:21 +0800
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Mon, 25 Jun 2012 20:53:16 -0700
x86/tlb: fall back to flush all when meet a THP large page
We don't need to flush large pages by PAGE_SIZE step, that just waste
time. and actually, large page don't need 'invlpg' optimizing according
to our macro benchmark. So, just flush whole TLB is enough for them.
The following result is tested on a 2CPU * 4cores * 2HT NHM EP machine,
with THP 'always' setting.
Multi-thread testing, '-t' paramter is thread number:
without this patch with this patch
./mprotect -t 1 14ns 13ns
./mprotect -t 2 13ns 13ns
./mprotect -t 4 12ns 11ns
./mprotect -t 8 14ns 10ns
./mprotect -t 16 28ns 28ns
./mprotect -t 32 54ns 52ns
./mprotect -t 128 200ns 200ns
Signed-off-by: Alex Shi <alex.shi@intel.com>
Link: http://lkml.kernel.org/r/1340604507-11214-4-git-send-email-alex.shi@intel.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/mm/tlb.c | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 3b91c98..184a02a 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -318,12 +318,42 @@ void flush_tlb_mm(struct mm_struct *mm)
#define FLUSHALL_BAR 16
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+static inline unsigned long has_large_page(struct mm_struct *mm,
+ unsigned long start, unsigned long end)
+{
+ pgd_t *pgd;
+ pud_t *pud;
+ pmd_t *pmd;
+ unsigned long addr = ALIGN(start, HPAGE_SIZE);
+ for (; addr < end; addr += HPAGE_SIZE) {
+ pgd = pgd_offset(mm, addr);
+ if (likely(!pgd_none(*pgd))) {
+ pud = pud_offset(pgd, addr);
+ if (likely(!pud_none(*pud))) {
+ pmd = pmd_offset(pud, addr);
+ if (likely(!pmd_none(*pmd)))
+ if (pmd_large(*pmd))
+ return addr;
+ }
+ }
+ }
+ return 0;
+}
+#else
+static inline unsigned long has_large_page(struct mm_struct *mm,
+ unsigned long start, unsigned long end)
+{
+ return 0;
+}
+#endif
void flush_tlb_range(struct vm_area_struct *vma,
unsigned long start, unsigned long end)
{
struct mm_struct *mm;
if (!cpu_has_invlpg || vma->vm_flags & VM_HUGETLB) {
+flush_all:
flush_tlb_mm(vma->vm_mm);
return;
}
@@ -346,6 +376,10 @@ void flush_tlb_range(struct vm_area_struct *vma,
if ((end - start)/PAGE_SIZE > act_entries/FLUSHALL_BAR)
local_flush_tlb();
else {
+ if (has_large_page(mm, start, end)) {
+ preempt_enable();
+ goto flush_all;
+ }
for (addr = start; addr < end;
addr += PAGE_SIZE)
__flush_tlb_single(addr);
next prev parent reply other threads:[~2012-06-26 15:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-25 6:08 [PATCH v9 0/9] x86 tlb optimisation and clean up Alex Shi
2012-06-25 6:08 ` [PATCH v9 1/9] x86/tlb_info: get last level TLB entry number of CPU Alex Shi
2012-06-26 15:13 ` [tip:x86/mm] " tip-bot for Alex Shi
2012-06-25 6:08 ` [PATCH v9 2/9] x86/flush_tlb: try flush_tlb_single one by one in flush_tlb_range Alex Shi
2012-06-26 15:13 ` [tip:x86/mm] " tip-bot for Alex Shi
2012-06-25 6:08 ` [PATCH v9 3/9] x86/tlb: fall back to flush all when meet a THP large page Alex Shi
2012-06-26 15:14 ` tip-bot for Alex Shi [this message]
2012-06-25 6:08 ` [PATCH v9 4/9] x86/tlb: add tlb_flushall_shift for specific CPU Alex Shi
2012-06-26 15:15 ` [tip:x86/mm] " tip-bot for Alex Shi
2012-06-25 6:08 ` [PATCH v9 5/9] x86/tlb: add tlb_flushall_shift knob into debugfs Alex Shi
2012-06-26 15:16 ` [tip:x86/mm] " tip-bot for Alex Shi
2012-06-25 6:08 ` [PATCH v9 6/9] mm/mmu_gather: enable tlb flush range in generic mmu_gather Alex Shi
2012-06-26 15:17 ` [tip:x86/mm] " tip-bot for Alex Shi
2012-06-25 6:08 ` [PATCH v9 7/9] x86/tlb: enable tlb flush range support for x86 Alex Shi
2012-06-26 15:18 ` [tip:x86/mm] " tip-bot for Alex Shi
2012-06-25 6:08 ` [PATCH v9 8/9] x86/tlb: replace INVALIDATE_TLB_VECTOR by CALL_FUNCTION_VECTOR Alex Shi
2012-06-26 15:19 ` [tip:x86/mm] " tip-bot for Alex Shi
2012-06-25 6:08 ` [PATCH v9 9/9] x86/tlb: do flush_tlb_kernel_range by 'invlpg' Alex Shi
2012-06-26 15:19 ` [tip:x86/mm] " tip-bot for Alex Shi
-- strict thread matches above, loose matches on Subject: below --
2012-06-28 1:02 [PATCH v10 3/9] x86/tlb: fall back to flush all when meet a THP large page Alex Shi
2012-06-28 15:39 ` [tip:x86/mm] " tip-bot for Alex Shi
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=tip-fd460eec063227223e9b1151e36c846e2a87b619@git.kernel.org \
--to=alex.shi@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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