Skip to contentSkip to conversation

x86/entry64: move comment about informing of context tracking in right place

PATCH In review Alexander Kuleshov 2 participants 2 messages Oct 24, 2016 – Nov 3, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/entry64: move comment about informing of context tracking in right place

We are switching to kernel gsbase if an IRQ come from usermode with swpags. Now there is comment which describes this:

IRQ from user mode. Switch to kernel gsbase and inform context tracking that we're in kernel mode.

But now we execute swapgs, next TRACE_IRQS_OFF and only then the CALL_enter_from_user_mode macro expands to the informing of context tracking about this event. Let's move part of comment to the right place where actual call to context tracing occured.

---
 arch/x86/entry/entry_64.S | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/entry/entry_64.S +4 -2
index ef766a3..5e97642 100644
@@ -474,8 +474,7 @@ END(irq_entries_start)
 	jz	1f
 
 	/*
-	 * IRQ from user mode.  Switch to kernel gsbase and inform context
-	 * tracking that we're in kernel mode.
+	 * IRQ from user mode.  Switch to kernel gsbase.
 	 */
 	SWAPGS
 
@@ -489,6 +488,9 @@ END(irq_entries_start)
 	 */
 	TRACE_IRQS_OFF
 
+	/*
+	 * Inform context tracking that we're in kernel mode.
+	 */
 	CALL_enter_from_user_mode
 
 1:
Signature · 1 line
2.8.0.rc3.1353.gea9bdc0
maintainer
#1 lore raw
Quoted 1 line · Alexander Kuleshov

We are switching to kernel gsbase if an IRQ come from usermode with swpags.

"... if an IRQ comes from ..."

Also, you mean SWAPGS. Instruction names in allcaps please and spelled correctly please.

Quoted 9 lines

Now there is comment which describes this:

IRQ from user mode. Switch to kernel gsbase and inform context tracking that we're in kernel mode.

But now we execute swapgs, next TRACE_IRQS_OFF and only then the CALL_enter_from_user_mode macro expands to the informing of context tracking about this event. Let's move part of comment to the right place where actual call to context tracing occured.

I don't agree with that change - SWAPGS is part of what the comment explains so it looks just fine where it is.

For future patches:

Please integrate scripts/checkpatch.pl in your patch creation workflow:

WARNING: 'occured' may be misspelled - perhaps 'occurred'? #27:
the right place where actual call to context tracing occured.

Signature · 4 lines
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.