Add two user program for testing fork and mailbox call, all success, need fix sync_handler_exception issue

Author: JusticeLeee

lab6/kernel/include/mbox.h

@@ -24,7 +24,7 @@
  */
 
 /* a properly aligned buffer */
-extern unsigned int mbox[36];
+extern unsigned int mbox[8];
 
 #define MBOX_REQUEST    0
 

lab6/kernel/include/mmu.h

@@ -36,8 +36,8 @@
 #define VA2PA(addr) ((uint64_t)(addr) & (uint64_t)0x0000ffffffffffff)
 #define PA2VA(addr) ((uint64_t)(addr) | (uint64_t)0xffff000000000000)
 
-#define PERIPHERAL_START 0x3c100000
-#define PERIPHERAL_END 0x3c300000
+#define PERIPHERAL_START 0x3c000000
+#define PERIPHERAL_END 0x3f000000
 
 void init_page_table(thread_info *thread, uint64_t **table);
 void update_page_table(thread_info *thread, uint64_t virtual_addr,

lab6/kernel/include/thread.h

@@ -5,7 +5,7 @@
 #define STACK_SIZE 4096
 #define USER_STACK_BASE ((uint64_t)0xffffffffb000)
 #define USER_PROGRAM_BASE 0x80000
-#define USER_PROGRAM_SIZE (256 * kb)
+#define USER_PROGRAM_SIZE (512 * kb)
 
 #define MAX_PAGE_FRAME_PER_THREAD 1000
 

lab6/kernel/src/exception.c

@@ -61,19 +61,19 @@ void sync_handler_lowerEL_64(uint64_t sp) {
       const char **argv = (const char **)trap_frame->x[1];
       exec(program_name, argv);
     } else if (iss == 4) {  // fork
-      printf("[fork]\n");
+      // printf("[fork]\n");
       fork(sp);
     } else if (iss == 5) {  // exit
       exit();
     } else if (iss == 6) {  // mbox_call
-      printf("[mbox_call]\n");
+      // printf("[mbox_call]\n");
       thread_info *cur = get_current();
       unsigned int * mbox_user_va = (unsigned int *)trap_frame->x[1];
       unsigned int * mbox_user_pa = (unsigned int *)el0_VA2PA(cur,(uint64_t)mbox_user_va);
-      printf("mbox_user_va:%p\n",mbox_user_va);
-      printf("mbox_user_pa :%p\n",mbox_user_pa);
+      // printf("mbox_user_va:%p\n",mbox_user_va);
+      // printf("mbox_user_pa :%p\n",mbox_user_pa);
       unsigned int * mbox_kernel_va = (unsigned int *) PA2VA(mbox_user_pa);
-      printf("mbox_kernel_va :%p\n",mbox_kernel_va);      // trap_frame->x[0] = mbox_call(trap_frame->x[0],(unsigned int *)trap_frame->x[1]);
+      // printf("mbox_kernel_va :%p\n",mbox_kernel_va);      // trap_frame->x[0] = mbox_call(trap_frame->x[0],(unsigned int *)trap_frame->x[1]);
       trap_frame->x[0] = mbox_call(trap_frame->x[0],mbox_kernel_va);
     } else if (iss == 7) {  // kill
       kill((int)trap_frame->x[0]);

lab6/kernel/src/mbox.c

@@ -26,8 +26,9 @@
 #include "gpio.h"
 #include "mmu.h"
 #include "printf.h"
+#include "mbox.h"
 /* mailbox message buffer */
-volatile unsigned int  __attribute__((aligned(16))) mbox[36];
+unsigned int  __attribute__((aligned(16))) mbox[8];
 
 #define VIDEOCORE_MBOX  (MMIO_BASE+0x0000B880)
 #define MBOX_READ       ((volatile unsigned int*)(VIDEOCORE_MBOX+0x0))
@@ -45,7 +46,8 @@ volatile unsigned int  __attribute__((aligned(16))) mbox[36];
  */
 int mbox_call(unsigned char ch, unsigned int *user_mbox)
 {
-    printf("[1]user_mbox[1]=%p\n",user_mbox[1]);
+    // printf("[1]user_mbox[1]=%p\n",user_mbox[1]);
+    // printf("[1]user_mbox[28]=%p\n",user_mbox[28]);
     unsigned int r = (((unsigned int)((unsigned long)VA2PA(user_mbox))&~0xF) | (ch&0xF));
     /* wait until we can write to the mailbox */
     do{asm volatile("nop");}while(*MBOX_STATUS & MBOX_FULL);
@@ -58,7 +60,9 @@ int mbox_call(unsigned char ch, unsigned int *user_mbox)
         /* is it a response to our message? */
         if(r == *MBOX_READ)
             /* is it a valid successful response? */
-            printf("[2]user_mbox[1]=%p\n",user_mbox[1]);
+            // printf("[2]user_mbox[1]=%p\n",user_mbox[1]);
+            // printf("[2]user_mbox[28]=%p\n",user_mbox[28]);
+
             return user_mbox[1]==MBOX_RESPONSE;
     }
     return 0;

lab6/kernel/src/mmu.c

@@ -4,6 +4,8 @@
 #include "alloc.h"
 #include "printf.h"
 #include "thread.h"
+#include "exception.h"
+#include "mbox.h"
 
 void init_page_table(thread_info *thread, uint64_t **table) {
   *table = (uint64_t *)thread_allocate_page(thread, PAGE_SIZE);
@@ -55,6 +57,7 @@ void update_page_table(thread_info *thread, uint64_t virtual_addr,
 }
 
 uint64_t el0_VA2PA(thread_info *thread, uint64_t virtual_addr) {
+  disable_interrupt();
   uint32_t index[4] = {
       (virtual_addr >> 39) & 0x1ff, (virtual_addr >> 30) & 0x1ff,
       (virtual_addr >> 21) & 0x1ff, (virtual_addr >> 12) & 0x1ff};
@@ -70,7 +73,7 @@ uint64_t el0_VA2PA(thread_info *thread, uint64_t virtual_addr) {
   // printf("pgd: %p\n", (uint64_t)table);
   for (int level = 0; level < 3; level++) {
     if (table[index[level]] == 0) {
-      printf("Your page table implement unsuccessful\n");
+      printf("[el0_VA2PA]*Your page table implement unsuccessful*\n");
       break;
     }
     // printf("  [el0_VA2PA]table PA: 0x%p\n", (uint64_t)table[index[level]]);

lab6/kernel/src/shell.c

@@ -119,6 +119,28 @@ void command_mailbox()
     }
 }
 
+unsigned int get_board_revision()
+{
+    // get board revision
+    mbox[0] = 8*4;                  // length of the message
+    mbox[1] = MBOX_REQUEST;         // this is a request message
+    
+    mbox[2] = MBOX_TAG_GETBDVS;     // get board revision
+    mbox[3] = 4;                    // buffer size
+    mbox[4] = 4;
+    mbox[5] = 0;                    // clear output buffer
+    mbox[6] = 0;
+
+    mbox[7] = MBOX_TAG_LAST;
+    if (mbox_call(MBOX_CH_PROP,mbox)) {
+        uart_puts("board revision is: ");
+        uart_hex(mbox[6]);
+        uart_hex(mbox[5]);
+        uart_puts("\n");
+    }
+    return mbox[5];
+}
+
 void command_test()
 {
     // test malloc

lab6/kernel/src/thread.c

@@ -19,7 +19,7 @@ void foo() {
 
 void user_test1() {
   const char *argv[] = {"argv_test", "-o", "arg2", 0};
-  exec("my_test", argv);
+  exec("mailbox_test", argv);
 }
 
 void user_test2() {
@@ -41,11 +41,10 @@ void user_test5() {
   exec("vm.img", argv);
 }
 
-void thread_test1() { // thread test
+void thread_test1() { // mailbox test
   thread_info *idle_t = thread_create(0);
   asm volatile("msr tpidr_el1, %0\n" ::"r"((uint64_t)idle_t));
   thread_create(user_test1);
-  thread_create(user_test2);
   idle();
 }
 
@@ -143,7 +142,7 @@ void idle() {
 }
 
 void exit() {
-  printf("[exit]\n");
+  // printf("[exit]\n");
   thread_info *cur = get_current();
   // thread_free_page(cur);
   cur->status = THREAD_DEAD;
@@ -177,22 +176,24 @@ void kill_zombies() {
 }
 
 void exec(const char *program_name, const char **argv) {
-  printf("[exec]\n");
+  // printf("[exec]\n");
   thread_info *cur = get_current();
   if (cur->user_program_base == 0) {
     cur->user_program_base = thread_allocate_page(cur, USER_PROGRAM_SIZE);
     cur->user_stack_base = thread_allocate_page(cur, STACK_SIZE);
     init_page_table(cur, &(cur->pgd));
   }
-    printf("cur_pgd: 0x%p\n", (uint64_t)(cur->pgd));
-    printf("user program base: 0x%p\n", cur->user_program_base);
-    printf("user stack base: 0x%p\n", cur->user_stack_base);
+    // printf("cur_pgd: 0x%p\n", (uint64_t)(cur->pgd));
+    // printf("user program base: 0x%p\n", cur->user_program_base);
+    // printf("user stack base: 0x%p\n", cur->user_stack_base);
 
   cur->user_program_size =
       cpio_load_user_program(program_name, cur->user_program_base);
   for (uint64_t size = 0; size < cur->user_program_size; size += PAGE_SIZE) {
     uint64_t virtual_addr = USER_PROGRAM_BASE + size;
     uint64_t physical_addr = VA2PA(cur->user_program_base + size);
+    if(size==0)
+      printf("[first_map]va:%p map to pa:%p\n",virtual_addr,physical_addr);
     update_page_table(cur, virtual_addr, physical_addr, 0b101);
   }
 
@@ -202,7 +203,13 @@ void exec(const char *program_name, const char **argv) {
     // printf("identity_page=%p\n",identity_page);
     update_page_table(cur, identity_page , identity_page, 0b101);
   }
-
+  el0_VA2PA(cur,USER_PROGRAM_BASE);
+  el0_VA2PA(cur,0x3f000000);
+  el0_VA2PA(cur,0x3f000000-1);
+  el0_VA2PA(cur,0x3c25e76c);
+  el0_VA2PA(cur,0x3c100000);
+  el0_VA2PA(cur,0x3c000000);
+  el0_VA2PA(cur,0x3c000000-1);
   uint64_t virtual_addr = USER_STACK_BASE;
   uint64_t physical_addr = VA2PA(cur->user_stack_base);
   update_page_table(cur, virtual_addr, physical_addr, 0b110);

lab6/user/src/argv_test.c

@@ -0,0 +1,63 @@
+#include "start.h"
+
+int main() {
+  unsigned int  __attribute__((aligned(16))) mbox[8];
+
+    // get serail number
+    mbox[0] = 8*4;                  // length of the message
+    mbox[1] = MBOX_REQUEST;         // this is a request message
+    
+    mbox[2] = MBOX_TAG_GETSERIAL;   // get serial number command
+    mbox[3] = 8;                    // buffer size
+    mbox[4] = 8;
+    mbox[5] = 0;                    // clear output buffer
+    mbox[6] = 0;
+
+    mbox[7] = MBOX_TAG_LAST;
+    print_s("\n");
+    if (mbox_call(MBOX_CH_PROP,mbox)) {
+        print_s("serial number is: ");
+        print_h(mbox[6]);
+        print_h(mbox[5]);
+        print_s("\n");
+    }
+    // get board revision
+    mbox[0] = 8*4;                  // length of the message
+    mbox[1] = MBOX_REQUEST;         // this is a request message
+    
+    mbox[2] = MBOX_TAG_GETBDVS;     // get board revision
+    mbox[3] = 4;                    // buffer size
+    mbox[4] = 4;
+    mbox[5] = 0;                    // clear output buffer
+    mbox[6] = 0;
+
+    mbox[7] = MBOX_TAG_LAST;
+    if (mbox_call(MBOX_CH_PROP,mbox)) {
+        print_s("board revision is: ");
+        print_h(mbox[6]);
+        print_h(mbox[5]);
+        print_s("\n");
+    }
+
+    // get arm memory
+    mbox[0] = 8*4;                  // length of the message
+    mbox[1] = MBOX_REQUEST;         // this is a request message
+    
+    mbox[2] = MBOX_TAG_GETARMMEM;   // get arm memory info
+    mbox[3] = 8;                    // buffer size
+    mbox[4] = 8;
+    mbox[5] = 0;                    // clear output buffer
+    mbox[6] = 0;
+
+    mbox[7] = MBOX_TAG_LAST;
+    if (mbox_call(MBOX_CH_PROP,mbox)) {
+        print_s("arm base addr: ");
+        print_h(mbox[5]);
+        print_s("\n");
+        print_s("arm addr size: ");
+        print_h(mbox[6]);
+        print_s("\n");
+    }
+  // while(1);
+  return 0;
+}