From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939500AbdEXK22 (ORCPT ); Wed, 24 May 2017 06:28:28 -0400 Received: from terminus.zytor.com ([65.50.211.136]:37745 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757594AbdEXK1g (ORCPT ); Wed, 24 May 2017 06:27:36 -0400 Date: Wed, 24 May 2017 03:21:44 -0700 From: tip-bot for Andy Lutomirski Message-ID: 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 Reply-To: bpetkov@suse.de, peterz@infradead.org, akpm@linux-foundation.org, riel@redhat.com, hpa@zytor.com, dave.hansen@intel.com, torvalds@linux-foundation.org, keescook@chromium.org, namit@vmware.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mgorman@suse.de, nadav.amit@gmail.com, mingo@kernel.org, mhocko@suse.com, luto@kernel.org In-Reply-To: <3cc3847cf888d8907577569b8bac3f01992ef8f9.1495492063.git.luto@kernel.org> References: <3cc3847cf888d8907577569b8bac3f01992ef8f9.1495492063.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm: Reimplement flush_tlb_page() using flush_tlb_mm_range() Git-Commit-ID: ca6c99c0794875c6d1db6e22f246699691ab7e6b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ca6c99c0794875c6d1db6e22f246699691ab7e6b Gitweb: http://git.kernel.org/tip/ca6c99c0794875c6d1db6e22f246699691ab7e6b Author: Andy Lutomirski AuthorDate: Mon, 22 May 2017 15:30:01 -0700 Committer: Ingo Molnar 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 Acked-by: Kees Cook Cc: Andrew Morton Cc: Borislav Petkov Cc: Dave Hansen Cc: Linus Torvalds Cc: Mel Gorman Cc: Michal Hocko Cc: Nadav Amit Cc: Nadav Amit Cc: Peter Zijlstra Cc: Rik van Riel Cc: Thomas Gleixner Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/3cc3847cf888d8907577569b8bac3f01992ef8f9.1495492063.git.luto@kernel.org Signed-off-by: Ingo Molnar --- 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);