Skip to contentSkip to conversation

x86: Some cleanup of delay() and io_delay()

PATCH In review [email protected] 3 participants 5 messages May 3, 2019 – May 20, 2019 KVM

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 x86: Some cleanup of delay() and io_delay()

From: Nadav Amit <[email protected]>

There is no guarantee that a self-IPI would be delivered immediately. In eventinj, io_delay() is called after self-IPI is generated but does nothing.

In general, there is mess in regard to delay() and io_delay(). There are two definitions of delay() and they do not really look on the timestamp counter and instead count invocations of "pause" (or even "nop"), which might be different on different CPUs/setups, for example due to different pause-loop-exiting configurations.

To address these issues change io_delay() to really do a delay, based on timestamp counter, and move common functions into delay.[hc].

Cc Krish Sadhukhan <[email protected]>
---
 lib/x86/delay.c | 9 ++++++---
 lib/x86/delay.h | 7 +++++++
 x86/eventinj.c  | 5 +----
 x86/ioapic.c    | 8 +-------
 4 files changed, 15 insertions(+), 14 deletions(-)
lib/x86/delay.c +6 -3
index 595ad24..e7d2717 100644
@@ -1,8 +1,11 @@
 #include "delay.h"
+#include "processor.h"
 
 void delay(u64 count)
 {
-	while (count--)
-		asm volatile("pause");
-}
+	u64 start = rdtsc();
 
+	do {
+		pause();
+	} while (rdtsc() - start < count);
+}
lib/x86/delay.h +7 -0
index a9bf894..a51eb34 100644
@@ -3,6 +3,13 @@
 
 #include "libcflat.h"
 
+#define IPI_DELAY 1000000
+
 void delay(u64 count);
 
+static inline void io_delay(void)
+{
+	delay(IPI_DELAY);
+}
+
 #endif
x86/eventinj.c +1 -4
index d2dfc40..901b9db 100644
@@ -7,6 +7,7 @@
 #include "apic-defs.h"
 #include "vmalloc.h"
 #include "alloc_page.h"
+#include "delay.h"
 
 #ifdef __x86_64__
 #  define R "r"
@@ -16,10 +17,6 @@
 
 void do_pf_tss(void);
 
-static inline void io_delay(void)
-{
-}
-
 static void apic_self_ipi(u8 v)
 {
 	apic_icr_write(APIC_DEST_SELF | APIC_DEST_PHYSICAL | APIC_DM_FIXED |
x86/ioapic.c +1 -7
index 2ac4ac6..c32dabd 100644
@@ -4,6 +4,7 @@
 #include "smp.h"
 #include "desc.h"
 #include "isr.h"
+#include "delay.h"
 
 static void toggle_irq_line(unsigned line)
 {
@@ -165,13 +166,6 @@ static void test_ioapic_level_tmr(bool expected_tmr_before)
 	       expected_tmr_before ? "true" : "false");
 }
 
-#define IPI_DELAY 1000000
-
-static void delay(int count)
-{
-	while(count--) asm("");
-}
-
 static void toggle_irq_line_0x0e(void *data)
 {
 	irq_disable();
Signature · 1 line
2.17.1
author
#1 lore raw

This one regards KVM-unit-tests, of course.

Quoted 114 lines · On May 3, 2019, at 4:13 AM, [email protected] wrote:

From: Nadav Amit <[email protected]>

There is no guarantee that a self-IPI would be delivered immediately. In eventinj, io_delay() is called after self-IPI is generated but does nothing.

In general, there is mess in regard to delay() and io_delay(). There are two definitions of delay() and they do not really look on the timestamp counter and instead count invocations of "pause" (or even "nop"), which might be different on different CPUs/setups, for example due to different pause-loop-exiting configurations.

To address these issues change io_delay() to really do a delay, based on timestamp counter, and move common functions into delay.[hc].

Cc Krish Sadhukhan <[email protected]>

---

lib/x86/delay.c | 9 ++++++---
lib/x86/delay.h | 7 +++++++
x86/eventinj.c  | 5 +----
x86/ioapic.c    | 8 +-------
4 files changed, 15 insertions(+), 14 deletions(-)
lib/x86/delay.c +6 -3
index 595ad24..e7d2717 100644
@@ -1,8 +1,11 @@
 #include "delay.h"
+#include "processor.h"
 
 void delay(u64 count)
 {
-	while (count--)
-		asm volatile("pause");
-}
+	u64 start = rdtsc();
 
+	do {
+		pause();
+	} while (rdtsc() - start < count);
+}
lib/x86/delay.h +7 -0
index a9bf894..a51eb34 100644
@@ -3,6 +3,13 @@
 
 #include "libcflat.h"
 
+#define IPI_DELAY 1000000
+
 void delay(u64 count);
 
+static inline void io_delay(void)
+{
+	delay(IPI_DELAY);
+}
+
 #endif
x86/eventinj.c +1 -4
index d2dfc40..901b9db 100644
@@ -7,6 +7,7 @@
 #include "apic-defs.h"
 #include "vmalloc.h"
 #include "alloc_page.h"
+#include "delay.h"
 
 #ifdef __x86_64__
 #  define R "r"
@@ -16,10 +17,6 @@
 
 void do_pf_tss(void);
 
-static inline void io_delay(void)
-{
-}
-
 static void apic_self_ipi(u8 v)
 {
 	apic_icr_write(APIC_DEST_SELF | APIC_DEST_PHYSICAL | APIC_DM_FIXED |
x86/ioapic.c +1 -7
index 2ac4ac6..c32dabd 100644
@@ -4,6 +4,7 @@
 #include "smp.h"
 #include "desc.h"
 #include "isr.h"
+#include "delay.h"
 
 static void toggle_irq_line(unsigned line)
 {
@@ -165,13 +166,6 @@ static void test_ioapic_level_tmr(bool expected_tmr_before)
 	       expected_tmr_before ? "true" : "false");
 }
 
-#define IPI_DELAY 1000000
-
-static void delay(int count)
-{
-	while(count--) asm("");
-}
-
 static void toggle_irq_line_0x0e(void *data)
 {
 	irq_disable();
Signature · 1 line
2.17.1
#2 lore raw
In reply to [email protected]
Quoted 100 lines · On 05/03/2019 04:13 AM, [email protected] wrote:

From: Nadav Amit <[email protected]>

There is no guarantee that a self-IPI would be delivered immediately. In eventinj, io_delay() is called after self-IPI is generated but does nothing.

In general, there is mess in regard to delay() and io_delay(). There are two definitions of delay() and they do not really look on the timestamp counter and instead count invocations of "pause" (or even "nop"), which might be different on different CPUs/setups, for example due to different pause-loop-exiting configurations.

To address these issues change io_delay() to really do a delay, based on timestamp counter, and move common functions into delay.[hc].

Cc Krish Sadhukhan <[email protected]>
---
  lib/x86/delay.c | 9 ++++++---
  lib/x86/delay.h | 7 +++++++
  x86/eventinj.c  | 5 +----
  x86/ioapic.c    | 8 +-------
  4 files changed, 15 insertions(+), 14 deletions(-)
lib/x86/delay.c +6 -3
index 595ad24..e7d2717 100644
@@ -1,8 +1,11 @@
  #include "delay.h"
+#include "processor.h"
 
  void delay(u64 count)
  {
-	while (count--)
-		asm volatile("pause");
-}
+	u64 start = rdtsc();
 
+	do {
+		pause();
+	} while (rdtsc() - start < count);
+}
lib/x86/delay.h +7 -0
index a9bf894..a51eb34 100644
@@ -3,6 +3,13 @@
 
  #include "libcflat.h"
 
+#define IPI_DELAY 1000000
+
  void delay(u64 count);
 
+static inline void io_delay(void)
+{
+	delay(IPI_DELAY);
+}
+
  #endif
x86/eventinj.c +1 -4
index d2dfc40..901b9db 100644
@@ -7,6 +7,7 @@
  #include "apic-defs.h"
  #include "vmalloc.h"
  #include "alloc_page.h"
+#include "delay.h"
 
  #ifdef __x86_64__
  #  define R "r"
@@ -16,10 +17,6 @@
 
  void do_pf_tss(void);
 
-static inline void io_delay(void)
-{
-}
-
  static void apic_self_ipi(u8 v)
  {
  	apic_icr_write(APIC_DEST_SELF | APIC_DEST_PHYSICAL | APIC_DM_FIXED |
x86/ioapic.c +1 -0
index 2ac4ac6..c32dabd 100644
@@ -4,6 +4,7 @@
  #include "smp.h"
  #include "desc.h"
  #include "isr.h"
+#include "delay.h"
 
  static void toggle_irq_line(unsigned line)
  {
@@ -165,13 +166,6 @@ static void test_ioapic_level_tmr(bool expected_tmr_before)
  	       expected_tmr_before ? "true" : "false");
  }
 

x86/ioapic.c static void test_ioapic_level_tmr(bool expected_tmr_before) · line 171

Quoted 10 lines
x86/ioapic.c +0 -7
-#define IPI_DELAY 1000000
-
-static void delay(int count)
-{
-	while(count--) asm("");
-}
-
  static void toggle_irq_line_0x0e(void *data)
  {
  	irq_disable();

May be the commit header can be re-worded to something like the following in order to summarize your changes in a better way ?

        x86: Incorporate timestamp in delay() and call the latter in io_delay()

author
#3 lore raw
Quoted 109 lines · Krish Sadhukhan
Quoted 90 lines · On 05/03/2019 04:13 AM, [email protected] wrote:

From: Nadav Amit <[email protected]>

There is no guarantee that a self-IPI would be delivered immediately. In eventinj, io_delay() is called after self-IPI is generated but does nothing.

In general, there is mess in regard to delay() and io_delay(). There are two definitions of delay() and they do not really look on the timestamp counter and instead count invocations of "pause" (or even "nop"), which might be different on different CPUs/setups, for example due to different pause-loop-exiting configurations.

To address these issues change io_delay() to really do a delay, based on timestamp counter, and move common functions into delay.[hc].

Cc Krish Sadhukhan <[email protected]>
---
 lib/x86/delay.c | 9 ++++++---
 lib/x86/delay.h | 7 +++++++
 x86/eventinj.c  | 5 +----
 x86/ioapic.c    | 8 +-------
 4 files changed, 15 insertions(+), 14 deletions(-)
lib/x86/delay.c +5 -3
index 595ad24..e7d2717 100644
@@ -1,8 +1,11 @@
 #include "delay.h"
+#include "processor.h"
   void delay(u64 count)
 {
-	while (count--)
-		asm volatile("pause");
-}
+	u64 start = rdtsc();
 +	do {
+		pause();
+	} while (rdtsc() - start < count);
+}
lib/x86/delay.h +5 -0
index a9bf894..a51eb34 100644
@@ -3,6 +3,13 @@
   #include "libcflat.h"
 +#define IPI_DELAY 1000000
+
 void delay(u64 count);
 +static inline void io_delay(void)
+{
+	delay(IPI_DELAY);
+}
+
 #endif
x86/eventinj.c +1 -3
index d2dfc40..901b9db 100644
@@ -7,6 +7,7 @@
 #include "apic-defs.h"
 #include "vmalloc.h"
 #include "alloc_page.h"
+#include "delay.h"
   #ifdef __x86_64__
 #  define R "r"
@@ -16,10 +17,6 @@
   void do_pf_tss(void);
 -static inline void io_delay(void)
-{
-}
-
 static void apic_self_ipi(u8 v)
 {
 	apic_icr_write(APIC_DEST_SELF | APIC_DEST_PHYSICAL | APIC_DM_FIXED |
x86/ioapic.c +1 -0
index 2ac4ac6..c32dabd 100644
@@ -4,6 +4,7 @@
 #include "smp.h"
 #include "desc.h"
 #include "isr.h"
+#include "delay.h"
   static void toggle_irq_line(unsigned line)
 {
@@ -165,13 +166,6 @@ static void test_ioapic_level_tmr(bool expected_tmr_before)
 	       expected_tmr_before ? "true" : "false");
 }

x86/ioapic.c static void test_ioapic_level_tmr(bool expected_tmr_before) · line 171

Quoted 10 lines
x86/ioapic.c +0 -6
 -#define IPI_DELAY 1000000
-
-static void delay(int count)
-{
-	while(count--) asm("");
-}
-
 static void toggle_irq_line_0x0e(void *data)
 {
 	irq_disable();

May be the commit header can be re-worded to something like the following in order to summarize your changes in a better way ?

Quoted 1 line

x86: Incorporate timestamp in delay() and call the latter in io_delay()

Sounds good. Let’s see if there is any additional feedback before I send v3 (and whether Paolo will just do the rewording when he applies the patch…)

maintainer
#4 lore raw
In reply to [email protected]
Quoted 12 lines · On 03/05/19 13:13, [email protected] wrote:

From: Nadav Amit <[email protected]>

There is no guarantee that a self-IPI would be delivered immediately. In eventinj, io_delay() is called after self-IPI is generated but does nothing.

In general, there is mess in regard to delay() and io_delay(). There are two definitions of delay() and they do not really look on the timestamp counter and instead count invocations of "pause" (or even "nop"), which might be different on different CPUs/setups, for example due to different pause-loop-exiting configurations.

Quoted 5 lines

To address these issues change io_delay() to really do a delay, based on timestamp counter, and move common functions into delay.[hc].

Cc Krish Sadhukhan <[email protected]>

Queued; there is another io_delay instance in taskswitch2.c, so I removed it too.

Paolo

Quoted 94 lines
---
 lib/x86/delay.c | 9 ++++++---
 lib/x86/delay.h | 7 +++++++
 x86/eventinj.c  | 5 +----
 x86/ioapic.c    | 8 +-------
 4 files changed, 15 insertions(+), 14 deletions(-)
lib/x86/delay.c +6 -3
index 595ad24..e7d2717 100644
@@ -1,8 +1,11 @@
 #include "delay.h"
+#include "processor.h"
 
 void delay(u64 count)
 {
-	while (count--)
-		asm volatile("pause");
-}
+	u64 start = rdtsc();
 
+	do {
+		pause();
+	} while (rdtsc() - start < count);
+}
lib/x86/delay.h +7 -0
index a9bf894..a51eb34 100644
@@ -3,6 +3,13 @@
 
 #include "libcflat.h"
 
+#define IPI_DELAY 1000000
+
 void delay(u64 count);
 
+static inline void io_delay(void)
+{
+	delay(IPI_DELAY);
+}
+
 #endif
x86/eventinj.c +1 -4
index d2dfc40..901b9db 100644
@@ -7,6 +7,7 @@
 #include "apic-defs.h"
 #include "vmalloc.h"
 #include "alloc_page.h"
+#include "delay.h"
 
 #ifdef __x86_64__
 #  define R "r"
@@ -16,10 +17,6 @@
 
 void do_pf_tss(void);
 
-static inline void io_delay(void)
-{
-}
-
 static void apic_self_ipi(u8 v)
 {
 	apic_icr_write(APIC_DEST_SELF | APIC_DEST_PHYSICAL | APIC_DM_FIXED |
x86/ioapic.c +1 -7
index 2ac4ac6..c32dabd 100644
@@ -4,6 +4,7 @@
 #include "smp.h"
 #include "desc.h"
 #include "isr.h"
+#include "delay.h"
 
 static void toggle_irq_line(unsigned line)
 {
@@ -165,13 +166,6 @@ static void test_ioapic_level_tmr(bool expected_tmr_before)
 	       expected_tmr_before ? "true" : "false");
 }
 
-#define IPI_DELAY 1000000
-
-static void delay(int count)
-{
-	while(count--) asm("");
-}
-
 static void toggle_irq_line_0x0e(void *data)
 {
 	irq_disable();