Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

* 'master' of ssh://sources.redhat.com/git/systemtap:
  Fix race condition in addr-map; simplify allocation logic
  Don't crash when reporting an error if getting alternatives fails.

4 files changed, 68 insertions, 48 deletions

diff --git a/ChangeLog b/ChangeLog
index 0683cce2..434a2e9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-30  Mark Wielaard  <mjw@redhat.com>
+
+	* tapsets.cxx (literal_stmt_for_local): Check if alternatives can be
+	provided after calling dwarf_formref_die.
+	(literal_stmt_for_return): Likewise.
+
 2008-09-26  Frank Ch. Eigler  <fche@elastic.org>
 
 	* elaborate.cxx (add_global_var_display): Implicitly sort arrays.
diff --git a/runtime/ChangeLog b/runtime/ChangeLog
index 6672dbb5..677b32ee 100644
--- a/runtime/ChangeLog
+++ b/runtime/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-30  Tim Moore  <timoore@redhat.com>
+
+	* addr-map.c (add_bad_addr_entry): Rewrite allocation of address
+	table to simplify locking and eliminate a race condition.
+
 2008-09-26  David Smith  <dsmith@redhat.com>
 
 	* task_finder.c (__STP_ATTACHED_TASK_EVENTS): Removed UTRACE_STOP,
diff --git a/runtime/addr-map.c b/runtime/addr-map.c
index 8231b57f..c215b744 100644
--- a/runtime/addr-map.c
+++ b/runtime/addr-map.c
@@ -113,64 +113,71 @@ add_bad_addr_entry(unsigned long min_addr, unsigned long max_addr,
   struct addr_map_entry* max_entry = 0;
   struct addr_map_entry* new_entry = 0;
   size_t existing = 0;
-  
+
+  /* Loop allocating memory for a new entry in the map. */
   while (1)
     {
-      size_t old_size;
+      size_t old_size = 0;
       spin_lock(&addr_map_lock);
       old_map = blackmap;
-      if (!blackmap)
-        {
-          existing = 0;
-          old_size = 0;
-        }
-      else
+      if (old_map)
+        old_size = old_map->size;
+      /* Either this is the first time through the loop, or we
+         allocated a map previous time, but someone has come in and
+         added an entry while we were sleeping. */
+      if (!new_map || (new_map && new_map->size < old_size + 1))
         {
-          min_entry = lookup_addr_aux(min_addr, blackmap);
-          max_entry = lookup_addr_aux(max_addr, blackmap);
-          if (min_entry || max_entry)
+          spin_unlock(&addr_map_lock);
+          if (new_map)
             {
-              if (existing_min)
-                *existing_min = min_entry;
-              if (existing_max)
-                *existing_max = max_entry;
-              spin_unlock(&addr_map_lock);
-              return 1;
+              kfree(new_map);
+              new_map = 0;
             }
-          existing = upper_bound(min_addr, old_map);
-          old_size = old_map->size;
-        }
-      spin_unlock(&addr_map_lock);
-      new_map = kmalloc(sizeof(*new_map)
-                       + sizeof(*new_entry) * (old_size + 1),
-                       GFP_KERNEL);
-      if (!new_map)
-        return -ENOMEM;
-      spin_lock(&addr_map_lock);
-      if (blackmap != old_map)
-        {
-          kfree(new_map);
-          spin_unlock(&addr_map_lock);
+          new_map = kmalloc(sizeof(*new_map)
+                            + sizeof(*new_entry) * (old_size + 1),
+                            GFP_KERNEL);
+          if (!new_map)
+            return -ENOMEM;
+          new_map->size = old_size + 1;
           continue;
         }
-      new_entry = &new_map->entries[existing];
-      new_entry->min = min_addr;
-      new_entry->max = max_addr;
-      if (old_map)
+    }
+  if (!blackmap)
+    {
+      existing = 0;
+    }
+  else
+    {
+      min_entry = lookup_addr_aux(min_addr, blackmap);
+      max_entry = lookup_addr_aux(max_addr, blackmap);
+      if (min_entry || max_entry)
         {
-          memcpy(&new_map->entries, old_map->entries,
-                 existing * sizeof(*new_entry));
-          if (old_map->size > existing)
-            memcpy(new_entry + 1, &old_map->entries[existing + 1],
-                   (old_map->size - existing) * sizeof(*new_entry));
+          if (existing_min)
+            *existing_min = min_entry;
+          if (existing_max)
+            *existing_max = max_entry;
+          spin_unlock(&addr_map_lock);
+          kfree(new_map);
+          return 1;
         }
-      new_map->size = blackmap->size + 1;
-      blackmap = new_map;
-      spin_unlock(&addr_map_lock);
-      if (old_map)
-        kfree(old_map);
-      return 0;
+      existing = upper_bound(min_addr, old_map);
+    }
+  new_entry = &new_map->entries[existing];
+  new_entry->min = min_addr;
+  new_entry->max = max_addr;
+  if (old_map)
+    {
+      memcpy(&new_map->entries, old_map->entries,
+             existing * sizeof(*new_entry));
+      if (old_map->size > existing)
+        memcpy(new_entry + 1, &old_map->entries[existing + 1],
+               (old_map->size - existing) * sizeof(*new_entry));
     }
+  blackmap = new_map;
+  spin_unlock(&addr_map_lock);
+  if (old_map)
+    kfree(old_map);
+  return 0;
 }
 
 void
diff --git a/tapsets.cxx b/tapsets.cxx
index b1475997..a5a62c7a 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -2241,7 +2241,8 @@ struct dwflpp
 	{ 
 	  die = dwarf_formref_die (&attr_mem, &vardie);
           stringstream alternatives;
-          print_members(die,alternatives); 
+          if (die != NULL)
+	    print_members(die,alternatives); 
 	  throw semantic_error("unable to find local '" + local + "'"
                                + " near pc " + lex_cast_hex<string>(pc)
                                + (alternatives.str() == "" ? "" : (" (alternatives:" + alternatives.str () + ")")));
@@ -2317,7 +2318,8 @@ struct dwflpp
 	{ 
 	  die = dwarf_formref_die (&attr_mem, vardie);
           stringstream alternatives;
-          print_members(die,alternatives); 
+          if (die != NULL)
+	    print_members(die,alternatives); 
 	  throw semantic_error("unable to find return value"
                                " near pc " + lex_cast_hex<string>(pc)
                                + (alternatives.str() == "" ? "" : (" (alternatives:" + alternatives.str () + ")")));