LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Glauber Costa <gcosta@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, glommer@gmail.com, mingo@elte.hu,
	tglx@linutronix.de, Glauber Costa <gcosta@redhat.com>
Subject: [PATCH 19/52] change x86_64 smp_call_function_mask to look alike i386
Date: Mon,  3 Mar 2008 14:12:47 -0300	[thread overview]
Message-ID: <1204564400-17636-20-git-send-email-gcosta@redhat.com> (raw)
In-Reply-To: <1204564400-17636-19-git-send-email-gcosta@redhat.com>

the two versions (the inner version, and the outer version, that takes
the locks) of smp_call_function_mask are made into one. With the changes,
i386 and x86_64 versions look exactly the same.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
---
 arch/x86/kernel/smp_32.c |    2 +-
 arch/x86/kernel/smp_64.c |   57 +++++++++++++---------------------------------
 2 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c
index dc0cde9..e4a6b66 100644
--- a/arch/x86/kernel/smp_32.c
+++ b/arch/x86/kernel/smp_32.c
@@ -583,7 +583,7 @@ native_smp_call_function_mask(cpumask_t mask,
 		atomic_set(&data.finished, 0);
 
 	call_data = &data;
-	mb();
+	wmb();
 
 	/* Send a message to other CPUs */
 	if (cpus_equal(mask, allbutself))
diff --git a/arch/x86/kernel/smp_64.c b/arch/x86/kernel/smp_64.c
index aa2edb7..e4494e8 100644
--- a/arch/x86/kernel/smp_64.c
+++ b/arch/x86/kernel/smp_64.c
@@ -354,26 +354,30 @@ static void __smp_call_function(void (*func) (void *info), void *info,
 }
 
 
-/*
- * this function sends a 'generic call function' IPI to all other CPU
- * of the system defined in the mask.
- */
-static int __smp_call_function_mask(cpumask_t mask,
-				    void (*func)(void *), void *info,
-				    int wait)
+int native_smp_call_function_mask(cpumask_t mask,
+				  void (*func)(void *), void *info,
+				  int wait)
 {
 	struct call_data_struct data;
 	cpumask_t allbutself;
 	int cpus;
 
+	/* Can deadlock when called with interrupts disabled */
+	WARN_ON(irqs_disabled());
+
+	/* Holding any lock stops cpus from going down. */
+	spin_lock(&call_lock);
+
 	allbutself = cpu_online_map;
 	cpu_clear(smp_processor_id(), allbutself);
 
 	cpus_and(mask, mask, allbutself);
 	cpus = cpus_weight(mask);
 
-	if (!cpus)
+	if (!cpus) {
+		spin_unlock(&call_lock);
 		return 0;
+	}
 
 	data.func = func;
 	data.info = info;
@@ -395,43 +399,14 @@ static int __smp_call_function_mask(cpumask_t mask,
 	while (atomic_read(&data.started) != cpus)
 		cpu_relax();
 
-	if (!wait)
-		return 0;
+	if (wait)
+		 while (atomic_read(&data.finished) != cpus)
+			cpu_relax();
 
-	while (atomic_read(&data.finished) != cpus)
-		cpu_relax();
+	spin_unlock(&call_lock);
 
 	return 0;
 }
-/**
- * smp_call_function_mask(): Run a function on a set of other CPUs.
- * @mask: The set of cpus to run on.  Must not include the current cpu.
- * @func: The function to run. This must be fast and non-blocking.
- * @info: An arbitrary pointer to pass to the function.
- * @wait: If true, wait (atomically) until function has completed on other CPUs.
- *
- * Returns 0 on success, else a negative status code.
- *
- * If @wait is true, then returns once @func has returned; otherwise
- * it returns just before the target cpu calls @func.
- *
- * You must not call this function with disabled interrupts or from a
- * hardware interrupt handler or from a bottom half handler.
- */
-int native_smp_call_function_mask(cpumask_t mask,
-				  void (*func)(void *), void *info,
-				  int wait)
-{
-	int ret;
-
-	/* Can deadlock when called with interrupts disabled */
-	WARN_ON(irqs_disabled());
-
-	spin_lock(&call_lock);
-	ret = __smp_call_function_mask(mask, func, info, wait);
-	spin_unlock(&call_lock);
-	return ret;
-}
 
 static void stop_this_cpu(void *dummy)
 {
-- 
1.5.0.6


  reply	other threads:[~2008-03-03 17:20 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-03 17:12 [PATCH 0/52] First attempt at smp integration Glauber Costa
2008-03-03 17:12 ` [PATCH 01/52] commonize smp.h Glauber Costa
2008-03-03 17:12   ` [PATCH 02/52] merge extern function definitions Glauber Costa
2008-03-03 17:12     ` [PATCH 03/52] merge extern variables definitions Glauber Costa
2008-03-03 17:12       ` [PATCH 04/52] define smp_ops in common header Glauber Costa
2008-03-03 17:12         ` [PATCH 05/52] move smp_ops extern declaration to " Glauber Costa
2008-03-03 17:12           ` [PATCH 06/52] merge smp_send_reschedule Glauber Costa
2008-03-03 17:12             ` [PATCH 07/52] unify smp_call_function_mask Glauber Costa
2008-03-03 17:12               ` [PATCH 08/52] unify __cpu_up Glauber Costa
2008-03-03 17:12                 ` [PATCH 09/52] unify prepare_boot_cpu Glauber Costa
2008-03-03 17:12                   ` [PATCH 10/52] unify smp_prepare_cpus Glauber Costa
2008-03-03 17:12                     ` [PATCH 11/52] unify smp_cpus_done Glauber Costa
2008-03-03 17:12                       ` [PATCH 12/52] move disabled_cpus to common header Glauber Costa
2008-03-03 17:12                         ` [PATCH 13/52] use disabled_cpus in i386 Glauber Costa
2008-03-03 17:12                           ` [PATCH 14/52] move prefill_possible_map to common file Glauber Costa
2008-03-03 17:12                             ` [PATCH 15/52] remove export for smp_call_function_mask Glauber Costa
2008-03-03 17:12                               ` [PATCH 16/52] remove irqs disabled warning Glauber Costa
2008-03-03 17:12                                 ` [PATCH 17/52] create smpcommon.c Glauber Costa
2008-03-03 17:12                                   ` [PATCH 18/52] provide __smp_call_function Glauber Costa
2008-03-03 17:12                                     ` Glauber Costa [this message]
2008-03-03 17:12                                       ` [PATCH 20/52] provide hlt_works function Glauber Costa
2008-03-03 17:12                                         ` [PATCH 21/52] make stop_this_cpu looks exactly equal in both arches Glauber Costa
2008-03-03 17:12                                           ` [PATCH 22/52] add reboot_force test to native_smp_send_stop Glauber Costa
2008-03-03 17:12                                             ` [PATCH 23/52] unify smp_send_stop Glauber Costa
2008-03-03 17:12                                               ` [PATCH 24/52] create smp.c Glauber Costa
2008-03-03 17:12                                                 ` [PATCH 25/52] create ipi.c Glauber Costa
2008-03-03 17:12                                                   ` [PATCH 26/52] create tlb files Glauber Costa
2008-03-03 17:12                                                     ` [PATCH 27/52] get rid of smp_32.c and smp_64.c Glauber Costa
2008-03-03 17:12                                                       ` [PATCH 28/52] remove cpu_llc_id from processor.h Glauber Costa
2008-03-03 17:12                                                         ` [PATCH 29/52] adjust types in smpcommon_32.c Glauber Costa
2008-03-03 17:12                                                           ` [PATCH 30/52] move equal types to common file Glauber Costa
2008-03-03 17:12                                                             ` [PATCH 31/52] make set_cpu_sibling_map nonstatic Glauber Costa
2008-03-03 17:13                                                               ` [PATCH 32/52] make remove_siblinginfo non-static Glauber Costa
2008-03-03 17:13                                                                 ` [PATCH 33/52] move hotplug related extern definitions to smp.h Glauber Costa
2008-03-03 17:13                                                                   ` [PATCH 34/52] move sibling functions to common file Glauber Costa
2008-03-03 17:13                                                                     ` [PATCH 35/52] move cpu_coregroup_map " Glauber Costa
2008-03-03 17:13                                                                       ` [PATCH 36/52] remove vector_lock around cpu_online_map Glauber Costa
2008-03-03 17:13                                                                         ` [PATCH 37/52] use remove_from_maps in cpu_disable Glauber Costa
2008-03-03 17:13                                                                           ` [PATCH 38/52] do not clear cpu_online_map Glauber Costa
2008-03-03 17:13                                                                             ` [PATCH 39/52] merge __cpu_disable and cpu_die Glauber Costa
2008-03-03 17:13                                                                               ` [PATCH 40/52] make x86_64 accept the max_cpus parameter Glauber Costa
2008-03-03 17:13                                                                                 ` [PATCH 41/52] move trampoline arrays extern definition to smp.h Glauber Costa
2008-03-03 17:13                                                                                   ` [PATCH 42/52] adapt voyager's trampoline_base Glauber Costa
2008-03-03 17:13                                                                                     ` [PATCH 43/52] adapt voyager's setup_trampoline Glauber Costa
2008-03-03 17:13                                                                                       ` [PATCH 44/52] unify setup_trampoline Glauber Costa
2008-03-03 17:13                                                                                         ` [PATCH 45/52] use wait_for_init_deassert in x86_64 Glauber Costa
2008-03-03 17:13                                                                                           ` [PATCH 46/52] use cpu_relax instead of rep_nop Glauber Costa
2008-03-03 17:13                                                                                             ` [PATCH 47/52] leave irqs enabled while calibrating delay Glauber Costa
2008-03-03 17:13                                                                                               ` [PATCH 48/52] modify x86_64 smp_callin so it looks like i386 Glauber Costa
2008-03-03 17:13                                                                                                 ` [PATCH 49/52] wrap esr setting up in i386 in lapic_setup_esr Glauber Costa
2008-03-03 17:13                                                                                                   ` [PATCH 50/52] provide an end_local_APIC_setup function Glauber Costa
2008-03-03 17:13                                                                                                     ` [PATCH 51/52] make map_cpu_to_logical_apicid nonstatic Glauber Costa
2008-03-03 17:13                                                                                                       ` [PATCH 52/52] merge smp_callin Glauber Costa
2008-03-03 17:22 ` [PATCH 0/52] First attempt at smp integration Ingo Molnar
2008-03-03 17:35   ` Glauber Costa
2008-03-03 17:23 ` Andi Kleen
2008-03-03 17:38   ` Glauber Costa

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=1204564400-17636-20-git-send-email-gcosta@redhat.com \
    --to=gcosta@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=glommer@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    --subject='Re: [PATCH 19/52] change x86_64 smp_call_function_mask to look alike i386' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).