Stefano Stabellini
2013-Jan-28 18:18 UTC
Re: [PATCH -v4 5/5] x86,smp: limit spinlock delay on virtual machines
On Fri, 25 Jan 2013, Rik van Riel wrote:> Modern Intel and AMD CPUs will trap to the host when the guest > is spinning on a spinlock, allowing the host to schedule in > something else. > > This effectively means the host is taking care of spinlock > backoff for virtual machines. It also means that doing the > spinlock backoff in the guest anyway can lead to totally > unpredictable results, extremely large backoffs, and > performance regressions. > > To prevent those problems, we limit the spinlock backoff > delay, when running in a virtual machine, to a small value. > > Signed-off-by: Rik van Riel <riel@redhat.com> > --- > arch/x86/include/asm/processor.h | 2 ++ > arch/x86/kernel/setup.c | 2 ++ > arch/x86/kernel/smp.c | 30 ++++++++++++++++++++++++------ > 3 files changed, 28 insertions(+), 6 deletions(-) > > diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h > index 888184b..a365f97 100644 > --- a/arch/x86/include/asm/processor.h > +++ b/arch/x86/include/asm/processor.h > @@ -997,6 +997,8 @@ extern bool cpu_has_amd_erratum(const int *); > extern unsigned long arch_align_stack(unsigned long sp); > extern void free_init_pages(char *what, unsigned long begin, unsigned long end); > > +extern void init_spinlock_delay(void); > + > void default_idle(void); > bool set_pm_idle_to_default(void); > > diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c > index 23ddd55..b834eae 100644 > --- a/arch/x86/kernel/setup.c > +++ b/arch/x86/kernel/setup.c > @@ -1048,6 +1048,8 @@ void __init setup_arch(char **cmdline_p) > > arch_init_ideal_nops(); > > + init_spinlock_delay(); > + > register_refined_jiffies(CLOCK_TICK_RATE); > > #ifdef CONFIG_EFI > diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c > index 1877890..b1a65f0 100644 > --- a/arch/x86/kernel/smp.c > +++ b/arch/x86/kernel/smp.c > @@ -31,6 +31,7 @@ > #include <asm/proto.h> > #include <asm/apic.h> > #include <asm/nmi.h> > +#include <asm/hypervisor.h> > /* > * Some notes on x86 processor bugs affecting SMP operation: > * > @@ -114,6 +115,27 @@ static atomic_t stopping_cpu = ATOMIC_INIT(-1); > static bool smp_no_nmi_ipi = false; > > /* > + * Modern Intel and AMD CPUs tell the hypervisor when a guest is > + * spinning excessively on a spinlock.I take that you are talking about PAUSE-loop exiting?> The hypervisor will then > + * schedule something else, effectively taking care of the backoff > + * for us. Doing our own backoff on top of the hypervisor''s pause > + * loop exit handling can lead to excessively long delays, and > + * performance degradations. Limit the spinlock delay in virtual > + * machines to a smaller value. > + */ > +#define DELAY_SHIFT 8 > +#define DELAY_FIXED_1 (1<<DELAY_SHIFT) > +#define MIN_SPINLOCK_DELAY (1 * DELAY_FIXED_1) > +#define MAX_SPINLOCK_DELAY_NATIVE (16000 * DELAY_FIXED_1) > +#define MAX_SPINLOCK_DELAY_GUEST (16 * DELAY_FIXED_1) > +static int __read_mostly max_spinlock_delay = MAX_SPINLOCK_DELAY_NATIVE; > +void __init init_spinlock_delay(void) > +{ > + if (x86_hyper) > + max_spinlock_delay = MAX_SPINLOCK_DELAY_GUEST; > +}Before reducing max_spinlock_delay, shouldn''t we check that PAUSE-loop exiting is available? What if we are running on an older x86 machine that doesn''t support it? It is probably worth mentioning in the comment that Xen PV guests cannot take advantage of PAUSE-loop exiting (they don''t run inside a VMX environment), but that''s OK because Xen PV guests don''t set x86_hyper. On the other hand Xen PV on HVM guests can take advantage of it (they run in a VMX environment), and in fact they set x86_hyper to x86_hyper_xen_hvm.