All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Peter Anvin <hpa@zytor.com>, xiao jin <jin.xiao@intel.com>,
	Joerg Roedel <jroedel@suse.de>, Borislav Petkov <bp@suse.de>,
	Yanmin Zhang <yanmin_zhang@linux.intel.com>
Subject: [patch 3/4] x86/irq: Use proper locking in check_irq_vectors_for_cpu_disable()
Date: Sun, 05 Jul 2015 17:12:33 -0000	[thread overview]
Message-ID: <20150705171102.236544164@linutronix.de> (raw)
In-Reply-To: 20150705170530.849428850@linutronix.de

[-- Attachment #1: x86-protect-irq-vector-check.patch --]
[-- Type: text/plain, Size: 1606 bytes --]

It's unsafe to examine fields in the irq descriptor w/o holding the
descriptor lock. Add proper locking.

While at it add a comment why the vector check can run lock less

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/x86/kernel/irq.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Index: tip/arch/x86/kernel/irq.c
===================================================================
--- tip.orig/arch/x86/kernel/irq.c
+++ tip/arch/x86/kernel/irq.c
@@ -347,14 +347,22 @@ int check_irq_vectors_for_cpu_disable(vo
 			if (!desc)
 				continue;
 
+			/*
+			 * Protect against concurrent action removal,
+			 * affinity changes etc.
+			 */
+			raw_spin_lock(&desc->lock);
 			data = irq_desc_get_irq_data(desc);
 			cpumask_copy(&affinity_new, data->affinity);
 			cpumask_clear_cpu(this_cpu, &affinity_new);
 
 			/* Do not count inactive or per-cpu irqs. */
-			if (!irq_has_action(irq) || irqd_is_per_cpu(data))
+			if (!irq_has_action(irq) || irqd_is_per_cpu(data)) {
+				raw_spin_unlock(&desc->lock);
 				continue;
+			}
 
+			raw_spin_unlock(&desc->lock);
 			/*
 			 * A single irq may be mapped to multiple
 			 * cpu's vector_irq[] (for example IOAPIC cluster
@@ -385,6 +393,9 @@ int check_irq_vectors_for_cpu_disable(vo
 		 * vector. If the vector is marked in the used vectors
 		 * bitmap or an irq is assigned to it, we don't count
 		 * it as available.
+		 *
+		 * As this is an inaccurate snapshot anyway, we can do
+		 * this w/o holding vector_lock.
 		 */
 		for (vector = FIRST_EXTERNAL_VECTOR;
 		     vector < first_system_vector; vector++) {



  parent reply	other threads:[~2015-07-05 17:12 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-05 17:12 [patch 0/4] x86/irq: Plug a couple of cpu hotplug races Thomas Gleixner
2015-07-05 17:12 ` [patch 1/4] hotplug: Prevent alloc/free of irq descriptors during cpu up/down Thomas Gleixner
2015-07-07  9:48   ` [tip:irq/urgent] hotplug: Prevent alloc/ free " tip-bot for Thomas Gleixner
2015-07-07 20:06   ` tip-bot for Thomas Gleixner
2015-07-08  9:37   ` tip-bot for Thomas Gleixner
2015-07-14 14:39   ` [patch 1/4] hotplug: Prevent alloc/free " Boris Ostrovsky
2015-07-14 14:39   ` Boris Ostrovsky
2015-07-14 15:44     ` Thomas Gleixner
2015-07-14 15:44     ` Thomas Gleixner
2015-07-14 16:03       ` Boris Ostrovsky
2015-07-14 16:03       ` Boris Ostrovsky
2015-07-14 17:32         ` Thomas Gleixner
2015-07-14 17:32         ` Thomas Gleixner
2015-07-14 20:04           ` Boris Ostrovsky
2015-07-14 20:04           ` [Xen-devel] " Boris Ostrovsky
2015-07-14 20:15             ` Thomas Gleixner
2015-07-14 20:15             ` [Xen-devel] " Thomas Gleixner
2015-07-14 21:07               ` Boris Ostrovsky
2016-03-12  9:19                 ` Thomas Gleixner
2016-03-14 13:12                   ` Boris Ostrovsky
2016-03-14 13:12                   ` Boris Ostrovsky
2016-03-12  9:19                 ` Thomas Gleixner
2015-07-14 21:07               ` Boris Ostrovsky
2015-07-05 17:12 ` [patch 2/4] x86: Plug irq vector hotplug race Thomas Gleixner
2015-07-07  9:57   ` [tip:x86/urgent] x86/irq: " tip-bot for Thomas Gleixner
2015-07-05 17:12 ` Thomas Gleixner [this message]
2015-07-07  9:57   ` [tip:x86/urgent] x86/irq: Use proper locking in check_irq_vectors_for_cpu_disable() tip-bot for Thomas Gleixner
2015-07-05 17:12 ` [patch 4/4] x86/irq: Retrieve irq data after locking irq_desc Thomas Gleixner
2015-07-07  9:58   ` [tip:x86/urgent] " tip-bot for Thomas Gleixner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150705171102.236544164@linutronix.de \
    --to=tglx@linutronix.de \
    --cc=bp@suse.de \
    --cc=hpa@zytor.com \
    --cc=jin.xiao@intel.com \
    --cc=jroedel@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=yanmin_zhang@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.