From: Aleksandar Markovic <aleksandar.marko...@imgtec.com>

This patch implements Qemu user mode sysfs() syscall support.

Syscall sysfs() involves returning information about the filesystem types
currently present in the kernel, and can operate in three distinct flavors,
depending on its first argument.

Its specific is that its declaration is threefold:

   int sysfs(int option, const char *fsname);
   int sysfs(int option, unsigned int fs_index, char *buf);
   int sysfs(int option);

Its implementation in Linux kernel is at fs/filesystems.c, line 184.

The implementation in Qemu user mode is based on invocation of host's sysfs(),
and its key part is in the correspondent case segment of the main switch
statement of the function do_syscall(), in file linux-user/syscalls.c.
All necessary conversions of data structures from target to host and from
host to target are covered. Based on the value of the first argument, three
cases are distinguished, and such conversions are implemented separately
for each case. Relevant support for "-strace" option is included in files
linux-user/strace.c and linux-user/strace.list.

This patch also fixes failures of LTP tests sysfs01, sysfs02, sysfs03,
sysfs04, sysfs05, and sysfs06, if executed in Qemu user mode.

Signed-off-by: Aleksandar Markovic <aleksandar.marko...@imgtec.com>
---
 linux-user/strace.c    | 27 +++++++++++++++++++++++++++
 linux-user/strace.list |  2 +-
 linux-user/syscall.c   | 37 +++++++++++++++++++++++++++++++++++--
 3 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/linux-user/strace.c b/linux-user/strace.c
index 754035e..6621e8c 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -2248,6 +2248,33 @@ print_kill(const struct syscallname *name,
 }
 #endif
 
+#ifdef TARGET_NR_sysfs
+static void
+print_sysfs(const struct syscallname *name,
+    abi_long arg0, abi_long arg1, abi_long arg2,
+    abi_long arg3, abi_long arg4, abi_long arg5)
+{
+    print_syscall_prologue(name);
+    /* arg0 is normally 1, 2, or 3 */
+    switch (arg0) {
+    case 1:
+        print_raw_param("%d", arg0, 0);
+        print_string(arg1, 1);
+        break;
+    case 2:
+        print_raw_param("%d", arg0, 0);
+        print_raw_param("%u", arg1, 0);
+        print_pointer(arg2, 1);
+        break;
+    /* if arg0 is 3, desired output is the same as default */
+    default:
+        print_raw_param("%d", arg0, 1);
+        break;
+    }
+    print_syscall_epilogue(name);
+}
+#endif
+
 /*
  * An array of all of the syscalls we know about
  */
diff --git a/linux-user/strace.list b/linux-user/strace.list
index 01aecfc..38139ba 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -1372,7 +1372,7 @@
 { TARGET_NR_sys_epoll_wait, "sys_epoll_wait" , NULL, NULL, NULL },
 #endif
 #ifdef TARGET_NR_sysfs
-{ TARGET_NR_sysfs, "sysfs" , NULL, NULL, NULL },
+{ TARGET_NR_sysfs, "sysfs" , NULL, print_sysfs, NULL },
 #endif
 #ifdef TARGET_NR_sysinfo
 { TARGET_NR_sysinfo, "sysinfo" , NULL, NULL, NULL },
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 116fd0c..1c140a8 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -9544,9 +9544,42 @@ abi_long do_syscall(void *cpu_env, int num, abi_long 
arg1,
     case TARGET_NR_bdflush:
         goto unimplemented;
 #endif
-#ifdef TARGET_NR_sysfs
+#if defined(TARGET_NR_sysfs)
     case TARGET_NR_sysfs:
-        goto unimplemented;
+        switch (arg1) {
+        case 1:
+            {
+                p = lock_user_string(arg2);
+                if (!p) {
+                    goto efault;
+                }
+                ret = get_errno(syscall(__NR_sysfs, arg1, p));
+                unlock_user(p, arg2, 0);
+            }
+            break;
+        case 2:
+            {
+                char buf[PATH_MAX];
+                memset(buf, 0, PATH_MAX);
+                ret = get_errno(syscall(__NR_sysfs, arg1, arg2, buf));
+                if (!is_error(ret)) {
+                    int len = PATH_MAX;
+                    if (len > strlen(buf)) {
+                        len = strlen(buf);
+                    }
+                    if (copy_to_user(arg3, buf, len) != 0) {
+                        goto efault;
+                    }
+                }
+            }
+            break;
+        case 3:
+            ret = get_errno(syscall(__NR_sysfs, arg1));
+            break;
+        default:
+            ret = -EINVAL;
+        }
+        break;
 #endif
     case TARGET_NR_personality:
         ret = get_errno(personality(arg1));
-- 
2.9.3


Reply via email to