[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1352042642-7306-9-git-send-email-jiang.liu@huawei.com>
Date: Sun, 4 Nov 2012 23:24:01 +0800
From: Jiang Liu <liuj97@...il.com>
To: "Rafael J . Wysocki" <rjw@...k.pl>,
Yinghai Lu <yinghai@...nel.org>,
Tony Luck <tony.luck@...el.com>,
Yasuaki Ishimatsu <isimatu.yasuaki@...fujitsu.com>,
Wen Congyang <wency@...fujitsu.com>,
Tang Chen <tangchen@...fujitsu.com>,
Taku Izumi <izumi.taku@...fujitsu.com>,
Bjorn Helgaas <bhelgaas@...gle.com>
Cc: Jiang Liu <jiang.liu@...wei.com>,
Kenji Kaneshige <kaneshige.kenji@...fujitsu.com>,
Huang Ying <ying.huang@...el.com>,
Bob Moore <robert.moore@...el.com>,
Len Brown <lenb@...nel.org>,
"Srivatsa S . Bhat" <srivatsa.bhat@...ux.vnet.ibm.com>,
Yijing Wang <wangyijing@...wei.com>,
Hanjun Guo <guohanjun@...wei.com>,
Jiang Liu <liuj97@...il.com>, linux-kernel@...r.kernel.org,
linux-acpi@...r.kernel.org, linux-pci@...r.kernel.org,
linux-mm@...ck.org
Subject: [ACPIHP PATCH part4 8/9] ACPI/processor: serialize call to acpi_map/unmap_lsapic
Function acpi_map_lsapic() is used to allocate CPU id for hot-added
CPUs and acpi_unmap_lsapic() is used to free CPU id for hot-removed
CPUs. But currently there's no mechanism to serialze the CPU id
allocation/free process, which may cause wrong CPU id assignment
when handling concurrent CPU online/offline operations. So introuce
a mutex to serialize CPU id allocation/free.
Signed-off-by: Jiang Liu <jiang.liu@...wei.com>
---
drivers/acpi/processor_driver.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 9a02210..6dbce2f 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -108,6 +108,7 @@ static struct acpi_driver acpi_processor_driver = {
.drv.pm = &acpi_processor_pm,
};
+static DEFINE_MUTEX(acpi_processor_mutex);
static DEFINE_PER_CPU(void *, processor_device_array);
DEFINE_PER_CPU(struct acpi_processor *, processors);
@@ -668,7 +669,9 @@ static void acpi_processor_reset(struct acpi_device *device, struct acpi_process
acpi_processor_unlink(device, pr);
put_online_cpus();
arch_unregister_cpu(pr->id);
+ mutex_lock(&acpi_processor_mutex);
acpi_unmap_lsapic(pr->id);
+ mutex_unlock(&acpi_processor_mutex);
pr->id = -1;
}
@@ -703,14 +706,18 @@ static int acpi_processor_pre_configure(struct acpi_device *device,
if (pr->apic_id == -1)
return result;
+ mutex_lock(&acpi_processor_mutex);
result = acpi_map_lsapic(device->handle, pr->apic_id, &pr->id);
+ mutex_unlock(&acpi_processor_mutex);
if (result)
return result;
BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
result = arch_register_cpu(pr->id, 1);
if (result) {
+ mutex_lock(&acpi_processor_mutex);
acpi_unmap_lsapic(pr->id);
+ mutex_unlock(&acpi_processor_mutex);
pr->id = -1;
return result;
}
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists