Changeset aeb6f25 in mainline for kernel/generic/src/sysinfo/sysinfo.c

Timestamp:

2010-04-26T20:09:02Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b4ad39f

Parents:

acda8f0

Message:

Do copy_to_uspace() when not holding the sysinfo spinlock. The opposit may
result in a situation when the spinlock is held for an excessive period of time
because copy_to_uspace() blocked on a memory management mutex.

File:

• kernel/generic/src/sysinfo/sysinfo.c (modified) (6 diffs)

kernel/generic/src/sysinfo/sysinfo.c

@@ -729 +729 @@
            binary data since we request a dry run */
         sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, true);
+
+        spinlock_unlock(&sysinfo_lock);
+        interrupts_restore(ipl);
+        
         int rc;
         
@@ -737 +741 @@
                 rc = EINVAL;
         
-        spinlock_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
-        
         return (unative_t) rc;
 }
@@ -770 +771 @@
            binary data since we request a dry run */
         sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, true);
+
+        spinlock_unlock(&sysinfo_lock);
+        interrupts_restore(ipl);
+        
         int rc;
         
@@ -779 +784 @@
                 rc = EINVAL;
         
-        spinlock_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
-        
         return (unative_t) rc;
 }
@@ -814 +816 @@
         /* Get the item */
         sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, false);
+
+        spinlock_unlock(&sysinfo_lock);
+        interrupts_restore(ipl);
+
         int rc;
         
@@ -831 +837 @@
                 free(ret.data.data);
         
-        spinlock_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
-        
         return (unative_t) rc;
 }