From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939460AbdEXK3H (ORCPT ); Wed, 24 May 2017 06:29:07 -0400 Received: from terminus.zytor.com ([65.50.211.136]:37047 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751951AbdEXK2n (ORCPT ); Wed, 24 May 2017 06:28:43 -0400 Date: Wed, 24 May 2017 03:22:18 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: tglx@linutronix.de, nadav.amit@gmail.com, akpm@linux-foundation.org, mingo@kernel.org, bpetkov@suse.de, peterz@infradead.org, namit@vmware.com, dave.hansen@intel.com, hpa@zytor.com, torvalds@linux-foundation.org, luto@kernel.org, keescook@chromium.org, riel@redhat.com, mgorman@suse.de, mhocko@suse.com, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, torvalds@linux-foundation.org, luto@kernel.org, peterz@infradead.org, bpetkov@suse.de, dave.hansen@intel.com, namit@vmware.com, akpm@linux-foundation.org, nadav.amit@gmail.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, mhocko@suse.com, mgorman@suse.de, keescook@chromium.org, riel@redhat.com In-Reply-To: <97901ddcc9821d7bc7b296d2918d1179f08aaf22.1495492063.git.luto@kernel.org> References: <97901ddcc9821d7bc7b296d2918d1179f08aaf22.1495492063.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm: Reduce indentation in flush_tlb_func() Git-Commit-ID: b3b90e5af7976e46541f5029a369c9c38c5e4cea 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: b3b90e5af7976e46541f5029a369c9c38c5e4cea Gitweb: http://git.kernel.org/tip/b3b90e5af7976e46541f5029a369c9c38c5e4cea Author: Andy Lutomirski AuthorDate: Mon, 22 May 2017 15:30:02 -0700 Committer: Ingo Molnar CommitDate: Wed, 24 May 2017 10:18:27 +0200 x86/mm: Reduce indentation in flush_tlb_func() The leave_mm() case can just exit the function early so we don't need to indent the entire remainder of the function. 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/97901ddcc9821d7bc7b296d2918d1179f08aaf22.1495492063.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/mm/tlb.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index fe64711..4d30386 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -237,24 +237,26 @@ static void flush_tlb_func(void *info) return; count_vm_tlb_event(NR_TLB_REMOTE_FLUSH_RECEIVED); - if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK) { - if (f->flush_end == TLB_FLUSH_ALL) { - local_flush_tlb(); - trace_tlb_flush(TLB_REMOTE_SHOOTDOWN, TLB_FLUSH_ALL); - } else { - unsigned long addr; - unsigned long nr_pages = - (f->flush_end - f->flush_start) / PAGE_SIZE; - addr = f->flush_start; - while (addr < f->flush_end) { - __flush_tlb_single(addr); - addr += PAGE_SIZE; - } - trace_tlb_flush(TLB_REMOTE_SHOOTDOWN, nr_pages); - } - } else + + if (this_cpu_read(cpu_tlbstate.state) != TLBSTATE_OK) { leave_mm(smp_processor_id()); + return; + } + if (f->flush_end == TLB_FLUSH_ALL) { + local_flush_tlb(); + trace_tlb_flush(TLB_REMOTE_SHOOTDOWN, TLB_FLUSH_ALL); + } else { + unsigned long addr; + unsigned long nr_pages = + (f->flush_end - f->flush_start) / PAGE_SIZE; + addr = f->flush_start; + while (addr < f->flush_end) { + __flush_tlb_single(addr); + addr += PAGE_SIZE; + } + trace_tlb_flush(TLB_REMOTE_SHOOTDOWN, nr_pages); + } } void native_flush_tlb_others(const struct cpumask *cpumask,