docs changes and small fixes

deislabs · Aug 31, 2022 · dc482ca · dc482ca
1 parent f8cbd69
commit dc482ca
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/doc/user-getting-started.md b/doc/user-getting-started.md
@@ -91,7 +91,7 @@ Options:
                             conditions to control the behavior of the breakpoint.
                             E.g: Use syscall number as a condition in the breakpoint
     --strace-filter 'SYS_name1:group1:SYS_name2:...'
-                         -- Specify the set of syscalls or group to be traced. When filters 
+                         -- Specify the set of syscalls or groups to be traced. When filters 
                             are specified, only those syscalls/groups specified in the filter 
                             will be traced, in addition to failing syscalls if
                             specified as described above. Any combination of syscalls and groups 
@@ -102,12 +102,10 @@ Options:
                             --strace-filter 'SYS_open:SYS_mprotect:desc'
     --strace-exclude-filter 'SYS_name1:SYS_name2:group1...'
                          -- Specify a set of syscalls or groups to exclude from the strace log. 
-                            All other syscalls will be logged in the strace. When filters 
-                            are specified, only those syscalls/groups specified in the filter 
-                            will not be traced, in addition to failing syscalls if
-                            specified as described above. Any combination of syscalls and groups 
-                            can be used.  For a list of all the groups and their consituents check
-                            out 'man strace' 
+                            All other syscalls will be logged in the strace. Failing syscalls, even 
+                            if excluded, will also be logged if --strace-failing is specified. Any 
+                            combination of syscalls and groups can be used.  For a list of all the 
+                            groups and their consituents check out 'man strace' 
                             E.g: To exclude open and mprotect syscalls and the group of 
                             file syscalls, specify
                             --strace-exclude-filter='SYS_open:SYS_mprotect:file'

diff --git a/tools/myst/host/exec.c b/tools/myst/host/exec.c
@@ -397,7 +397,7 @@ Options:\n\
                             conditions to control the behavior of the breakpoint.\n\
                             E.g: Use syscall number as a condition in the breakpoint\n\
     --strace-filter 'SYS_name1:group1:SYS_name2:...'\n\
-                         -- Specify the set of syscalls or group to be traced. When filters \n\
+                         -- Specify the set of syscalls or groups to be traced. When filters \n\
                             are specified, only those syscalls/groups specified in the filter \n\
                             will be traced, in addition to failing syscalls if\n\
                             specified as described above. Any combination of syscalls and groups \n\
@@ -408,12 +408,10 @@ Options:\n\
                             --strace-filter 'SYS_open:SYS_mprotect:desc'\n\
     --strace-exclude-filter 'SYS_name1:SYS_name2:group1...'\n\
                          -- Specify a set of syscalls or groups to exclude from the strace log. \n\
-                            All other syscalls will be logged in the strace. When filters \n\
-                            are specified, only those syscalls/groups specified in the filter \n\
-                            will not be traced, in addition to failing syscalls if\n\
-                            specified as described above. Any combination of syscalls and groups \n\
-                            can be used.  For a list of all the groups and their consituents check\n\
-                            out 'man strace' \n\
+                            All other syscalls will be logged in the strace. Failing syscalls, even \n\
+                            if excluded, will also be logged if --strace-failing is specified. Any \n\
+                            combination of syscalls and groups can be used.  For a list of all the \n\
+                            groups and their consituents check out 'man strace' \n\
                             E.g: To exclude open and mprotect syscalls and the group of \n\
                             file syscalls, specify\n\
                             --strace-exclude-filter='SYS_open:SYS_mprotect:file'\n\

diff --git a/tools/myst/host/exec_linux.c b/tools/myst/host/exec_linux.c
@@ -94,7 +94,7 @@ Options:\n\
                             conditions to control the behavior of the breakpoint.\n\
                             E.g: Use syscall number as a condition in the breakpoint\n\
     --strace-filter 'SYS_name1:group1:SYS_name2:...'\n\
-                         -- Specify the set of syscalls or group to be traced. When filters \n\
+                         -- Specify the set of syscalls or groups to be traced. When filters \n\
                             are specified, only those syscalls/groups specified in the filter \n\
                             will be traced, in addition to failing syscalls if\n\
                             specified as described above. Any combination of syscalls and groups \n\
@@ -105,12 +105,10 @@ Options:\n\
                             --strace-filter 'SYS_open:SYS_mprotect:desc'\n\
     --strace-exclude-filter 'SYS_name1:SYS_name2:group1...'\n\
                          -- Specify a set of syscalls or groups to exclude from the strace log. \n\
-                            All other syscalls will be logged in the strace. When filters \n\
-                            are specified, only those syscalls/groups specified in the filter \n\
-                            will not be traced, in addition to failing syscalls if\n\
-                            specified as described above. Any combination of syscalls and groups \n\
-                            can be used.  For a list of all the groups and their consituents check\n\
-                            out 'man strace' \n\
+                            All other syscalls will be logged in the strace. Failing syscalls, even \n\
+                            if excluded, will also be logged if --strace-failing is specified. Any \n\
+                            combination of syscalls and groups can be used.  For a list of all the \n\
+                            groups and their consituents check out 'man strace' \n\
                             E.g: To exclude open and mprotect syscalls and the group of \n\
                             file syscalls, specify\n\
                             --strace-exclude-filter='SYS_open:SYS_mprotect:file'\n\

diff --git a/utils/syscall.c b/utils/syscall.c
@@ -389,7 +389,7 @@ static const myst_syscall_pair_t _pairs[] = {
 
 const myst_syscall_group_t _groups[] = {
     {"desc",
-     100,
+     98,
      {SYS_read,
       SYS_write,
       SYS_open,
@@ -590,7 +590,7 @@ const myst_syscall_group_t _groups[] = {
       SYS_rt_tgsigqueueinfo,
       SYS_execveat}},
     {"signal",
-     15,
+     14,
      {SYS_rt_sigaction,
       SYS_rt_sigprocmask,
       SYS_rt_sigreturn,
@@ -706,7 +706,7 @@ const myst_syscall_group_t _groups[] = {
       SYS_capset,
       SYS_prctl}},
     {"clock",
-     8,
+     7,
      {SYS_gettimeofday,
       SYS_adjtimex,
       SYS_settimeofday,
@@ -716,6 +716,7 @@ const myst_syscall_group_t _groups[] = {
       //   SYS_lock_getres,
       SYS_clock_adjtime}},
     {"comm_change", 3, {SYS_execve, SYS_prctl, SYS_execveat}},
+    {"", 0, {}},
 };
 
 __attribute__((__unused__)) static void _check_myst_syscalls(void)