lkml.org 
[lkml]   [2008]   [Aug]   [1]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 2/2] Cell OProfile: SPU mutex lock fix, version 4
FromCarl Love <>
DateFri, 01 Aug 2008 13:01:19 -0700
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@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;
 }
 
  



\
 
 \ /
  Last update: 2008-08-01 22:05    [from the cache]
©2003-2008