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

Commit 6d459690 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 fix from Ingo Molnar:
 "This fixes the preemption-count imbalance crash reported by Owen
  Kibel"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Fix CMCI preemption bugs
parents 8f98f6f5 ea431643

arch/x86/kernel/cpu/mcheck/mce.c

+1 −3
Original line number Diff line number Diff line
@@ -598,7 +598,6 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b) 
{

	struct mce m;

	int i;

	unsigned long *v;



	this_cpu_inc(mce_poll_count);
@@ -618,8 +617,7 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b) 
		if (!(m.status & MCI_STATUS_VAL))

			continue;



		v = &get_cpu_var(mce_polled_error);

		set_bit(0, v);

		this_cpu_write(mce_polled_error, 1);

		/*

		 * Uncorrected or signalled events are handled by the exception

		 * handler when it is enabled, so don't process those here.

arch/x86/kernel/cpu/mcheck/mce_intel.c

+9 −9
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static DEFINE_PER_CPU(mce_banks_t, mce_banks_owned); 
 * cmci_discover_lock protects against parallel discovery attempts

 * which could race against each other.

 */

static DEFINE_RAW_SPINLOCK(cmci_discover_lock);

static DEFINE_SPINLOCK(cmci_discover_lock);



#define CMCI_THRESHOLD		1

#define CMCI_POLL_INTERVAL	(30 * HZ)
@@ -144,14 +144,14 @@ static void cmci_storm_disable_banks(void) 
	int bank;

	u64 val;



	raw_spin_lock_irqsave(&cmci_discover_lock, flags);

	spin_lock_irqsave(&cmci_discover_lock, flags);

	owned = __get_cpu_var(mce_banks_owned);

	for_each_set_bit(bank, owned, MAX_NR_BANKS) {

		rdmsrl(MSR_IA32_MCx_CTL2(bank), val);

		val &= ~MCI_CTL2_CMCI_EN;

		wrmsrl(MSR_IA32_MCx_CTL2(bank), val);

	}

	raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);

	spin_unlock_irqrestore(&cmci_discover_lock, flags);

}



static bool cmci_storm_detect(void)
@@ -211,7 +211,7 @@ static void cmci_discover(int banks) 
	int i;

	int bios_wrong_thresh = 0;



	raw_spin_lock_irqsave(&cmci_discover_lock, flags);

	spin_lock_irqsave(&cmci_discover_lock, flags);

	for (i = 0; i < banks; i++) {

		u64 val;

		int bios_zero_thresh = 0;
@@ -266,7 +266,7 @@ static void cmci_discover(int banks) 
			WARN_ON(!test_bit(i, __get_cpu_var(mce_poll_banks)));

		}

	}

	raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);

	spin_unlock_irqrestore(&cmci_discover_lock, flags);

	if (mca_cfg.bios_cmci_threshold && bios_wrong_thresh) {

		pr_info_once(

			"bios_cmci_threshold: Some banks do not have valid thresholds set\n");
@@ -316,10 +316,10 @@ void cmci_clear(void) 


	if (!cmci_supported(&banks))

		return;

	raw_spin_lock_irqsave(&cmci_discover_lock, flags);

	spin_lock_irqsave(&cmci_discover_lock, flags);

	for (i = 0; i < banks; i++)

		__cmci_disable_bank(i);

	raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);

	spin_unlock_irqrestore(&cmci_discover_lock, flags);

}



static void cmci_rediscover_work_func(void *arg)
@@ -360,9 +360,9 @@ void cmci_disable_bank(int bank) 
	if (!cmci_supported(&banks))

		return;



	raw_spin_lock_irqsave(&cmci_discover_lock, flags);

	spin_lock_irqsave(&cmci_discover_lock, flags);

	__cmci_disable_bank(bank);

	raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);

	spin_unlock_irqrestore(&cmci_discover_lock, flags);

}



static void intel_init_cmci(void)