From f5bf556ad5f45533cc1c4e3bfb253777c293910d Mon Sep 17 00:00:00 2001
From: wood <Littlew0od@qq.com>
Date: Mon, 17 Jul 2023 00:48:04 +0800
Subject: [PATCH] fix pagefault about lua, but it's fake implement!
---
fs-fuse/sdcard.img | Bin 64274432 -> 64274432 bytes
kernel/src/mm/memory_set.rs | 8 +++++---
kernel/src/syscall/fs.rs | 14 +++++++-------
kernel/src/syscall/mod.rs | 24 ++++++++++++------------
kernel/src/syscall/process.rs | 21 +++++++++++----------
5 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/fs-fuse/sdcard.img b/fs-fuse/sdcard.img
index 1cd89855d528a79ac6b829cf8fbfe4c8fba3d82d..fe4a07e0205f1a1fe89060581fe73220eb279b91 100644
GIT binary patch
delta 77975
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
delta 727662
zcmeI$RrsG}9mjEg8zScDj?s+TV04b|hVdC)DmJ2`h%rGwQ&hsjt{E607P9~wTNJxc
zv1Ni?(|P|r<;X*>>vizHpY!K>?(ge+Jqs7!vC+cOjdxF<+;#cV>5G<5pDbBAecJ3h
zS6se)`HUqq@0xb|%C}y)!-C1x6A!PzSKuO;1;!x}Xh=gE(vXHUq#+GyNJARZkcKq8
ze`q*oa@oAjo7^;S+6IgL?R9V6+xy48wP)G0>{;fud2L?%>p(*q(vXHUq#+GyNJARZ
z@V*+(nKUz+Rhm_s)tc3tHJUY>wVJh?b((dX^_umY4Vn#`jhc;{naw86rp;!}=FJw(
zmd#ep*3GPDn`YZ)yJq`lhh}y&r`fUDshQjC-0afq+U(Zs-t5ur+3eNq-R#rs+w9lO
zYxZvrXbx-+Y7TA=X%1};YYuOYXpU@-YL0G>X^w4<YmRSDXijWSYEEwEH>Wgd7Br_e
zr!}WHXEbLvXEkRx=QQUw=QZayk7yp*JgT{%d35ub=CRG=n#VU!Xr9<y*gUDZsCjbp
zl;)|;#m&>2r#F{0&uA`fp4mLBd3N)hW?}Q(=CbDU=6TKYn>LG@7c?(yu4rD=ytsKu
zb7gZ?b9Hk~^U~&J&C8otG_P!~ZC=&9x_M3W+U9l5>zg+;Z*1Pwyt#Qxv$%O{^S0*g
z%{!Xwns+wuYTn(vr@6klp?Pm}WAnb|{mloO4>liaZfce^A8tO<e6;yk^YP~9=9cEx
z<`c~)n@=^LZa&j|w)tFhTl4wm3(XgsFEw9ozS4ZP`C4;(^Y!K%%^l4*n{PGWZoboe
zxA|W4{pJVF51St~KW^@9e$xE3`B`&U^Yi8x%`cl@HNS3t)BLviU2}J{wE2B=Pjhec
zhvtvXpPD~6e`)^O{H^(W^N;4A&A*yu&A*%fG|R8Z<jPD&(?-)rD~=v8T50sa(aNI-
zjUGID$mpS?hm9USnlV~swCZTJ(dwf$Mr)4N8m&EAXSD8Uz0vxk4MrP|HX3a_nmO8J
zwCQNG(dMHqMq7@y8f`tAHQHvh?P$Bv_M;s}vqy7AJC1f5%^mGL+GVusXt&Ysqdi7@
zj`kYuJ=$lq?`Xf#ywU!n14ajq4jLUiI%IU{=&;e@qa#K~j*c1~JvwG|?C7}B@uL$)
zCyq`UojjU9I%PEVeiw{Ro!pYsCfCniWu;3mxo7@8^H*45>UrCB7hiSrqSGehIDP6k
zW9m3_>NsoaID6_iXL9S!i_V=azUbPyvo2Woe>>`;$(75_9i2D1VcGeUnf6wDtG(6U
zYHzi--gj>`8B7L~!DKKQ?8)|I8q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{Cr
zLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh
z4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4
zG^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF
z(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+Gy
zNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*
zAq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYM
zhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV2
z8q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7
zX-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHU
zq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZ
zkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{Cr
zLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh
z4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4
zG^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF
z(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+Gy
zNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*
zAq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYM
zhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV2
z8q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7
zX-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHU
zq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZ
zkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{Cr
zLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh
z4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4
zG^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF
z(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+Gy
zNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*
zAq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYM
zhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV2
z8q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7
zX-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHU
zq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZ
zkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{Cr
zLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh
z4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4
zG^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF
z(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+Gy
zNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*
zAq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYM
zhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV2
z8q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7
zX-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHU
zq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZ
zkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{Cr
zLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh
z4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4
zG^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF
z(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+Gy
zNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*
zAq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYM
zhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV2
z8q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7
zX-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHU
zq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZ
zkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{Cr
zLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh
z4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4
zG^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF
z(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+Gy
zNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*
zAq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYM
zhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV2
z8q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7
zX-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHU
zq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZ
zkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{Cr
zLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh
z4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4
zG^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF
z(vXHUq#+GyNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+Gy
zNJARZkcKp*Aq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*
zAq{CrLmJYMhBTxh4QWV28q$!4G^8O7X-GpF(vXHUq#+GyNJARZkcKp*Aq{CrLmJYM
dhBTxh4QWV28q$!4G^8O7Y50F>c+I^R{uk;{>wW+L
diff --git a/kernel/src/mm/memory_set.rs b/kernel/src/mm/memory_set.rs
index eb5bad8..28eec21 100644
--- a/kernel/src/mm/memory_set.rs
+++ b/kernel/src/mm/memory_set.rs
@@ -260,7 +260,8 @@ impl MemorySet {
let end_va: VirtAddr = end_addr.into();
// println!("[app_map] .{} [{:#x}, {:#x})", ph, start_addr, end_addr,);
let page_offset = start_va.page_offset();
- let mut map_perm = MapPermission::U;
+ // Attention, every memoryArea can write. It's wrong!
+ let mut map_perm = MapPermission::U | MapPermission::W;
let ph_flags = ph.flags();
if head_va == 0 {
head_va = start_va.0;
@@ -278,11 +279,12 @@ impl MemorySet {
max_end_vpn = map_area.vpn_range.get_end();
println!(
- "[from_elf] start_va = {:#x}, end_va = {:#x}, ph.offset = {:#x}, ph.file_size = {:#x}, page_offset = {:#x}",
+ "[from_elf] start_va = {:#x}, end_va = {:#x}, ph.offset = {:#x}, ph.file_size = {:#x}, page_offset = {:#x} flag = {}",
start_va.0 as usize, end_va.0 as usize,
ph.offset(),
ph.file_size(),
- page_offset
+ page_offset,
+ ph_flags
);
if page_offset == 0 {
memory_set.push(
diff --git a/kernel/src/syscall/fs.rs b/kernel/src/syscall/fs.rs
index b0e80d8..dbe3784 100644
--- a/kernel/src/syscall/fs.rs
+++ b/kernel/src/syscall/fs.rs
@@ -257,13 +257,13 @@ pub fn sys_openat(dirfd: usize, path: *const u8, flags: u32, mode: u32) -> isize
}
};
let mode = StatMode::from_bits(mode);
- log!(
- "[sys_openat] dirfd: {}, path: {}, flags: {:?}, mode: {:?}",
- dirfd as isize,
- path,
- flags,
- mode
- );
+ // log!(
+ // "[sys_openat] dirfd: {}, path: {}, flags: {:?}, mode: {:?}",
+ // dirfd as isize,
+ // path,
+ // flags,
+ // mode
+ // );
let inner = process.inner_exclusive_access();
let mut fd_table = inner.fd_table.lock();
let file_descriptor = match dirfd {
diff --git a/kernel/src/syscall/mod.rs b/kernel/src/syscall/mod.rs
index 9c64ae4..32d9e13 100644
--- a/kernel/src/syscall/mod.rs
+++ b/kernel/src/syscall/mod.rs
@@ -22,11 +22,11 @@ use system::*;
use thread::*;
pub fn syscall(syscall_id: usize, args: [usize; 6]) -> isize {
- println!(
- "[kernel] syscall start, syscall_name: {}, syscall_id: {}",
- syscall_name(syscall_id),
- syscall_id,
- );
+ // println!(
+ // "[kernel] syscall start, syscall_name: {}, syscall_id: {}",
+ // syscall_name(syscall_id),
+ // syscall_id,
+ // );
let ret = match syscall_id {
SYSCALL_GETCWD => sys_getcwd(args[0] as *mut u8, args[1]),
SYSCALL_DUP => sys_dup(args[0]),
@@ -151,13 +151,13 @@ pub fn syscall(syscall_id: usize, args: [usize; 6]) -> isize {
SYSCALL_SHUTDOWN => sys_shutdown(args[0] != 0),
_ => panic!("Unsupported syscall_id: {}", syscall_id),
};
- tip!(
- "[syscall] pid: {}, syscall_name: {}, syscall_id: {}, returned {:#x}",
- sys_getpid(),
- syscall_name(syscall_id),
- syscall_id,
- ret
- );
+ // tip!(
+ // "[syscall] pid: {}, syscall_name: {}, syscall_id: {}, returned {:#x}",
+ // sys_getpid(),
+ // syscall_name(syscall_id),
+ // syscall_id,
+ // ret
+ // );
// if [
// SYSCALL_SIGACTION,
diff --git a/kernel/src/syscall/process.rs b/kernel/src/syscall/process.rs
index 953e72f..99ced1e 100644
--- a/kernel/src/syscall/process.rs
+++ b/kernel/src/syscall/process.rs
@@ -154,14 +154,14 @@ pub fn sys_execve(path: *const u8, mut args: *const usize, mut envp: *const usiz
args_vec.insert(0, String::from("/busybox"));
path = String::from("./busybox");
}
- log!(
- "[exec] path: {} argv: {:?} /* {} vars */, envp: {:?} /* {} vars */",
- path,
- args_vec,
- args_vec.len(),
- envp_vec,
- envp_vec.len()
- );
+ // log!(
+ // "[exec] path: {} argv: {:?} /* {} vars */, envp: {:?} /* {} vars */",
+ // path,
+ // args_vec,
+ // args_vec.len(),
+ // envp_vec,
+ // envp_vec.len()
+ // );
let process = current_process();
let working_inode = process
.inner_exclusive_access()
@@ -182,7 +182,7 @@ pub fn sys_execve(path: *const u8, mut args: *const usize, mut envp: *const usiz
}
pub fn sys_brk(addr: usize) -> isize {
- println!("[sys_brk] addr = {:#x}", addr);
+ // println!("[sys_brk] addr = {:#x}", addr);
let process = current_process();
let mut inner = process.inner_exclusive_access();
if addr == 0 {
@@ -414,7 +414,7 @@ pub fn sys_sigaction(
}
pub fn sys_set_tid_address(tid_ptr: usize) -> isize {
- tip!("[sys_set_tid_address] tid_ptr = {:#x}", tid_ptr);
+ // tip!("[sys_set_tid_address] tid_ptr = {:#x}", tid_ptr);
let task = current_task().unwrap();
let mut task_inner = task.inner_exclusive_access();
task_inner.clear_child_tid = tid_ptr;
@@ -422,6 +422,7 @@ pub fn sys_set_tid_address(tid_ptr: usize) -> isize {
}
pub fn sys_mprotect(addr: usize, len: usize, prot: usize) -> isize {
+ tip!("[sys_mprotect] addr = {:#x}", addr);
if addr == 0 || addr % PAGE_SIZE != 0 {
EINVAL
} else {
--
GitLab