x86/mm/tlb: Skip tracing when flush is not done

PATCH Superseded Nadav Amit 2 participants 3 messages Jul 11, 2022

Subsystems (3)

Memory management x86 x86 MM

lore

Share & tools

lore

Nadav Amit

author

2022-07-11 07:08 UTC #0 lore raw

PATCH 1/1 x86/mm/tlb: Skip tracing when flush is not done

From: Nadav Amit <[email protected]>

Currently, if flush_tlb_func() does not flush for some reason, the tracing of the flush will be done only in certain cases, depending on the reason of the flush. Be consistent and just do not trace in all cases when the flush was eventually not done.

Cc Peter Zijlstra (Intel) <[email protected]>

Cc Andy Lutomirski <[email protected]>

Signed-off-by Nadav Amit <[email protected]>

---
 arch/x86/mm/tlb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

arch/x86/mm/tlb.c +2 -3

index 0f346c51dd99..5c17b86b928d 100644
@@ -736,7 +736,7 @@ static void flush_tlb_func(void *info)
 	u32 loaded_mm_asid = this_cpu_read(cpu_tlbstate.loaded_mm_asid);
 	u64 local_tlb_gen = this_cpu_read(cpu_tlbstate.ctxs[loaded_mm_asid].tlb_gen);
 	bool local = smp_processor_id() == f->initiating_cpu;
-	unsigned long nr_invalidate = 0;
+	unsigned long nr_invalidate;
 	u64 mm_tlb_gen;
 
 	/* This code cannot presently handle being reentered. */

@@ -795,7 +795,7 @@ static void flush_tlb_func(void *info)
 		 * be handled can catch us all the way up, leaving no work for
 		 * the second flush.
 		 */
-		goto done;
+		return;
 	}
 
 	WARN_ON_ONCE(local_tlb_gen > mm_tlb_gen);

@@ -871,7 +871,6 @@ static void flush_tlb_func(void *info)
 	this_cpu_write(cpu_tlbstate.ctxs[loaded_mm_asid].tlb_gen, mm_tlb_gen);
 
 	/* Tracing is done in a unified manner to reduce the code size */
-done:
 	trace_tlb_flush(!local ? TLB_REMOTE_SHOOTDOWN :
 				(f->mm == NULL) ? TLB_LOCAL_SHOOTDOWN :
 						  TLB_LOCAL_MM_SHOOTDOWN,

Signature · 1 line

2.25.1

Andy Lutomirski

maintainer

2022-07-11 22:50 UTC #1 lore raw

Quoted 11 lines · Nadav Amit

From: Nadav Amit <[email protected]>
Currently, if flush_tlb_func() does not flush for some reason, the tracing of the flush will be done only in certain cases, depending on the reason of the flush. Be consistent and just do not trace in all cases when the flush was eventually not done.
Suggested-by Dave Hansen <[email protected]>
Cc Peter Zijlstra (Intel) <[email protected]>
Cc Andy Lutomirski <[email protected]>
Signed-off-by Nadav Amit <[email protected]>

Can you remove this comment, too?

Quoted 6 lines

/* Tracing is done in a unified manner to reduce the code size */
-done:
trace_tlb_flush(!local ? TLB_REMOTE_SHOOTDOWN :
(f->mm == NULL) ? TLB_LOCAL_SHOOTDOWN :
TLB_LOCAL_MM_SHOOTDOWN,

Nadav Amit

author

2022-07-11 23:42 UTC #2 lore raw

Quoted 12 lines · Andy Lutomirski

Quoted 9 lines · Nadav Amit
From: Nadav Amit <[email protected]>
Currently, if flush_tlb_func() does not flush for some reason, the tracing of the flush will be done only in certain cases, depending on the reason of the flush. Be consistent and just do not trace in all cases when the flush was eventually not done.
Suggested-by Dave Hansen <[email protected]>
Cc Peter Zijlstra (Intel) <[email protected]>
Cc Andy Lutomirski <[email protected]>
Signed-off-by Nadav Amit <[email protected]>

Quoted 3 lines

Can you remove this comment, too?
Quoted 1 line
/* Tracing is done in a unified manner to reduce the code size */

Yes. I will send v2.

… And if you have time, can you please review the other TLB patch that I sent? It is a really urgent one.

Thanks,
Nadav