Changeset 824

Timestamp:

08/06/08 14:35:32 (4 years ago)

Author:

mwhitworth

Message:

Fix locking in module loading.

Files:

• Whitix/trunk/kernel/module.c (modified) (8 diffs)

Whitix/trunk/kernel/module.c

@@ -121 +121 @@
 #endif
 
+SYMBOL_EXPORT(ModuleSymbolPrint);
+
 DWORD ModuleResolveKernel(char* name)
 {
@@ -136 +138 @@
         struct Module* curr;
 
+        PreemptDisable();
+
         /* Look through the kernel symbol table of different modules. */
         ListForEachEntry(curr, &moduleList, next)
@@ -148 +152 @@
                 {
                         if (!strcmp(currSym->name, name))
+                        {
+                                PreemptEnable();
                                 return currSym->addr;
+                        }
 
                         currSym++;
@@ -155 +162 @@
         }
 
-        KePrint("Could not resolve %s\n", name);
+        PreemptEnable();
 
         return 0;
@@ -198 +205 @@
                                         break;
 
-                                KePrint("Could not resolve %s\n", symName);
+                                KePrint(KERN_ERROR "Could not resolve %s\n", symName);
+
                                 return -ENOENT;
 
@@ -373 +381 @@
         module->keSymTab=ModuleSectionFind(module, (char*)file+sectionHeaders[elfHeader->strTabSectionIndex].shOffset, ".symtable", elfHeader->shEntries, &module->keSymTabSize);
 
-        ListAdd(&module->next, &moduleList);
+        PreemptDisable();
+        ListAddTail(&module->next, &moduleList);
+        PreemptEnable();
 
         return ret;
@@ -411 +421 @@
                 strcat(buf, ".sys");
 
-                KePrint("length = %#X: ", *length);
-
                 if (ModuleAdd(data, kData, *length, 0))
                         KernelPanic("Could not initialize the kernel");
 
-                KePrint("MODULES: Loaded %s, %dkb\n", buf, (*length)/1024);
+                KePrint(KERN_INFO "MODULES: Loaded %s, %dkb\n", buf, (*length)/1024);
 
                 names+=strlen(names)+1;
@@ -434 +442 @@
         int ret;
 
-        SpinLock(&moduleListLock);
-
         /* Check data is ok to access. */
         kData=(void*)VirtMapPhysRange(MODULE_START, MODULE_END, PAGE_ALIGN_UP(length) >> PAGE_SHIFT, 3);
 
         ret=ModuleAdd(data, kData, length, 0);
-        SpinUnlock(&moduleListLock);
 
         return ret;