fix the kallsyms errors

update musl config

Signed-off-by: Godones <chenlinfeng25@outlook.com>

Author: Godones

Cargo.lock

@@ -104,53 +104,55 @@ endef
 all:
 
 install:
-ifeq (, $(shell which $(TRACE_EXE)))
-	@cargo install --git https://github.com/os-module/elfinfo
-else
-	@echo "elfinfo has been installed"
-endif
-
+	@if ! command -v gen_ksym >/dev/null 2>&1; then \
+		echo "Installing gen_ksym..."; \
+		RUSTFLAGS= cargo install --git https://github.com/Starry-OS/ksym --features=demangle; \
+	else \
+		echo "gen_ksym already installed."; \
+	fi
 
-build:install  compile
+build: install compile
 
 compile:
 	RUSTFLAGS="$(RUSTFLAGS)" \
 		cargo build --release -p kernel \
 		--target $(TARGET) \
 		--features $(FEATURES)
-
-	@riscv64-linux-gnu-ld -T $(LINKER_SCRIPT) \
-		-o $(KERNEL_FILE) \
-		$(KERNEL_LIB)
-	
-	@nm -n -C ${KERNEL_FILE} | grep ' [Tt] ' | grep -v '\.L' | grep -v '$$x' \
-		| cargo run --manifest-path ../os-modules/ext_ebpf/ksym/Cargo.toml \
-		--bin gen_ksym_as --features="demangle" > subsystems/unwinder/src/kernel_symbol.S
 
-	@riscv64-linux-gnu-gcc \
-		-c subsystems/unwinder/src/kernel_symbol.S \
-		-o subsystems/unwinder/src/ksym.o
 	@riscv64-linux-gnu-ld -T $(LINKER_SCRIPT) \
 		-o $(KERNEL_FILE) \
-		$(KERNEL_LIB) \
-		subsystems/unwinder/src/ksym.o
+		$(KERNEL_LIB)
+	@echo "Generating kernel symbols at $@"
+	@nm -n -C $(KERNEL_FILE) | grep ' [Tt] ' | grep -v '\.L' | grep -v '$$x' | RUSTFLAGS= gen_ksym > kallsyms
+	@make copy_kallsyms
 
 	@#$(OBJCOPY) $(KERNEL_FILE) --strip-all -O binary $(KERNEL_BIN)
 	@cp $(KERNEL_FILE) ./kernel-qemu
 
+
+copy_kallsyms:
+	@-sudo umount $(FSMOUNT)
+	@-sudo rm -rf $(FSMOUNT)
+	@-mkdir $(FSMOUNT)
+	@sudo mount $(IMG) $(FSMOUNT)
+	@echo "copying kallsyms"
+	sudo cp kallsyms $(FSMOUNT)/kallsyms
+	@echo "copying kallsyms done"
+	@make unmount
+	@rm kallsyms
+
 initramfs:
 	make -C tools/initrd
 
 user:
 	@echo "Building user apps"
 	@make all -C ./user/apps
 	@make all -C ./user/c_apps ARCH=riscv64
-# 	@make all -C ./user/musl
+	@make all -C ./user/musl
 	@echo "Building user apps done"
 
 sdcard:$(FS) mount testelf user initramfs
-	@sudo umount $(FSMOUNT)
-	@rm -rf $(FSMOUNT)
+	@make unmount
 
 run:sdcard install compile
 	@echo qemu booot $(SMP)
@@ -209,15 +211,23 @@ jh7110:
 	@dtc -I dtb -o dts -o jh7110.dts ./tools/jh7110-visionfive-v2.dtb
 
 fat:
-	dd if=/dev/zero of=$(IMG) bs=1M count=72;
-	@mkfs.fat -F 32 $(IMG)
+# check the file if exist 
+	if [ ! -f $(IMG) ]; then \
+		echo "Creating $(IMG)"; \
+		dd if=/dev/zero of=$(IMG) bs=1M count=72; \
+		mkfs.fat -F 32 $(IMG); \
+	else \
+		echo "$(IMG) already exists."; \
+	fi
 
 ext:
-	@if [ `ls -l $(IMG) | awk '{print $$5}' ` -lt 2147483648 ]; then \
-		echo "resize img to 2G"; \
-		dd if=/dev/zero bs=1M count=2048 >> $(IMG); \
+	if [ ! -f $(IMG) ]; then \
+		echo "Creating $(IMG)"; \
+		dd if=/dev/zero of=$(IMG) bs=1M count=128; \
+		mkfs.ext4 $(IMG); \
+	else \
+		echo "$(IMG) already exists."; \
 	fi
-	@mkfs.ext4 $(IMG)
 
 mount:
 	@echo "Mounting $(IMG) to $(FSMOUNT)"
@@ -230,6 +240,11 @@ mount:
 	@sudo mkdir $(FSMOUNT)/folder
 	@sudo cp tools/f1.txt $(FSMOUNT)/folder
 
+unmount:
+	@echo "Unmounting $(FSMOUNT)"
+	@sudo umount $(FSMOUNT)
+	@-rm -rf $(FSMOUNT)
+
 img-hex:
 	@hexdump $(IMG) > test.hex
 	@cat test.hex

Makefile

@@ -26,15 +26,15 @@ gmanager = { path = "../subsystems/gmanager" }
 shim = { path = "../subsystems/shim", features = ["kernel"] }
 kprobe = { git = "https://github.com/Godones/ext_ebpf", rev = "9d09582" }
 bpf-basic = { git = "https://github.com/Godones/ext_ebpf", rev = "9d09582" }
-ksym = { git = "https://github.com/Godones/ext_ebpf", rev = "9d09582" }
+ksym = { git = "https://github.com/Godones/ext_ebpf" }
 rbpf = { git = "https://github.com/qmonnet/rbpf.git", default-features = false }
 
 
 riscv = "0.10"
 bit_field = "0.10"
 xmas-elf = "0.9"
 bitflags = "1.3"
-spin = "0"
+spin = "0.10"
 log = "0.4.21"
 vfscore = { git = "https://github.com/os-module/rvfs.git", features = [
     "linux_error",

kernel/Cargo.toml

@@ -130,7 +130,7 @@ impl FutexWaitManager {
     /// 唤醒 futex 上的至多 num 个等待的进程
     pub fn wake(&mut self, futex: usize, num: usize) -> AlienResult<usize> {
         if let Some(waiters) = self.map.get_mut(&futex) {
-            error!("there are {} waiters, wake {}", waiters.len(), num);
+            log::info!("there are {} waiters, wake {}", waiters.len(), num);
             let min_index = min(num, waiters.len());
             for i in 0..min_index {
                 let task = waiters[i].wake();