* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
struct inode *inode = vvp_object_inode(ios->cis_obj);
LASSERT(inode == file_inode(vio->vui_fd->fd_file));
- vio->u.fault.ft_mtime = LTIME_S(inode->i_mtime);
+ vio->u.fault.ft_mtime = inode->i_mtime.tv_sec;
return 0;
}
struct cl_object *obj = io->ci_obj;
struct vvp_io *vio = cl2vvp_io(env, ios);
struct inode *inode = vvp_object_inode(obj);
+ int rc;
CLOBINVRNT(env, obj, vvp_object_invariant(obj));
CDEBUG(D_VFSTRACE, DFID" ignore/verify layout %d/%d, layout version %d "
- "restore needed %d\n",
+ "need write layout %d, restore needed %d\n",
PFID(lu_object_fid(&obj->co_lu)),
io->ci_ignore_layout, io->ci_verify_layout,
- vio->vui_layout_gen, io->ci_restore_needed);
+ vio->vui_layout_gen, io->ci_need_write_intent,
+ io->ci_restore_needed);
if (io->ci_restore_needed) {
- int rc;
-
/* file was detected release, we need to restore it
* before finishing the io
*/
}
}
+ /**
+ * dynamic layout change needed, send layout intent
+ * RPC.
+ */
+ if (io->ci_need_write_intent) {
+ loff_t start = 0;
+ loff_t end = OBD_OBJECT_EOF;
+
+ io->ci_need_write_intent = 0;
+
+ LASSERT(io->ci_type == CIT_WRITE ||
+ cl_io_is_trunc(io) || cl_io_is_mkwrite(io));
+
+ if (io->ci_type == CIT_WRITE) {
+ if (!cl_io_is_append(io)) {
+ start = io->u.ci_rw.rw_range.cir_pos;
+ end = start + io->u.ci_rw.rw_range.cir_count;
+ }
+ } else if (cl_io_is_trunc(io)) {
+ end = io->u.ci_setattr.sa_attr.lvb_size;
+ } else { /* mkwrite */
+ pgoff_t index = io->u.ci_fault.ft_index;
+
+ start = cl_offset(io->ci_obj, index);
+ end = cl_offset(io->ci_obj, index + 1);
+ }
+
+ CDEBUG(D_VFSTRACE, DFID" write layout, type %u [%llu, %llu)\n",
+ PFID(lu_object_fid(&obj->co_lu)), io->ci_type,
+ start, end);
+ rc = ll_layout_write_intent(inode, start, end);
+ io->ci_result = rc;
+ if (!rc)
+ io->ci_need_restart = 1;
+ }
+
if (!io->ci_ignore_layout && io->ci_verify_layout) {
__u32 gen = 0;
return CLM_READ;
}
-static int vvp_mmap_locks(const struct lu_env *env,
- struct vvp_io *vio, struct cl_io *io)
+static int vvp_mmap_locks(const struct lu_env *env, struct cl_io *io)
{
struct vvp_thread_info *vti = vvp_env_info(env);
struct mm_struct *mm = current->mm;
if (!cl_is_normalio(env, io))
RETURN(0);
- /* nfs or loop back device write */
- if (vio->vui_iter == NULL)
- RETURN(0);
-
/* No MM (e.g. NFS)? No vmas too. */
if (mm == NULL)
RETURN(0);
- iov_for_each(iov, i, *(vio->vui_iter)) {
+ iov_for_each(iov, i, io->u.ci_rw.rw_iter) {
unsigned long addr = (unsigned long)iov.iov_base;
size_t count = iov.iov_len;
return;
vio->vui_tot_count -= nob;
- iov_iter_reexpand(vio->vui_iter, vio->vui_tot_count);
-}
-
-static void vvp_io_update_iov(const struct lu_env *env,
- struct vvp_io *vio, struct cl_io *io)
-{
- size_t size = io->u.ci_rw.crw_count;
-
- if (!cl_is_normalio(env, io) || vio->vui_iter == NULL)
- return;
-
- iov_iter_truncate(vio->vui_iter, size);
+ if (io->ci_pio) {
+ iov_iter_advance(&io->u.ci_rw.rw_iter, nob);
+ io->u.ci_rw.rw_iocb.ki_pos = io->u.ci_rw.rw_range.cir_pos;
+#ifdef HAVE_KIOCB_KI_LEFT
+ io->u.ci_rw.rw_iocb.ki_left = vio->vui_tot_count;
+#elif defined(HAVE_KI_NBYTES)
+ io->u.ci_rw.rw_iocb.ki_nbytes = vio->vui_tot_count;
+#endif
+ } else {
+ /* It was truncated to stripe size in vvp_io_rw_lock() */
+ iov_iter_reexpand(&io->u.ci_rw.rw_iter, vio->vui_tot_count);
+ }
}
static int vvp_io_rw_lock(const struct lu_env *env, struct cl_io *io,
enum cl_lock_mode mode, loff_t start, loff_t end)
{
- struct vvp_io *vio = vvp_env_io(env);
int result;
int ast_flags = 0;
LASSERT(io->ci_type == CIT_READ || io->ci_type == CIT_WRITE);
ENTRY;
- vvp_io_update_iov(env, vio, io);
+ if (cl_is_normalio(env, io))
+ iov_iter_truncate(&io->u.ci_rw.rw_iter,
+ io->u.ci_rw.rw_range.cir_count);
- if (io->u.ci_rw.crw_nonblock)
+ if (io->u.ci_rw.rw_nonblock)
ast_flags |= CEF_NONBLOCK;
- result = vvp_mmap_locks(env, vio, io);
+ result = vvp_mmap_locks(env, io);
if (result == 0)
result = vvp_io_one_lock(env, io, ast_flags, mode, start, end);
- RETURN(result);
+ RETURN(result);
}
static int vvp_io_read_lock(const struct lu_env *env,
const struct cl_io_slice *ios)
{
- struct cl_io *io = ios->cis_io;
- struct cl_io_rw_common *rd = &io->u.ci_rd.rd;
- int result;
+ struct cl_io *io = ios->cis_io;
+ struct cl_io_range *range = &io->u.ci_rw.rw_range;
+ int rc;
ENTRY;
- result = vvp_io_rw_lock(env, io, CLM_READ, rd->crw_pos,
- rd->crw_pos + rd->crw_count - 1);
- RETURN(result);
+ rc = vvp_io_rw_lock(env, io, CLM_READ, range->cir_pos,
+ range->cir_pos + range->cir_count - 1);
+ RETURN(rc);
}
static int vvp_io_fault_lock(const struct lu_env *env,
static int vvp_io_write_lock(const struct lu_env *env,
const struct cl_io_slice *ios)
{
- struct cl_io *io = ios->cis_io;
- loff_t start;
- loff_t end;
+ struct cl_io *io = ios->cis_io;
+ loff_t start;
+ loff_t end;
+ int rc;
- if (io->u.ci_wr.wr_append) {
- start = 0;
- end = OBD_OBJECT_EOF;
- } else {
- start = io->u.ci_wr.wr.crw_pos;
- end = start + io->u.ci_wr.wr.crw_count - 1;
- }
- return vvp_io_rw_lock(env, io, CLM_WRITE, start, end);
+ ENTRY;
+ if (io->u.ci_rw.rw_append) {
+ start = 0;
+ end = OBD_OBJECT_EOF;
+ } else {
+ start = io->u.ci_rw.rw_range.cir_pos;
+ end = start + io->u.ci_rw.rw_range.cir_count - 1;
+ }
+ rc = vvp_io_rw_lock(env, io, CLM_WRITE, start, end);
+ RETURN(rc);
}
static int vvp_io_setattr_iter_init(const struct lu_env *env,
struct inode *inode = vvp_object_inode(obj);
struct ll_inode_info *lli = ll_i2info(inode);
struct file *file = vio->vui_fd->fd_file;
-
- int result;
- loff_t pos = io->u.ci_rd.rd.crw_pos;
- long cnt = io->u.ci_rd.rd.crw_count;
- long tot = vio->vui_tot_count;
- int exceed = 0;
+ struct cl_io_range *range = &io->u.ci_rw.rw_range;
+ loff_t pos = range->cir_pos; /* for generic_file_splice_read() only */
+ size_t tot = vio->vui_tot_count;
+ int exceed = 0;
+ int result;
CLOBINVRNT(env, obj, vvp_object_invariant(obj));
- CDEBUG(D_VFSTRACE, "read: -> [%lli, %lli)\n", pos, pos + cnt);
+ CDEBUG(D_VFSTRACE, "%s: read [%llu, %llu)\n",
+ file_dentry(file)->d_name.name,
+ range->cir_pos, range->cir_pos + range->cir_count);
if (vio->vui_io_subtype == IO_NORMAL)
down_read(&lli->lli_trunc_sem);
if (!can_populate_pages(env, io, inode))
return 0;
- result = vvp_prep_size(env, obj, io, pos, tot, &exceed);
+ result = vvp_prep_size(env, obj, io, range->cir_pos, tot, &exceed);
if (result != 0)
return result;
else if (exceed != 0)
goto out;
LU_OBJECT_HEADER(D_INODE, env, &obj->co_lu,
- "Read ino %lu, %lu bytes, offset %lld, size %llu\n",
- inode->i_ino, cnt, pos, i_size_read(inode));
+ "Read ino %lu, %lu bytes, offset %lld, size %llu\n",
+ inode->i_ino, range->cir_count, range->cir_pos,
+ i_size_read(inode));
/* turn off the kernel's read-ahead */
vio->vui_fd->fd_file->f_ra.ra_pages = 0;
/* initialize read-ahead window once per syscall */
if (!vio->vui_ra_valid) {
vio->vui_ra_valid = true;
- vio->vui_ra_start = cl_index(obj, pos);
+ vio->vui_ra_start = cl_index(obj, range->cir_pos);
vio->vui_ra_count = cl_index(obj, tot + PAGE_SIZE - 1);
ll_ras_enter(file);
}
file_accessed(file);
switch (vio->vui_io_subtype) {
case IO_NORMAL:
- LASSERT(vio->vui_iocb->ki_pos == pos);
- result = generic_file_read_iter(vio->vui_iocb, vio->vui_iter);
+ LASSERTF(io->u.ci_rw.rw_iocb.ki_pos == range->cir_pos,
+ "ki_pos %lld [%lld, %lld)\n",
+ io->u.ci_rw.rw_iocb.ki_pos,
+ range->cir_pos, range->cir_pos + range->cir_count);
+ result = generic_file_read_iter(&io->u.ci_rw.rw_iocb,
+ &io->u.ci_rw.rw_iter);
break;
case IO_SPLICE:
result = generic_file_splice_read(file, &pos,
- vio->u.splice.vui_pipe, cnt,
+ vio->u.splice.vui_pipe,
+ range->cir_count,
vio->u.splice.vui_flags);
/* LU-1109: do splice read stripe by stripe otherwise if it
* may make nfsd stuck if this read occupied all internal pipe
out:
if (result >= 0) {
- if (result < cnt)
+ if (result < range->cir_count)
io->ci_continue = 0;
io->ci_nob += result;
ll_rw_stats_tally(ll_i2sbi(inode), current->pid, vio->vui_fd,
- pos, result, READ);
+ range->cir_pos, result, READ);
result = 0;
}
SetPageUptodate(cl_page_vmpage(page));
cl_page_disown(env, io, page);
- /* held in ll_cl_init() */
lu_ref_del(&page->cp_reference, "cl_io", io);
cl_page_put(env, page);
}
cl_page_disown(env, io, page);
- /* held in ll_cl_init() */
lu_ref_del(&page->cp_reference, "cl_io", cl_io_top(io));
cl_page_put(env, page);
}
cl_page_disown(env, io, page);
- /* held in ll_cl_init() */
lu_ref_del(&page->cp_reference, "cl_io", io);
cl_page_put(env, page);
}
struct cl_object *obj = io->ci_obj;
struct inode *inode = vvp_object_inode(obj);
struct ll_inode_info *lli = ll_i2info(inode);
+ struct file *file = vio->vui_fd->fd_file;
+ struct cl_io_range *range = &io->u.ci_rw.rw_range;
+ bool lock_inode = !lli->lli_inode_locked &&
+ !IS_NOSEC(inode);
ssize_t result = 0;
- loff_t pos = io->u.ci_wr.wr.crw_pos;
- size_t cnt = io->u.ci_wr.wr.crw_count;
-
ENTRY;
if (vio->vui_io_subtype == IO_NORMAL)
* out-of-order writes.
*/
ll_merge_attr(env, inode);
- pos = io->u.ci_wr.wr.crw_pos = i_size_read(inode);
- vio->vui_iocb->ki_pos = pos;
+ range->cir_pos = i_size_read(inode);
+ io->u.ci_rw.rw_iocb.ki_pos = range->cir_pos;
} else {
- LASSERT(vio->vui_iocb->ki_pos == pos);
+ LASSERTF(io->u.ci_rw.rw_iocb.ki_pos == range->cir_pos,
+ "ki_pos %lld [%lld, %lld)\n",
+ io->u.ci_rw.rw_iocb.ki_pos,
+ range->cir_pos, range->cir_pos + range->cir_count);
}
- CDEBUG(D_VFSTRACE, "write: [%lli, %lli)\n", pos, pos + (long long)cnt);
+ CDEBUG(D_VFSTRACE, "%s: write [%llu, %llu)\n",
+ file_dentry(file)->d_name.name,
+ range->cir_pos, range->cir_pos + range->cir_count);
/* The maximum Lustre file size is variable, based on the OST maximum
* object size and number of stripes. This needs another check in
* addition to the VFS checks earlier. */
- if (pos + cnt > ll_file_maxbytes(inode)) {
+ if (range->cir_pos + range->cir_count > ll_file_maxbytes(inode)) {
CDEBUG(D_INODE,
- "%s: file "DFID" offset %llu > maxbytes %llu\n",
+ "%s: file %s ("DFID") offset %llu > maxbytes %llu\n",
ll_get_fsname(inode->i_sb, NULL, 0),
- PFID(ll_inode2fid(inode)), pos + cnt,
+ file_dentry(file)->d_name.name,
+ PFID(ll_inode2fid(inode)),
+ range->cir_pos + range->cir_count,
ll_file_maxbytes(inode));
RETURN(-EFBIG);
}
- if (vio->vui_iter == NULL) {
- /* from a temp io in ll_cl_init(). */
- result = 0;
- } else {
- /*
- * When using the locked AIO function (generic_file_aio_write())
- * testing has shown the inode mutex to be a limiting factor
- * with multi-threaded single shared file performance. To get
- * around this, we now use the lockless version. To maintain
- * consistency, proper locking to protect against writes,
- * trucates, etc. is handled in the higher layers of lustre.
- */
- bool lock_node = !IS_NOSEC(inode);
-
- if (lock_node)
- inode_lock(inode);
- result = __generic_file_write_iter(vio->vui_iocb,
- vio->vui_iter);
- if (lock_node)
- inode_unlock(inode);
-
- if (result > 0 || result == -EIOCBQUEUED) {
- ssize_t err;
-
- err = generic_write_sync(vio->vui_iocb->ki_filp,
- pos, result);
- if (err < 0 && result > 0)
- result = err;
- }
+ /* Tests to verify we take the i_mutex correctly */
+ if (OBD_FAIL_CHECK(OBD_FAIL_LLITE_IMUTEX_SEC) && !lock_inode)
+ RETURN(-EINVAL);
+ if (OBD_FAIL_CHECK(OBD_FAIL_LLITE_IMUTEX_NOSEC) && lock_inode)
+ RETURN(-EINVAL);
+
+ /*
+ * When using the locked AIO function (generic_file_aio_write())
+ * testing has shown the inode mutex to be a limiting factor
+ * with multi-threaded single shared file performance. To get
+ * around this, we now use the lockless version. To maintain
+ * consistency, proper locking to protect against writes,
+ * trucates, etc. is handled in the higher layers of lustre.
+ */
+ if (lock_inode)
+ inode_lock(inode);
+ result = __generic_file_write_iter(&io->u.ci_rw.rw_iocb,
+ &io->u.ci_rw.rw_iter);
+ if (lock_inode)
+ inode_unlock(inode);
+
+ if (result > 0 || result == -EIOCBQUEUED)
+#ifdef HAVE_GENERIC_WRITE_SYNC_2ARGS
+ result = generic_write_sync(&io->u.ci_rw.rw_iocb, result);
+#else
+ {
+ ssize_t err;
+
+ err = generic_write_sync(io->u.ci_rw.rw_iocb.ki_filp,
+ range->cir_pos, result);
+ if (err < 0 && result > 0)
+ result = err;
}
+#endif
+
if (result > 0) {
result = vvp_io_write_commit(env, io);
if (vio->u.write.vui_written > 0) {
result = vio->u.write.vui_written;
- io->ci_nob += result;
-
- CDEBUG(D_VFSTRACE, "write: nob %zd, result: %zd\n",
+ CDEBUG(D_VFSTRACE, "%s: write nob %zd, result: %zd\n",
+ file_dentry(file)->d_name.name,
io->ci_nob, result);
+ io->ci_nob += result;
}
}
if (result > 0) {
ll_file_set_flag(ll_i2info(inode), LLIF_DATA_MODIFIED);
- if (result < cnt)
+ if (result < range->cir_count)
io->ci_continue = 0;
ll_rw_stats_tally(ll_i2sbi(inode), current->pid,
- vio->vui_fd, pos, result, WRITE);
+ vio->vui_fd, range->cir_pos, result, WRITE);
result = 0;
}
{
struct vm_fault *vmf = cfio->ft_vmf;
- cfio->ft_flags = filemap_fault(cfio->ft_vma, vmf);
+ cfio->ft_flags = ll_filemap_fault(cfio->ft_vma, vmf);
cfio->ft_flags_valid = 1;
if (vmf->page) {
LL_CDEBUG_PAGE(D_PAGE, vmf->page, "got addr %p type NOPAGE\n",
- vmf->virtual_address);
+ get_vmf_address(vmf));
if (unlikely(!(cfio->ft_flags & VM_FAULT_LOCKED))) {
lock_page(vmf->page);
cfio->ft_flags |= VM_FAULT_LOCKED;
}
if (cfio->ft_flags & VM_FAULT_SIGBUS) {
- CDEBUG(D_PAGE, "got addr %p - SIGBUS\n", vmf->virtual_address);
+ CDEBUG(D_PAGE, "got addr %p - SIGBUS\n", get_vmf_address(vmf));
return -EFAULT;
}
if (cfio->ft_flags & VM_FAULT_OOM) {
- CDEBUG(D_PAGE, "got addr %p - OOM\n", vmf->virtual_address);
+ CDEBUG(D_PAGE, "got addr %p - OOM\n", get_vmf_address(vmf));
return -ENOMEM;
}
vio->vui_ra_valid = false;
result = 0;
if (io->ci_type == CIT_READ || io->ci_type == CIT_WRITE) {
- size_t count;
struct ll_inode_info *lli = ll_i2info(inode);
- count = io->u.ci_rw.crw_count;
- /* "If nbyte is 0, read() will return 0 and have no other
- * results." -- Single Unix Spec */
- if (count == 0)
- result = 1;
- else
- vio->vui_tot_count = count;
+ vio->vui_tot_count = io->u.ci_rw.rw_range.cir_count;
+ /* "If nbyte is 0, read() will return 0 and have no other
+ * results." -- Single Unix Spec */
+ if (vio->vui_tot_count == 0)
+ result = 1;
/* for read/write, we store the jobid in the inode, and
* it'll be fetched by osc when building RPC.
git://git.whamcloud.com / fs / lustre-release.git / blobdiff