Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a568276 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fixes from Thomas Gleixner:
 "A set of fixes for x86:

   - Prevent multiplication result truncation on 32bit. Introduced with
     the early timestamp reworrk.

   - Ensure microcode revision storage to be consistent under all
     circumstances

   - Prevent write tearing of PTEs

   - Prevent confusion of user and kernel reegisters when dumping fatal
     signals verbosely

   - Make an error return value in a failure path of the vector
     allocation negative. Returning EINVAL might the caller assume
     success and causes further wreckage.

   - A trivial kernel doc warning fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Use WRITE_ONCE() when setting PTEs
  x86/apic/vector: Make error return value negative
  x86/process: Don't mix user/kernel regs in 64bit __show_regs()
  x86/tsc: Prevent result truncation on 32bit
  x86: Fix kernel-doc atomic.h warnings
  x86/microcode: Update the new microcode revision unconditionally
  x86/microcode: Make sure boot_cpu_data.microcode is up-to-date
parents 3567994a 9bc4f28a

arch/x86/include/asm/atomic.h

+6 −6
Original line number Diff line number Diff line
@@ -80,11 +80,11 @@ static __always_inline void arch_atomic_sub(int i, atomic_t *v) 
 * true if the result is zero, or false for all

 * other cases.

 */

#define arch_atomic_sub_and_test arch_atomic_sub_and_test

static __always_inline bool arch_atomic_sub_and_test(int i, atomic_t *v)

{

	GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", e);

}

#define arch_atomic_sub_and_test arch_atomic_sub_and_test



/**

 * arch_atomic_inc - increment atomic variable
@@ -92,12 +92,12 @@ static __always_inline bool arch_atomic_sub_and_test(int i, atomic_t *v) 
 *

 * Atomically increments @v by 1.

 */

#define arch_atomic_inc arch_atomic_inc

static __always_inline void arch_atomic_inc(atomic_t *v)

{

	asm volatile(LOCK_PREFIX "incl %0"

		     : "+m" (v->counter));

}

#define arch_atomic_inc arch_atomic_inc



/**

 * arch_atomic_dec - decrement atomic variable
@@ -105,12 +105,12 @@ static __always_inline void arch_atomic_inc(atomic_t *v) 
 *

 * Atomically decrements @v by 1.

 */

#define arch_atomic_dec arch_atomic_dec

static __always_inline void arch_atomic_dec(atomic_t *v)

{

	asm volatile(LOCK_PREFIX "decl %0"

		     : "+m" (v->counter));

}

#define arch_atomic_dec arch_atomic_dec



/**

 * arch_atomic_dec_and_test - decrement and test
@@ -120,11 +120,11 @@ static __always_inline void arch_atomic_dec(atomic_t *v) 
 * returns true if the result is 0, or false for all other

 * cases.

 */

#define arch_atomic_dec_and_test arch_atomic_dec_and_test

static __always_inline bool arch_atomic_dec_and_test(atomic_t *v)

{

	GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", e);

}

#define arch_atomic_dec_and_test arch_atomic_dec_and_test



/**

 * arch_atomic_inc_and_test - increment and test
@@ -134,11 +134,11 @@ static __always_inline bool arch_atomic_dec_and_test(atomic_t *v) 
 * and returns true if the result is zero, or false for all

 * other cases.

 */

#define arch_atomic_inc_and_test arch_atomic_inc_and_test

static __always_inline bool arch_atomic_inc_and_test(atomic_t *v)

{

	GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", e);

}

#define arch_atomic_inc_and_test arch_atomic_inc_and_test



/**

 * arch_atomic_add_negative - add and test if negative
@@ -149,11 +149,11 @@ static __always_inline bool arch_atomic_inc_and_test(atomic_t *v) 
 * if the result is negative, or false when

 * result is greater than or equal to zero.

 */

#define arch_atomic_add_negative arch_atomic_add_negative

static __always_inline bool arch_atomic_add_negative(int i, atomic_t *v)

{

	GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", s);

}

#define arch_atomic_add_negative arch_atomic_add_negative



/**

 * arch_atomic_add_return - add integer and return

arch/x86/include/asm/atomic64_32.h

+4 −4
Original line number Diff line number Diff line
@@ -205,12 +205,12 @@ static inline long long arch_atomic64_sub(long long i, atomic64_t *v) 
 *

 * Atomically increments @v by 1.

 */

#define arch_atomic64_inc arch_atomic64_inc

static inline void arch_atomic64_inc(atomic64_t *v)

{

	__alternative_atomic64(inc, inc_return, /* no output */,

			       "S" (v) : "memory", "eax", "ecx", "edx");

}

#define arch_atomic64_inc arch_atomic64_inc



/**

 * arch_atomic64_dec - decrement atomic64 variable
@@ -218,12 +218,12 @@ static inline void arch_atomic64_inc(atomic64_t *v) 
 *

 * Atomically decrements @v by 1.

 */

#define arch_atomic64_dec arch_atomic64_dec

static inline void arch_atomic64_dec(atomic64_t *v)

{

	__alternative_atomic64(dec, dec_return, /* no output */,

			       "S" (v) : "memory", "eax", "ecx", "edx");

}

#define arch_atomic64_dec arch_atomic64_dec



/**

 * arch_atomic64_add_unless - add unless the number is a given value
@@ -245,7 +245,6 @@ static inline int arch_atomic64_add_unless(atomic64_t *v, long long a, 
	return (int)a;

}



#define arch_atomic64_inc_not_zero arch_atomic64_inc_not_zero

static inline int arch_atomic64_inc_not_zero(atomic64_t *v)

{

	int r;
@@ -253,8 +252,8 @@ static inline int arch_atomic64_inc_not_zero(atomic64_t *v) 
			     "S" (v) : "ecx", "edx", "memory");

	return r;

}

#define arch_atomic64_inc_not_zero arch_atomic64_inc_not_zero



#define arch_atomic64_dec_if_positive arch_atomic64_dec_if_positive

static inline long long arch_atomic64_dec_if_positive(atomic64_t *v)

{

	long long r;
@@ -262,6 +261,7 @@ static inline long long arch_atomic64_dec_if_positive(atomic64_t *v) 
			     "S" (v) : "ecx", "memory");

	return r;

}

#define arch_atomic64_dec_if_positive arch_atomic64_dec_if_positive



#undef alternative_atomic64

#undef __alternative_atomic64

arch/x86/include/asm/atomic64_64.h

+6 −6
Original line number Diff line number Diff line
@@ -71,11 +71,11 @@ static inline void arch_atomic64_sub(long i, atomic64_t *v) 
 * true if the result is zero, or false for all

 * other cases.

 */

#define arch_atomic64_sub_and_test arch_atomic64_sub_and_test

static inline bool arch_atomic64_sub_and_test(long i, atomic64_t *v)

{

	GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", e);

}

#define arch_atomic64_sub_and_test arch_atomic64_sub_and_test



/**

 * arch_atomic64_inc - increment atomic64 variable
@@ -83,13 +83,13 @@ static inline bool arch_atomic64_sub_and_test(long i, atomic64_t *v) 
 *

 * Atomically increments @v by 1.

 */

#define arch_atomic64_inc arch_atomic64_inc

static __always_inline void arch_atomic64_inc(atomic64_t *v)

{

	asm volatile(LOCK_PREFIX "incq %0"

		     : "=m" (v->counter)

		     : "m" (v->counter));

}

#define arch_atomic64_inc arch_atomic64_inc



/**

 * arch_atomic64_dec - decrement atomic64 variable
@@ -97,13 +97,13 @@ static __always_inline void arch_atomic64_inc(atomic64_t *v) 
 *

 * Atomically decrements @v by 1.

 */

#define arch_atomic64_dec arch_atomic64_dec

static __always_inline void arch_atomic64_dec(atomic64_t *v)

{

	asm volatile(LOCK_PREFIX "decq %0"

		     : "=m" (v->counter)

		     : "m" (v->counter));

}

#define arch_atomic64_dec arch_atomic64_dec



/**

 * arch_atomic64_dec_and_test - decrement and test
@@ -113,11 +113,11 @@ static __always_inline void arch_atomic64_dec(atomic64_t *v) 
 * returns true if the result is 0, or false for all other

 * cases.

 */

#define arch_atomic64_dec_and_test arch_atomic64_dec_and_test

static inline bool arch_atomic64_dec_and_test(atomic64_t *v)

{

	GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", e);

}

#define arch_atomic64_dec_and_test arch_atomic64_dec_and_test



/**

 * arch_atomic64_inc_and_test - increment and test
@@ -127,11 +127,11 @@ static inline bool arch_atomic64_dec_and_test(atomic64_t *v) 
 * and returns true if the result is zero, or false for all

 * other cases.

 */

#define arch_atomic64_inc_and_test arch_atomic64_inc_and_test

static inline bool arch_atomic64_inc_and_test(atomic64_t *v)

{

	GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", e);

}

#define arch_atomic64_inc_and_test arch_atomic64_inc_and_test



/**

 * arch_atomic64_add_negative - add and test if negative
@@ -142,11 +142,11 @@ static inline bool arch_atomic64_inc_and_test(atomic64_t *v) 
 * if the result is negative, or false when

 * result is greater than or equal to zero.

 */

#define arch_atomic64_add_negative arch_atomic64_add_negative

static inline bool arch_atomic64_add_negative(long i, atomic64_t *v)

{

	GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", s);

}

#define arch_atomic64_add_negative arch_atomic64_add_negative



/**

 * arch_atomic64_add_return - add and return

arch/x86/include/asm/kdebug.h

+11 −1
Original line number Diff line number Diff line
@@ -22,10 +22,20 @@ enum die_val { 
	DIE_NMIUNKNOWN,

};



enum show_regs_mode {

	SHOW_REGS_SHORT,

	/*

	 * For when userspace crashed, but we don't think it's our fault, and

	 * therefore don't print kernel registers.

	 */

	SHOW_REGS_USER,

	SHOW_REGS_ALL

};



extern void die(const char *, struct pt_regs *,long);

extern int __must_check __die(const char *, struct pt_regs *, long);

extern void show_stack_regs(struct pt_regs *regs);

extern void __show_regs(struct pt_regs *regs, int all);

extern void __show_regs(struct pt_regs *regs, enum show_regs_mode);

extern void show_iret_regs(struct pt_regs *regs);

extern unsigned long oops_begin(void);

extern void oops_end(unsigned long, struct pt_regs *, int signr);

arch/x86/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -1195,7 +1195,7 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma, 
		return xchg(pmdp, pmd);

	} else {

		pmd_t old = *pmdp;

		*pmdp = pmd;

		WRITE_ONCE(*pmdp, pmd);

		return old;

	}

}