From 976135b79ca7f8c004ac464f062532587f3c0e78 Mon Sep 17 00:00:00 2001
From: "Hui, Chunyang" <sanqian.hcy@antfin.com>
Date: Thu, 28 Dec 2023 02:57:16 +0000
Subject: [PATCH] Refine error level log

---
 src/libos/src/exception/mod.rs     | 2 +-
 src/libos/src/process/task/exec.rs | 2 +-
 src/libos/src/syscall/mod.rs       | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/libos/src/exception/mod.rs b/src/libos/src/exception/mod.rs
index 8e550e59..cfe634f8 100644
--- a/src/libos/src/exception/mod.rs
+++ b/src/libos/src/exception/mod.rs
@@ -131,7 +131,7 @@ pub fn do_handle_exception(
             return Ok(0);
         }
 
-        warn!(
+        error!(
             "#PF not handled. Turn to signal. user context = {:?}",
             user_context
         );
diff --git a/src/libos/src/process/task/exec.rs b/src/libos/src/process/task/exec.rs
index 9d8023fd..737df5d1 100644
--- a/src/libos/src/process/task/exec.rs
+++ b/src/libos/src/process/task/exec.rs
@@ -55,7 +55,7 @@ pub fn exec(libos_tid: pid_t, host_tid: pid_t) -> Result<i32> {
             info!("Thread exited: tid = {}, status = {}", libos_tid, status);
         }
         TermStatus::Killed(signum) => {
-            info!("Thread killed: tid = {}, signum = {:?}", libos_tid, signum);
+            error!("Thread killed: tid = {}, signum = {:?}", libos_tid, signum);
         }
     }
 
diff --git a/src/libos/src/syscall/mod.rs b/src/libos/src/syscall/mod.rs
index cce00e42..2febe775 100644
--- a/src/libos/src/syscall/mod.rs
+++ b/src/libos/src/syscall/mod.rs
@@ -689,7 +689,6 @@ fn do_syscall(user_context: &mut CpuContext) {
     let retval = match ret {
         Ok(retval) => retval as isize,
         Err(e) => {
-            // let syscall_num = SyscallNum::try_from(num).unwrap();
             let should_log_err = |num, errno| {
                 let syscall_num = match SyscallNum::try_from(num) {
                     Ok(num) => num,
@@ -708,9 +707,15 @@ fn do_syscall(user_context: &mut CpuContext) {
                 // to suppress error messages.
                 match errno {
                     EAGAIN | ETIMEDOUT | ENOENT | ENOTTY => false,
+                    EINTR => match syscall_num {
+                        SyscallNum::Nanosleep => false,
+                        SyscallNum::Futex => false,
+                        _ => true,
+                    },
                     ENOSYS => match syscall_num {
                         SyscallNum::Getrusage => false,
                         SyscallNum::Madvise => false,
+                        SyscallNum::Ioctl => false,
                         _ => true,
                     },
                     _ => true,