Attachment 153821 Details for Bug 236929 – PATCH 3 (revised): Fix cpu_hotplug_lock deadly embrace

[patch] PATCH 3 (revised): Fix cpu_hotplug_lock deadly embrace

linux-2.6.9-xen-hotplug-cleanup3.patch (text/plain), 2.97 KB, created by Chris Lalancette on 2007-04-30 20:09:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2007-04-30 20:09:22 UTC

Size: 2.97 KB

patch

obsolete

>--- linux-2.6.9/drivers/xen/xenbus/xenbus_xs.c.orig
>+++ linux-2.6.9/drivers/xen/xenbus/xenbus_xs.c
>@@ -695,7 +695,6 @@ void xs_resume(void)
> 	up_write(&xs_state.suspend_mutex);
> }
> 
>-#if 0
> static int xenwatch_handle_callback(void *data)
> {
> 	struct xs_stored_msg *msg = data;
>@@ -713,7 +712,6 @@ static int xenwatch_handle_callback(void
> 
> 	return 0;
> }
>-#endif
> 
> static int xenwatch_thread(void *unused)
> {
>@@ -737,12 +735,11 @@ static int xenwatch_thread(void *unused)
> 
> 		if (ent != &watch_events) {
> 			msg = list_entry(ent, struct xs_stored_msg, list);
>-			msg->u.watch.handle->callback(
>-				msg->u.watch.handle,
>-				(const char **)msg->u.watch.vec,
>-				msg->u.watch.vec_size);
>-			kfree(msg->u.watch.vec);
>-			kfree(msg);
>+			if (msg->u.watch.handle->flags & XBWF_new_thread)
>+				kthread_run(xenwatch_handle_callback,
>+					    msg, "xenwatch_cb");
>+			else
>+				xenwatch_handle_callback(msg);
> 		}
> 
> 		up(&xenwatch_mutex);
>--- linux-2.6.9/drivers/xen/core/cpu_hotplug.c.orig
>+++ linux-2.6.9/drivers/xen/core/cpu_hotplug.c
>@@ -86,24 +86,18 @@ static int setup_cpu_watcher(struct noti
> {
> 	int i;
> 
>-#ifdef rhel5
> 	static struct xenbus_watch cpu_watch = {
> 		.node = "cpu",
> 		.callback = handle_vcpu_hotplug_event,
> 		.flags = XBWF_new_thread };
>-#else /* rhel4 */
>-	static struct xenbus_watch cpu_watch = {
>-		.node = "cpu",
>-		.callback = handle_vcpu_hotplug_event};
>-#endif
>+
> 	(void)register_xenbus_watch(&cpu_watch);
>-//	if (!is_initial_xendomain()) {
>-//		for_each_possible_cpu(i)
>-		for_each_cpu(i)
>+	if (!is_initial_xendomain()) {
>+		for_each_possible_cpu(i)
> 			vcpu_hotplug(i);
> 		printk(KERN_INFO "Brought up %ld VCPUs\n",
> 		       (long)num_online_cpus());
>-//	}
>+	}
> 
> 	return NOTIFY_DONE;
> }
>@@ -145,8 +139,7 @@ int smp_suspend(void)
> 			if (err) {
> 				printk(KERN_CRIT "Failed to take all CPUs "
> 				       "down: %d.\n", err);
>-//				for_each_possible_cpu(i)
>-				for_each_cpu(i)
>+				for_each_possible_cpu(i)
> 					vcpu_hotplug(i);
> 				return err;
> 			}
>@@ -161,14 +154,12 @@ void smp_resume(void)
> {
> 	int cpu;
> 
>-//	for_each_possible_cpu(cpu)
>-	for_each_cpu(cpu)
>+	for_each_possible_cpu(cpu)
> 		cpu_initialize_context(cpu);
> 
> 	unlock_cpu_hotplug();
> 
>-//	for_each_possible_cpu(cpu)
>-	for_each_cpu(cpu)
>+	for_each_possible_cpu(cpu)
> 		vcpu_hotplug(cpu);
> }
> 
>--- linux-2.6.9/drivers/xen/core/smpboot.c.orig
>+++ linux-2.6.9/drivers/xen/core/smpboot.c
>@@ -278,8 +278,7 @@ void __init smp_prepare_cpus(unsigned in
> 		cpu_clear(cpu, cpu_possible_map);
> 	}
> 
>-//	for_each_possible_cpu (cpu) {
>-	for_each_cpu (cpu) {
>+	for_each_possible_cpu (cpu) {
> 		if (cpu == 0)
> 			continue;
> 
>--- linux-2.6.9/include/linux/cpumask.h.orig
>+++ linux-2.6.9/include/linux/cpumask.h
>@@ -371,6 +371,7 @@ extern cpumask_t cpu_present_map;
> })
> 
> #define for_each_cpu(cpu)	  for_each_cpu_mask((cpu), cpu_possible_map)
>+#define for_each_possible_cpu(cpu) for_each_cpu(cpu)
> #define for_each_online_cpu(cpu)  for_each_cpu_mask((cpu), cpu_online_map)
> #define for_each_present_cpu(cpu) for_each_cpu_mask((cpu), cpu_present_map)
>

Actions: View | Diff

Attachments on bug 236929: 153275 | 153276 | 153277 | 153278 | 153350 | 153821 | 153881 | 153962 | 153977