From: tip-bot for Andy Lutomirski <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mhocko@suse.com, luto@kernel.org, keescook@chromium.org,
namit@vmware.com, tglx@linutronix.de,
linux-kernel@vger.kernel.org, nadav.amit@gmail.com,
mgorman@suse.de, mingo@kernel.org, riel@redhat.com,
hpa@zytor.com, torvalds@linux-foundation.org,
dave.hansen@intel.com, bpetkov@suse.de, peterz@infradead.org,
akpm@linux-foundation.org
Subject: [tip:x86/mm] x86/mm: Reimplement flush_tlb_page() using flush_tlb_mm_range()
Date: Wed, 24 May 2017 03:21:44 -0700 [thread overview]
Message-ID: <tip-ca6c99c0794875c6d1db6e22f246699691ab7e6b@git.kernel.org> (raw)
In-Reply-To: <3cc3847cf888d8907577569b8bac3f01992ef8f9.1495492063.git.luto@kernel.org>
Commit-ID: ca6c99c0794875c6d1db6e22f246699691ab7e6b
Gitweb: http://git.kernel.org/tip/ca6c99c0794875c6d1db6e22f246699691ab7e6b
Author: Andy Lutomirski <luto@kernel.org>
AuthorDate: Mon, 22 May 2017 15:30:01 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 24 May 2017 10:18:27 +0200
x86/mm: Reimplement flush_tlb_page() using flush_tlb_mm_range()
flush_tlb_page() was very similar to flush_tlb_mm_range() except that
it had a couple of issues:
- It was missing an smp_mb() in the case where
current->active_mm != mm. (This is a longstanding bug reported by Nadav Amit)
- It was missing tracepoints and vm counter updates.
The only reason that I can see for keeping it at as a separate
function is that it could avoid a few branches that
flush_tlb_mm_range() needs to decide to flush just one page. This
hardly seems worthwhile. If we decide we want to get rid of those
branches again, a better way would be to introduce an
__flush_tlb_mm_range() helper and make both flush_tlb_page() and
flush_tlb_mm_range() use it.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Borislav Petkov <bpetkov@suse.de>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Nadav Amit <nadav.amit@gmail.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/3cc3847cf888d8907577569b8bac3f01992ef8f9.1495492063.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/include/asm/tlbflush.h | 6 +++++-
arch/x86/mm/tlb.c | 27 ---------------------------
2 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index 6ed9ea4..b9db0f8fe 100644
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -307,11 +307,15 @@ static inline void flush_tlb_kernel_range(unsigned long start,
flush_tlb_mm_range(vma->vm_mm, start, end, vma->vm_flags)
extern void flush_tlb_all(void);
-extern void flush_tlb_page(struct vm_area_struct *, unsigned long);
extern void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
unsigned long end, unsigned long vmflag);
extern void flush_tlb_kernel_range(unsigned long start, unsigned long end);
+static inline void flush_tlb_page(struct vm_area_struct *vma, unsigned long a)
+{
+ flush_tlb_mm_range(vma->vm_mm, a, a + PAGE_SIZE, VM_NONE);
+}
+
void native_flush_tlb_others(const struct cpumask *cpumask,
struct mm_struct *mm,
unsigned long start, unsigned long end);
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 6e7bedf..fe64711 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -354,33 +354,6 @@ out:
preempt_enable();
}
-void flush_tlb_page(struct vm_area_struct *vma, unsigned long start)
-{
- struct mm_struct *mm = vma->vm_mm;
-
- preempt_disable();
-
- if (current->active_mm == mm) {
- if (current->mm) {
- /*
- * Implicit full barrier (INVLPG) that synchronizes
- * with switch_mm.
- */
- __flush_tlb_one(start);
- } else {
- leave_mm(smp_processor_id());
-
- /* Synchronize with switch_mm. */
- smp_mb();
- }
- }
-
- if (cpumask_any_but(mm_cpumask(mm), smp_processor_id()) < nr_cpu_ids)
- flush_tlb_others(mm_cpumask(mm), mm, start, start + PAGE_SIZE);
-
- preempt_enable();
-}
-
static void do_flush_tlb_all(void *info)
{
count_vm_tlb_event(NR_TLB_REMOTE_FLUSH_RECEIVED);
next prev parent reply other threads:[~2017-05-24 10:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-22 22:30 [PATCH v2 00/11] x86 TLB flush cleanups, moving toward PCID support Andy Lutomirski
2017-05-22 22:30 ` [PATCH v2 01/11] x86/mm: Reimplement flush_tlb_page() using flush_tlb_mm_range() Andy Lutomirski
2017-05-24 10:21 ` tip-bot for Andy Lutomirski [this message]
2017-05-22 22:30 ` [PATCH v2 02/11] x86/mm: Reduce indentation in flush_tlb_func() Andy Lutomirski
2017-05-24 10:22 ` [tip:x86/mm] " tip-bot for Andy Lutomirski
2017-05-22 22:30 ` [PATCH v2 03/11] x86/mm: Make the batched unmap TLB flush API more generic Andy Lutomirski
2017-05-24 10:22 ` [tip:x86/mm] mm, " tip-bot for Andy Lutomirski
2017-05-22 22:30 ` [PATCH v2 04/11] x86/mm: Pass flush_tlb_info to flush_tlb_others() etc Andy Lutomirski
2017-05-24 8:18 ` Ingo Molnar
2017-05-22 22:30 ` [PATCH v2 05/11] x86/mm: Change the leave_mm() condition for local TLB flushes Andy Lutomirski
2017-05-22 22:30 ` [PATCH v2 06/11] x86/mm: Refactor flush_tlb_mm_range() to merge local and remote cases Andy Lutomirski
2017-05-22 22:30 ` [PATCH v2 07/11] x86/mm: Use new merged flush logic in arch_tlbbatch_flush() Andy Lutomirski
2017-05-22 22:30 ` [PATCH v2 08/11] x86/mm: Remove the UP tlbflush code; always use the formerly SMP code Andy Lutomirski
2017-05-22 22:30 ` [PATCH v2 09/11] x86/mm: Rework lazy TLB to track the actual loaded mm Andy Lutomirski
2017-05-22 22:30 ` [PATCH v2 10/11] x86/mm: Be more consistent wrt PAGE_SHIFT vs PAGE_SIZE in tlb flush code Andy Lutomirski
2017-05-22 23:24 ` Nadav Amit
2017-05-22 23:41 ` Andy Lutomirski
2017-05-22 22:30 ` [PATCH v2 11/11] x86,kvm: Teach KVM's VMX code that CR3 isn't a constant Andy Lutomirski
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-ca6c99c0794875c6d1db6e22f246699691ab7e6b@git.kernel.org \
--to=tipbot@zytor.com \
--cc=akpm@linux-foundation.org \
--cc=bpetkov@suse.de \
--cc=dave.hansen@intel.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.com \
--cc=mingo@kernel.org \
--cc=nadav.amit@gmail.com \
--cc=namit@vmware.com \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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).