vfs-6.8-release.fixes
-----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQRAhzRXHqcMeLMyaSiRxhvAZXjcogUCZehsXQAKCRCRxhvAZXjc ogG1AP9GD22EqFJtm62s7m+/Whls4hK2Js0WOY/eb7H4N97cvQD/aZ/fYOU2sDUw gY3ejUoOVFqwh8jp1kp4EYSKFlcLOgQ= =nYZR -----END PGP SIGNATURE----- Merge tag 'vfs-6.8-release.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs Pull vfs fixes from Christian Brauner: - Get rid of copy_mc flag in iov_iter which really only makes sense for the core dumping code so move it out of the generic iov iter code and make it coredump's problem. See the detailed commit description. - Revert fs/aio: Make io_cancel() generate completions again The initial fix here was predicated on the assumption that calling ki_cancel() didn't complete aio requests. However, that turned out to be wrong since the two drivers that actually make use of this set a cancellation function that performs the cancellation correctly. So revert this change. - Ensure that the test for IOCB_AIO_RW always happens before the read from ki_ctx. * tag 'vfs-6.8-release.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs: iov_iter: get rid of 'copy_mc' flag fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion Revert "fs/aio: Make io_cancel() generate completions again"
This commit is contained in:
Linus Torvalds
commit
67be068d31
35
fs/aio.c
35
fs/aio.c
@ -589,8 +589,8 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events)
|
||||
|
||||
void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel)
|
||||
{
|
||||
struct aio_kiocb *req = container_of(iocb, struct aio_kiocb, rw);
|
||||
struct kioctx *ctx = req->ki_ctx;
|
||||
struct aio_kiocb *req;
|
||||
struct kioctx *ctx;
|
||||
unsigned long flags;
|
||||
|
||||
/*
|
||||
@ -600,9 +600,13 @@ void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel)
|
||||
if (!(iocb->ki_flags & IOCB_AIO_RW))
|
||||
return;
|
||||
|
||||
req = container_of(iocb, struct aio_kiocb, rw);
|
||||
|
||||
if (WARN_ON_ONCE(!list_empty(&req->ki_list)))
|
||||
return;
|
||||
|
||||
ctx = req->ki_ctx;
|
||||
|
||||
spin_lock_irqsave(&ctx->ctx_lock, flags);
|
||||
list_add_tail(&req->ki_list, &ctx->active_reqs);
|
||||
req->ki_cancel = cancel;
|
||||
@ -2165,11 +2169,14 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat_aio_context_t, ctx_id,
|
||||
#endif
|
||||
|
||||
/* sys_io_cancel:
|
||||
* Attempts to cancel an iocb previously passed to io_submit(). If the
|
||||
* operation is successfully cancelled 0 is returned. May fail with
|
||||
* -EFAULT if any of the data structures pointed to are invalid. May
|
||||
* fail with -EINVAL if aio_context specified by ctx_id is invalid. Will
|
||||
* fail with -ENOSYS if not implemented.
|
||||
* Attempts to cancel an iocb previously passed to io_submit. If
|
||||
* the operation is successfully cancelled, the resulting event is
|
||||
* copied into the memory pointed to by result without being placed
|
||||
* into the completion queue and 0 is returned. May fail with
|
||||
* -EFAULT if any of the data structures pointed to are invalid.
|
||||
* May fail with -EINVAL if aio_context specified by ctx_id is
|
||||
* invalid. May fail with -EAGAIN if the iocb specified was not
|
||||
* cancelled. Will fail with -ENOSYS if not implemented.
|
||||
*/
|
||||
SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,
|
||||
struct io_event __user *, result)
|
||||
@ -2200,12 +2207,14 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,
|
||||
}
|
||||
spin_unlock_irq(&ctx->ctx_lock);
|
||||
|
||||
/*
|
||||
* The result argument is no longer used - the io_event is always
|
||||
* delivered via the ring buffer.
|
||||
*/
|
||||
if (ret == 0 && kiocb->rw.ki_flags & IOCB_AIO_RW)
|
||||
aio_complete_rw(&kiocb->rw, -EINTR);
|
||||
if (!ret) {
|
||||
/*
|
||||
* The result argument is no longer used - the io_event is
|
||||
* always delivered via the ring buffer. -EINPROGRESS indicates
|
||||
* cancellation is progress:
|
||||
*/
|
||||
ret = -EINPROGRESS;
|
||||
}
|
||||
|
||||
percpu_ref_put(&ctx->users);
|
||||
|
||||
|
||||
@ -872,6 +872,9 @@ static int dump_emit_page(struct coredump_params *cprm, struct page *page)
|
||||
loff_t pos;
|
||||
ssize_t n;
|
||||
|
||||
if (!page)
|
||||
return 0;
|
||||
|
||||
if (cprm->to_skip) {
|
||||
if (!__dump_skip(cprm, cprm->to_skip))
|
||||
return 0;
|
||||
@ -884,7 +887,6 @@ static int dump_emit_page(struct coredump_params *cprm, struct page *page)
|
||||
pos = file->f_pos;
|
||||
bvec_set_page(&bvec, page, PAGE_SIZE, 0);
|
||||
iov_iter_bvec(&iter, ITER_SOURCE, &bvec, 1, PAGE_SIZE);
|
||||
iov_iter_set_copy_mc(&iter);
|
||||
n = __kernel_write_iter(cprm->file, &iter, &pos);
|
||||
if (n != PAGE_SIZE)
|
||||
return 0;
|
||||
@ -895,10 +897,44 @@ static int dump_emit_page(struct coredump_params *cprm, struct page *page)
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* If we might get machine checks from kernel accesses during the
|
||||
* core dump, let's get those errors early rather than during the
|
||||
* IO. This is not performance-critical enough to warrant having
|
||||
* all the machine check logic in the iovec paths.
|
||||
*/
|
||||
#ifdef copy_mc_to_kernel
|
||||
|
||||
#define dump_page_alloc() alloc_page(GFP_KERNEL)
|
||||
#define dump_page_free(x) __free_page(x)
|
||||
static struct page *dump_page_copy(struct page *src, struct page *dst)
|
||||
{
|
||||
void *buf = kmap_local_page(src);
|
||||
size_t left = copy_mc_to_kernel(page_address(dst), buf, PAGE_SIZE);
|
||||
kunmap_local(buf);
|
||||
return left ? NULL : dst;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
/* We just want to return non-NULL; it's never used. */
|
||||
#define dump_page_alloc() ERR_PTR(-EINVAL)
|
||||
#define dump_page_free(x) ((void)(x))
|
||||
static inline struct page *dump_page_copy(struct page *src, struct page *dst)
|
||||
{
|
||||
return src;
|
||||
}
|
||||
#endif
|
||||
|
||||
int dump_user_range(struct coredump_params *cprm, unsigned long start,
|
||||
unsigned long len)
|
||||
{
|
||||
unsigned long addr;
|
||||
struct page *dump_page;
|
||||
|
||||
dump_page = dump_page_alloc();
|
||||
if (!dump_page)
|
||||
return 0;
|
||||
|
||||
for (addr = start; addr < start + len; addr += PAGE_SIZE) {
|
||||
struct page *page;
|
||||
@ -912,14 +948,17 @@ int dump_user_range(struct coredump_params *cprm, unsigned long start,
|
||||
*/
|
||||
page = get_dump_page(addr);
|
||||
if (page) {
|
||||
int stop = !dump_emit_page(cprm, page);
|
||||
int stop = !dump_emit_page(cprm, dump_page_copy(page, dump_page));
|
||||
put_page(page);
|
||||
if (stop)
|
||||
if (stop) {
|
||||
dump_page_free(dump_page);
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
dump_skip(cprm, PAGE_SIZE);
|
||||
}
|
||||
}
|
||||
dump_page_free(dump_page);
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -40,7 +40,6 @@ struct iov_iter_state {
|
||||
|
||||
struct iov_iter {
|
||||
u8 iter_type;
|
||||
bool copy_mc;
|
||||
bool nofault;
|
||||
bool data_source;
|
||||
size_t iov_offset;
|
||||
@ -248,22 +247,8 @@ size_t _copy_from_iter_flushcache(void *addr, size_t bytes, struct iov_iter *i);
|
||||
|
||||
#ifdef CONFIG_ARCH_HAS_COPY_MC
|
||||
size_t _copy_mc_to_iter(const void *addr, size_t bytes, struct iov_iter *i);
|
||||
static inline void iov_iter_set_copy_mc(struct iov_iter *i)
|
||||
{
|
||||
i->copy_mc = true;
|
||||
}
|
||||
|
||||
static inline bool iov_iter_is_copy_mc(const struct iov_iter *i)
|
||||
{
|
||||
return i->copy_mc;
|
||||
}
|
||||
#else
|
||||
#define _copy_mc_to_iter _copy_to_iter
|
||||
static inline void iov_iter_set_copy_mc(struct iov_iter *i) { }
|
||||
static inline bool iov_iter_is_copy_mc(const struct iov_iter *i)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
size_t iov_iter_zero(size_t bytes, struct iov_iter *);
|
||||
@ -355,7 +340,6 @@ static inline void iov_iter_ubuf(struct iov_iter *i, unsigned int direction,
|
||||
WARN_ON(direction & ~(READ | WRITE));
|
||||
*i = (struct iov_iter) {
|
||||
.iter_type = ITER_UBUF,
|
||||
.copy_mc = false,
|
||||
.data_source = direction,
|
||||
.ubuf = buf,
|
||||
.count = count,
|
||||
|
||||
@ -166,7 +166,6 @@ void iov_iter_init(struct iov_iter *i, unsigned int direction,
|
||||
WARN_ON(direction & ~(READ | WRITE));
|
||||
*i = (struct iov_iter) {
|
||||
.iter_type = ITER_IOVEC,
|
||||
.copy_mc = false,
|
||||
.nofault = false,
|
||||
.data_source = direction,
|
||||
.__iov = iov,
|
||||
@ -244,27 +243,9 @@ size_t _copy_mc_to_iter(const void *addr, size_t bytes, struct iov_iter *i)
|
||||
EXPORT_SYMBOL_GPL(_copy_mc_to_iter);
|
||||
#endif /* CONFIG_ARCH_HAS_COPY_MC */
|
||||
|
||||
static __always_inline
|
||||
size_t memcpy_from_iter_mc(void *iter_from, size_t progress,
|
||||
size_t len, void *to, void *priv2)
|
||||
{
|
||||
return copy_mc_to_kernel(to + progress, iter_from, len);
|
||||
}
|
||||
|
||||
static size_t __copy_from_iter_mc(void *addr, size_t bytes, struct iov_iter *i)
|
||||
{
|
||||
if (unlikely(i->count < bytes))
|
||||
bytes = i->count;
|
||||
if (unlikely(!bytes))
|
||||
return 0;
|
||||
return iterate_bvec(i, bytes, addr, NULL, memcpy_from_iter_mc);
|
||||
}
|
||||
|
||||
static __always_inline
|
||||
size_t __copy_from_iter(void *addr, size_t bytes, struct iov_iter *i)
|
||||
{
|
||||
if (unlikely(iov_iter_is_copy_mc(i)))
|
||||
return __copy_from_iter_mc(addr, bytes, i);
|
||||
return iterate_and_advance(i, bytes, addr,
|
||||
copy_from_user_iter, memcpy_from_iter);
|
||||
}
|
||||
@ -633,7 +614,6 @@ void iov_iter_kvec(struct iov_iter *i, unsigned int direction,
|
||||
WARN_ON(direction & ~(READ | WRITE));
|
||||
*i = (struct iov_iter){
|
||||
.iter_type = ITER_KVEC,
|
||||
.copy_mc = false,
|
||||
.data_source = direction,
|
||||
.kvec = kvec,
|
||||
.nr_segs = nr_segs,
|
||||
@ -650,7 +630,6 @@ void iov_iter_bvec(struct iov_iter *i, unsigned int direction,
|
||||
WARN_ON(direction & ~(READ | WRITE));
|
||||
*i = (struct iov_iter){
|
||||
.iter_type = ITER_BVEC,
|
||||
.copy_mc = false,
|
||||
.data_source = direction,
|
||||
.bvec = bvec,
|
||||
.nr_segs = nr_segs,
|
||||
@ -679,7 +658,6 @@ void iov_iter_xarray(struct iov_iter *i, unsigned int direction,
|
||||
BUG_ON(direction & ~1);
|
||||
*i = (struct iov_iter) {
|
||||
.iter_type = ITER_XARRAY,
|
||||
.copy_mc = false,
|
||||
.data_source = direction,
|
||||
.xarray = xarray,
|
||||
.xarray_start = start,
|
||||
@ -703,7 +681,6 @@ void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t count)
|
||||
BUG_ON(direction != READ);
|
||||
*i = (struct iov_iter){
|
||||
.iter_type = ITER_DISCARD,
|
||||
.copy_mc = false,
|
||||
.data_source = false,
|
||||
.count = count,
|
||||
.iov_offset = 0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user