contrib/vhost-user-blk: Replace lseek64 with lseek
PATCH 1/2 contrib/vhost-user-blk: Replace lseek64 with lseek
64bit off_t is already in use since build uses _FILE_OFFSET_BITS=64 already. Using lseek/off_t also makes it work with latest must without using _LARGEFILE64_SOURCE macro. This macro is implied with _GNU_SOURCE when using glibc but not with musl.
--- contrib/vhost-user-blk/vhost-user-blk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
contrib/vhost-user-blk/vhost-user-blk.c +2 -2
@@ -532,9 +532,9 @@ vub_get_blocksize(int fd)static void vub_initialize_config (int fd,struct virtio_blk_config *config) { -off64_t capacity; +off_t capacity; - capacity =lseek64 (fd,0 ,SEEK_END ); + capacity =lseek (fd,0 ,SEEK_END ); config->capacity = capacity >>9 ; config->blk_size =vub_get_blocksize (fd); config->size_max =65536 ;
Signature · 1 line
2.39.0
PATCH 2/2 linux-user: Replace use of lfs64 related functions and macros
Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions anf macros behave same as their 64 suffixed counterparts. This also helps in compiling with latest musl C library, where these macros and functions are no more available under _GNU_SOURCE feature macro
--- linux-user/syscall.c | 153 +++++++++++-------------------------------- 1 file changed, 39 insertions(+), 114 deletions(-)
linux-user/syscall.c +39 -114
@@ -795,8 +795,8 @@ safe_syscall6(ssize_t, copy_file_range, int, infd, loff_t *, pinoff,*/ #define safe_ioctl (...) safe_syscall(__NR_ioctl, __VA_ARGS__)/* Similarly for fcntl. Note that callers must always: -* pass the F_GETLK64 etc constants rather than the unsuffixed F_GETLK -* use the flock64 struct rather than unsuffixed flock +* pass the F_GETLK etc constants rather than the unsuffixed F_GETLK +* use the flock struct rather than unsuffixed flock * This will then work and use a 64-bit offset for both 32-bit and 64-bit hosts. */ #ifdef __NR_fcntl64
@@ -6797,13 +6797,13 @@ static int target_to_host_fcntl_cmd(int cmd) ret = cmd;break ;case TARGET_F_GETLK : - ret =F_GETLK64 ; + ret =F_GETLK ;break ;case TARGET_F_SETLK : - ret =F_SETLK64 ; + ret =F_SETLK ;break ;case TARGET_F_SETLKW : - ret =F_SETLKW64 ; + ret =F_SETLKW ;break ;case TARGET_F_GETOWN : ret =F_GETOWN ;
@@ -6817,17 +6817,6 @@ static int target_to_host_fcntl_cmd(int cmd)case TARGET_F_SETSIG : ret =F_SETSIG ;break ; -#if TARGET_ABI_BITS ==32 -case TARGET_F_GETLK64 : - ret =F_GETLK64 ; -break ; -case TARGET_F_SETLK64 : - ret =F_SETLK64 ; -break ; -case TARGET_F_SETLKW64 : - ret =F_SETLKW64 ; -break ; -#endif case TARGET_F_SETLEASE : ret =F_SETLEASE ;break ;
@@ -6879,8 +6868,8 @@ static int target_to_host_fcntl_cmd(int cmd)* them to 5, 6 and 7 before making the syscall(). Since we make the * syscall directly, adjust to what is supported by the kernel. */ -if (ret >=F_GETLK64 && ret <=F_SETLKW64 ) { - ret -=F_GETLK64 -5 ; +if (ret >=F_GETLK && ret <=F_SETLKW ) { + ret -=F_GETLK -5 ; }#endif
@@ -6913,55 +6902,11 @@ static int host_to_target_flock(int type)return type; } -static inline abi_long copy_from_user_flock (struct flock64 *fl, -abi_ulong target_flock_addr) -{ -struct target_flock *target_fl; -int l_type; - -if (!lock_user_struct (VERIFY_READ , target_fl, target_flock_addr,1 )) { -return -TARGET_EFAULT ; - } - -__get_user (l_type, &target_fl->l_type); - l_type =target_to_host_flock (l_type); -if (l_type <0 ) { -return l_type; - } - fl->l_type = l_type; -__get_user (fl->l_whence, &target_fl->l_whence); -__get_user (fl->l_start, &target_fl->l_start); -__get_user (fl->l_len, &target_fl->l_len); -__get_user (fl->l_pid, &target_fl->l_pid); -unlock_user_struct (target_fl, target_flock_addr,0 ); -return 0 ; -} - -static inline abi_long copy_to_user_flock (abi_ulong target_flock_addr, -const struct flock64 *fl) -{ -struct target_flock *target_fl; -short l_type; - -if (!lock_user_struct (VERIFY_WRITE , target_fl, target_flock_addr,0 )) { -return -TARGET_EFAULT ; - } - - l_type =host_to_target_flock (fl->l_type); -__put_user (l_type, &target_fl->l_type); -__put_user (fl->l_whence, &target_fl->l_whence); -__put_user (fl->l_start, &target_fl->l_start); -__put_user (fl->l_len, &target_fl->l_len); -__put_user (fl->l_pid, &target_fl->l_pid); -unlock_user_struct (target_fl, target_flock_addr,1 ); -return 0 ; -} - -typedef abi_long from_flock64_fn (struct flock64 *fl,abi_ulong target_addr); -typedef abi_long to_flock64_fn (abi_ulong target_addr,const struct flock64 *fl); +typedef abi_long from_flock_fn (struct flock *fl,abi_ulong target_addr); +typedef abi_long to_flock_fn (abi_ulong target_addr,const struct flock *fl); #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32 -struct target_oabi_flock64 { +struct target_oabi_flock { abi_short l_type; abi_short l_whence; abi_llong l_start;
@@ -6969,10 +6914,10 @@ struct target_oabi_flock64 {abi_int l_pid; }QEMU_PACKED ; -static inline abi_long copy_from_user_oabi_flock64 (struct flock64 *fl, +static inline abi_long copy_from_user_oabi_flock (struct flock *fl,abi_ulong target_flock_addr) { -struct target_oabi_flock64 *target_fl; +struct target_oabi_flock *target_fl;int l_type;if (!lock_user_struct (VERIFY_READ , target_fl, target_flock_addr,1 )) {
@@ -6993,10 +6938,10 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,return 0 ; } -static inline abi_long copy_to_user_oabi_flock64 (abi_ulong target_flock_addr, -const struct flock64 *fl) +static inline abi_long copy_to_user_oabi_flock (abi_ulong target_flock_addr, +const struct flock *fl) { -struct target_oabi_flock64 *target_fl; +struct target_oabi_flock *target_fl;short l_type;if (!lock_user_struct (VERIFY_WRITE , target_fl, target_flock_addr,0 )) {
@@ -7014,10 +6959,10 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr, }#endif -static inline abi_long copy_from_user_flock64 (struct flock64 *fl, +static inline abi_long copy_from_user_flock (struct flock *fl,abi_ulong target_flock_addr) { -struct target_flock64 *target_fl; +struct target_flock *target_fl;int l_type;if (!lock_user_struct (VERIFY_READ , target_fl, target_flock_addr,1 )) {
@@ -7038,10 +6983,10 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl,return 0 ; } -static inline abi_long copy_to_user_flock64 (abi_ulong target_flock_addr, -const struct flock64 *fl) +static inline abi_long copy_to_user_flock (abi_ulong target_flock_addr, +const struct flock *fl) { -struct target_flock64 *target_fl; +struct target_flock *target_fl;short l_type;if (!lock_user_struct (VERIFY_WRITE , target_fl, target_flock_addr,0 )) {
@@ -7060,7 +7005,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,static abi_long do_fcntl (int fd,int cmd,abi_ulong arg) { -struct flock64 fl64; +struct flock fl64;#ifdef F_GETOWN_EX struct f_owner_ex fox;struct target_f_owner_ex *target_fox;
@@ -7073,6 +7018,7 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)switch (cmd) {case TARGET_F_GETLK : +case TARGET_F_OFD_GETLK : ret =copy_from_user_flock (&fl64, arg);if (ret) {return ret;
@@ -7082,32 +7028,11 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) ret =copy_to_user_flock (arg, &fl64); }break ; -case TARGET_F_SETLK :case TARGET_F_SETLKW : - ret =copy_from_user_flock (&fl64, arg); -if (ret) { -return ret; - } - ret =get_errno (safe_fcntl (fd, host_cmd, &fl64)); -break ; - -case TARGET_F_GETLK64 : -case TARGET_F_OFD_GETLK : - ret =copy_from_user_flock64 (&fl64, arg); -if (ret) { -return ret; - } - ret =get_errno (safe_fcntl (fd, host_cmd, &fl64)); -if (ret ==0 ) { - ret =copy_to_user_flock64 (arg, &fl64); - } -break ; -case TARGET_F_SETLK64 : -case TARGET_F_SETLKW64 :case TARGET_F_OFD_SETLK :case TARGET_F_OFD_SETLKW : - ret =copy_from_user_flock64 (&fl64, arg); + ret =copy_from_user_flock (&fl64, arg);if (ret) {return ret; }
@@ -7332,7 +7257,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1 arg2 = arg3; arg3 = arg4; } -return get_errno (truncate64 (arg1,target_offset64 (arg2, arg3))); +return get_errno (truncate (arg1,target_offset64 (arg2, arg3))); }#endif
@@ -7346,7 +7271,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1, arg2 = arg3; arg3 = arg4; } -return get_errno (ftruncate64 (arg1,target_offset64 (arg2, arg3))); +return get_errno (ftruncate (arg1,target_offset64 (arg2, arg3))); }#endif
@@ -8452,7 +8377,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)void *tdirp;int hlen, hoff, toff;int hreclen, treclen; -off64_t prev_diroff =0 ; +off_t prev_diroff =0 ; hdirp =g_try_malloc (count);if (!hdirp) {
@@ -8505,7 +8430,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)* Return what we have, resetting the file pointer to the * location of the first record not returned. */ -lseek64 (dirfd, prev_diroff,SEEK_SET ); +lseek (dirfd, prev_diroff,SEEK_SET );break ; }
@@ -8539,7 +8464,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)void *tdirp;int hlen, hoff, toff;int hreclen, treclen; -off64_t prev_diroff =0 ; +off_t prev_diroff =0 ; hdirp =g_try_malloc (count);if (!hdirp) {
@@ -8581,7 +8506,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)* Return what we have, resetting the file pointer to the * location of the first record not returned. */ -lseek64 (dirfd, prev_diroff,SEEK_SET ); +lseek (dirfd, prev_diroff,SEEK_SET );break ; }
@@ -11114,7 +11039,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,return -TARGET_EFAULT ; } } - ret =get_errno (pread64 (arg1, p, arg3,target_offset64 (arg4, arg5))); + ret =get_errno (pread (arg1, p, arg3,target_offset64 (arg4, arg5)));unlock_user (p, arg2, ret);return ret;case TARGET_NR_pwrite64:
@@ -11131,7 +11056,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, return -TARGET_EFAULT; } } - ret =get_errno (pwrite64 (arg1, p, arg3,target_offset64 (arg4, arg5))); + ret =get_errno (pwrite (arg1, p, arg3,target_offset64 (arg4, arg5)));unlock_user (p, arg2,0 );return ret;#endif
@@ -11954,14 +11879,14 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,case TARGET_NR_fcntl64: {int cmd; -struct flock64 fl; -from_flock64_fn *copyfrom = copy_from_user_flock64; -to_flock64_fn *copyto = copy_to_user_flock64; +struct flock fl; +from_flock_fn *copyfrom = copy_from_user_flock; +to_flock_fn *copyto = copy_to_user_flock;#ifdef TARGET_ARM if (!cpu_env->eabi) { - copyfrom = copy_from_user_oabi_flock64; - copyto = copy_to_user_oabi_flock64; + copyfrom = copy_from_user_oabi_flock; + copyto = copy_to_user_oabi_flock; }#endif
@@ -11971,7 +11896,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, }switch (arg2) { -case TARGET_F_GETLK64 : +case TARGET_F_GETLK : ret =copyfrom (&fl, arg3);if (ret) {break ;
@@ -11982,8 +11907,8 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, }break ; -case TARGET_F_SETLK64 : -case TARGET_F_SETLKW64 : +case TARGET_F_SETLK : +case TARGET_F_SETLKW : ret =copyfrom (&fl, arg3);if (ret) {break ;
Signature · 1 line
2.39.0
Re: [PATCH 2/2] linux-user: Replace use of lfs64 related functions and macros
Did anything happen with this, or did it get stuck?
We just had another user hit it in Gentoo at
https://bugs.gentoo.org/915809.
It looks like openembedded (obviously given the author) and Alpine have been using this for nearly a year.
thanks,
sam
Re: [PATCH 2/2] linux-user: Replace use of lfs64 related functions and macros
Quoted 7 lines · Sam James
Did anything happen with this, or did it get stuck?
We just had another user hit it in Gentoo at
https://bugs.gentoo.org/915809.It looks like openembedded (obviously given the author) and Alpine have been using this for nearly a year.
I might be wrong, but it seems this will probably break various 32-bit linux-user emulations, e.g. the whole TARGET_ABI_BITS == 32 block is dropped:
-#if TARGET_ABI_BITS == 32
- case TARGET_F_GETLK64:
- ret = F_GETLK64;
- break;
....
Where is TARGET_F_GETLK64 handled?
Helge
Quoted 4 lines · Khem Raj
64bit
off_tis already in use since build uses _FILE_OFFSET_BITS=64 already. Using lseek/off_t also makes it work with latest must without
s/must/musl/ ?
Quoted 3 lines
using
_LARGEFILE64_SOURCEmacro. This macro is implied with_GNU_SOURCEwhen using glibc but not with musl.
Other than the nit LGTM
Quoted 26 lines
Signed-off-by Khem Raj <[email protected]>Cc Michael S. Tsirkin <[email protected]>CC Raphael Norwitz <[email protected]>---
contrib/vhost-user-blk/vhost-user-blk.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)contrib/vhost-user-blk/vhost-user-blk.c +0
-0@@ -532,9 +532,9 @@ vub_get_blocksize(int fd)static void
vub_initialize_config(int fd, struct virtio_blk_config *config){contrib/vhost-user-blk/vhost-user-blk.c +2
-2-off64_t capacity; +off_t capacity; - capacity =lseek64 (fd,0 ,SEEK_END ); + capacity =lseek (fd,0 ,SEEK_END ); config->capacity = capacity >>9 ; config->blk_size =vub_get_blocksize (fd); config->size_max =65536 ;Signature · 1 line
2.39.0