Changeset 235d31d in mainline for kernel/arch/ia32/src/smp/smp.c

Timestamp:

2014-12-22T17:47:40Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8c7d5ad

Parents:

eae91e0 (diff), 759ea0d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge the CHT pre-integration branch

This branch contains:

• the merge of lp:~adam-hraska+lp/helenos/rcu, which brings:

• a new preemptible kernel RCU variant called A-RCU,
• a preemptible variant of Podzimek's non-preemptible kernel RCU and
• a new variant of usersace RCU,
• a new concurrent hash table (CHT) implementation based on RCU,
• a deployment of CHT in kernel futex handling,
• a deployment of the userspace RCU in the implementation of upgradable futexes,

all described in Adam Hraska's master thesis named Read-Copy-Update
for HelenOS, defended in 2013 at MFF UK; furthemore, the branch
fixes two synchronization bugs in condvars and waitq, respectively:

• revid:adam.hraska+hos@gmail.com-20121116144921-3to9u1tn1sg07rg7
• revid:adam.hraska+hos@gmail.com-20121116173623-km7gwtqixwudpe66

• build fixes required to pass make check
• overhaul of ia64 and sparc64 trap handling, to allow exc_dispatch() to be used now when the kernel is more picky about CPU state accounting
• an important fix of the sparc64/sun4v preemptible trap handler
• various other fixes of issues discovered on non-x86 architectures

File:

• kernel/arch/ia32/src/smp/smp.c (modified) (3 diffs)

kernel/arch/ia32/src/smp/smp.c

@@ -55 +55 @@
 #include <memstr.h>
 #include <arch/drivers/i8259.h>
+#include <cpu.h>
 
 #ifdef CONFIG_SMP
@@ -77 +78 @@
                 io_apic = (uint32_t *) km_map((uintptr_t) io_apic, PAGE_SIZE,
                     PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        }
+}
+
+static void cpu_arch_id_init(void)
+{
+        ASSERT(ops != NULL);
+        ASSERT(cpus != NULL);
+        
+        for (unsigned int i = 0; i < config.cpu_count; ++i) {
+                cpus[i].arch.id = ops->cpu_apic_id(i);
         }
 }
@@ -92 +103 @@
         
         ASSERT(ops != NULL);
+
+        /*
+         * SMP initialized, cpus array allocated. Assign each CPU its 
+         * physical APIC ID.
+         */
+        cpu_arch_id_init();
         
         /*