feat: add basic loongarch64 support #126

Godones · 2023-09-18T12:36:27Z

Refactor the repo code to merge
Use standard toolchain
Fix the compile command

I will submit other code about interrupt soon.

- Refactor the [repo](https://github.com/aoooos/arceos) code to merge - Use standard toolchain - Fix the compile command

Cargo.lock

crates/loongarch64/Cargo.toml

1. Use r21 register to record percpu variable address 2. Add page table description, although la64 does not use page table for the time being. 3. Modify the kernel page table remap part in runtime. la64 does not require remapping.

This commit includes multiple changes aimed at ensuring all apps/task and fs can be supported properly. These edits affect various files within the 'axhal' module and its subdirectories, as well as specific system configuration aspects outlined in the 'loongarch64-qemu-virt.toml' file. fix bugs about percpu, use r21 register; fix bugs about timer interrupt; Simplify saving and restoring trap context;

Since loongarch64 does not seem to have the musl tool chain, here we use the gnu tool chain. 1. add pointer type definition 2. add float definition 3. add setjmp/longjmp

Godones · 2023-09-29T12:44:33Z

@hky1999 Support for la64 is now complete. Except for the two applications redis and sqlite, which were not tested, other apps have passed. If you have time, please check to see if there are any areas for improvement.

equation314

Thanks for your contribution! Are you still available? Let’s work on merging this PR.

crates/kernel_guard/src/arch/loongarch64.rs

crates/kernel_guard/src/arch/mod.rs

crates/percpu/src/imp.rs

equation314 · 2023-12-06T13:34:11Z

tools/la64/la-qemu.sh

Could it run on the mainline qemu? So we can remove this script.

Maybe it can be run on the mainline qemu, but according to existing attempts qemu-system-loongarch64 v7.1 不能正确启动kernel, it is difficult to compile a complete tool chain, so most projects currently use a specific version.

What about qemu 8.1.3?

The main problem is that these versions of qemu require appropriate uefi support. I have not yet tried to compile the latest tool chain. Maybe we can remove the dependency on uefi later, so that there will be no restrictions on the qemu version.

crates/page_table_entry/src/arch/loongarch64.rs

equation314 · 2023-12-06T13:53:25Z

crates/page_table_entry/src/arch/loongarch64.rs

+    fn is_present(&self) -> bool {
+        PTEFlags::from_bits_truncate(self.0 as usize).contains(PTEFlags::V)
+    }
+    fn is_huge(&self) -> bool {


Any reasons for not supporting huge pages?

crates/percpu/src/imp.rs

modules/axhal/Cargo.toml

Godones · 2023-12-07T07:37:40Z

Thanks for your contribution! Are you still available? Let’s work on merging this PR.

I will fix these errors.

crates/percpu/src/imp.rs

rename loongArch64 to loongarch64

Remove unnecessary firmware programs and add help documentation.

Godones · 2023-12-15T04:32:37Z

@equation314 Do you have time to check and see if there are any other problems?

equation314 · 2023-12-18T08:25:04Z

Thanks! Please fix conflicts and CI.

crates/page_table_entry/src/arch/loongarch64.rs

equation314 · 2023-12-18T08:41:46Z

crates/percpu/src/imp.rs

@@ -108,6 +110,8 @@ pub fn set_local_thread_pointer(cpu_id: usize) {
                core::arch::asm!("mv gp, {}", in(reg) tp)
            } else if #[cfg(target_arch = "aarch64")] {
                core::arch::asm!("msr TPIDR_EL1, {}", in(reg) tp)
+            }else if #[cfg(target_arch = "loongarch64")] {


Godones · 2023-12-18T13:50:02Z

Thanks! Please fix conflicts and CI.

@equation314 This CI error may be due to a rust version issue. I'm not very familiar with CI, but it seems that the latest version of rust is used in CI.

hky1999 · 2023-12-25T16:32:49Z

Thanks! Please fix conflicts and CI.

@equation314 This CI error may be due to a rust version issue. I'm not very familiar with CI, but it seems that the latest version of rust is used in CI.

Hello, CI should fit the latest version of Rust, currently I believe it should be rust version 1.77.0-nightly (bf8716f1c 2023-12-24).

Some warnings like this should be fixed.

warning: `axhal` (lib) generated 1 warning
warning: the feature `ip_in_core` has been stable since 1.77.0-nightly and no longer requires an attribute to enable
 --> api/arceos_api/src/lib.rs:6:12
  |
6 | #![feature(ip_in_core)]
  |            ^^^^^^^^^^
  |
  = note: `#[warn(stable_features)]` on by default

I try to build this branch tonight.

BIOS loongarch_bios_0310.bin is downloaded from https://github.com/foxsen/qemu-loongarch-runenv/blob/main/loongarch_bios_0310.bin and put it under tools/la64.
maybe this should be added into .gitignore or some corresponding scripts should be added ?
QEMU version :

➜  arceos git:(la64) ✗ qemu-system-loongarch64 --version                                                     
QEMU emulator version 8.1.94
Copyright (c) 2003-2023 Fabrice Bellard and the QEMU Project developers

The command is make A=apps/helloworld ARCH=loongarch64 run.
But I just get no output:

➜  arceos git:(la64) ✗ make A=apps/helloworld ARCH=loongarch64 run
    Building App: helloworld, Arch: loongarch64, Platform: loongarch64-qemu-virt, App type: rust
cargo build --target loongarch64-unknown-none --target-dir /home/hky/workspace/rcore-os/arceos/target --release  -Z build-std --manifest-path apps/helloworld/Cargo.toml --features "axstd/log-level-warn axstd/bus-pci"
warning: value assigned to `flags` is never read
  --> crates/kernel_guard/src/arch/loongarch64.rs:17:53
   |
17 |     unsafe { asm!("csrxchg {}, {}, 0x0", inout(reg) flags, in(reg) IE_BIT) };
   |                                                     ^^^^^
   |
   = help: maybe it is overwritten before being read?
   = note: `#[warn(unused_assignments)]` on by default

warning: `kernel_guard` (lib) generated 1 warning
warning: the feature `const_maybe_uninit_zeroed` has been stable since 1.75.0 and no longer requires an attribute to enable
  --> modules/axhal/src/lib.rs:30:12
   |
30 | #![feature(const_maybe_uninit_zeroed)]
   |            ^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `#[warn(stable_features)]` on by default

warning: `axhal` (lib) generated 1 warning
warning: the feature `ip_in_core` has been stable since 1.77.0-nightly and no longer requires an attribute to enable
 --> api/arceos_api/src/lib.rs:6:12
  |
6 | #![feature(ip_in_core)]
  |            ^^^^^^^^^^
  |
  = note: `#[warn(stable_features)]` on by default

warning: `arceos_api` (lib) generated 1 warning
warning: the feature `ip_in_core` has been stable since 1.77.0-nightly and no longer requires an attribute to enable
  --> ulib/axstd/src/lib.rs:52:12
   |
52 | #![feature(ip_in_core)]
   |            ^^^^^^^^^^
   |
   = note: `#[warn(stable_features)]` on by default

warning: `axstd` (lib) generated 1 warning
    Finished release [optimized] target(s) in 0.11s
rust-objcopy --binary-architecture=loongarch64 apps/helloworld/helloworld_loongarch64-qemu-virt.elf --strip-all -O binary apps/helloworld/helloworld_loongarch64-qemu-virt.bin
    Running on qemu...
qemu-system-loongarch64 -m 1G -smp 1 -bios tools/la64/loongarch_bios_0310.bin -kernel apps/helloworld/helloworld_loongarch64-qemu-virt.elf -nographic -vga none

Could you offer some help or advice with it? Thanks a lot! @Godones

Godones · 2023-12-26T05:25:23Z

Thanks! Please fix conflicts and CI.

@equation314 This CI error may be due to a rust version issue. I'm not very familiar with CI, but it seems that the latest version of rust is used in CI.

Hello, CI should fit the latest version of Rust, currently I believe it should be rust version 1.77.0-nightly (bf8716f1c 2023-12-24).

Some warnings like this should be fixed.

warning: `axhal` (lib) generated 1 warning
warning: the feature `ip_in_core` has been stable since 1.77.0-nightly and no longer requires an attribute to enable
 --> api/arceos_api/src/lib.rs:6:12
  |
6 | #![feature(ip_in_core)]
  |            ^^^^^^^^^^
  |
  = note: `#[warn(stable_features)]` on by default

I try to build this branch tonight.

BIOS loongarch_bios_0310.bin is downloaded from https://github.com/foxsen/qemu-loongarch-runenv/blob/main/loongarch_bios_0310.bin and put it under tools/la64.
maybe this should be added into .gitignore or some corresponding scripts should be added ?
QEMU version :

➜  arceos git:(la64) ✗ qemu-system-loongarch64 --version                                                     
QEMU emulator version 8.1.94
Copyright (c) 2003-2023 Fabrice Bellard and the QEMU Project developers

The command is make A=apps/helloworld ARCH=loongarch64 run.
But I just get no output:

➜  arceos git:(la64) ✗ make A=apps/helloworld ARCH=loongarch64 run
    Building App: helloworld, Arch: loongarch64, Platform: loongarch64-qemu-virt, App type: rust
cargo build --target loongarch64-unknown-none --target-dir /home/hky/workspace/rcore-os/arceos/target --release  -Z build-std --manifest-path apps/helloworld/Cargo.toml --features "axstd/log-level-warn axstd/bus-pci"
warning: value assigned to `flags` is never read
  --> crates/kernel_guard/src/arch/loongarch64.rs:17:53
   |
17 |     unsafe { asm!("csrxchg {}, {}, 0x0", inout(reg) flags, in(reg) IE_BIT) };
   |                                                     ^^^^^
   |
   = help: maybe it is overwritten before being read?
   = note: `#[warn(unused_assignments)]` on by default

warning: `kernel_guard` (lib) generated 1 warning
warning: the feature `const_maybe_uninit_zeroed` has been stable since 1.75.0 and no longer requires an attribute to enable
  --> modules/axhal/src/lib.rs:30:12
   |
30 | #![feature(const_maybe_uninit_zeroed)]
   |            ^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `#[warn(stable_features)]` on by default

warning: `axhal` (lib) generated 1 warning
warning: the feature `ip_in_core` has been stable since 1.77.0-nightly and no longer requires an attribute to enable
 --> api/arceos_api/src/lib.rs:6:12
  |
6 | #![feature(ip_in_core)]
  |            ^^^^^^^^^^
  |
  = note: `#[warn(stable_features)]` on by default

warning: `arceos_api` (lib) generated 1 warning
warning: the feature `ip_in_core` has been stable since 1.77.0-nightly and no longer requires an attribute to enable
  --> ulib/axstd/src/lib.rs:52:12
   |
52 | #![feature(ip_in_core)]
   |            ^^^^^^^^^^
   |
   = note: `#[warn(stable_features)]` on by default

warning: `axstd` (lib) generated 1 warning
    Finished release [optimized] target(s) in 0.11s
rust-objcopy --binary-architecture=loongarch64 apps/helloworld/helloworld_loongarch64-qemu-virt.elf --strip-all -O binary apps/helloworld/helloworld_loongarch64-qemu-virt.bin
    Running on qemu...
qemu-system-loongarch64 -m 1G -smp 1 -bios tools/la64/loongarch_bios_0310.bin -kernel apps/helloworld/helloworld_loongarch64-qemu-virt.elf -nographic -vga none

Could you offer some help or advice with it? Thanks a lot! @Godones

The Qemu version should be:

❯ qemu-system-loongarch64 --version
QEMU emulator version 6.2.50 (v6.0.0-7567-gac069a8ffb)
Copyright (c) 2003-2022 Fabrice Bellard and the QEMU Project developers

You can complie it according to tools/la64/la-qemu.sh or https://github.com/foxsen/qemu-loongarch-runenv/

hky1999 · 2023-12-26T06:19:23Z

scripts/make/qemu.mk

@@ -24,7 +24,17 @@ qemu_args-aarch64 := \
  -machine virt \
  -kernel $(OUT_BIN)

+LOONGARCH_BIOS = tools/la64/loongarch_bios_0310.bin
+qemu_args-loongarch64 := \
+  -bios $(LOONGARCH_BIOS) \


It seems that it can be boot upon default bios provided by QEMU 8.1.94,
I'll try to verify other applications later, why not just delete this line?

There should be no bios here.

The first instruction is not located in the BIOS.

The latest version of la qemu seems to have changed the memory layout, which is causing some loading errors. Also, We need to use the environment prepared by the BIOS for us, such as multi-core startup.

I see, I tried both SMP=2 and SMP=4 and they got stucked at different place.
Sorry I haven't try your provided QEMU emulator, I appreciate and admire your excellent work.
But @equation314 suggested that code should run on mainstream QEMU version (by the way I personally do not recommend that the system itself should rely a special BIOS version as loongaarch currently provides), maybe we should have a little discussion about it?

Is it possible to use mainline QEMU with the specific BIOS?

I will try it.

Now, we can use the mainline QEMU for la64.
I discussed the issue of mainline qemu with some teachers at loongarch. They said that mainline qemu cannot currently boot the ELF format kernel. because our kernel is not as complex as Linux, we do not need the information passed by the bios, so here I chose to remove the BIOS dependency and start the kernel directly.

I tested it on qemu-8.2.0. The latest rust tool chain seems to cause several programs under apps/c/pthread to fail.

Could you provide a list of the current support status of apps?

These apps have not been tested: apps/c/iperf|redis|sqlite3. Other apps have been tested.

Rewrite boot code. Add pci address space definition Fix word errors for platforms/*.toml

equation314 · 2023-12-27T13:37:16Z

modules/axhal/src/platform/qemu_virt_loongarch64/misc.rs

@@ -0,0 +1,9 @@
+/// Shutdown the whole system, including all CPUs.
+pub fn terminate() -> ! {


Is there any instruction to exit QEMU? This is necessary for CI.

I didn't find relevant information on the Internet. Maybe I can ask the engineers at la.

Mainline qemu does not have an exit function. Is it possible to use other means to exit qemu from the outside?

equation314 · 2023-12-27T13:38:25Z

tools/la64/README.md

This doc needs to be updated.

equation314 · 2023-12-27T13:39:30Z

tools/la64/la-qemu.sh

This script is no longer in use.

Godones added 2 commits September 18, 2023 19:53

feat: add basic loongarch64 support

34de609

- Refactor the [repo](https://github.com/aoooos/arceos) code to merge - Use standard toolchain - Fix the compile command

fix: fix the CI error about loongarch64 crate

fabae91

hky1999 reviewed Sep 22, 2023

View reviewed changes

Cargo.lock Outdated Show resolved Hide resolved

hky1999 reviewed Sep 22, 2023

View reviewed changes

crates/loongarch64/Cargo.toml Outdated Show resolved Hide resolved

Godones added 8 commits September 22, 2023 23:54

refactor: use loongarch64 crate

7aa5260

refactor: Remove most useless code

42fdc45

feat: pass apps/exception

ad413d0

feat: Support yield application

a2b1f30

1. Use r21 register to record percpu variable address 2. Add page table description, although la64 does not use page table for the time being. 3. Modify the kernel page table remap part in runtime. la64 does not require remapping.

Restore cargo.lock

3606df6

feat: Add basic C App support for la64

e83ec55

Since loongarch64 does not seem to have the musl tool chain, here we use the gnu tool chain. 1. add pointer type definition 2. add float definition 3. add setjmp/longjmp

feat: support net/display app

a1fa046

equation314 requested changes Dec 6, 2023

View reviewed changes

fix: fix some formatting errors

f20bf83

equation314 reviewed Dec 9, 2023

View reviewed changes

crates/percpu/src/imp.rs Show resolved Hide resolved

Godones added 3 commits December 9, 2023 23:46

fix: update page table impl

754b950

rename loongArch64 to loongarch64

Restore cargo.lock on the main branch

2d41808

doc: add doc for la64

b7c3360

Remove unnecessary firmware programs and add help documentation.

equation314 reviewed Dec 18, 2023

View reviewed changes

crates/page_table_entry/src/arch/loongarch64.rs Outdated Show resolved Hide resolved

equation314 reviewed Dec 18, 2023

View reviewed changes

fix: fix the condition judgment error

ccd44e1

doc: add documentation

b2c67b7

hky1999 reviewed Dec 26, 2023

View reviewed changes

Godones added 2 commits December 27, 2023 21:15

feat: remove the bios dep for loongarch64-qemu-virt

38f0e86

Rewrite boot code. Add pci address space definition Fix word errors for platforms/*.toml

remove dead code

e81c425

equation314 reviewed Dec 27, 2023

View reviewed changes

tools/la64/README.md Outdated

Copy link

Member

equation314 Dec 27, 2023 •

edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doc needs to be updated.

equation314 reviewed Dec 27, 2023

View reviewed changes

tools/la64/la-qemu.sh Outdated

Copy link

Member

equation314 Dec 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This script is no longer in use.

update doc

2d32006

equation314 mentioned this pull request Dec 28, 2023

feat: add support for LoongArch64-2K500 and 2K1000 development boards #136

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add basic loongarch64 support #126

feat: add basic loongarch64 support #126

Godones commented Sep 18, 2023

Godones commented Sep 29, 2023

equation314 left a comment

equation314 Dec 6, 2023

Godones Dec 9, 2023

equation314 Dec 9, 2023

Godones Dec 9, 2023

equation314 Dec 6, 2023

Godones commented Dec 7, 2023

Godones commented Dec 15, 2023

equation314 commented Dec 18, 2023

equation314 Dec 18, 2023

Godones commented Dec 18, 2023

hky1999 commented Dec 25, 2023 •

edited

Godones commented Dec 26, 2023

hky1999 Dec 26, 2023

Godones Dec 26, 2023

Godones Dec 26, 2023

hky1999 Dec 26, 2023

equation314 Dec 26, 2023

Godones Dec 27, 2023

Godones Dec 27, 2023

Godones Dec 27, 2023

equation314 Dec 27, 2023 •

edited

Godones Dec 27, 2023

equation314 Dec 27, 2023

Godones Dec 27, 2023

Godones Dec 28, 2023

equation314 Dec 27, 2023 •

edited

equation314 Dec 27, 2023

		@@ -0,0 +1,9 @@
		/// Shutdown the whole system, including all CPUs.
		pub fn terminate() -> ! {

feat: add basic loongarch64 support #126

Are you sure you want to change the base?

feat: add basic loongarch64 support #126

Conversation

Godones commented Sep 18, 2023

Godones commented Sep 29, 2023

equation314 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Godones commented Dec 7, 2023

Godones commented Dec 15, 2023

equation314 commented Dec 18, 2023

Choose a reason for hiding this comment

Godones commented Dec 18, 2023

hky1999 commented Dec 25, 2023 • edited

Godones commented Dec 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

equation314 Dec 27, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

equation314 Dec 27, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hky1999 commented Dec 25, 2023 •

edited

equation314 Dec 27, 2023 •

edited

equation314 Dec 27, 2023 •

edited