From: tip-bot for Andy Lutomirski <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:x86/mm] x86/mm: Reduce indentation in flush_tlb_func()
Date: Wed, 24 May 2017 03:22:18 -0700 [thread overview]
Message-ID: <tip-b3b90e5af7976e46541f5029a369c9c38c5e4cea@git.kernel.org> (raw)
In-Reply-To: <97901ddcc9821d7bc7b296d2918d1179f08aaf22.1495492063.git.luto@kernel.org>
Commit-ID: b3b90e5af7976e46541f5029a369c9c38c5e4cea
Gitweb: http://git.kernel.org/tip/b3b90e5af7976e46541f5029a369c9c38c5e4cea
Author: Andy Lutomirski <luto@kernel.org>
AuthorDate: Mon, 22 May 2017 15:30:02 -0700
Committer: Ingo Molnar <mingo@kernel.org>
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 <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/97901ddcc9821d7bc7b296d2918d1179f08aaf22.1495492063.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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,
next prev parent reply other threads:[~2017-05-24 10:29 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:x86/mm] " tip-bot for Andy Lutomirski
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-bot for Andy Lutomirski [this message]
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-b3b90e5af7976e46541f5029a369c9c38c5e4cea@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
Powered by JetHome