Chapter 5

Author: rcy17

.github/workflows/github-autotest.yml

@@ -1,6 +1,6 @@
 name: auto-test
 
-on: 
+on:
   push:
 
 jobs:
@@ -12,11 +12,11 @@ jobs:
         image: duskmoon/dev-env:ucore-ci
     steps:
       - uses: actions/checkout@v3
-      - run: git clone https://github.com/LearningOS/uCore-Tutorial-Checker-2023S.git ucore-tutorial-ci 
+      - run: git clone https://github.com/LearningOS/uCore-Tutorial-Checker-2023S.git ucore-tutorial-ci
       - run: git clone https://github.com/LearningOS/uCore-Tutorial-Test-2023S.git ucore-tutorial-ci/workplace/user
       - name: run test
         id: tester
-        run: cd ucore-tutorial-ci && make test passwd=${{ secrets.BASE_TEST_TOKEN }} CHAPTER=`echo ${GITHUB_REF##*/} | grep -oP 'ch\K[0-9]'` | tee ../output.txt
+        run: cd ucore-tutorial-ci && make test passwd=${{ secrets.BASE_TEST_TOKEN }} CHAPTER=`echo ${GITHUB_REF##*/} | grep -oP 'ch\K[0-9]'` > ../output.txt && cat ../output.txt
       - name: end
         id: end
         run: cat output.txt | grep "Test passed" | grep -oP "\d{1,}/\d{1,}" | xargs -i echo "points={}" >> $GITHUB_OUTPUT

Makefile

@@ -1,5 +1,5 @@
-.PHONY: clean build user
-all: build_kernel
+.PHONY: clean build user run debug test .FORCE
+all: build
 
 K = os
 
@@ -57,6 +57,9 @@ ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]nopie'),)
 CFLAGS += -fno-pie -nopie
 endif
 
+# empty target
+.FORCE:
+
 LDFLAGS = -z max-page-size=4096
 
 $(AS_OBJS): $(BUILDDIR)/$K/%.o : $K/%.S
@@ -73,10 +76,12 @@ $(HEADER_DEP): $(BUILDDIR)/$K/%.d : $K/%.c
         sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
         rm -f $@.$$$$
 
+INIT_PROC ?= usershell
+
 os/link_app.o: $K/link_app.S
-os/link_app.S: scripts/pack.py
-	@$(PY) scripts/pack.py
-os/kernel_app.ld: scripts/kernelld.py
+os/link_app.S: scripts/pack.py .FORCE
+	@$(PY) scripts/pack.py $(INIT_PROC)
+os/kernel_app.ld: scripts/kernelld.py .FORCE
 	@$(PY) scripts/kernelld.py
 
 build: build/kernel
@@ -89,7 +94,6 @@ build/kernel: $(OBJS) os/kernel_app.ld
 
 clean:
 	rm -rf $(BUILDDIR) os/kernel_app.ld os/link_app.S
-	make -C user clean
 
 # BOARD
 BOARD		?= qemu
@@ -118,8 +122,6 @@ debug: build/kernel .gdbinit
 
 CHAPTER ?= $(shell git rev-parse --abbrev-ref HEAD | grep -oP 'ch\K[0-9]')
 
-BASE ?= 0
-
 user:
 	make -C user CHAPTER=$(CHAPTER) BASE=$(BASE)
 

os/console.c

@@ -9,4 +9,9 @@ void consputc(int c)
 void console_init()
 {
 	// DO NOTHING
+}
+
+int consgetc()
+{
+	return console_getchar();
 }

os/console.h

@@ -2,6 +2,7 @@
 #define CONSOLE_H
 
 void consputc(int);
+int consgetc();
 void console_init();
 
 #endif // CONSOLE_H

os/const.h

@@ -31,6 +31,8 @@ enum {
 
 // memory layout end
 
+#define MAX_APP_NUM (32)
 #define MAX_STR_LEN (200)
+#define IDLE_PID (0)
 
 #endif // CONST_H

os/defs.h

@@ -17,4 +17,6 @@
 #define MIN(a, b) (a < b ? a : b)
 #define MAX(a, b) (a > b ? a : b)
 
+#define NULL ((void *)0)
+
 #endif // DEF_H

os/kalloc.c

@@ -45,7 +45,7 @@ void kfree(void *pa)
 // Allocate one 4096-byte page of physical memory.
 // Returns a pointer that the kernel can use.
 // Returns 0 if the memory cannot be allocated.
-void *kalloc(void)
+void *kalloc()
 {
 	struct linklist *l;
 	l = kmem.freelist;

os/kalloc.h

@@ -1,8 +1,8 @@
 #ifndef KALLOC_H
 #define KALLOC_H
 
-void *kalloc(void);
+void *kalloc();
 void kfree(void *);
-void kinit(void);
+void kinit();
 
 #endif // KALLOC_H

os/kernelld.py

@@ -38,7 +38,7 @@
         *(.data)
 ''')
     for (idx, _) in enumerate(apps):
-        f.write('        . = ALIGN(0x1000);\n')
+        f.write('        . = ALIGN(0x8);\n')
         f.write('        *(.data.app{})\n'.format(idx))
     f.write(
 '''

os/loader.c

@@ -4,74 +4,101 @@
 
 static int app_num;
 static uint64 *app_info_ptr;
-extern char _app_num[];
-
-// Count finished programs. If all apps exited, shutdown.
-int finished()
-{
-	static int fin = 0;
-	if (++fin >= app_num)
-		panic("all apps over");
-	return 0;
-}
+extern char _app_num[], _app_names[], INIT_PROC[];
+char names[MAX_APP_NUM][MAX_STR_LEN];
 
 // Get user progs' infomation through pre-defined symbol in `link_app.S`
 void loader_init()
 {
+	char *s;
 	app_info_ptr = (uint64 *)_app_num;
 	app_num = *app_info_ptr;
 	app_info_ptr++;
+	s = _app_names;
+	printf("app list:\n");
+	for (int i = 0; i < app_num; ++i) {
+		int len = strlen(s);
+		strncpy(names[i], (const char *)s, len);
+		s += len + 1;
+		printf("%s\n", names[i]);
+	}
 }
 
-pagetable_t bin_loader(uint64 start, uint64 end, struct proc *p)
+int get_id_by_name(char *name)
 {
-	pagetable_t pg = uvmcreate();
-	if (mappages(pg, TRAPFRAME, PGSIZE, (uint64)p->trapframe,
-		     PTE_R | PTE_W) < 0) {
-		panic("mappages fail");
-	}
-	if (!PGALIGNED(start)) {
-		panic("user program not aligned, start = %p", start);
-	}
-	if (!PGALIGNED(end)) {
-		// Fix in ch5
-		warnf("Some kernel data maybe mapped to user, start = %p, end = %p",
-		      start, end);
+	for (int i = 0; i < app_num; ++i) {
+		if (strncmp(name, names[i], 100) == 0)
+			return i;
 	}
-	end = PGROUNDUP(end);
-	uint64 length = end - start;
-	if (mappages(pg, BASE_ADDRESS, length, start,
-		     PTE_U | PTE_R | PTE_W | PTE_X) != 0) {
-		panic("mappages fail");
+	warnf("Cannot find such app %s", name);
+	return -1;
+}
+
+int bin_loader(uint64 start, uint64 end, struct proc *p)
+{
+	if (p == NULL || p->state == UNUSED)
+		panic("...");
+	void *page;
+	uint64 pa_start = PGROUNDDOWN(start);
+	uint64 pa_end = PGROUNDUP(end);
+	uint64 length = pa_end - pa_start;
+	uint64 va_start = BASE_ADDRESS;
+	uint64 va_end = BASE_ADDRESS + length;
+	for (uint64 va = va_start, pa = pa_start; pa < pa_end;
+	     va += PGSIZE, pa += PGSIZE) {
+		page = kalloc();
+		if (page == 0) {
+			panic("...");
+		}
+		memmove(page, (const void *)pa, PGSIZE);
+		if (pa < start) {
+			memset(page, 0, start - va);
+		} else if (pa + PAGE_SIZE > end) {
+			memset(page + (end - pa), 0, PAGE_SIZE - (end - pa));
+		}
+		if (mappages(p->pagetable, va, PGSIZE, (uint64)page,
+			     PTE_U | PTE_R | PTE_W | PTE_X) != 0)
+			panic("...");
 	}
-	p->pagetable = pg;
-	uint64 ustack_bottom_vaddr = BASE_ADDRESS + length + PAGE_SIZE;
-	if (USTACK_SIZE != PAGE_SIZE) {
-		// Fix in ch5
-		panic("Unsupported");
+	// map ustack
+	p->ustack = va_end + PAGE_SIZE;
+	for (uint64 va = p->ustack; va < p->ustack + USTACK_SIZE;
+	     va += PGSIZE) {
+		page = kalloc();
+		if (page == 0) {
+			panic("...");
+		}
+		memset(page, 0, PGSIZE);
+		if (mappages(p->pagetable, va, PGSIZE, (uint64)page,
+			     PTE_U | PTE_R | PTE_W) != 0)
+			panic("...");
 	}
-	mappages(pg, ustack_bottom_vaddr, USTACK_SIZE, (uint64)kalloc(),
-		 PTE_U | PTE_R | PTE_W | PTE_X);
-	p->ustack = ustack_bottom_vaddr;
-	p->trapframe->epc = BASE_ADDRESS;
 	p->trapframe->sp = p->ustack + USTACK_SIZE;
+	p->trapframe->epc = va_start;
 	p->max_page = PGROUNDUP(p->ustack + USTACK_SIZE - 1) / PAGE_SIZE;
 	p->program_brk = p->ustack + USTACK_SIZE;
         p->heap_bottom = p->ustack + USTACK_SIZE;
-	return pg;
+	p->state = RUNNABLE;
+	return 0;
+}
+
+int loader(int app_id, struct proc *p)
+{
+	return bin_loader(app_info_ptr[app_id], app_info_ptr[app_id + 1], p);
 }
 
 // load all apps and init the corresponding `proc` structure.
-int run_all_app()
+int load_init_app()
 {
-	for (int i = 0; i < app_num; ++i) {
-		struct proc *p = allocproc();
-		tracef("load app %d", i);
-		bin_loader(app_info_ptr[i], app_info_ptr[i + 1], p);
-		p->state = RUNNABLE;
-		/*
-		* LAB1: you may need to initialize your new fields of proc here
-		*/
+	int id = get_id_by_name(INIT_PROC);
+	if (id < 0)
+		panic("Cannpt find INIT_PROC %s", INIT_PROC);
+	struct proc *p = allocproc();
+	if (p == NULL) {
+		panic("allocproc\n");
 	}
+	debugf("load init proc %s", INIT_PROC);
+	loader(id, p);
+	add_task(p);
 	return 0;
 }

os/loader.h

@@ -2,11 +2,14 @@
 #define LOADER_H
 
 #include "const.h"
+#include "proc.h"
 #include "types.h"
 
 int finished();
 void loader_init();
-int run_all_app();
+int load_init_app();
+int loader(int, struct proc *);
+int get_id_by_name(char *);
 
 #define BASE_ADDRESS (0x1000)
 #define USTACK_SIZE (PAGE_SIZE)

os/main.c

@@ -21,7 +21,7 @@ void main()
 	loader_init();
 	trap_init();
 	timer_init();
-	run_all_app();
+	load_init_app();
 	infof("start scheduler!");
 	scheduler();
 }