Commit 247373b5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Ingo writes:
  "x86 fixes:

   Misc fixes:

    - fix various vDSO bugs: asm constraints and retpolines
    - add vDSO test units to make sure they never re-appear
    - fix UV platform TSC initialization bug
    - fix build warning on Clang"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vdso: Fix vDSO syscall fallback asm constraint regression
  x86/cpu/amd: Remove unnecessary parentheses
  x86/vdso: Only enable vDSO retpolines when enabled and supported
  x86/tsc: Fix UV TSC initialization
  x86/platform/uv: Provide is_early_uv_system()
  selftests/x86: Add clock_gettime() tests to test_vdso
  x86/vdso: Fix asm constraints on vDSO syscall fallbacks
parents 8be67373 02e42566

arch/x86/entry/vdso/Makefile

+14 −2
Original line number Diff line number Diff line
@@ -68,7 +68,13 @@ $(obj)/vdso-image-%.c: $(obj)/vdso%.so.dbg $(obj)/vdso%.so $(obj)/vdso2c FORCE 
CFL := $(PROFILING) -mcmodel=small -fPIC -O2 -fasynchronous-unwind-tables -m64 \

       $(filter -g%,$(KBUILD_CFLAGS)) $(call cc-option, -fno-stack-protector) \

       -fno-omit-frame-pointer -foptimize-sibling-calls \

       -DDISABLE_BRANCH_PROFILING -DBUILD_VDSO $(RETPOLINE_VDSO_CFLAGS)

       -DDISABLE_BRANCH_PROFILING -DBUILD_VDSO



ifdef CONFIG_RETPOLINE

ifneq ($(RETPOLINE_VDSO_CFLAGS),)

  CFL += $(RETPOLINE_VDSO_CFLAGS)

endif

endif



$(vobjs): KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS) $(RETPOLINE_CFLAGS),$(KBUILD_CFLAGS)) $(CFL)
@@ -138,7 +144,13 @@ KBUILD_CFLAGS_32 += $(call cc-option, -fno-stack-protector) 
KBUILD_CFLAGS_32 += $(call cc-option, -foptimize-sibling-calls)

KBUILD_CFLAGS_32 += -fno-omit-frame-pointer

KBUILD_CFLAGS_32 += -DDISABLE_BRANCH_PROFILING



ifdef CONFIG_RETPOLINE

ifneq ($(RETPOLINE_VDSO_CFLAGS),)

  KBUILD_CFLAGS_32 += $(RETPOLINE_VDSO_CFLAGS)

endif

endif



$(obj)/vdso32.so.dbg: KBUILD_CFLAGS = $(KBUILD_CFLAGS_32)



$(obj)/vdso32.so.dbg: FORCE \

arch/x86/entry/vdso/vclock_gettime.c

+14 −12
Original line number Diff line number Diff line
@@ -43,8 +43,9 @@ extern u8 hvclock_page 
notrace static long vdso_fallback_gettime(long clock, struct timespec *ts)

{

	long ret;

	asm("syscall" : "=a" (ret) :

	    "0" (__NR_clock_gettime), "D" (clock), "S" (ts) : "memory");

	asm ("syscall" : "=a" (ret), "=m" (*ts) :

	     "0" (__NR_clock_gettime), "D" (clock), "S" (ts) :

	     "memory", "rcx", "r11");

	return ret;

}
@@ -52,8 +53,9 @@ notrace static long vdso_fallback_gtod(struct timeval *tv, struct timezone *tz) 
{

	long ret;



	asm("syscall" : "=a" (ret) :

	    "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "memory");

	asm ("syscall" : "=a" (ret), "=m" (*tv), "=m" (*tz) :

	     "0" (__NR_gettimeofday), "D" (tv), "S" (tz) :

	     "memory", "rcx", "r11");

	return ret;

}
@@ -66,11 +68,11 @@ notrace static long vdso_fallback_gettime(long clock, struct timespec *ts) 


	asm (

		"mov %%ebx, %%edx \n"

		"mov %2, %%ebx \n"

		"mov %[clock], %%ebx \n"

		"call __kernel_vsyscall \n"

		"mov %%edx, %%ebx \n"

		: "=a" (ret)

		: "0" (__NR_clock_gettime), "g" (clock), "c" (ts)

		: "=a" (ret), "=m" (*ts)

		: "0" (__NR_clock_gettime), [clock] "g" (clock), "c" (ts)

		: "memory", "edx");

	return ret;

}
@@ -81,11 +83,11 @@ notrace static long vdso_fallback_gtod(struct timeval *tv, struct timezone *tz) 


	asm (

		"mov %%ebx, %%edx \n"

		"mov %2, %%ebx \n"

		"mov %[tv], %%ebx \n"

		"call __kernel_vsyscall \n"

		"mov %%edx, %%ebx \n"

		: "=a" (ret)

		: "0" (__NR_gettimeofday), "g" (tv), "c" (tz)

		: "=a" (ret), "=m" (*tv), "=m" (*tz)

		: "0" (__NR_gettimeofday), [tv] "g" (tv), "c" (tz)

		: "memory", "edx");

	return ret;

}

arch/x86/include/asm/uv/uv.h

+6 −0
Original line number Diff line number Diff line
@@ -10,8 +10,13 @@ struct cpumask; 
struct mm_struct;



#ifdef CONFIG_X86_UV

#include <linux/efi.h>



extern enum uv_system_type get_uv_system_type(void);

static inline bool is_early_uv_system(void)

{

	return !((efi.uv_systab == EFI_INVALID_TABLE_ADDR) || !efi.uv_systab);

}

extern int is_uv_system(void);

extern int is_uv_hubless(void);

extern void uv_cpu_init(void);
@@ -23,6 +28,7 @@ extern const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask, 
#else	/* X86_UV */



static inline enum uv_system_type get_uv_system_type(void) { return UV_NONE; }

static inline bool is_early_uv_system(void)	{ return 0; }

static inline int is_uv_system(void)	{ return 0; }

static inline int is_uv_hubless(void)	{ return 0; }

static inline void uv_cpu_init(void)	{ }

arch/x86/kernel/cpu/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ static void init_amd(struct cpuinfo_x86 *c) 
static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)

{

	/* AMD errata T13 (order #21922) */

	if ((c->x86 == 6)) {

	if (c->x86 == 6) {

		/* Duron Rev A0 */

		if (c->x86_model == 3 && c->x86_stepping == 0)

			size = 64;

arch/x86/kernel/tsc.c

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/apic.h>

#include <asm/intel-family.h>

#include <asm/i8259.h>

#include <asm/uv/uv.h>



unsigned int __read_mostly cpu_khz;	/* TSC clocks / usec, not used here */

EXPORT_SYMBOL(cpu_khz);
@@ -1433,6 +1434,9 @@ void __init tsc_early_init(void) 
{

	if (!boot_cpu_has(X86_FEATURE_TSC))

		return;

	/* Don't change UV TSC multi-chassis synchronization */

	if (is_early_uv_system())

		return;

	if (!determine_cpu_tsc_frequencies(true))

		return;

	loops_per_jiffy = get_loops_per_jiffy();

CRA Git | Maintained and supported by SUSTech CRA and CCSE