From: Dave Hansen <dave@sr71.net> To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, mgorman@suse.de, ak@linux.intel.com, riel@redhat.com, alex.shi@linaro.org, Dave Hansen <dave@sr71.net>, dave.hansen@linux.intel.com Subject: [PATCH 3/6] x86: mm: fix missed global TLB flush stat Date: Mon, 21 Apr 2014 11:24:22 -0700 [thread overview] Message-ID: <20140421182422.DE5E728F@viggo.jf.intel.com> (raw) In-Reply-To: <20140421182418.81CF7519@viggo.jf.intel.com> From: Dave Hansen <dave.hansen@linux.intel.com> If we take the if (end == TLB_FLUSH_ALL || vmflag & VM_HUGETLB) { local_flush_tlb(); goto out; } path out of flush_tlb_mm_range(), we will have flushed the tlb, but not incremented NR_TLB_LOCAL_FLUSH_ALL. This unifies the way out of the function so that we always take a single path when doing a full tlb flush. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> --- b/arch/x86/mm/tlb.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff -puN arch/x86/mm/tlb.c~fix-missed-global-flush-stat arch/x86/mm/tlb.c --- a/arch/x86/mm/tlb.c~fix-missed-global-flush-stat 2014-04-21 11:10:35.176852256 -0700 +++ b/arch/x86/mm/tlb.c 2014-04-21 11:10:35.190852888 -0700 @@ -172,8 +172,9 @@ unsigned long tlb_single_page_flush_ceil void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long vmflag) { - int need_flush_others_all = 1; unsigned long addr; + /* do a global flush by default */ + unsigned long base_pages_to_flush = TLB_FLUSH_ALL; preempt_disable(); if (current->active_mm != mm) @@ -184,16 +185,14 @@ void flush_tlb_mm_range(struct mm_struct goto out; } - if (end == TLB_FLUSH_ALL || vmflag & VM_HUGETLB) { - local_flush_tlb(); - goto out; - } + if ((end != TLB_FLUSH_ALL) && !(vmflag & VM_HUGETLB)) + base_pages_to_flush = (end - start) >> PAGE_SHIFT; - if ((end - start) > tlb_single_page_flush_ceiling * PAGE_SIZE) { + if (base_pages_to_flush > tlb_single_page_flush_ceiling) { + base_pages_to_flush = TLB_FLUSH_ALL; count_vm_tlb_event(NR_TLB_LOCAL_FLUSH_ALL); local_flush_tlb(); } else { - need_flush_others_all = 0; /* flush range by one by one 'invlpg' */ for (addr = start; addr < end; addr += PAGE_SIZE) { count_vm_tlb_event(NR_TLB_LOCAL_FLUSH_ONE); @@ -201,7 +200,7 @@ void flush_tlb_mm_range(struct mm_struct } } out: - if (need_flush_others_all) { + if (base_pages_to_flush == TLB_FLUSH_ALL) { start = 0UL; end = TLB_FLUSH_ALL; } _
WARNING: multiple messages have this Message-ID (diff)
From: Dave Hansen <dave@sr71.net> To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, mgorman@suse.de, ak@linux.intel.com, riel@redhat.com, alex.shi@linaro.org, Dave Hansen <dave@sr71.net>, dave.hansen@linux.intel.com Subject: [PATCH 3/6] x86: mm: fix missed global TLB flush stat Date: Mon, 21 Apr 2014 11:24:22 -0700 [thread overview] Message-ID: <20140421182422.DE5E728F@viggo.jf.intel.com> (raw) In-Reply-To: <20140421182418.81CF7519@viggo.jf.intel.com> From: Dave Hansen <dave.hansen@linux.intel.com> If we take the if (end == TLB_FLUSH_ALL || vmflag & VM_HUGETLB) { local_flush_tlb(); goto out; } path out of flush_tlb_mm_range(), we will have flushed the tlb, but not incremented NR_TLB_LOCAL_FLUSH_ALL. This unifies the way out of the function so that we always take a single path when doing a full tlb flush. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> --- b/arch/x86/mm/tlb.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff -puN arch/x86/mm/tlb.c~fix-missed-global-flush-stat arch/x86/mm/tlb.c --- a/arch/x86/mm/tlb.c~fix-missed-global-flush-stat 2014-04-21 11:10:35.176852256 -0700 +++ b/arch/x86/mm/tlb.c 2014-04-21 11:10:35.190852888 -0700 @@ -172,8 +172,9 @@ unsigned long tlb_single_page_flush_ceil void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long vmflag) { - int need_flush_others_all = 1; unsigned long addr; + /* do a global flush by default */ + unsigned long base_pages_to_flush = TLB_FLUSH_ALL; preempt_disable(); if (current->active_mm != mm) @@ -184,16 +185,14 @@ void flush_tlb_mm_range(struct mm_struct goto out; } - if (end == TLB_FLUSH_ALL || vmflag & VM_HUGETLB) { - local_flush_tlb(); - goto out; - } + if ((end != TLB_FLUSH_ALL) && !(vmflag & VM_HUGETLB)) + base_pages_to_flush = (end - start) >> PAGE_SHIFT; - if ((end - start) > tlb_single_page_flush_ceiling * PAGE_SIZE) { + if (base_pages_to_flush > tlb_single_page_flush_ceiling) { + base_pages_to_flush = TLB_FLUSH_ALL; count_vm_tlb_event(NR_TLB_LOCAL_FLUSH_ALL); local_flush_tlb(); } else { - need_flush_others_all = 0; /* flush range by one by one 'invlpg' */ for (addr = start; addr < end; addr += PAGE_SIZE) { count_vm_tlb_event(NR_TLB_LOCAL_FLUSH_ONE); @@ -201,7 +200,7 @@ void flush_tlb_mm_range(struct mm_struct } } out: - if (need_flush_others_all) { + if (base_pages_to_flush == TLB_FLUSH_ALL) { start = 0UL; end = TLB_FLUSH_ALL; } _ -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2014-04-21 18:25 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-04-21 18:24 [PATCH 0/6] x86: rework tlb range flushing code Dave Hansen 2014-04-21 18:24 ` Dave Hansen 2014-04-21 18:24 ` [PATCH 1/6] x86: mm: clean up tlb " Dave Hansen 2014-04-21 18:24 ` Dave Hansen 2014-04-22 16:53 ` Rik van Riel 2014-04-22 16:53 ` Rik van Riel 2014-04-24 8:33 ` Mel Gorman 2014-04-24 8:33 ` Mel Gorman 2014-04-21 18:24 ` [PATCH 2/6] x86: mm: rip out complicated, out-of-date, buggy TLB flushing Dave Hansen 2014-04-21 18:24 ` Dave Hansen 2014-04-22 16:54 ` Rik van Riel 2014-04-22 16:54 ` Rik van Riel 2014-04-24 8:45 ` Mel Gorman 2014-04-24 8:45 ` Mel Gorman 2014-04-24 16:58 ` Dave Hansen 2014-04-24 16:58 ` Dave Hansen 2014-04-24 18:00 ` Mel Gorman 2014-04-24 18:00 ` Mel Gorman 2014-04-25 21:39 ` Dave Hansen 2014-04-25 21:39 ` Dave Hansen 2014-04-21 18:24 ` Dave Hansen [this message] 2014-04-21 18:24 ` [PATCH 3/6] x86: mm: fix missed global TLB flush stat Dave Hansen 2014-04-22 17:15 ` Rik van Riel 2014-04-22 17:15 ` Rik van Riel 2014-04-24 8:49 ` Mel Gorman 2014-04-24 8:49 ` Mel Gorman 2014-04-21 18:24 ` [PATCH 4/6] x86: mm: trace tlb flushes Dave Hansen 2014-04-21 18:24 ` Dave Hansen 2014-04-22 21:19 ` Rik van Riel 2014-04-22 21:19 ` Rik van Riel 2014-04-24 10:14 ` Mel Gorman 2014-04-24 10:14 ` Mel Gorman 2014-04-24 20:42 ` Dave Hansen 2014-04-24 20:42 ` Dave Hansen 2014-04-21 18:24 ` [PATCH 5/6] x86: mm: new tunable for single vs full TLB flush Dave Hansen 2014-04-21 18:24 ` Dave Hansen 2014-04-22 21:31 ` Rik van Riel 2014-04-22 21:31 ` Rik van Riel 2014-04-24 10:37 ` Mel Gorman 2014-04-24 10:37 ` Mel Gorman 2014-04-24 17:25 ` Dave Hansen 2014-04-24 17:25 ` Dave Hansen 2014-04-24 17:53 ` Rik van Riel 2014-04-24 17:53 ` Rik van Riel 2014-04-24 22:03 ` Dave Hansen 2014-04-24 22:03 ` Dave Hansen 2014-07-07 17:43 ` Dave Hansen 2014-07-07 17:43 ` Dave Hansen 2014-07-08 0:43 ` Alex Shi 2014-07-08 0:43 ` Alex Shi 2014-04-21 18:24 ` [PATCH 6/6] x86: mm: set TLB flush tunable to sane value (33) Dave Hansen 2014-04-21 18:24 ` Dave Hansen 2014-04-22 21:33 ` Rik van Riel 2014-04-22 21:33 ` Rik van Riel 2014-04-24 10:46 ` Mel Gorman 2014-04-24 10:46 ` Mel Gorman
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=20140421182422.DE5E728F@viggo.jf.intel.com \ --to=dave@sr71.net \ --cc=ak@linux.intel.com \ --cc=akpm@linux-foundation.org \ --cc=alex.shi@linaro.org \ --cc=dave.hansen@linux.intel.com \ --cc=kirill.shutemov@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mgorman@suse.de \ --cc=riel@redhat.com \ --cc=x86@kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.