axhal: refactor codes related to physical memory regions

jtzhpf · Aug 8, 2023 · 1e74d04 · 1e74d04
1 parent f50b696
commit 1e74d04
Show file tree

Hide file tree

Showing 45 changed files with 198 additions and 290 deletions.
diff --git a/apps/c/helloworld/expect_info.out b/apps/c/helloworld/expect_info.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/c/helloworld/expect_info_smp4.out b/apps/c/helloworld/expect_info_smp4.out
@@ -6,7 +6,7 @@ CPU 0 started
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/c/httpclient/expect_info.out b/apps/c/httpclient/expect_info.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/c/memtest/expect_trace.out b/apps/c/memtest/expect_trace.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/c/pthread/basic/expect_info_smp4_fifo.out b/apps/c/pthread/basic/expect_info_smp4_fifo.out
@@ -6,7 +6,7 @@ CPU 0 started
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/c/pthread/parallel/expect_info_smp4_fifo.out b/apps/c/pthread/parallel/expect_info_smp4_fifo.out
@@ -6,7 +6,7 @@ CPU 0 started
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/c/pthread/parallel/expect_info_smp4_rr.out b/apps/c/pthread/parallel/expect_info_smp4_rr.out
@@ -6,7 +6,7 @@ CPU 0 started
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)
@@ -58,4 +58,4 @@ part 14 finished
 part 15 finished
 actual sum = 61783189038
 (C)Pthread parallel run OK!
-Shutting down...
+Shutting down...
diff --git a/apps/c/pthread/pipe/expect_info_smp4_fifo.out b/apps/c/pthread/pipe/expect_info_smp4_fifo.out
@@ -6,7 +6,7 @@ CPU 0 started
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)
@@ -27,4 +27,4 @@ Child thread send message(5)
 Main thread recieve (4): I am child(4)!
 Main thread recieve (5): I am child(5)!
 (C)Pipe tests run OK
-Shutting down...
+Shutting down...
diff --git a/apps/c/pthread/sleep/expect_info_smp4_fifo.out b/apps/c/pthread/sleep/expect_info_smp4_fifo.out
@@ -6,7 +6,7 @@ CPU 0 started
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/c/sqlite3/expect_info.out b/apps/c/sqlite3/expect_info.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/c/sqlite3/expect_info_again.out b/apps/c/sqlite3/expect_info_again.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/c/sqlite3/expect_info_ramdisk.out b/apps/c/sqlite3/expect_info_ramdisk.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/exception/expect_debug_aarch64.out b/apps/exception/expect_debug_aarch64.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/exception/expect_debug_riscv64.out b/apps/exception/expect_debug_riscv64.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/exception/expect_debug_x86_64.out b/apps/exception/expect_debug_x86_64.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/helloworld/expect_info.out b/apps/helloworld/expect_info.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/helloworld/expect_info_smp4.out b/apps/helloworld/expect_info_smp4.out
@@ -6,7 +6,7 @@ CPU 0 started
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/memtest/expect_trace.out b/apps/memtest/expect_trace.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/net/httpclient/expect_info.out b/apps/net/httpclient/expect_info.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/net/httpclient/expect_info_dns.out b/apps/net/httpclient/expect_info_dns.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/task/parallel/expect_info_smp1_fifo.out b/apps/task/parallel/expect_info_smp1_fifo.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/task/parallel/expect_info_smp4_cfs.out b/apps/task/parallel/expect_info_smp4_cfs.out
@@ -6,7 +6,7 @@ CPU 0 started
 Found physcial memory regions:
 .text (READ | EXECUTE | RESERVED)
 .rodata (READ | RESERVED)
-.data (READ | WRITE | RESERVED)
+.data .tdata .tbss .percpu (READ | WRITE | RESERVED)
 .percpu (READ | WRITE | RESERVED)
 boot stack (READ | WRITE | RESERVED)
 .bss (READ | WRITE | RESERVED)

diff --git a/apps/task/parallel/expect_info_smp4_rr.out b/apps/task/parallel/expect_info_smp4_rr.out
@@ -6,7 +6,7 @@ CPU 0 started
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/task/priority/expect_info_smp1_cfs.out b/apps/task/priority/expect_info_smp1_cfs.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/task/priority/expect_info_smp1_fifo.out b/apps/task/priority/expect_info_smp1_fifo.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/task/priority/expect_info_smp1_rr.out b/apps/task/priority/expect_info_smp1_rr.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/task/priority/expect_info_smp4_cfs.out b/apps/task/priority/expect_info_smp4_cfs.out
@@ -12,7 +12,7 @@ Secondary CPU [0-9]\+ init OK.
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/task/sleep/expect_info_smp4_fifo.out b/apps/task/sleep/expect_info_smp4_fifo.out
@@ -6,7 +6,7 @@ CPU 0 started
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/task/sleep/expect_info_smp4_rr.out b/apps/task/sleep/expect_info_smp4_rr.out
@@ -6,7 +6,7 @@ CPU 0 started
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/task/yield/expect_debug_smp1_fifo.out b/apps/task/yield/expect_debug_smp1_fifo.out
@@ -6,7 +6,7 @@ Primary CPU 0 started,
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/task/yield/expect_info_smp4_fifo.out b/apps/task/yield/expect_info_smp4_fifo.out
@@ -6,7 +6,7 @@ CPU 0 started
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/apps/task/yield/expect_info_smp4_rr.out b/apps/task/yield/expect_info_smp4_rr.out
@@ -6,7 +6,7 @@ CPU 0 started
 Found physcial memory regions:
  .text (READ | EXECUTE | RESERVED)
  .rodata (READ | RESERVED)
- .data (READ | WRITE | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
  .percpu (READ | WRITE | RESERVED)
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)

diff --git a/crates/percpu/src/imp.rs b/crates/percpu/src/imp.rs
@@ -6,15 +6,15 @@ const fn align_up(val: usize) -> usize {
 #[cfg(not(target_os = "none"))]
 static PERCPU_AREA_BASE: spin::once::Once<usize> = spin::once::Once::new();
 
-/// Returns the per-CPU data area size for each CPUs.
+/// Returns the per-CPU data area size for one CPU.
 #[doc(cfg(not(feature = "sp-naive")))]
 pub fn percpu_area_size() -> usize {
     extern "C" {
-        fn __percpu_offset_start();
-        fn __percpu_offset_end();
+        fn _percpu_load_start();
+        fn _percpu_load_end();
     }
     use percpu_macros::percpu_symbol_offset;
-    percpu_symbol_offset!(__percpu_offset_end) - percpu_symbol_offset!(__percpu_offset_start)
+    percpu_symbol_offset!(_percpu_load_end) - percpu_symbol_offset!(_percpu_load_start)
 }
 
 /// Returns the base address of the per-CPU data area on the given CPU.
@@ -25,9 +25,9 @@ pub fn percpu_area_base(cpu_id: usize) -> usize {
     cfg_if::cfg_if! {
         if #[cfg(target_os = "none")] {
             extern "C" {
-                fn percpu_start();
+                fn _percpu_start();
             }
-            let base = percpu_start as usize;
+            let base = _percpu_start as usize;
         } else {
             let base = *PERCPU_AREA_BASE.get().unwrap();
         }

diff --git a/crates/percpu/test_percpu.x b/crates/percpu/test_percpu.x
@@ -2,17 +2,18 @@ CPU_NUM = 4;
 
 SECTIONS
 {
-    percpu_start = .;
-    .percpu 0x0 (NOLOAD) : AT(percpu_start) ALIGN(4K) {
-        __percpu_offset_start = .;
+    . = ALIGN(4K);
+    _percpu_start = .;
+    .percpu 0x0 (NOLOAD) : AT(_percpu_start) {
+        _percpu_load_start = .;
         *(.percpu .percpu.*)
-        __percpu_offset_end = .;
-        . = ALIGN(4K);
-        __percpu_size_aligned = .;
+        _percpu_load_end = .;
+        . = ALIGN(64);
+        _percpu_size_aligned = .;
 
-        . = __percpu_offset_start + __percpu_size_aligned * CPU_NUM;
+        . = _percpu_load_start + _percpu_size_aligned * CPU_NUM;
     }
-    . = percpu_start + SIZEOF(.percpu);
-    percpu_end = .;
+    . = _percpu_start + SIZEOF(.percpu);
+    _percpu_end = .;
 }
 INSERT BEFORE .bss;