From: Riku Voipio <riku.voipio@iki.fi>
To: qemu-devel@nongnu.org
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Subject: Re: [Qemu-devel] [PATCH] Implement fstatat64() syscall
Date: Fri, 19 Sep 2008 17:09:18 +0300 [thread overview]
Message-ID: <20080919140918.GD21479@kos.to> (raw)
In-Reply-To: <1221750426-14863-5-git-send-email-kirill@shutemov.name>
On Thu, Sep 18, 2008 at 06:07:03PM +0300, Kirill A. Shutemov wrote:
> Move transformation of struct stat64 into the separate function and
> implement fstatat64() using it.
>
> Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
> ---
> linux-user/syscall.c | 141 +++++++++++++++++++++++++++++--------------------
> 1 files changed, 83 insertions(+), 58 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 88b44b8..ac7e7d9 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -156,6 +156,7 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \
> #define __NR_sys_faccessat __NR_faccessat
> #define __NR_sys_fchmodat __NR_fchmodat
> #define __NR_sys_fchownat __NR_fchownat
> +#define __NR_sys_fstatat64 __NR_fstatat64
> #define __NR_sys_getcwd1 __NR_getcwd
> #define __NR_sys_getdents __NR_getdents
> #define __NR_sys_getdents64 __NR_getdents64
> @@ -200,6 +201,10 @@ _syscall4(int,sys_fchmodat,int,dirfd,const char *,pathname,
> _syscall5(int,sys_fchownat,int,dirfd,const char *,pathname,
> uid_t,owner,gid_t,group,int,flags)
> #endif
> +#if defined(TARGET_NR_fstatat64) && defined(__NR_fstatat64)
> +_syscall4(int,sys_fstatat64,int,dirfd,const char *,pathname,
> + struct stat *,buf,int,flags)
> +#endif
> _syscall2(int,sys_getcwd1,char *,buf,size_t,size)
> #if TARGET_ABI_BITS == 32
> _syscall3(int, sys_getdents, uint, fd, struct dirent *, dirp, uint, count);
> @@ -3149,6 +3154,67 @@ static inline abi_long host_to_target_timespec(abi_ulong target_addr,
> return 0;
> }
>
> +#ifdef TARGET_NR_stat64
> +static inline abi_long host_to_target_stat64(void *cpu_env,
> + abi_ulong target_addr,
> + struct stat *host_st)
> +{
> +#ifdef TARGET_ARM
> + if (((CPUARMState *)cpu_env)->eabi) {
> + struct target_eabi_stat64 *target_st;
> +
> + if (!lock_user_struct(VERIFY_WRITE, target_st, target_addr, 0))
> + return -TARGET_EFAULT;
> + memset(target_st, 0, sizeof(struct target_eabi_stat64));
> + __put_user(host_st->st_dev, &target_st->st_dev);
> + __put_user(host_st->st_ino, &target_st->st_ino);
> +#ifdef TARGET_STAT64_HAS_BROKEN_ST_INO
> + __put_user(host_st->st_ino, &target_st->__st_ino);
> +#endif
> + __put_user(host_st->st_mode, &target_st->st_mode);
> + __put_user(host_st->st_nlink, &target_st->st_nlink);
> + __put_user(host_st->st_uid, &target_st->st_uid);
> + __put_user(host_st->st_gid, &target_st->st_gid);
> + __put_user(host_st->st_rdev, &target_st->st_rdev);
> + __put_user(host_st->st_size, &target_st->st_size);
> + __put_user(host_st->st_blksize, &target_st->st_blksize);
> + __put_user(host_st->st_blocks, &target_st->st_blocks);
> + __put_user(host_st->st_atime, &target_st->target_st_atime);
> + __put_user(host_st->st_mtime, &target_st->target_st_mtime);
> + __put_user(host_st->st_ctime, &target_st->target_st_ctime);
> + unlock_user_struct(target_st, target_addr, 1);
> + } else
> +#endif
> + {
> + struct target_stat64 *target_st;
> +
> + if (!lock_user_struct(VERIFY_WRITE, target_st, target_addr, 0))
> + return -TARGET_EFAULT;
> + memset(target_st, 0, sizeof(struct target_stat64));
> + __put_user(host_st->st_dev, &target_st->st_dev);
> + __put_user(host_st->st_ino, &target_st->st_ino);
> +#ifdef TARGET_STAT64_HAS_BROKEN_ST_INO
> + __put_user(host_st->st_ino, &target_st->__st_ino);
> +#endif
> + __put_user(host_st->st_mode, &target_st->st_mode);
> + __put_user(host_st->st_nlink, &target_st->st_nlink);
> + __put_user(host_st->st_uid, &target_st->st_uid);
> + __put_user(host_st->st_gid, &target_st->st_gid);
> + __put_user(host_st->st_rdev, &target_st->st_rdev);
> + /* XXX: better use of kernel struct */
> + __put_user(host_st->st_size, &target_st->st_size);
> + __put_user(host_st->st_blksize, &target_st->st_blksize);
> + __put_user(host_st->st_blocks, &target_st->st_blocks);
> + __put_user(host_st->st_atime, &target_st->target_st_atime);
> + __put_user(host_st->st_mtime, &target_st->target_st_mtime);
> + __put_user(host_st->st_ctime, &target_st->target_st_ctime);
> + unlock_user_struct(target_st, target_addr, 1);
> + }
> +
> + return 0;
> +}
> +#endif
This is suboptimal - we same code (list of __put_user()) twice. We
should have smaller if/else in the beginning of the function that sets
target_st.
> +
> #if defined(USE_NPTL)
> /* ??? Using host futex calls even when target atomic operations
> are not really atomic probably breaks things. However implementing
> @@ -5154,7 +5220,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
> goto efault;
> ret = get_errno(stat(path(p), &st));
> unlock_user(p, arg1, 0);
> - goto do_stat64;
> + if (!is_error(ret))
> + ret = host_to_target_stat64(cpu_env, arg2, &st);
> + break;
> #endif
> #ifdef TARGET_NR_lstat64
> case TARGET_NR_lstat64:
> @@ -5162,67 +5230,24 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
> goto efault;
> ret = get_errno(lstat(path(p), &st));
> unlock_user(p, arg1, 0);
> - goto do_stat64;
> + if (!is_error(ret))
> + ret = host_to_target_stat64(cpu_env, arg2, &st);
> + break;
> #endif
> #ifdef TARGET_NR_fstat64
> case TARGET_NR_fstat64:
> - {
> - ret = get_errno(fstat(arg1, &st));
> - do_stat64:
> - if (!is_error(ret)) {
> -#ifdef TARGET_ARM
> - if (((CPUARMState *)cpu_env)->eabi) {
> - struct target_eabi_stat64 *target_st;
> -
> - if (!lock_user_struct(VERIFY_WRITE, target_st, arg2, 0))
> - goto efault;
> - memset(target_st, 0, sizeof(struct target_eabi_stat64));
> - __put_user(st.st_dev, &target_st->st_dev);
> - __put_user(st.st_ino, &target_st->st_ino);
> -#ifdef TARGET_STAT64_HAS_BROKEN_ST_INO
> - __put_user(st.st_ino, &target_st->__st_ino);
> -#endif
> - __put_user(st.st_mode, &target_st->st_mode);
> - __put_user(st.st_nlink, &target_st->st_nlink);
> - __put_user(st.st_uid, &target_st->st_uid);
> - __put_user(st.st_gid, &target_st->st_gid);
> - __put_user(st.st_rdev, &target_st->st_rdev);
> - __put_user(st.st_size, &target_st->st_size);
> - __put_user(st.st_blksize, &target_st->st_blksize);
> - __put_user(st.st_blocks, &target_st->st_blocks);
> - __put_user(st.st_atime, &target_st->target_st_atime);
> - __put_user(st.st_mtime, &target_st->target_st_mtime);
> - __put_user(st.st_ctime, &target_st->target_st_ctime);
> - unlock_user_struct(target_st, arg2, 1);
> - } else
> + ret = get_errno(fstat(arg1, &st));
> + if (!is_error(ret))
> + ret = host_to_target_stat64(cpu_env, arg2, &st);
> + break;
> #endif
> - {
> - struct target_stat64 *target_st;
> -
> - if (!lock_user_struct(VERIFY_WRITE, target_st, arg2, 0))
> - goto efault;
> - memset(target_st, 0, sizeof(struct target_stat64));
> - __put_user(st.st_dev, &target_st->st_dev);
> - __put_user(st.st_ino, &target_st->st_ino);
> -#ifdef TARGET_STAT64_HAS_BROKEN_ST_INO
> - __put_user(st.st_ino, &target_st->__st_ino);
> -#endif
> - __put_user(st.st_mode, &target_st->st_mode);
> - __put_user(st.st_nlink, &target_st->st_nlink);
> - __put_user(st.st_uid, &target_st->st_uid);
> - __put_user(st.st_gid, &target_st->st_gid);
> - __put_user(st.st_rdev, &target_st->st_rdev);
> - /* XXX: better use of kernel struct */
> - __put_user(st.st_size, &target_st->st_size);
> - __put_user(st.st_blksize, &target_st->st_blksize);
> - __put_user(st.st_blocks, &target_st->st_blocks);
> - __put_user(st.st_atime, &target_st->target_st_atime);
> - __put_user(st.st_mtime, &target_st->target_st_mtime);
> - __put_user(st.st_ctime, &target_st->target_st_ctime);
> - unlock_user_struct(target_st, arg2, 1);
> - }
> - }
> - }
> +#if defined(TARGET_NR_fstatat64) && defined(__NR_fstatat64)
> + case TARGET_NR_fstatat64:
> + if (!(p = lock_user_string(arg2)))
> + goto efault;
> + ret = get_errno(sys_fstatat64(arg1, path(p), &st, arg4));
> + if (!is_error(ret))
> + ret = host_to_target_stat64(cpu_env, arg3, &st);
> break;
> #endif
> #ifdef USE_UID16
> --
> 1.5.6.5.GIT
>
>
--
"rm -rf" only sounds scary if you don't have backups
next prev parent reply other threads:[~2008-09-19 14:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-18 15:06 [Qemu-devel] [PATCH] Fix vfork() syscall emulation Kirill A. Shutemov
2008-09-18 15:07 ` [Qemu-devel] [PATCH] Fix getgroups() " Kirill A. Shutemov
2008-09-18 15:07 ` [Qemu-devel] [PATCH] Swap only altered elements of the grouplist Kirill A. Shutemov
2008-09-18 15:07 ` [Qemu-devel] [PATCH] Fix pread() and pwrite() syscall on ARM EABI Kirill A. Shutemov
2008-09-18 15:07 ` [Qemu-devel] [PATCH] Implement fstatat64() syscall Kirill A. Shutemov
2008-09-18 15:07 ` [Qemu-devel] [PATCH] Implement futimesat() syscall Kirill A. Shutemov
2008-09-18 15:07 ` [Qemu-devel] [PATCH] Imaplement ioctls MTIOCTOP, MTIOCGET and MTIOCPOS Kirill A. Shutemov
2008-09-18 15:07 ` [Qemu-devel] [PATCH] Fix building with 2.6.27 kernel headers Kirill A. Shutemov
2008-09-19 14:10 ` Riku Voipio
2008-09-19 14:04 ` [Qemu-devel] [PATCH] Implement futimesat() syscall Riku Voipio
2008-09-19 14:09 ` Riku Voipio [this message]
2008-09-19 14:24 ` [Qemu-devel] [PATCH] Implement fstatat64() syscall Kirill A. Shutemov
2008-09-19 13:59 ` [Qemu-devel] [PATCH] Swap only altered elements of the grouplist Riku Voipio
2008-09-19 13:57 ` [Qemu-devel] [PATCH] Fix getgroups() syscall emulation Riku Voipio
2008-09-20 2:56 ` [Qemu-devel] [PATCH] Fix vfork() " andrzej zaborowski
2008-09-20 6:45 ` Kirill A. Shutemov
2008-09-20 12:45 ` andrzej zaborowski
2008-09-20 13:11 ` Kirill A. Shutemov
2008-09-20 13:52 ` andrzej zaborowski
2008-09-20 14:20 ` Kirill A. Shutemov
2008-09-20 14:35 ` andrzej zaborowski
2008-09-20 14:38 ` Kirill A. Shutemov
2008-09-20 7:12 ` Kirill A. Shutemov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080919140918.GD21479@kos.to \
--to=riku.voipio@iki.fi \
--cc=kirill@shutemov.name \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.