let import_iovec deal with compat_iovecs as well v3
Subsystems (25)
Hi Al,
this series changes import_iovec to transparently deal with comat iovec structures, and then cleanups up a lot of code dupliation.
Changes since v2:
- revert the switch of the access process vm sysclls to iov_iter
- refactor the import_iovec internals differently
- switch aio to use __import_iovec
Changes since v1:
- improve a commit message
- drop a pointless unlikely
- drop the PF_FORCE_COMPAT flag
- add a few more cleanups (including two from David Laight)
Diffstat:
arch/arm64/include/asm/unistd32.h | 10 arch/mips/kernel/syscalls/syscall_n32.tbl | 10 arch/mips/kernel/syscalls/syscall_o32.tbl | 10 arch/parisc/kernel/syscalls/syscall.tbl | 10 arch/powerpc/kernel/syscalls/syscall.tbl | 10 arch/s390/kernel/syscalls/syscall.tbl | 10 arch/sparc/kernel/syscalls/syscall.tbl | 10 arch/x86/entry/syscall_x32.c | 5 arch/x86/entry/syscalls/syscall_32.tbl | 10 arch/x86/entry/syscalls/syscall_64.tbl | 10 block/scsi_ioctl.c | 12 drivers/scsi/sg.c | 9 fs/aio.c | 38 -- fs/io_uring.c | 20 - fs/read_write.c | 362 +-------------------- fs/splice.c | 57 --- include/linux/compat.h | 24 - include/linux/fs.h | 11 include/linux/uio.h | 10 include/uapi/asm-generic/unistd.h | 12 lib/iov_iter.c | 161 +++++++-- mm/process_vm_access.c | 85 ---- net/compat.c | 4 security/keys/compat.c | 37 -- security/keys/internal.h | 5 security/keys/keyctl.c | 2 tools/include/uapi/asm-generic/unistd.h | 12 tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 10 tools/perf/arch/s390/entry/syscalls/syscall.tbl | 10 tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 10 30 files changed, 280 insertions(+), 706 deletions(-)
PATCH 1/9 compat.h: fix a spelling error in <linux/compat.h>
There is no compat_sys_readv64v2 syscall, only a compat_sys_preadv64v2 one.
--- include/linux/compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/compat.h +1 -1
@@ -812,7 +812,7 @@ asmlinkage ssize_t compat_sys_pwritev2(compat_ulong_t fd,const struct compat_iovec __user *vec, compat_ulong_t vlen, u32 pos_low, u32 pos_high, rwf_t flags);#ifdef __ARCH_WANT_COMPAT_SYS_PREADV64V2 -asmlinkage long compat_sys_readv64v2 (unsigned long fd, +asmlinkage long compat_sys_preadv64v2 (unsigned long fd,const struct compat_iovec __user *vec,unsigned long vlen,loff_t pos,rwf_t flags);#endif
Signature · 1 line
2.28.0
PATCH 2/9 iov_iter: move rw_copy_check_uvector() into lib/iov_iter.c
In reply to Christoph HellwigFrom: David Laight <[email protected]>
This lets the compiler inline it into import_iovec() generating much better code.
--- fs/read_write.c | 179 ------------------------------------------------ lib/iov_iter.c | 176 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+), 179 deletions(-)
fs/read_write.c +0 -179
@@ -752,185 +752,6 @@ static ssize_t do_loop_readv_writev(struct file *filp, struct iov_iter *iter,return ret; } -/** -* rw_copy_check_uvector() - Copy an array of &struct iovec from userspace -* into the kernel and check that it is valid. -* -* @type: One of %CHECK_IOVEC_ONLY, %READ, or %WRITE. -* @uvector: Pointer to the userspace array. -* @nr_segs: Number of elements in userspace array. -* @fast_segs: Number of elements in @fast_pointer. -* @fast_pointer: Pointer to (usually small on-stack) kernel array. -* @ret_pointer: (output parameter) Pointer to a variable that will point to -* either @fast_pointer, a newly allocated kernel array, or NULL, -* depending on which array was used. -* -* This function copies an array of &struct iovec of @nr_segs from -* userspace into the kernel and checks that each element is valid (e.g. -* it does not point to a kernel address or cause overflow by being too -* large, etc.). -* -* As an optimization, the caller may provide a pointer to a small -* on-stack array in @fast_pointer, typically %UIO_FASTIOV elements long -* (the size of this array, or 0 if unused, should be given in @fast_segs). -* -* @ret_pointer will always point to the array that was used, so the -* caller must take care not to call kfree() on it e.g. in case the -* @fast_pointer array was used and it was allocated on the stack. -* -* Return: The total number of bytes covered by the iovec array on success -* or a negative error code on error. -*/ -ssize_t rw_copy_check_uvector (int type,const struct iovec __user * uvector, -unsigned long nr_segs,unsigned long fast_segs, -struct iovec *fast_pointer, -struct iovec **ret_pointer) -{ -unsigned long seg; -ssize_t ret; -struct iovec *iov = fast_pointer; - -/* -* SuS says "The readv() function *may* fail if the iovcnt argument -* was less than or equal to 0, or greater than {IOV_MAX}. Linux has -* traditionally returned zero for zero segments, so... -*/ -if (nr_segs =0 ) { - ret =0 ; - goto out; - } - -/* -* First get the "struct iovec" from user memory and -* verify all the pointers -*/ -if (nr_segs >UIO_MAXIOV ) { - ret = -EINVAL ; - goto out; - } -if (nr_segs > fast_segs) { - iov =kmalloc_array (nr_segs,sizeof (struct iovec ),GFP_KERNEL ); -if (iov =NULL ) { - ret = -ENOMEM ; - goto out; - } - } -if (copy_from_user (iov, uvector, nr_segs*sizeof (*uvector))) { - ret = -EFAULT ; - goto out; - } - -/* -* According to the Single Unix Specification we should return EINVAL -* if an element length is < 0 when cast to ssize_t or if the -* total length would overflow the ssize_t return value of the -* system call. -* -* Linux caps all read/write calls to MAX_RW_COUNT, and avoids the -* overflow case. -*/ - ret =0 ; -for (seg =0 ; seg < nr_segs; seg++) { -void __user *buf = iov[seg].iov_base; -ssize_t len = (ssize_t )iov[seg].iov_len; - -/* see if we we're about to use an invalid len or if -* it's about to overflow ssize_t */ -if (len <0 ) { - ret = -EINVAL ; - goto out; - } -if (type >=0 - &&unlikely (!access_ok (buf, len))) { - ret = -EFAULT ; - goto out; - } -if (len >MAX_RW_COUNT - ret) { - len =MAX_RW_COUNT - ret; - iov[seg].iov_len = len; - } - ret += len; - } -out: - *ret_pointer = iov; -return ret; -} - -#ifdef CONFIG_COMPAT -ssize_t compat_rw_copy_check_uvector (int type, -const struct compat_iovec __user *uvector,unsigned long nr_segs, -unsigned long fast_segs,struct iovec *fast_pointer, -struct iovec **ret_pointer) -{ -compat_ssize_t tot_len; -struct iovec *iov = *ret_pointer = fast_pointer; -ssize_t ret =0 ; -int seg; - -/* -* SuS says "The readv() function *may* fail if the iovcnt argument -* was less than or equal to 0, or greater than {IOV_MAX}. Linux has -* traditionally returned zero for zero segments, so... -*/ -if (nr_segs =0 ) - goto out; - - ret = -EINVAL ; -if (nr_segs >UIO_MAXIOV ) - goto out; -if (nr_segs > fast_segs) { - ret = -ENOMEM ; - iov =kmalloc_array (nr_segs,sizeof (struct iovec ),GFP_KERNEL ); -if (iov =NULL ) - goto out; - } - *ret_pointer = iov; - - ret = -EFAULT ; -if (!access_ok (uvector, nr_segs*sizeof (*uvector))) - goto out; - -/* -* Single unix specification: -* We should -EINVAL if an element length is not >= 0 and fitting an -* ssize_t. -* -* In Linux, the total length is limited to MAX_RW_COUNT, there is -* no overflow possibility. -*/ - tot_len =0 ; - ret = -EINVAL ; -for (seg =0 ; seg < nr_segs; seg++) { -compat_uptr_t buf; -compat_ssize_t len; - -if (__get_user (len, &uvector->iov_len) || -__get_user (buf, &uvector->iov_base)) { - ret = -EFAULT ; - goto out; - } -if (len <0 )/* size_t not fitting in compat_ssize_t .. */ - goto out; -if (type >=0 && - !access_ok (compat_ptr (buf), len)) { - ret = -EFAULT ; - goto out; - } -if (len >MAX_RW_COUNT - tot_len) - len =MAX_RW_COUNT - tot_len; - tot_len += len; - iov->iov_base =compat_ptr (buf); - iov->iov_len = (compat_size_t ) len; - uvector++; - iov++; - } - ret = tot_len; - -out: -return ret; -} -#endif -static ssize_t do_iter_read (struct file *file,struct iov_iter *iter,loff_t *pos,rwf_t flags) {
lib/iov_iter.c +176 -0
188 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH 3/9 iov_iter: refactor rw_copy_check_uvector and import_iovec
In reply to Christoph HellwigSplit rw_copy_check_uvector into two new helpers with more sensible calling conventions:
- iovec_from_user copies a iovec from userspace either into the provided stack buffer if it fits, or allocates a new buffer for it. Returns the actually used iovec. It also verifies that iov_len does fit a signed type, and handles compat iovecs if the compat flag is set.
- __import_iovec consolidates the native and compat versions of import_iovec. It calls iovec_from_user, then validates each iovec actually points to user addresses, and ensures the total length doesn't overflow.
This has two major implications:
- the access_process_vm case loses the total lenght checking, which wasn't required anyway, given that each call receives two iovecs for the local and remote side of the operation, and it verifies the total length on the local side already.
- instead of a single loop there now are two loops over the iovecs. Given that the iovecs are cache hot this doesn't make a major difference
--- include/linux/compat.h | 6 - include/linux/fs.h | 13 -- include/linux/uio.h | 12 +- lib/iov_iter.c | 300 ++++++++++++++++------------------------- mm/process_vm_access.c | 34 +++-- 5 files changed, 138 insertions(+), 227 deletions(-)
include/linux/compat.h +0 -6
@@ -451,12 +451,6 @@ extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,struct epoll_event ;/* fortunately, this one is fixed-layout */ -extern ssize_t compat_rw_copy_check_uvector (int type, -const struct compat_iovec __user *uvector, -unsigned long nr_segs, -unsigned long fast_segs,struct iovec *fast_pointer, -struct iovec **ret_pointer); -extern void __user *compat_alloc_user_space (unsigned long len);int compat_restore_altstack (const compat_stack_t __user *uss);
include/linux/fs.h +0 -13
@@ -178,14 +178,6 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,/* File supports async buffered reads */ #define FMODE_BUF_RASYNC ((__force fmode_t)0x40000000) -/* -* Flag for rw_copy_check_uvector and compat_rw_copy_check_uvector -* that indicates that they should check the contents of the iovec are -* valid, but not check the memory that the iovec elements -* points too. -*/ -#define CHECK_IOVEC_ONLY -1 -/* * Attribute flags. These should be or-ed together to figure out what * has been changed!
@@ -1887,11 +1879,6 @@ static inline int call_mmap(struct file *file, struct vm_area_struct *vma)return file->f_op->mmap (file, vma); } -ssize_t rw_copy_check_uvector (int type,const struct iovec __user * uvector, -unsigned long nr_segs,unsigned long fast_segs, -struct iovec *fast_pointer, -struct iovec **ret_pointer); -extern ssize_t vfs_read (struct file *,char __user *,size_t ,loff_t *);extern ssize_t vfs_write (struct file *,const char __user *,size_t ,loff_t *); extern ssize_t vfs_readv(struct file *, const struct iovec __user *,
include/linux/uio.h +9 -3
@@ -266,9 +266,15 @@ bool csum_and_copy_from_iter_full(void *addr, size_t bytes, __wsum *csum, structsize_t hash_and_copy_to_iter (const void *addr,size_t bytes,void *hashp,struct iov_iter *i); -ssize_t import_iovec (int type,const struct iovec __user * uvector, -unsigned nr_segs,unsigned fast_segs, -struct iovec **iov,struct iov_iter *i); +struct iovec *iovec_from_user (const struct iovec __user *uvector, +unsigned long nr_segs,unsigned long fast_segs, +struct iovec *fast_iov,bool compat); +ssize_t import_iovec (int type,const struct iovec __user *uvec, +unsigned nr_segs,unsigned fast_segs,struct iovec **iovp, +struct iov_iter *i); +ssize_t __import_iovec (int type,const struct iovec __user *uvec, +unsigned nr_segs,unsigned fast_segs,struct iovec **iovp, +struct iov_iter *i,bool compat);#ifdef CONFIG_COMPAT struct compat_iovec ;
lib/iov_iter.c +113 -186
356 lines not on this page · raw message
mm/process_vm_access.c +15 -19
@@ -276,20 +276,17 @@ static ssize_t process_vm_rw(pid_t pid,if (rc <0 )return rc;if (!iov_iter_count (&iter)) - goto free_iovecs; - - rc =rw_copy_check_uvector (CHECK_IOVEC_ONLY , rvec, riovcnt,UIO_FASTIOV , - iovstack_r, &iov_r); -if (rc <=0 ) - goto free_iovecs; - + goto free_iov_l; + iov_r =iovec_from_user (rvec, riovcnt,UIO_FASTIOV , iovstack_r, false); +if (IS_ERR (iov_r)) { + rc =PTR_ERR (iov_r); + goto free_iov_l; + } rc =process_vm_rw_core (pid, &iter, iov_r, riovcnt, flags, vm_write); - -free_iovecs:if (iov_r != iovstack_r)kfree (iov_r); +free_iov_l:kfree (iov_l); -return rc; }
@@ -333,18 +330,17 @@ compat_process_vm_rw(compat_pid_t pid,if (rc <0 )return rc;if (!iov_iter_count (&iter)) - goto free_iovecs; - rc =compat_rw_copy_check_uvector (CHECK_IOVEC_ONLY , rvec, riovcnt, -UIO_FASTIOV , iovstack_r, - &iov_r); -if (rc <=0 ) - goto free_iovecs; - + goto free_iov_l; + iov_r =iovec_from_user ((const struct iovec __user *)rvec, riovcnt, +UIO_FASTIOV , iovstack_r, true); +if (IS_ERR (iov_r)) { + rc =PTR_ERR (iov_r); + goto free_iov_l; + } rc =process_vm_rw_core (pid, &iter, iov_r, riovcnt, flags, vm_write); - -free_iovecs:if (iov_r != iovstack_r)kfree (iov_r); +free_iov_l:kfree (iov_l);return rc; }
Signature · 1 line
2.28.0
Al Viro
maintainerRe: [PATCH 3/9] iov_iter: refactor rw_copy_check_uvector and import_iovec
lib/iov_iter.c const void *dup_iter(struct iov_iter *new, struct iov_iter *old, gfp_t flags) · line 1701
Quoted 2 lines · Christoph Hellwig
lib/iov_iter.c +2
-0+struct iovec *iovec_from_user(const struct iovec __user *uvec, + unsigned long nr_segs, unsigned long fast_segs,
Hmm... For fast_segs unsigned long had always been ridiculous (4G struct iovec on caller stack frame?), but that got me wondering about nr_segs and I wish I'd thought of that when introducing import_iovec().
The thing is, import_iovec() takes unsigned int there. Which is fine (hell, the maximal value that can be accepted in 1024), except that we do pass unsigned long syscall argument to it in some places.
E.g. vfs_readv() quietly truncates vlen to 32 bits, and vlen can come unchanged through sys_readv() -> do_readv() -> vfs_readv(). With unsigned long passed by syscall glue.
AFAICS, passing 4G+1 as the third argument to readv(2) on 64bit box will be quietly treated as 1 these days. Which would be fine, except that before "switch {compat_,}do_readv_writev() to {compat_,}import_iovec()" it used to fail with -EINVAL.
Userland, BTW, describes readv(2) iovcnt as int; process_vm_readv(), OTOH, has these counts unsigned long from the userland POV...
I suppose we ought to switch import_iovec() to unsigned long for nr_segs ;-/ Strictly speaking that had been a userland ABI change, even though nothing except regression tests checking for expected errors would've been likely to notice. And it looks like no regression tests covered that one...
Linus, does that qualify for your "if no userland has noticed the change, it's not a breakage"?
RE: [PATCH 3/9] iov_iter: refactor rw_copy_check_uvector and import_iovec
From: Al Viro
Quoted 11 lines
Sent: 23 September 2020 15:17
lib/iov_iter.c const void *dup_iter(struct iov_iter *new, struct iov_iter *old, gfp_t flags) · line 1701
Quoted 2 lines · Christoph Hellwig
lib/iov_iter.c +2
-0+struct iovec *iovec_from_user(const struct iovec __user *uvec, + unsigned long nr_segs, unsigned long fast_segs,Hmm... For
fast_segsunsigned long had always been ridiculous (4G struct iovec on caller stack frame?), but that got me wondering aboutnr_segsand I wish I'd thought of that when introducingimport_iovec().
Quoted 3 lines
The thing is,
import_iovec()takes unsigned int there. Which is fine (hell, the maximal value that can be accepted in 1024), except that we do pass unsigned long syscall argument to it in some places.
It will make diddly-squit difference.
The parameters end up in registers on most calling conventions. Plausibly you get an extra 'REX' byte on x86 for the 64bit value. What you want to avoid is explicit sign/zero extension and value masking after arithmetic.
On x86-64 the 'horrid' type is actually 'signed int'. It often needs sign extending to 64bits (eg when being used as an array subscript).
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Al Viro
maintainerRe: [PATCH 3/9] iov_iter: refactor rw_copy_check_uvector and import_iovec
Quoted 16 lines · David Laight
From: Al Viro
Quoted 11 lines
Sent: 23 September 2020 15:17
lib/iov_iter.c const void *dup_iter(struct iov_iter *new, struct iov_iter *old, gfp_t flags) · line 1701
Quoted 2 lines · Christoph Hellwig
lib/iov_iter.c +2
-0+struct iovec *iovec_from_user(const struct iovec __user *uvec, + unsigned long nr_segs, unsigned long fast_segs,Hmm... For
fast_segsunsigned long had always been ridiculous (4G struct iovec on caller stack frame?), but that got me wondering aboutnr_segsand I wish I'd thought of that when introducingimport_iovec().Quoted 3 lines
The thing is,
import_iovec()takes unsigned int there. Which is fine (hell, the maximal value that can be accepted in 1024), except that we do pass unsigned long syscall argument to it in some places.
Quoted 5 lines
It will make diddly-squit difference.
The parameters end up in registers on most calling conventions. Plausibly you get an extra 'REX' byte on x86 for the 64bit value. What you want to avoid is explicit sign/zero extension and value masking after arithmetic.
Don't tell me what I want; your telepathic abilities are consistently sucky.
I am *NOT* talking about microoptimization here. I have described the behaviour change of syscall caused by commit 5 years ago. Which is generally considered a problem. Then I asked whether that behaviour change would fall under the "if nobody noticed, it's not a userland ABI breakage" exception.
Could you show me the point where I have expressed concerns about the quality of amd64 code generated for that thing, before or after the change in question?
Al Viro
maintainerRe: [PATCH 3/9] iov_iter: refactor rw_copy_check_uvector and import_iovec
In reply to Al ViroQuoted 25 lines · Al Viro
lib/iov_iter.c const void *dup_iter(struct iov_iter *new, struct iov_iter *old, gfp_t flags) · line 1701
Quoted 2 lines · Christoph Hellwig
lib/iov_iter.c +2
-0+struct iovec *iovec_from_user(const struct iovec __user *uvec, + unsigned long nr_segs, unsigned long fast_segs,Hmm... For
fast_segsunsigned long had always been ridiculous (4G struct iovec on caller stack frame?), but that got me wondering aboutnr_segsand I wish I'd thought of that when introducingimport_iovec().The thing is,
import_iovec()takes unsigned int there. Which is fine (hell, the maximal value that can be accepted in 1024), except that we do pass unsigned long syscall argument to it in some places.E.g.
vfs_readv()quietly truncates vlen to 32 bits, and vlen can come unchanged throughsys_readv()->do_readv()->vfs_readv(). With unsigned long passed by syscall glue.AFAICS, passing 4G+1 as the third argument to readv(2) on 64bit box will be quietly treated as 1 these days. Which would be fine, except that before "switch {compat_,}do_readv_writev() to {compat_,}import_iovec()" it used to fail with
-EINVAL.Userland, BTW, describes readv(2) iovcnt as int;
process_vm_readv(), OTOH, has these counts unsigned long from the userland POV...
Quoted 7 lines
I suppose we ought to switch
import_iovec()to unsigned long fornr_segs;-/ Strictly speaking that had been a userland ABI change, even though nothing except regression tests checking for expected errors would've been likely to notice. And it looks like no regression tests covered that one...Linus, does that qualify for your "if no userland has noticed the change, it's not a breakage"?
Egads... We have sys_readv() with unsigned long for file descriptor, since 1.3.31 when it had been introduced. And originally it did comparison with NR_OPEN right in sys_readv(). Then in 2.1.60 it had been switched to fget(), which used to take unsigned long at that point. And in 2.1.90pre1 it went unsigned int, so non-zero upper 32 bits in readv(2) first argument ceased to cause EBADF...
Of course, libc had it as int fd all along.
PATCH 4/9 iov_iter: transparently handle compat iovecs in import_iovec
In reply to Christoph HellwigUse in compat_syscall to import either native or the compat iovecs, and remove the now superflous compat_import_iovec.
This removes the need for special compat logic in most callers, and the remaining ones can still be simplified by using __import_iovec with a bool compat parameter.
--- block/scsi_ioctl.c | 12 ++---------- drivers/scsi/sg.c | 9 +-------- fs/aio.c | 8 ++------ fs/io_uring.c | 20 ++++++++------------ fs/read_write.c | 6 ++++-- fs/splice.c | 2 +- include/linux/uio.h | 8 -------- lib/iov_iter.c | 14 ++------------ mm/process_vm_access.c | 3 ++- net/compat.c | 4 ++-- security/keys/compat.c | 5 ++--- 11 files changed, 26 insertions(+), 65 deletions(-)
block/scsi_ioctl.c +2 -10
@@ -333,16 +333,8 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,struct iov_iter i;struct iovec *iov =NULL ; -#ifdef CONFIG_COMPAT -if (in_compat_syscall ()) - ret =compat_import_iovec (rq_data_dir (rq), - hdr->dxferp, hdr->iovec_count, -0 , &iov, &i); - else -#endif - ret =import_iovec (rq_data_dir (rq), - hdr->dxferp, hdr->iovec_count, -0 , &iov, &i); + ret =import_iovec (rq_data_dir (rq), hdr->dxferp, + hdr->iovec_count,0 , &iov, &i);if (ret <0 ) goto out_free_cdb;
drivers/scsi/sg.c +1 -8
@@ -1820,14 +1820,7 @@ sg_start_req(Sg_request *srp, unsigned char *cmd)struct iovec *iov =NULL ;struct iov_iter i; -#ifdef CONFIG_COMPAT -if (in_compat_syscall ()) - res =compat_import_iovec (rw, hp->dxferp, iov_count, -0 , &iov, &i); - else -#endif - res =import_iovec (rw, hp->dxferp, iov_count, -0 , &iov, &i); + res =import_iovec (rw, hp->dxferp, iov_count,0 , &iov, &i);if (res <0 )return res;
fs/aio.c +2 -6
@@ -1489,12 +1489,8 @@ static ssize_t aio_setup_rw(int rw, const struct iocb *iocb, *iovec =NULL ;return ret; } -#ifdef CONFIG_COMPAT -if (compat) -return compat_import_iovec (rw, buf, len,UIO_FASTIOV , iovec, - iter); -#endif -return import_iovec (rw, buf, len,UIO_FASTIOV , iovec, iter); + +return __import_iovec (rw, buf, len,UIO_FASTIOV , iovec, iter, compat); }static inline void aio_rw_done (struct kiocb *req,ssize_t ret)
fs/io_uring.c +8 -12
@@ -2837,13 +2837,8 @@ static ssize_t __io_import_iovec(int rw, struct io_kiocb *req,return ret; } -#ifdef CONFIG_COMPAT -if (req->ctx->compat) -return compat_import_iovec (rw, buf, sqe_len,UIO_FASTIOV , - iovec, iter); -#endif - -return import_iovec (rw, buf, sqe_len,UIO_FASTIOV , iovec, iter); +return __import_iovec (rw, buf, sqe_len,UIO_FASTIOV , iovec, iter, + req->ctx->compat); } static ssize_t io_import_iovec(int rw, struct io_kiocb *req,
@@ -4179,8 +4174,9 @@ static int __io_recvmsg_copy_hdr(struct io_kiocb *req, sr->len); iomsg->iov =NULL ; }else { - ret =import_iovec (READ , uiov, iov_len,UIO_FASTIOV , - &iomsg->iov, &iomsg->msg.msg_iter); + ret =__import_iovec (READ , uiov, iov_len,UIO_FASTIOV , + &iomsg->iov, &iomsg->msg.msg_iter, + false);if (ret >0 ) ret =0 ; }
@@ -4220,9 +4216,9 @@ static int __io_compat_recvmsg_copy_hdr(struct io_kiocb *req, sr->len = iomsg->iov[0 ].iov_len; iomsg->iov =NULL ; }else { - ret =compat_import_iovec (READ , uiov, len,UIO_FASTIOV , - &iomsg->iov, - &iomsg->msg.msg_iter); + ret =__import_iovec (READ , (struct iovec __user *)uiov, len, +UIO_FASTIOV , &iomsg->iov, + &iomsg->msg.msg_iter, true);if (ret <0 )return ret; }
fs/read_write.c +4 -2
@@ -1078,7 +1078,8 @@ static size_t compat_readv(struct file *file,struct iov_iter iter;ssize_t ret; - ret =compat_import_iovec (READ , vec, vlen,UIO_FASTIOV , &iov, &iter); + ret =import_iovec (READ , (const struct iovec __user *)vec, vlen, +UIO_FASTIOV , &iov, &iter);if (ret >=0 ) { ret =do_iter_read (file, &iter, pos, flags);kfree (iov);
@@ -1186,7 +1187,8 @@ static size_t compat_writev(struct file *file,struct iov_iter iter;ssize_t ret; - ret =compat_import_iovec (WRITE , vec, vlen,UIO_FASTIOV , &iov, &iter); + ret =import_iovec (WRITE , (const struct iovec __user *)vec, vlen, +UIO_FASTIOV , &iov, &iter);if (ret >=0 ) {file_start_write (file); ret =do_iter_write (file, &iter, pos, flags);
fs/splice.c +1 -1
@@ -1387,7 +1387,7 @@ COMPAT_SYSCALL_DEFINE4(vmsplice, int, fd, const struct compat_iovec __user *, ioif (error)return error; - error =compat_import_iovec (type, iov32, nr_segs, + error =import_iovec (type, (struct iovec __user *)iov32, nr_segs,ARRAY_SIZE (iovstack), &iov, &iter);if (error >=0 ) { error =do_vmsplice (f.file, &iter, flags);
include/linux/uio.h +0 -8
@@ -275,14 +275,6 @@ ssize_t import_iovec(int type, const struct iovec __user *uvec,ssize_t __import_iovec (int type,const struct iovec __user *uvec,unsigned nr_segs,unsigned fast_segs,struct iovec **iovp,struct iov_iter *i,bool compat); - -#ifdef CONFIG_COMPAT -struct compat_iovec ; -ssize_t compat_import_iovec (int type,const struct compat_iovec __user * uvector, -unsigned nr_segs,unsigned fast_segs, -struct iovec **iov,struct iov_iter *i); -#endif -int import_single_range (int type,void __user *buf,size_t len,struct iovec *iov,struct iov_iter *i);
lib/iov_iter.c +2 -12
@@ -1806,21 +1806,11 @@ ssize_t import_iovec(int type, const struct iovec __user *uvec, unsigned nr_segs, unsigned fast_segs, struct iovec **iovp, struct iov_iter *i) { - return __import_iovec(type, uvec, nr_segs, fast_segs, iovp, i, false); + return __import_iovec(type, uvec, nr_segs, fast_segs, iovp, i, +in_compat_syscall ()); }EXPORT_SYMBOL (import_iovec); -#ifdef CONFIG_COMPAT -ssize_t compat_import_iovec (int type,const struct compat_iovec __user *uvec, -unsigned nr_segs,unsigned fast_segs,struct iovec **iovp, -struct iov_iter *i) -{ -return __import_iovec (type, (const struct iovec __user *)uvec, nr_segs, - fast_segs, iovp, i, true); -} -EXPORT_SYMBOL (compat_import_iovec); -#endif -int import_single_range (int rw,void __user *buf,size_t len,struct iovec *iov,struct iov_iter *i) {
mm/process_vm_access.c +2 -1
@@ -326,7 +326,8 @@ compat_process_vm_rw(compat_pid_t pid,if (flags !=0 )return -EINVAL ; - rc =compat_import_iovec (dir, lvec, liovcnt,UIO_FASTIOV , &iov_l, &iter); + rc =import_iovec (dir, (const struct iovec __user *)lvec, liovcnt, +UIO_FASTIOV , &iov_l, &iter);if (rc <0 )return rc;if (!iov_iter_count (&iter))
net/compat.c +2 -2
@@ -98,8 +98,8 @@ int get_compat_msghdr(struct msghdr *kmsg,if (err)return err; - err =compat_import_iovec (save_addr ?READ :WRITE ,compat_ptr (ptr), - len,UIO_FASTIOV , iov, &kmsg->msg_iter); + err =import_iovec (save_addr ?READ :WRITE ,compat_ptr (ptr), len, +UIO_FASTIOV , iov, &kmsg->msg_iter);return err <0 ? err :0 ; }
security/keys/compat.c +2 -3
@@ -33,9 +33,8 @@ static long compat_keyctl_instantiate_key_iov(if (!_payload_iov) ioc =0 ; - ret =compat_import_iovec (WRITE , _payload_iov, ioc, -ARRAY_SIZE (iovstack), &iov, - &from); + ret =import_iovec (WRITE , (const struct iovec __user *)_payload_iov, + ioc,ARRAY_SIZE (iovstack), &iov, &from);if (ret <0 )return ret;
Signature · 1 line
2.28.0
PATCH 5/9 fs: remove various compat readv/writev helpers
In reply to Christoph HellwigNow that import_iovec handles compat iovecs as well, all the duplicated code in the compat readv/writev helpers is not needed. Remove them and switch the compat syscall handlers to use the native helpers.
--- fs/read_write.c | 179 ++++++++---------------------------------------- 1 file changed, 30 insertions(+), 149 deletions(-)
fs/read_write.c +30 -149
@@ -1068,226 +1068,107 @@ SYSCALL_DEFINE6(pwritev2, unsigned long, fd, const struct iovec __user *, vec,return do_pwritev (fd, vec, vlen, pos, flags); } +/* +* Various compat syscalls. Note that they all pretend to take a native +* iovec - import_iovec will properly treat those as compat_iovecs based on +* in_compat_syscall(). +*/ #ifdef CONFIG_COMPAT -static size_t compat_readv (struct file *file, -const struct compat_iovec __user *vec, -unsigned long vlen,loff_t *pos,rwf_t flags) -{ -struct iovec iovstack[UIO_FASTIOV ]; -struct iovec *iov = iovstack; -struct iov_iter iter; -ssize_t ret; - - ret =import_iovec (READ , (const struct iovec __user *)vec, vlen, -UIO_FASTIOV , &iov, &iter); -if (ret >=0 ) { - ret =do_iter_read (file, &iter, pos, flags); -kfree (iov); - } -if (ret >0 ) -add_rchar (current, ret); -inc_syscr (current); -return ret; -} - -static size_t do_compat_readv (compat_ulong_t fd, -const struct compat_iovec __user *vec, -compat_ulong_t vlen,rwf_t flags) -{ -struct fd f =fdget_pos (fd); -ssize_t ret; -loff_t pos; - -if (!f.file) -return -EBADF ; - pos = f.file->f_pos; - ret =compat_readv (f.file, vec, vlen, &pos, flags); -if (ret >=0 ) - f.file->f_pos = pos; -fdput_pos (f); -return ret; - -} -COMPAT_SYSCALL_DEFINE3 (readv, compat_ulong_t, fd, - const struct compat_iovec __user *,vec, + const struct iovec __user *, vec, compat_ulong_t, vlen) { -return do_compat_readv (fd, vec, vlen,0 ); -} - -static long do_compat_preadv64 (unsigned long fd, -const struct compat_iovec __user *vec, -unsigned long vlen,loff_t pos,rwf_t flags) -{ -struct fd f; -ssize_t ret; - -if (pos <0 ) -return -EINVAL ; - f =fdget (fd); -if (!f.file) -return -EBADF ; - ret = -ESPIPE ; -if (f.file->f_mode &FMODE_PREAD ) - ret =compat_readv (f.file, vec, vlen, &pos, flags); -fdput (f); -return ret; +return do_readv (fd, vec, vlen,0 ); }#ifdef __ARCH_WANT_COMPAT_SYS_PREADV64 COMPAT_SYSCALL_DEFINE4(preadv64, unsigned long, fd, - const struct compat_iovec __user *,vec, + const struct iovec __user *, vec, unsigned long, vlen, loff_t, pos) { -return do_compat_preadv64 (fd, vec, vlen, pos,0 ); +return do_preadv (fd, vec, vlen, pos,0 ); }#endif COMPAT_SYSCALL_DEFINE5 (preadv, compat_ulong_t, fd, - const struct compat_iovec __user *,vec, + const struct iovec __user *, vec, compat_ulong_t, vlen, u32, pos_low, u32, pos_high) {loff_t pos = ((loff_t )pos_high <<32 ) | pos_low; -return do_compat_preadv64 (fd, vec, vlen, pos,0 ); +return do_preadv (fd, vec, vlen, pos,0 ); }#ifdef __ARCH_WANT_COMPAT_SYS_PREADV64V2 COMPAT_SYSCALL_DEFINE5(preadv64v2, unsigned long, fd, - const struct compat_iovec __user *,vec, + const struct iovec __user *, vec, unsigned long, vlen, loff_t, pos, rwf_t, flags) {if (pos =-1 ) -return do_compat_readv (fd, vec, vlen, flags); - -return do_compat_preadv64 (fd, vec, vlen, pos, flags); +return do_readv (fd, vec, vlen, flags); +return do_preadv (fd, vec, vlen, pos, flags); }#endif COMPAT_SYSCALL_DEFINE6 (preadv2, compat_ulong_t, fd, - const struct compat_iovec __user *,vec, + const struct iovec __user *, vec, compat_ulong_t, vlen, u32, pos_low, u32, pos_high, rwf_t, flags) {loff_t pos = ((loff_t )pos_high <<32 ) | pos_low;if (pos =-1 ) -return do_compat_readv (fd, vec, vlen, flags); - -return do_compat_preadv64 (fd, vec, vlen, pos, flags); -} - -static size_t compat_writev (struct file *file, -const struct compat_iovec __user *vec, -unsigned long vlen,loff_t *pos,rwf_t flags) -{ -struct iovec iovstack[UIO_FASTIOV ]; -struct iovec *iov = iovstack; -struct iov_iter iter; -ssize_t ret; - - ret =import_iovec (WRITE , (const struct iovec __user *)vec, vlen, -UIO_FASTIOV , &iov, &iter); -if (ret >=0 ) { -file_start_write (file); - ret =do_iter_write (file, &iter, pos, flags); -file_end_write (file); -kfree (iov); - } -if (ret >0 ) -add_wchar (current, ret); -inc_syscw (current); -return ret; -} - -static size_t do_compat_writev (compat_ulong_t fd, -const struct compat_iovec __user * vec, -compat_ulong_t vlen,rwf_t flags) -{ -struct fd f =fdget_pos (fd); -ssize_t ret; -loff_t pos; - -if (!f.file) -return -EBADF ; - pos = f.file->f_pos; - ret =compat_writev (f.file, vec, vlen, &pos, flags); -if (ret >=0 ) - f.file->f_pos = pos; -fdput_pos (f); -return ret; +return do_readv (fd, vec, vlen, flags); +return do_preadv (fd, vec, vlen, pos, flags); }COMPAT_SYSCALL_DEFINE3 (writev, compat_ulong_t, fd, - const struct compat_iovec __user *, vec, + const struct iovec __user *, vec, compat_ulong_t, vlen) { -return do_compat_writev (fd, vec, vlen,0 ); -} - -static long do_compat_pwritev64 (unsigned long fd, -const struct compat_iovec __user *vec, -unsigned long vlen,loff_t pos,rwf_t flags) -{ -struct fd f; -ssize_t ret; - -if (pos <0 ) -return -EINVAL ; - f =fdget (fd); -if (!f.file) -return -EBADF ; - ret = -ESPIPE ; -if (f.file->f_mode &FMODE_PWRITE ) - ret =compat_writev (f.file, vec, vlen, &pos, flags); -fdput (f); -return ret; +return do_writev (fd, vec, vlen,0 ); }#ifdef __ARCH_WANT_COMPAT_SYS_PWRITEV64 COMPAT_SYSCALL_DEFINE4(pwritev64, unsigned long, fd, - const struct compat_iovec __user *,vec, + const struct iovec __user *, vec, unsigned long, vlen, loff_t, pos) { -return do_compat_pwritev64 (fd, vec, vlen, pos,0 ); +return do_pwritev (fd, vec, vlen, pos,0 ); }#endif COMPAT_SYSCALL_DEFINE5 (pwritev, compat_ulong_t, fd, - const struct compat_iovec __user *,vec, + const struct iovec __user *,vec, compat_ulong_t, vlen, u32, pos_low, u32, pos_high) {loff_t pos = ((loff_t )pos_high <<32 ) | pos_low; -return do_compat_pwritev64 (fd, vec, vlen, pos,0 ); +return do_pwritev (fd, vec, vlen, pos,0 ); }#ifdef __ARCH_WANT_COMPAT_SYS_PWRITEV64V2 COMPAT_SYSCALL_DEFINE5(pwritev64v2, unsigned long, fd, - const struct compat_iovec __user *,vec, + const struct iovec __user *, vec, unsigned long, vlen, loff_t, pos, rwf_t, flags) {if (pos =-1 ) -return do_compat_writev (fd, vec, vlen, flags); - -return do_compat_pwritev64 (fd, vec, vlen, pos, flags); +return do_writev (fd, vec, vlen, flags); +return do_pwritev (fd, vec, vlen, pos, flags); }#endif COMPAT_SYSCALL_DEFINE6 (pwritev2, compat_ulong_t, fd, - const struct compat_iovec __user *,vec, + const struct iovec __user *,vec, compat_ulong_t, vlen, u32, pos_low, u32, pos_high, rwf_t, flags) {loff_t pos = ((loff_t )pos_high <<32 ) | pos_low;if (pos =-1 ) -return do_compat_writev (fd, vec, vlen, flags); - -return do_compat_pwritev64 (fd, vec, vlen, pos, flags); +return do_writev (fd, vec, vlen, flags); +return do_pwritev (fd, vec, vlen, pos, flags); } - -#endif +#endif /* CONFIG_COMPAT */ static ssize_t do_sendfile (int out_fd,int in_fd,loff_t *ppos,size_t count,loff_t max)
Signature · 1 line
2.28.0
Al Viro
maintainerRe: [PATCH 5/9] fs: remove various compat readv/writev helpers
Review
Quoted 3 lines · Christoph Hellwig
COMPAT_SYSCALL_DEFINE3(readv,
compat_ulong_t, fd,(quoted diff) +1
-1- const struct compat_iovec __user *,vec, + const struct iovec __user *, vec,
Um... Will it even compile?
Review
Quoted 4 lines
#ifdef
__ARCH_WANT_COMPAT_SYS_PREADV64COMPAT_SYSCALL_DEFINE4(preadv64, unsigned long, fd,(quoted diff) +1
-1- const struct compat_iovec __user *,vec, + const struct iovec __user *, vec,
Ditto. Look into include/linux/compat.h and you'll see
asmlinkage long compat_sys_preadv64(unsigned long fd,
const struct compat_iovec __user *vec, unsigned long vlen, loff_t pos);
How does that manage to avoid the compiler screaming bloody murder?
Re: [PATCH 5/9] fs: remove various compat readv/writev helpers
Quoted 14 lines · Al Viro
Review
Quoted 3 lines · Christoph Hellwig
COMPAT_SYSCALL_DEFINE3(readv,
compat_ulong_t, fd,(quoted diff) +1
-1- const struct compat_iovec __user *,vec, + const struct iovec __user *, vec,Um... Will it even compile?
Review
Quoted 4 lines
#ifdef
__ARCH_WANT_COMPAT_SYS_PREADV64COMPAT_SYSCALL_DEFINE4(preadv64, unsigned long, fd,(quoted diff) +1
-1- const struct compat_iovec __user *,vec, + const struct iovec __user *, vec,Ditto. Look into
include/linux/compat.hand you'll see
Quoted 6 lines
asmlinkage long compat_sys_preadv64(unsigned long fd,
const structcompat_iovec__user*vec, unsigned long vlen,loff_tpos);How does that manage to avoid the compiler screaming bloody murder?
That's a very good question. But it does not just compile but actually works. Probably because all the syscall wrappers mean that we don't actually generate the normal names. I just tried this:
include/linux/syscalls.h +1 -1
@@ -468,7 +468,7 @@ asmlinkage long sys_lseek(unsigned int fd, off_t offset,asmlinkage long sys_read (unsigned int fd,char __user *buf,size_t count);asmlinkage long sys_write (unsigned int fd,const char __user *buf,size_t count); -asmlinkage long sys_readv(unsigned long fd, +asmlinkage long sys_readv(void *fd,
for fun, and the compiler doesn't care either..
Al Viro
maintainerRe: [PATCH 5/9] fs: remove various compat readv/writev helpers
Quoted 35 lines · Christoph Hellwig
Quoted 14 lines · Al Viro
Review
Quoted 3 lines · Christoph Hellwig
COMPAT_SYSCALL_DEFINE3(readv,
compat_ulong_t, fd,(quoted diff) +1
-1- const struct compat_iovec __user *,vec, + const struct iovec __user *, vec,Um... Will it even compile?
Review
Quoted 4 lines
#ifdef
__ARCH_WANT_COMPAT_SYS_PREADV64COMPAT_SYSCALL_DEFINE4(preadv64, unsigned long, fd,(quoted diff) +1
-1- const struct compat_iovec __user *,vec, + const struct iovec __user *, vec,Ditto. Look into
include/linux/compat.hand you'll seeQuoted 6 lines
asmlinkage long compat_sys_preadv64(unsigned long fd,
const structcompat_iovec__user*vec, unsigned long vlen,loff_tpos);How does that manage to avoid the compiler screaming bloody murder?
That's a very good question. But it does not just compile but actually works. Probably because all the syscall wrappers mean that we don't actually generate the normal names. I just tried this:
include/linux/syscalls.h +1
-1@@ -468,7 +468,7 @@ asmlinkage long sys_lseek(unsigned int fd, off_t offset,asmlinkage long sys_read (unsigned int fd,char __user *buf,size_t count);asmlinkage long sys_write (unsigned int fd,const char __user *buf,size_t count); -asmlinkage long sys_readv(unsigned long fd, +asmlinkage long sys_readv(void *fd,
Quoted 1 line
for fun, and the compiler doesn't care either..
Try to build it for sparc or ppc...
Al Viro
maintainerRe: [PATCH 5/9] fs: remove various compat readv/writev helpers
Quoted 13 lines · Al Viro
Quoted 13 lines
That's a very good question. But it does not just compile but actually works. Probably because all the syscall wrappers mean that we don't actually generate the normal names. I just tried this:
include/linux/syscalls.h +1
-1@@ -468,7 +468,7 @@ asmlinkage long sys_lseek(unsigned int fd, off_t offset,asmlinkage long sys_read (unsigned int fd,char __user *buf,size_t count);asmlinkage long sys_write (unsigned int fd,const char __user *buf,size_t count); -asmlinkage long sys_readv(unsigned long fd, +asmlinkage long sys_readv(void *fd,
Quoted 3 lines
Quoted 1 line
for fun, and the compiler doesn't care either..
Try to build it for sparc or ppc...
FWIW, declarations in syscalls.h used to serve 4 purposes:
1) syscall table initializers needed symbols declared
2) direct calls needed the same
3) catching mismatches between the declarations and definitions
4) centralized list of all syscalls
(2) has been (thankfully) reduced for some time; in any case, ksys_... is used for the remaining ones.
(1) and (3) are served by syscalls.h in architectures other than x86, arm64 and s390. On those 3 (1) is done otherwise (near the syscall table initializer) and (3) is not done at all.
I wonder if we should do something like
SYSCALL_DECLARE3(readv, unsigned long, fd, const struct iovec __user *, vec,
unsigned long, vlen);
in syscalls.h instead, and not under that ifdef.
Let it expand to declaration of sys_...() in generic case and, on x86, into __do_sys_...() and __ia32_sys_...()/__x64_sys_...(), with types matching what SYSCALL_DEFINE ends up using.
Similar macro would cover compat_sys_...() declarations. That would restore mismatch checking for x86 and friends. AFAICS, the cost wouldn't be terribly high - cpp would have more to chew through in syscalls.h, but it shouldn't be all that costly. Famous last words, of course...
Does anybody see fundamental problems with that?
Al Viro
maintainerRe: [PATCH 5/9] fs: remove various compat readv/writev helpers
Quoted 42 lines · Al Viro
Quoted 13 lines · Al Viro
Quoted 13 lines
That's a very good question. But it does not just compile but actually works. Probably because all the syscall wrappers mean that we don't actually generate the normal names. I just tried this:
include/linux/syscalls.h +1
-1@@ -468,7 +468,7 @@ asmlinkage long sys_lseek(unsigned int fd, off_t offset,asmlinkage long sys_read (unsigned int fd,char __user *buf,size_t count);asmlinkage long sys_write (unsigned int fd,const char __user *buf,size_t count); -asmlinkage long sys_readv(unsigned long fd, +asmlinkage long sys_readv(void *fd,Quoted 3 lines
Quoted 1 line
for fun, and the compiler doesn't care either..
Try to build it for sparc or ppc...
FWIW, declarations in
syscalls.hused to serve 4 purposes:
1) syscall table initializers needed symbols declared
2) direct calls needed the same
3) catching mismatches between the declarations and definitions
4) centralized list of all syscalls(2) has been (thankfully) reduced for some time; in any case,
ksys_... is used for the remaining ones.(1) and (3) are served by
syscalls.hin architectures other than x86, arm64 and s390. On those 3 (1) is done otherwise (near the syscall table initializer) and (3) is not done at all.I wonder if we should do something like
SYSCALL_DECLARE3(readv, unsigned long, fd, const struct iovec
__user*, vec,unsigned long, vlen);in
syscalls.hinstead, and not under that ifdef.Let it expand to declaration of sys_...() in generic case and, on x86, into __do_sys_...() and __ia32_sys_...()/__x64_sys_...(), with types matching what
SYSCALL_DEFINEends up using.
Quoted 6 lines
Similar macro would cover compat_sys_...() declarations. That would restore mismatch checking for x86 and friends. AFAICS, the cost wouldn't be terribly high - cpp would have more to chew through in
syscalls.h, but it shouldn't be all that costly. Famous last words, of course...Does anybody see fundamental problems with that?
Just to make it clear - I do not propose to fold that into this series; there we just need to keep those declarations in sync with fs/read_write.c
Re: [PATCH 5/9] fs: remove various compat readv/writev helpers
Quoted 48 lines · Al Viro
Quoted 47 lines · Al Viro
Quoted 13 lines · Al Viro
Quoted 13 lines
That's a very good question. But it does not just compile but actually works. Probably because all the syscall wrappers mean that we don't actually generate the normal names. I just tried this:
include/linux/syscalls.h +1
-1@@ -468,7 +468,7 @@ asmlinkage long sys_lseek(unsigned int fd, off_t offset,asmlinkage long sys_read (unsigned int fd,char __user *buf,size_t count);asmlinkage long sys_write (unsigned int fd,const char __user *buf,size_t count); -asmlinkage long sys_readv(unsigned long fd, +asmlinkage long sys_readv(void *fd,Quoted 3 lines
Quoted 1 line
for fun, and the compiler doesn't care either..
Try to build it for sparc or ppc...
FWIW, declarations in
syscalls.hused to serve 4 purposes:
1) syscall table initializers needed symbols declared
2) direct calls needed the same
3) catching mismatches between the declarations and definitions
4) centralized list of all syscalls(2) has been (thankfully) reduced for some time; in any case,
ksys_... is used for the remaining ones.(1) and (3) are served by
syscalls.hin architectures other than x86, arm64 and s390. On those 3 (1) is done otherwise (near the syscall table initializer) and (3) is not done at all.I wonder if we should do something like
SYSCALL_DECLARE3(readv, unsigned long, fd, const struct iovec
__user*, vec,unsigned long, vlen);in
syscalls.hinstead, and not under that ifdef.Let it expand to declaration of sys_...() in generic case and, on x86, into __do_sys_...() and __ia32_sys_...()/__x64_sys_...(), with types matching what
SYSCALL_DEFINEends up using.Similar macro would cover compat_sys_...() declarations. That would restore mismatch checking for x86 and friends. AFAICS, the cost wouldn't be terribly high - cpp would have more to chew through in
syscalls.h, but it shouldn't be all that costly. Famous last words, of course...
Quoted 4 lines
Quoted 1 line
Does anybody see fundamental problems with that?
Just to make it clear - I do not propose to fold that into this series; there we just need to keep those declarations in sync with
fs/read_write.c
Agreed. The above idea generally sounds sane to me.
Re: [PATCH 5/9] fs: remove various compat readv/writev helpers
In reply to Al ViroQuoted 43 lines · Al Viro
Quoted 13 lines · Al Viro
Quoted 13 lines
That's a very good question. But it does not just compile but actually works. Probably because all the syscall wrappers mean that we don't actually generate the normal names. I just tried this:
include/linux/syscalls.h +1
-1@@ -468,7 +468,7 @@ asmlinkage long sys_lseek(unsigned int fd, off_t offset,asmlinkage long sys_read (unsigned int fd,char __user *buf,size_t count);asmlinkage long sys_write (unsigned int fd,const char __user *buf,size_t count); -asmlinkage long sys_readv(unsigned long fd, +asmlinkage long sys_readv(void *fd,Quoted 3 lines
Quoted 1 line
for fun, and the compiler doesn't care either..
Try to build it for sparc or ppc...
FWIW, declarations in
syscalls.hused to serve 4 purposes:
1) syscall table initializers needed symbols declared
2) direct calls needed the same
3) catching mismatches between the declarations and definitions
4) centralized list of all syscalls(2) has been (thankfully) reduced for some time; in any case,
ksys_... is used for the remaining ones.(1) and (3) are served by
syscalls.hin architectures other than x86, arm64 and s390. On those 3 (1) is done otherwise (near the syscall table initializer) and (3) is not done at all.I wonder if we should do something like
SYSCALL_DECLARE3(readv, unsigned long, fd, const struct iovec
__user*, vec,unsigned long, vlen);in
syscalls.hinstead, and not under that ifdef.Let it expand to declaration of sys_...() in generic case and, on x86, into __do_sys_...() and __ia32_sys_...()/__x64_sys_...(), with types matching what
SYSCALL_DEFINEends up using.
Quoted 6 lines
Similar macro would cover compat_sys_...() declarations. That would restore mismatch checking for x86 and friends. AFAICS, the cost wouldn't be terribly high - cpp would have more to chew through in
syscalls.h, but it shouldn't be all that costly. Famous last words, of course...Does anybody see fundamental problems with that?
I think this would be a good idea. I have been working on a patchset to clean up the conditional syscall handling (sys_ni.c), and conflicts with the prototypes in syscalls.h have been getting in the way. Having the prototypes use SYSCALL_DECLAREx(...) would solve that issue.
--
Brian Gerst
Arnd Bergmann
maintainerRe: [PATCH 5/9] fs: remove various compat readv/writev helpers
In reply to Al ViroQuoted 11 lines · Al Viro
I wonder if we should do something like
SYSCALL_DECLARE3(readv, unsigned long, fd, const struct iovec
__user*, vec,unsigned long, vlen);in
syscalls.hinstead, and not under that ifdef.Let it expand to declaration of sys_...() in generic case and, on x86, into __do_sys_...() and __ia32_sys_...()/__x64_sys_...(), with types matching what
SYSCALL_DEFINEends up using.
Quoted 6 lines
Similar macro would cover compat_sys_...() declarations. That would restore mismatch checking for x86 and friends. AFAICS, the cost wouldn't be terribly high - cpp would have more to chew through in
syscalls.h, but it shouldn't be all that costly. Famous last words, of course...Does anybody see fundamental problems with that?
I've had some ideas along those lines in the past and I think it should work.
As a variation of this, the SYSCALL_DEFINEx() macros could go away entirely, leaving only the macro instantiations from the header to require that syntax. It would require first changing the remaining architectures to build the syscall table from C code instead of assembler though.
Regardless of that, another advantage of having the SYSCALL_DECLAREx() would be the ability to include that header file from elsewhere with a different macro definition to create a machine-readable version of the interface when combined with the syscall.tbl files. This could be used to create a user space stub for calling into the low-level syscall regardless of the libc interfaces,
or for synchronizing the interfaces with strace, qemu-user, or anything that needs to deal with the low-level interface.
Arnd
Al Viro
maintainerRe: [PATCH 5/9] fs: remove various compat readv/writev helpers
Quoted 27 lines · Arnd Bergmann
Quoted 11 lines · Al Viro
I wonder if we should do something like
SYSCALL_DECLARE3(readv, unsigned long, fd, const struct iovec
__user*, vec,unsigned long, vlen);in
syscalls.hinstead, and not under that ifdef.Let it expand to declaration of sys_...() in generic case and, on x86, into __do_sys_...() and __ia32_sys_...()/__x64_sys_...(), with types matching what
SYSCALL_DEFINEends up using.Quoted 6 lines
Similar macro would cover compat_sys_...() declarations. That would restore mismatch checking for x86 and friends. AFAICS, the cost wouldn't be terribly high - cpp would have more to chew through in
syscalls.h, but it shouldn't be all that costly. Famous last words, of course...Does anybody see fundamental problems with that?
I've had some ideas along those lines in the past and I think it should work.
As a variation of this, the
SYSCALL_DEFINEx()macros could go away entirely, leaving only the macro instantiations from the header to require that syntax. It would require first changing the remaining architectures to build the syscall table from C code instead of assembler though.
Quoted 8 lines
Regardless of that, another advantage of having the
SYSCALL_DECLAREx()would be the ability to include that header file from elsewhere with a different macro definition to create a machine-readable version of the interface when combined with the syscall.tbl files. This could be used to create a user space stub for calling into the low-level syscall regardless of the libc interfaces,
or for synchronizing the interfaces with strace, qemu-user, or anything that needs to deal with the low-level interface.
FWIW, after playing with that for a while... Do we really want the compat_sys_...() declarations to live in linux/compat.h? Most of the users of that file don't want those; why not move them to linux/syscalls.h?
Reason: there's a lot more users of linux/compat.h than those of linux/syscalls.h - it's pulled by everything in the networking stack, for starters...
Arnd Bergmann
maintainerRe: [PATCH 5/9] fs: remove various compat readv/writev helpers
Quoted 4 lines · Al Viro
FWIW, after playing with that for a while... Do we really want the compat_sys_...() declarations to live in
linux/compat.h? Most of the users of that file don't want those; why not move them tolinux/syscalls.h?
Sure, let's do that. The trend overall is to integrate the compat stuff more closely into where the native implementation lives, so this would just follow that trend.
I think with Christoph's latest patches, about half of them are going away as well.
Quoted 3 lines
Reason: there's a lot more users of
linux/compat.hthan those oflinux/syscalls.h- it's pulled by everything in the networking stack, for starters...
Right, the network headers pull in almost everything else through multiple indirect inclusions, anything we can do to reduce that helps.
Arnd
RE: [PATCH 5/9] fs: remove various compat readv/writev helpers
In reply to Arnd BergmannRnJvbTogQXJuZCBCZXJnbWFubg0KPiBTZW50OiAyMyBTZXB0ZW1iZXIgMjAyMCAxOTo0Ng0KLi4u DQo+IFJlZ2FyZGxlc3Mgb2YgdGhhdCwgYW5vdGhlciBhZHZhbnRhZ2Ugb2YgaGF2aW5nIHRoZSBT WVNDQUxMX0RFQ0xBUkV4KCkNCj4gd291bGQgYmUgdGhlIGFiaWxpdHkgdG8gaW5jbHVkZSB0aGF0 IGhlYWRlciBmaWxlIGZyb20gZWxzZXdoZXJlIHdpdGggYSBkaWZmZXJlbnQNCj4gbWFjcm8gZGVm aW5pdGlvbiB0byBjcmVhdGUgYSBtYWNoaW5lLXJlYWRhYmxlIHZlcnNpb24gb2YgdGhlIGludGVy ZmFjZSB3aGVuDQo+IGNvbWJpbmVkIHdpdGggdGhlIHN5c2NhbGwudGJsIGZpbGVzLiBUaGlzIGNv dWxkIGJlIHVzZWQgdG8gY3JlYXRlIGEgdXNlcg0KPiBzcGFjZSBzdHViIGZvciBjYWxsaW5nIGlu dG8gdGhlIGxvdy1sZXZlbCBzeXNjYWxsIHJlZ2FyZGxlc3Mgb2YgdGhlDQo+IGxpYmMgaW50ZXJm YWNlcywNCj4gb3IgZm9yIHN5bmNocm9uaXppbmcgdGhlIGludGVyZmFjZXMgd2l0aCBzdHJhY2Us IHFlbXUtdXNlciwgb3IgYW55dGhpbmcgdGhhdA0KPiBuZWVkcyB0byBkZWFsIHdpdGggdGhlIGxv dy1sZXZlbCBpbnRlcmZhY2UuDQoNCkEgc2ltaWxhciAndHJpY2snICh0aGF0IHByb2JhYmx5IHdv bid0IHdvcmsgaGVyZSkgaXMgdG8gcGFzcw0KdGhlIG5hbWUgb2YgYSAjZGVmaW5lIGZ1bmN0aW9u IGFzIGEgcGFyYW1ldGVyIHRvIGFub3RoZXIgZGVmaW5lLg0KVXNlZnVsIGZvciBkZWZpbmluZyBj b25zdGFudHMgYW5kIGVycm9yIHN0cmluZ3MgdG9nZXRoZXIuIGVnOg0KI2RlZmluZSBUUkFGRklD X0xJR0hUUyh4KSBcDQoJeChSRUQsIDAsICJSZWQiKSBcDQoJeChZRUxMT1csIDEsICJZZWxsb3cp IFwNCgl4KEdSRUVOLCAyLCAiR1JFRU4pDQoNCllvdSBjYW4gdGhlbiBkbyB0aGluZyBsaWtlOg0K I2RlZmluZSB4KHRva2VuLCB2YWx1ZSwgc3RyaW5nKSB0b2tlbiA9IHZhbHVlLA0KZW51bSB7VFJB RkZJQ19MSUdIVFMoeCkgTlVNX0xJR0hUU307DQojdW5kZWYgeA0KI2RlZmluZSB4KHRva2VuLCB2 YWx1ZSwgc3RyaW5nKSBbdmFsdWVdID0gc3RyaW5nLA0KY29uc3QgY2hhciAqY29sb3Vyc1tdID0g e1RSQUZGSUNfTElHSFRTKHgpfTsNCiN1bmRlZiB4DQp0byBpbml0aWFsaXNlIGNvbnN0YW50cyBh bmQgYSBuYW1lIHRhYmxlIHRoYXQgYXJlIGFsd2F5cyBpbiBzeW5jLg0KDQpJdCBpcyBhbHNvIGEg Z29vZCB3YXkgdG8gZ2VuZXJhdGUgc291cmNlIGxpbmVzIHRoYXQgYXJlIG92ZXIgMU1CLg0KDQoJ RGF2aWQNCg0KLQ0KUmVnaXN0ZXJlZCBBZGRyZXNzIExha2VzaWRlLCBCcmFtbGV5IFJvYWQsIE1v dW50IEZhcm0sIE1pbHRvbiBLZXluZXMsIE1LMSAxUFQsIFVLDQpSZWdpc3RyYXRpb24gTm86IDEz OTczODYgKFdhbGVzKQ0K
PATCH 6/9 fs: remove the compat readv/writev syscalls
In reply to Christoph HellwigNow that import_iovec handles compat iovecs, the native readv and writev syscalls can be used for the compat case as well.
--- arch/arm64/include/asm/unistd32.h | 4 ++-- arch/mips/kernel/syscalls/syscall_n32.tbl | 4 ++-- arch/mips/kernel/syscalls/syscall_o32.tbl | 4 ++-- arch/parisc/kernel/syscalls/syscall.tbl | 4 ++-- arch/powerpc/kernel/syscalls/syscall.tbl | 4 ++-- arch/s390/kernel/syscalls/syscall.tbl | 4 ++-- arch/sparc/kernel/syscalls/syscall.tbl | 4 ++-- arch/x86/entry/syscall_x32.c | 2 ++ arch/x86/entry/syscalls/syscall_32.tbl | 4 ++-- arch/x86/entry/syscalls/syscall_64.tbl | 4 ++-- fs/read_write.c | 14 -------------- include/linux/compat.h | 4 ---- include/uapi/asm-generic/unistd.h | 4 ++-- tools/include/uapi/asm-generic/unistd.h | 4 ++-- tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 4 ++-- tools/perf/arch/s390/entry/syscalls/syscall.tbl | 4 ++-- tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 4 ++-- 17 files changed, 30 insertions(+), 46 deletions(-)
arch/arm64/include/asm/unistd32.h +2 -2
@@ -301,9 +301,9 @@ __SYSCALL(__NR_flock, sys_flock)#define __NR_msync 144 __SYSCALL(__NR_msync, sys_msync)#define __NR_readv 145 -__SYSCALL(__NR_readv, compat_sys_readv) +__SYSCALL(__NR_readv, sys_readv)#define __NR_writev 146 -__SYSCALL(__NR_writev, compat_sys_writev) +__SYSCALL(__NR_writev, sys_writev)#define __NR_getsid 147 __SYSCALL(__NR_getsid, sys_getsid)#define __NR_fdatasync 148
arch/mips/kernel/syscalls/syscall_n32.tbl +2 -2
@@ -25,8 +25,8 @@ 15 n32 ioctl compat_sys_ioctl 16 n32 pread64 sys_pread64 17 n32 pwrite64 sys_pwrite64 -18 n32 readv compat_sys_readv -19 n32 writev compat_sys_writev +18 n32 readv sys_readv +19 n32 writev sys_writev 20 n32 access sys_access 21 n32 pipe sysm_pipe 22 n32 _newselect compat_sys_select
arch/mips/kernel/syscalls/syscall_o32.tbl +2 -2
@@ -156,8 +156,8 @@ 142 o32 _newselect sys_select compat_sys_select 143 o32 flock sys_flock 144 o32 msync sys_msync -145 o32 readv sys_readv compat_sys_readv -146 o32 writev sys_writev compat_sys_writev +145 o32 readv sys_readv +146 o32 writev sys_writev 147 o32 cacheflush sys_cacheflush 148 o32 cachectl sys_cachectl 149 o32 sysmips __sys_sysmips
arch/parisc/kernel/syscalls/syscall.tbl +2 -2
@@ -159,8 +159,8 @@ 142 common _newselect sys_select compat_sys_select 143 common flock sys_flock 144 common msync sys_msync -145 common readv sys_readv compat_sys_readv -146 common writev sys_writev compat_sys_writev +145 common readv sys_readv +146 common writev sys_writev 147 common getsid sys_getsid 148 common fdatasync sys_fdatasync 149 common _sysctl sys_ni_syscall
arch/powerpc/kernel/syscalls/syscall.tbl +2 -2
@@ -193,8 +193,8 @@ 142 common _newselect sys_select compat_sys_select 143 common flock sys_flock 144 common msync sys_msync -145 common readv sys_readv compat_sys_readv -146 common writev sys_writev compat_sys_writev +145 common readv sys_readv +146 common writev sys_writev 147 common getsid sys_getsid 148 common fdatasync sys_fdatasync 149 nospu _sysctl sys_ni_syscall
arch/s390/kernel/syscalls/syscall.tbl +2 -2
@@ -134,8 +134,8 @@ 142 64 select sys_select - 143 common flock sys_flock sys_flock 144 common msync sys_msync sys_msync -145 common readv sys_readv compat_sys_readv -146 common writev sys_writev compat_sys_writev +145 common readv sys_readv sys_readv +146 common writev sys_writev sys_writev 147 common getsid sys_getsid sys_getsid 148 common fdatasync sys_fdatasync sys_fdatasync 149 common _sysctl - -
arch/sparc/kernel/syscalls/syscall.tbl +2 -2
@@ -149,8 +149,8 @@ 117 common getrusage sys_getrusage compat_sys_getrusage 118 common getsockopt sys_getsockopt sys_getsockopt 119 common getcwd sys_getcwd -120 common readv sys_readv compat_sys_readv -121 common writev sys_writev compat_sys_writev +120 common readv sys_readv +121 common writev sys_writev 122 common settimeofday sys_settimeofday compat_sys_settimeofday 123 32 fchown sys_fchown16 123 64 fchown sys_fchown
arch/x86/entry/syscall_x32.c +2 -0
@@ -12,6 +12,8 @@* Reuse the 64-bit entry points for the x32 versions that occupy different * slots in the syscall table. */ +#define __x32_sys_readv __x64_sys_readv +#define __x32_sys_writev __x64_sys_writev#define __x32_sys_getsockopt __x64_sys_getsockopt#define __x32_sys_setsockopt __x64_sys_setsockopt
arch/x86/entry/syscalls/syscall_32.tbl +2 -2
@@ -156,8 +156,8 @@ 142 i386 _newselect sys_select compat_sys_select 143 i386 flock sys_flock 144 i386 msync sys_msync -145 i386 readv sys_readv compat_sys_readv -146 i386 writev sys_writev compat_sys_writev +145 i386 readv sys_readv +146 i386 writev sys_writev 147 i386 getsid sys_getsid 148 i386 fdatasync sys_fdatasync 149 i386 _sysctl sys_ni_syscall
arch/x86/entry/syscalls/syscall_64.tbl +2 -2
@@ -371,8 +371,8 @@ 512 x32 rt_sigaction compat_sys_rt_sigaction 513 x32 rt_sigreturn compat_sys_x32_rt_sigreturn 514 x32 ioctl compat_sys_ioctl -515 x32 readv compat_sys_readv -516 x32 writev compat_sys_writev +515 x32 readv sys_readv +516 x32 writev sys_writev 517 x32 recvfrom compat_sys_recvfrom 518 x32 sendmsg compat_sys_sendmsg 519 x32 recvmsg compat_sys_recvmsg
fs/read_write.c +0 -14
@@ -1074,13 +1074,6 @@ SYSCALL_DEFINE6(pwritev2, unsigned long, fd, const struct iovec __user *, vec,* in_compat_syscall(). */ #ifdef CONFIG_COMPAT -COMPAT_SYSCALL_DEFINE3 (readv, compat_ulong_t, fd, - const struct iovec __user *, vec, - compat_ulong_t, vlen) -{ -return do_readv (fd, vec, vlen,0 ); -} -#ifdef __ARCH_WANT_COMPAT_SYS_PREADV64 COMPAT_SYSCALL_DEFINE4(preadv64, unsigned long, fd, const struct iovec __user *, vec,
@@ -1122,13 +1115,6 @@ COMPAT_SYSCALL_DEFINE6(preadv2, compat_ulong_t, fd,return do_preadv (fd, vec, vlen, pos, flags); } -COMPAT_SYSCALL_DEFINE3 (writev, compat_ulong_t, fd, - const struct iovec __user *, vec, - compat_ulong_t, vlen) -{ -return do_writev (fd, vec, vlen,0 ); -} -#ifdef __ARCH_WANT_COMPAT_SYS_PWRITEV64 COMPAT_SYSCALL_DEFINE4(pwritev64, unsigned long, fd, const struct iovec __user *, vec,
include/linux/compat.h +0 -4
@@ -545,10 +545,6 @@ asmlinkage long compat_sys_getdents(unsigned int fd,/* fs/read_write.c */ asmlinkage long compat_sys_lseek (unsigned int ,compat_off_t ,unsigned int ); -asmlinkage ssize_t compat_sys_readv(compat_ulong_t fd, -const struct compat_iovec __user *vec,compat_ulong_t vlen); -asmlinkage ssize_t compat_sys_writev(compat_ulong_t fd, -const struct compat_iovec __user *vec,compat_ulong_t vlen);/* No generic prototype for pread64 and pwrite64 */ asmlinkage ssize_t compat_sys_preadv(compat_ulong_t fd, const struct compat_iovec __user *vec,
include/uapi/asm-generic/unistd.h +2 -2
@@ -207,9 +207,9 @@ __SYSCALL(__NR_read, sys_read)#define __NR_write 64 __SYSCALL(__NR_write, sys_write)#define __NR_readv 65 -__SC_COMP(__NR_readv, sys_readv, compat_sys_readv) +__SC_COMP(__NR_readv, sys_readv, sys_readv)#define __NR_writev 66 -__SC_COMP(__NR_writev, sys_writev, compat_sys_writev) +__SC_COMP(__NR_writev, sys_writev, sys_writev)#define __NR_pread64 67 __SC_COMP(__NR_pread64, sys_pread64, compat_sys_pread64)#define __NR_pwrite64 68
tools/include/uapi/asm-generic/unistd.h +2 -2
@@ -207,9 +207,9 @@ __SYSCALL(__NR_read, sys_read)#define __NR_write 64 __SYSCALL(__NR_write, sys_write)#define __NR_readv 65 -__SC_COMP(__NR_readv, sys_readv, compat_sys_readv) +__SC_COMP(__NR_readv, sys_readv, sys_readv)#define __NR_writev 66 -__SC_COMP(__NR_writev, sys_writev, compat_sys_writev) +__SC_COMP(__NR_writev, sys_writev, sys_writev)#define __NR_pread64 67 __SC_COMP(__NR_pread64, sys_pread64, compat_sys_pread64)#define __NR_pwrite64 68
tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +2 -2
@@ -189,8 +189,8 @@ 142 common _newselect sys_select compat_sys_select 143 common flock sys_flock 144 common msync sys_msync -145 common readv sys_readv compat_sys_readv -146 common writev sys_writev compat_sys_writev +145 common readv sys_readv +146 common writev sys_writev 147 common getsid sys_getsid 148 common fdatasync sys_fdatasync 149 nospu _sysctl sys_ni_syscall
tools/perf/arch/s390/entry/syscalls/syscall.tbl +2 -2
@@ -134,8 +134,8 @@ 142 64 select sys_select - 143 common flock sys_flock sys_flock 144 common msync sys_msync compat_sys_msync -145 common readv sys_readv compat_sys_readv -146 common writev sys_writev compat_sys_writev +145 common readv sys_readv +146 common writev sys_writev 147 common getsid sys_getsid sys_getsid 148 common fdatasync sys_fdatasync sys_fdatasync 149 common _sysctl - -
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +2 -2
@@ -371,8 +371,8 @@ 512 x32 rt_sigaction compat_sys_rt_sigaction 513 x32 rt_sigreturn compat_sys_x32_rt_sigreturn 514 x32 ioctl compat_sys_ioctl -515 x32 readv compat_sys_readv -516 x32 writev compat_sys_writev +515 x32 readv sys_readv +516 x32 writev sys_writev 517 x32 recvfrom compat_sys_recvfrom 518 x32 sendmsg compat_sys_sendmsg 519 x32 recvmsg compat_sys_recvmsg
Signature · 1 line
2.28.0
PATCH 7/9 fs: remove compat_sys_vmsplice
In reply to Christoph HellwigNow that import_iovec handles compat iovecs, the native vmsplice syscall can be used for the compat case as well.
--- arch/arm64/include/asm/unistd32.h | 2 +- arch/mips/kernel/syscalls/syscall_n32.tbl | 2 +- arch/mips/kernel/syscalls/syscall_o32.tbl | 2 +- arch/parisc/kernel/syscalls/syscall.tbl | 2 +- arch/powerpc/kernel/syscalls/syscall.tbl | 2 +- arch/s390/kernel/syscalls/syscall.tbl | 2 +- arch/sparc/kernel/syscalls/syscall.tbl | 2 +- arch/x86/entry/syscall_x32.c | 1 + arch/x86/entry/syscalls/syscall_32.tbl | 2 +- arch/x86/entry/syscalls/syscall_64.tbl | 2 +- fs/splice.c | 57 +++++-------------- include/linux/compat.h | 4 -- include/uapi/asm-generic/unistd.h | 2 +- tools/include/uapi/asm-generic/unistd.h | 2 +- .../arch/powerpc/entry/syscalls/syscall.tbl | 2 +- .../perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- .../arch/x86/entry/syscalls/syscall_64.tbl | 2 +- 17 files changed, 28 insertions(+), 62 deletions(-)
arch/arm64/include/asm/unistd32.h +1 -1
@@ -697,7 +697,7 @@ __SYSCALL(__NR_sync_file_range2, compat_sys_aarch32_sync_file_range2)#define __NR_tee 342 __SYSCALL(__NR_tee, sys_tee)#define __NR_vmsplice 343 -__SYSCALL(__NR_vmsplice, compat_sys_vmsplice) +__SYSCALL(__NR_vmsplice, sys_vmsplice)#define __NR_move_pages 344 __SYSCALL(__NR_move_pages, compat_sys_move_pages)#define __NR_getcpu 345
arch/mips/kernel/syscalls/syscall_n32.tbl +1 -1
@@ -278,7 +278,7 @@ 267 n32 splice sys_splice 268 n32 sync_file_range sys_sync_file_range 269 n32 tee sys_tee -270 n32 vmsplice compat_sys_vmsplice +270 n32 vmsplice sys_vmsplice 271 n32 move_pages compat_sys_move_pages 272 n32 set_robust_list compat_sys_set_robust_list 273 n32 get_robust_list compat_sys_get_robust_list
arch/mips/kernel/syscalls/syscall_o32.tbl +1 -1
@@ -318,7 +318,7 @@ 304 o32 splice sys_splice 305 o32 sync_file_range sys_sync_file_range sys32_sync_file_range 306 o32 tee sys_tee -307 o32 vmsplice sys_vmsplice compat_sys_vmsplice +307 o32 vmsplice sys_vmsplice 308 o32 move_pages sys_move_pages compat_sys_move_pages 309 o32 set_robust_list sys_set_robust_list compat_sys_set_robust_list 310 o32 get_robust_list sys_get_robust_list compat_sys_get_robust_list
arch/parisc/kernel/syscalls/syscall.tbl +1 -1
@@ -330,7 +330,7 @@ 292 32 sync_file_range parisc_sync_file_range 292 64 sync_file_range sys_sync_file_range 293 common tee sys_tee -294 common vmsplice sys_vmsplice compat_sys_vmsplice +294 common vmsplice sys_vmsplice 295 common move_pages sys_move_pages compat_sys_move_pages 296 common getcpu sys_getcpu 297 common epoll_pwait sys_epoll_pwait compat_sys_epoll_pwait
arch/powerpc/kernel/syscalls/syscall.tbl +1 -1
@@ -369,7 +369,7 @@ 282 common unshare sys_unshare 283 common splice sys_splice 284 common tee sys_tee -285 common vmsplice sys_vmsplice compat_sys_vmsplice +285 common vmsplice sys_vmsplice 286 common openat sys_openat compat_sys_openat 287 common mkdirat sys_mkdirat 288 common mknodat sys_mknodat
arch/s390/kernel/syscalls/syscall.tbl +1 -1
@@ -316,7 +316,7 @@ 306 common splice sys_splice sys_splice 307 common sync_file_range sys_sync_file_range compat_sys_s390_sync_file_range 308 common tee sys_tee sys_tee -309 common vmsplice sys_vmsplice compat_sys_vmsplice +309 common vmsplice sys_vmsplice sys_vmsplice 310 common move_pages sys_move_pages compat_sys_move_pages 311 common getcpu sys_getcpu sys_getcpu 312 common epoll_pwait sys_epoll_pwait compat_sys_epoll_pwait
arch/sparc/kernel/syscalls/syscall.tbl +1 -1
@@ -38,7 +38,7 @@ 23 64 setuid sys_setuid 24 32 getuid sys_getuid16 24 64 getuid sys_getuid -25 common vmsplice sys_vmsplice compat_sys_vmsplice +25 common vmsplice sys_vmsplice 26 common ptrace sys_ptrace compat_sys_ptrace 27 common alarm sys_alarm 28 common sigaltstack sys_sigaltstack compat_sys_sigaltstack
arch/x86/entry/syscall_x32.c +1 -0
@@ -16,6 +16,7 @@#define __x32_sys_writev __x64_sys_writev#define __x32_sys_getsockopt __x64_sys_getsockopt#define __x32_sys_setsockopt __x64_sys_setsockopt +#define __x32_sys_vmsplice __x64_sys_vmsplice#define __SYSCALL_64 (nr, sym)
arch/x86/entry/syscalls/syscall_32.tbl +1 -1
@@ -327,7 +327,7 @@ 313 i386 splice sys_splice 314 i386 sync_file_range sys_ia32_sync_file_range 315 i386 tee sys_tee -316 i386 vmsplice sys_vmsplice compat_sys_vmsplice +316 i386 vmsplice sys_vmsplice 317 i386 move_pages sys_move_pages compat_sys_move_pages 318 i386 getcpu sys_getcpu 319 i386 epoll_pwait sys_epoll_pwait
arch/x86/entry/syscalls/syscall_64.tbl +1 -1
@@ -388,7 +388,7 @@ 529 x32 waitid compat_sys_waitid 530 x32 set_robust_list compat_sys_set_robust_list 531 x32 get_robust_list compat_sys_get_robust_list -532 x32 vmsplice compat_sys_vmsplice +532 x32 vmsplice sys_vmsplice 533 x32 move_pages compat_sys_move_pages 534 x32 preadv compat_sys_preadv64 535 x32 pwritev compat_sys_pwritev64
fs/splice.c +13 -44
86 lines not on this page · raw message
include/linux/compat.h +0 -4
@@ -597,10 +597,6 @@ asmlinkage long compat_sys_signalfd4(int ufd,const compat_sigset_t __user *sigmask, compat_size_t sigsetsize, int flags); -/* fs/splice.c */ -asmlinkage long compat_sys_vmsplice (int fd,const struct compat_iovec __user *, -unsigned int nr_segs,unsigned int flags); -/* fs/stat.c */ asmlinkage long compat_sys_newfstatat(unsigned int dfd, const char __user *filename,
include/uapi/asm-generic/unistd.h +1 -1
@@ -237,7 +237,7 @@ __SC_COMP(__NR_signalfd4, sys_signalfd4, compat_sys_signalfd4)/* fs/splice.c */ #define __NR_vmsplice 75 -__SC_COMP(__NR_vmsplice, sys_vmsplice, compat_sys_vmsplice) +__SYSCALL(__NR_vmsplice, sys_vmsplice)#define __NR_splice 76 __SYSCALL(__NR_splice, sys_splice)#define __NR_tee 77
tools/include/uapi/asm-generic/unistd.h +1 -1
@@ -237,7 +237,7 @@ __SC_COMP(__NR_signalfd4, sys_signalfd4, compat_sys_signalfd4)/* fs/splice.c */ #define __NR_vmsplice 75 -__SC_COMP(__NR_vmsplice, sys_vmsplice, compat_sys_vmsplice) +__SYSCALL(__NR_vmsplice, sys_vmsplice)#define __NR_splice 76 __SYSCALL(__NR_splice, sys_splice)#define __NR_tee 77
tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +1 -1
@@ -363,7 +363,7 @@ 282 common unshare sys_unshare 283 common splice sys_splice 284 common tee sys_tee -285 common vmsplice sys_vmsplice compat_sys_vmsplice +285 common vmsplice sys_vmsplice 286 common openat sys_openat compat_sys_openat 287 common mkdirat sys_mkdirat 288 common mknodat sys_mknodat
tools/perf/arch/s390/entry/syscalls/syscall.tbl +1 -1
@@ -316,7 +316,7 @@ 306 common splice sys_splice compat_sys_splice 307 common sync_file_range sys_sync_file_range compat_sys_s390_sync_file_range 308 common tee sys_tee compat_sys_tee -309 common vmsplice sys_vmsplice compat_sys_vmsplice +309 common vmsplice sys_vmsplice sys_vmsplice 310 common move_pages sys_move_pages compat_sys_move_pages 311 common getcpu sys_getcpu compat_sys_getcpu 312 common epoll_pwait sys_epoll_pwait compat_sys_epoll_pwait
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +1 -1
@@ -388,7 +388,7 @@ 529 x32 waitid compat_sys_waitid 530 x32 set_robust_list compat_sys_set_robust_list 531 x32 get_robust_list compat_sys_get_robust_list -532 x32 vmsplice compat_sys_vmsplice +532 x32 vmsplice sys_vmsplice 533 x32 move_pages compat_sys_move_pages 534 x32 preadv compat_sys_preadv64 535 x32 pwritev compat_sys_pwritev64
Signature · 1 line
2.28.0
PATCH 8/9 mm: remove compat_process_vm_{readv,writev}
In reply to Christoph HellwigNow that import_iovec handles compat iovecs, the native syscalls can be used for the compat case as well.
--- arch/arm64/include/asm/unistd32.h | 4 +- arch/mips/kernel/syscalls/syscall_n32.tbl | 4 +- arch/mips/kernel/syscalls/syscall_o32.tbl | 4 +- arch/parisc/kernel/syscalls/syscall.tbl | 4 +- arch/powerpc/kernel/syscalls/syscall.tbl | 4 +- arch/s390/kernel/syscalls/syscall.tbl | 4 +- arch/sparc/kernel/syscalls/syscall.tbl | 4 +- arch/x86/entry/syscall_x32.c | 2 + arch/x86/entry/syscalls/syscall_32.tbl | 4 +- arch/x86/entry/syscalls/syscall_64.tbl | 4 +- include/linux/compat.h | 8 --- include/uapi/asm-generic/unistd.h | 6 +- mm/process_vm_access.c | 69 ------------------- tools/include/uapi/asm-generic/unistd.h | 6 +- .../arch/powerpc/entry/syscalls/syscall.tbl | 4 +- .../perf/arch/s390/entry/syscalls/syscall.tbl | 4 +- .../arch/x86/entry/syscalls/syscall_64.tbl | 4 +- 17 files changed, 30 insertions(+), 109 deletions(-)
arch/arm64/include/asm/unistd32.h +2 -2
@@ -763,9 +763,9 @@ __SYSCALL(__NR_sendmmsg, compat_sys_sendmmsg)#define __NR_setns 375 __SYSCALL(__NR_setns, sys_setns)#define __NR_process_vm_readv 376 -__SYSCALL(__NR_process_vm_readv, compat_sys_process_vm_readv) +__SYSCALL(__NR_process_vm_readv, sys_process_vm_readv)#define __NR_process_vm_writev 377 -__SYSCALL(__NR_process_vm_writev, compat_sys_process_vm_writev) +__SYSCALL(__NR_process_vm_writev, sys_process_vm_writev)#define __NR_kcmp 378 __SYSCALL(__NR_kcmp, sys_kcmp)#define __NR_finit_module 379
arch/mips/kernel/syscalls/syscall_n32.tbl +2 -2
@@ -317,8 +317,8 @@ 306 n32 syncfs sys_syncfs 307 n32 sendmmsg compat_sys_sendmmsg 308 n32 setns sys_setns -309 n32 process_vm_readv compat_sys_process_vm_readv -310 n32 process_vm_writev compat_sys_process_vm_writev +309 n32 process_vm_readv sys_process_vm_readv +310 n32 process_vm_writev sys_process_vm_writev 311 n32 kcmp sys_kcmp 312 n32 finit_module sys_finit_module 313 n32 sched_setattr sys_sched_setattr
arch/mips/kernel/syscalls/syscall_o32.tbl +2 -2
@@ -356,8 +356,8 @@ 342 o32 syncfs sys_syncfs 343 o32 sendmmsg sys_sendmmsg compat_sys_sendmmsg 344 o32 setns sys_setns -345 o32 process_vm_readv sys_process_vm_readv compat_sys_process_vm_readv -346 o32 process_vm_writev sys_process_vm_writev compat_sys_process_vm_writev +345 o32 process_vm_readv sys_process_vm_readv +346 o32 process_vm_writev sys_process_vm_writev 347 o32 kcmp sys_kcmp 348 o32 finit_module sys_finit_module 349 o32 sched_setattr sys_sched_setattr
arch/parisc/kernel/syscalls/syscall.tbl +2 -2
@@ -372,8 +372,8 @@ 327 common syncfs sys_syncfs 328 common setns sys_setns 329 common sendmmsg sys_sendmmsg compat_sys_sendmmsg -330 common process_vm_readv sys_process_vm_readv compat_sys_process_vm_readv -331 common process_vm_writev sys_process_vm_writev compat_sys_process_vm_writev +330 common process_vm_readv sys_process_vm_readv +331 common process_vm_writev sys_process_vm_writev 332 common kcmp sys_kcmp 333 common finit_module sys_finit_module 334 common sched_setattr sys_sched_setattr
arch/powerpc/kernel/syscalls/syscall.tbl +2 -2
@@ -449,8 +449,8 @@ 348 common syncfs sys_syncfs 349 common sendmmsg sys_sendmmsg compat_sys_sendmmsg 350 common setns sys_setns -351 nospu process_vm_readv sys_process_vm_readv compat_sys_process_vm_readv -352 nospu process_vm_writev sys_process_vm_writev compat_sys_process_vm_writev +351 nospu process_vm_readv sys_process_vm_readv +352 nospu process_vm_writev sys_process_vm_writev 353 nospu finit_module sys_finit_module 354 nospu kcmp sys_kcmp 355 common sched_setattr sys_sched_setattr
arch/s390/kernel/syscalls/syscall.tbl +2 -2
@@ -347,8 +347,8 @@ 337 common clock_adjtime sys_clock_adjtime sys_clock_adjtime32 338 common syncfs sys_syncfs sys_syncfs 339 common setns sys_setns sys_setns -340 common process_vm_readv sys_process_vm_readv compat_sys_process_vm_readv -341 common process_vm_writev sys_process_vm_writev compat_sys_process_vm_writev +340 common process_vm_readv sys_process_vm_readv sys_process_vm_readv +341 common process_vm_writev sys_process_vm_writev sys_process_vm_writev 342 common s390_runtime_instr sys_s390_runtime_instr sys_s390_runtime_instr 343 common kcmp sys_kcmp sys_kcmp 344 common finit_module sys_finit_module sys_finit_module
arch/sparc/kernel/syscalls/syscall.tbl +2 -2
@@ -406,8 +406,8 @@ 335 common syncfs sys_syncfs 336 common sendmmsg sys_sendmmsg compat_sys_sendmmsg 337 common setns sys_setns -338 common process_vm_readv sys_process_vm_readv compat_sys_process_vm_readv -339 common process_vm_writev sys_process_vm_writev compat_sys_process_vm_writev +338 common process_vm_readv sys_process_vm_readv +339 common process_vm_writev sys_process_vm_writev 340 32 kern_features sys_ni_syscall sys_kern_features 340 64 kern_features sys_kern_features 341 common kcmp sys_kcmp
arch/x86/entry/syscall_x32.c +2 -0
@@ -17,6 +17,8 @@#define __x32_sys_getsockopt __x64_sys_getsockopt#define __x32_sys_setsockopt __x64_sys_setsockopt#define __x32_sys_vmsplice __x64_sys_vmsplice +#define __x32_sys_process_vm_readv __x64_sys_process_vm_readv +#define __x32_sys_process_vm_writev __x64_sys_process_vm_writev#define __SYSCALL_64 (nr, sym)
arch/x86/entry/syscalls/syscall_32.tbl +2 -2
@@ -358,8 +358,8 @@ 344 i386 syncfs sys_syncfs 345 i386 sendmmsg sys_sendmmsg compat_sys_sendmmsg 346 i386 setns sys_setns -347 i386 process_vm_readv sys_process_vm_readv compat_sys_process_vm_readv -348 i386 process_vm_writev sys_process_vm_writev compat_sys_process_vm_writev +347 i386 process_vm_readv sys_process_vm_readv +348 i386 process_vm_writev sys_process_vm_writev 349 i386 kcmp sys_kcmp 350 i386 finit_module sys_finit_module 351 i386 sched_setattr sys_sched_setattr
arch/x86/entry/syscalls/syscall_64.tbl +2 -2
@@ -395,8 +395,8 @@ 536 x32 rt_tgsigqueueinfo compat_sys_rt_tgsigqueueinfo 537 x32 recvmmsg compat_sys_recvmmsg_time64 538 x32 sendmmsg compat_sys_sendmmsg -539 x32 process_vm_readv compat_sys_process_vm_readv -540 x32 process_vm_writev compat_sys_process_vm_writev +539 x32 process_vm_readv sys_process_vm_readv +540 x32 process_vm_writev sys_process_vm_writev 541 x32 setsockopt sys_setsockopt 542 x32 getsockopt sys_getsockopt 543 x32 io_setup compat_sys_io_setup
include/linux/compat.h +0 -8
@@ -780,14 +780,6 @@ asmlinkage long compat_sys_open_by_handle_at(int mountdirfd, int flags);asmlinkage long compat_sys_sendmmsg (int fd,struct compat_mmsghdr __user *mmsg,unsigned vlen,unsigned int flags); -asmlinkage ssize_t compat_sys_process_vm_readv(compat_pid_t pid, -const struct compat_iovec __user *lvec, -compat_ulong_t liovcnt,const struct compat_iovec __user *rvec, -compat_ulong_t riovcnt,compat_ulong_t flags); -asmlinkage ssize_t compat_sys_process_vm_writev(compat_pid_t pid, -const struct compat_iovec __user *lvec, -compat_ulong_t liovcnt,const struct compat_iovec __user *rvec, -compat_ulong_t riovcnt,compat_ulong_t flags);asmlinkage long compat_sys_execveat (int dfd,const char __user *filename,const compat_uptr_t __user *argv,const compat_uptr_t __user *envp,int flags);
include/uapi/asm-generic/unistd.h +2 -4
@@ -727,11 +727,9 @@ __SYSCALL(__NR_setns, sys_setns)#define __NR_sendmmsg 269 __SC_COMP(__NR_sendmmsg, sys_sendmmsg, compat_sys_sendmmsg)#define __NR_process_vm_readv 270 -__SC_COMP (__NR_process_vm_readv, sys_process_vm_readv, \ - compat_sys_process_vm_readv) +__SYSCALL(__NR_process_vm_readv, sys_process_vm_readv)#define __NR_process_vm_writev 271 -__SC_COMP (__NR_process_vm_writev, sys_process_vm_writev, \ - compat_sys_process_vm_writev) +__SYSCALL(__NR_process_vm_writev, sys_process_vm_writev)#define __NR_kcmp 272 __SYSCALL(__NR_kcmp, sys_kcmp)#define __NR_finit_module 273
mm/process_vm_access.c +0 -69
78 lines not on this page · raw message
tools/include/uapi/asm-generic/unistd.h +2 -4
@@ -727,11 +727,9 @@ __SYSCALL(__NR_setns, sys_setns)#define __NR_sendmmsg 269 __SC_COMP(__NR_sendmmsg, sys_sendmmsg, compat_sys_sendmmsg)#define __NR_process_vm_readv 270 -__SC_COMP (__NR_process_vm_readv, sys_process_vm_readv, \ - compat_sys_process_vm_readv) +__SYSCALL(__NR_process_vm_readv, sys_process_vm_readv)#define __NR_process_vm_writev 271 -__SC_COMP (__NR_process_vm_writev, sys_process_vm_writev, \ - compat_sys_process_vm_writev) +__SYSCALL(__NR_process_vm_writev, sys_process_vm_writev)#define __NR_kcmp 272 __SYSCALL(__NR_kcmp, sys_kcmp)#define __NR_finit_module 273
tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +2 -2
@@ -443,8 +443,8 @@ 348 common syncfs sys_syncfs 349 common sendmmsg sys_sendmmsg compat_sys_sendmmsg 350 common setns sys_setns -351 nospu process_vm_readv sys_process_vm_readv compat_sys_process_vm_readv -352 nospu process_vm_writev sys_process_vm_writev compat_sys_process_vm_writev +351 nospu process_vm_readv sys_process_vm_readv +352 nospu process_vm_writev sys_process_vm_writev 353 nospu finit_module sys_finit_module 354 nospu kcmp sys_kcmp 355 common sched_setattr sys_sched_setattr
tools/perf/arch/s390/entry/syscalls/syscall.tbl +2 -2
@@ -347,8 +347,8 @@ 337 common clock_adjtime sys_clock_adjtime compat_sys_clock_adjtime 338 common syncfs sys_syncfs sys_syncfs 339 common setns sys_setns sys_setns -340 common process_vm_readv sys_process_vm_readv compat_sys_process_vm_readv -341 common process_vm_writev sys_process_vm_writev compat_sys_process_vm_writev +340 common process_vm_readv sys_process_vm_readv sys_process_vm_readv +341 common process_vm_writev sys_process_vm_writev sys_process_vm_writev 342 common s390_runtime_instr sys_s390_runtime_instr sys_s390_runtime_instr 343 common kcmp sys_kcmp compat_sys_kcmp 344 common finit_module sys_finit_module compat_sys_finit_module
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +2 -2
@@ -395,8 +395,8 @@ 536 x32 rt_tgsigqueueinfo compat_sys_rt_tgsigqueueinfo 537 x32 recvmmsg compat_sys_recvmmsg_time64 538 x32 sendmmsg compat_sys_sendmmsg -539 x32 process_vm_readv compat_sys_process_vm_readv -540 x32 process_vm_writev compat_sys_process_vm_writev +539 x32 process_vm_readv sys_process_vm_readv +540 x32 process_vm_writev sys_process_vm_writev 541 x32 setsockopt sys_setsockopt 542 x32 getsockopt sys_getsockopt 543 x32 io_setup compat_sys_io_setup
Signature · 1 line
2.28.0
PATCH 9/9 security/keys: remove compat_keyctl_instantiate_key_iov
In reply to Christoph HellwigNow that import_iovec handles compat iovecs, the native version of keyctl_instantiate_key_iov can be used for the compat case as well.
--- security/keys/compat.c | 36 ++---------------------------------- security/keys/internal.h | 5 ----- security/keys/keyctl.c | 2 +- 3 files changed, 3 insertions(+), 40 deletions(-)
security/keys/compat.c +2 -34
@@ -11,38 +11,6 @@#include <linux/slab.h> #include "internal.h" -/* -* Instantiate a key with the specified compatibility multipart payload and -* link the key into the destination keyring if one is given. -* -* The caller must have the appropriate instantiation permit set for this to -* work (see keyctl_assume_authority). No other permissions are required. -* -* If successful, 0 will be returned. -*/ -static long compat_keyctl_instantiate_key_iov ( -key_serial_t id, -const struct compat_iovec __user *_payload_iov, -unsigned ioc, -key_serial_t ringid) -{ -struct iovec iovstack[UIO_FASTIOV ], *iov = iovstack; -struct iov_iter from; -long ret; - -if (!_payload_iov) - ioc =0 ; - - ret =import_iovec (WRITE , (const struct iovec __user *)_payload_iov, - ioc,ARRAY_SIZE (iovstack), &iov, &from); -if (ret <0 ) -return ret; - - ret =keyctl_instantiate_key_common (id, &from, ringid); -kfree (iov); -return ret; -} -/* * The key control system call, 32-bit compatibility version for 64-bit archs */
@@ -113,8 +81,8 @@ COMPAT_SYSCALL_DEFINE5(keyctl, u32, option,return keyctl_reject_key (arg2, arg3, arg4, arg5);case KEYCTL_INSTANTIATE_IOV : -return compat_keyctl_instantiate_key_iov ( - arg2,compat_ptr (arg3), arg4, arg5); +return keyctl_instantiate_key_iov (arg2,compat_ptr (arg3), arg4, + arg5);case KEYCTL_INVALIDATE :return keyctl_invalidate_key (arg2);
security/keys/internal.h +0 -5
@@ -262,11 +262,6 @@ extern long keyctl_instantiate_key_iov(key_serial_t, const struct iovec __user *, unsigned, key_serial_t);extern long keyctl_invalidate_key (key_serial_t ); - -struct iov_iter ; -extern long keyctl_instantiate_key_common (key_serial_t , -struct iov_iter *, -key_serial_t );extern long keyctl_restrict_keyring (key_serial_t id,const char __user *_type,const char __user *_restriction);
security/keys/keyctl.c +1 -1
@@ -1164,7 +1164,7 @@ static int keyctl_change_reqkey_auth(struct key *key)* * If successful, 0 will be returned. */ -long keyctl_instantiate_key_common (key_serial_t id, +static long keyctl_instantiate_key_common (key_serial_t id,struct iov_iter *from,key_serial_t ringid) {
Signature · 1 line
2.28.0