[PATCH 2/2] Cell OProfile: SPU mutex lock fix, version 4

Carl Love cel at us.ibm.com
Sat Aug 2 06:01:19 EST 2008


If an error occurs on opcontrol start, the event and per cpu buffers 
are released.  If later opcontrol shutdown is called then the free
function will be called again to free buffers that no longer 
exist.  This results in a kernel oops.  The following changes
prevent the call to delete buffers that don't exist.

Signed-off-by: Carl Love <carll at us.ibm.com>

Index: Cell_kernel_6_26_2008/drivers/oprofile/cpu_buffer.c
===================================================================
--- Cell_kernel_6_26_2008.orig/drivers/oprofile/cpu_buffer.c
+++ Cell_kernel_6_26_2008/drivers/oprofile/cpu_buffer.c
@@ -38,8 +38,12 @@ void free_cpu_buffers(void)
 {
 	int i;
 
-	for_each_online_cpu(i)
-		vfree(per_cpu(cpu_buffer, i).buffer);
+	for_each_online_cpu(i) {
+		if (per_cpu(cpu_buffer, i).buffer) {
+			vfree(per_cpu(cpu_buffer, i).buffer);
+			per_cpu(cpu_buffer, i).buffer = NULL;
+		}
+	}
 }
 
 unsigned long oprofile_get_cpu_buffer_size(void)
Index: Cell_kernel_6_26_2008/drivers/oprofile/event_buffer.c
===================================================================
--- Cell_kernel_6_26_2008.orig/drivers/oprofile/event_buffer.c
+++ Cell_kernel_6_26_2008/drivers/oprofile/event_buffer.c
@@ -92,7 +92,10 @@ out:
 
 void free_event_buffer(void)
 {
-	vfree(event_buffer);
+	if (event_buffer)
+		vfree(event_buffer);
+
+	event_buffer = NULL;
 }
 
  





More information about the Linuxppc-dev mailing list