X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fvvp_io.c;h=78e1da7937a47005a38f337ca176ab7d162e9187;hb=58f3eb928f563f24f0b3ee41970fa23a59fdcb87;hp=a601017a9ab38ff888aabd2684fa5cf34e31cd9e;hpb=86a153fc4d659dc2662ab5201fac86eb06a31a96;p=fs%2Flustre-release.git diff --git a/lustre/llite/vvp_io.c b/lustre/llite/vvp_io.c index a601017..78e1da7 100644 --- a/lustre/llite/vvp_io.c +++ b/lustre/llite/vvp_io.c @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -180,6 +180,11 @@ static int vvp_mmap_locks(const struct lu_env *env, policy.l_extent.end); descr->cld_enq_flags = flags; result = cl_io_lock_alloc_add(env, io, descr); + + CDEBUG(D_VFSTRACE, "lock: %d: [%lu, %lu]\n", + descr->cld_mode, descr->cld_start, + descr->cld_end); + if (result < 0) RETURN(result); @@ -262,10 +267,10 @@ static int vvp_io_write_lock(const struct lu_env *env, return vvp_io_rw_lock(env, io, CLM_WRITE, start, end); } -static int vvp_io_trunc_iter_init(const struct lu_env *env, - const struct cl_io_slice *ios) +static int vvp_io_setattr_iter_init(const struct lu_env *env, + const struct cl_io_slice *ios) { - struct ccc_io *vio = cl2ccc_io(env, ios); + struct ccc_io *cio = ccc_env_io(env); struct inode *inode = ccc_object_inode(ios->cis_obj); /* @@ -276,31 +281,41 @@ static int vvp_io_trunc_iter_init(const struct lu_env *env, * This last one is especially bad for racing o_append users on other * nodes. */ - UNLOCK_INODE_MUTEX(inode); - UP_WRITE_I_ALLOC_SEM(inode); - vio->u.trunc.cui_locks_released = 1; + if (cl_io_is_trunc(ios->cis_io)) + UP_WRITE_I_ALLOC_SEM(inode); + cio->u.setattr.cui_locks_released = 1; return 0; } /** - * Implementation of cl_io_operations::cio_lock() method for CIT_TRUNC io. + * Implementation of cl_io_operations::cio_lock() method for CIT_SETATTR io. * * Handles "lockless io" mode when extent locking is done by server. */ -static int vvp_io_trunc_lock(const struct lu_env *env, - const struct cl_io_slice *ios) +static int vvp_io_setattr_lock(const struct lu_env *env, + const struct cl_io_slice *ios) { - struct ccc_io *vio = cl2ccc_io(env, ios); - struct cl_io *io = ios->cis_io; - size_t new_size = io->u.ci_truncate.tr_size; - __u32 enqflags = new_size == 0 ? CEF_DISCARD_DATA : 0; - int result; - - vio->u.trunc.cui_local_lock = TRUNC_EXTENT; - result = ccc_io_one_lock(env, io, enqflags, CLM_WRITE, - new_size, OBD_OBJECT_EOF); - return result; + struct ccc_io *cio = ccc_env_io(env); + struct cl_io *io = ios->cis_io; + size_t new_size; + __u32 enqflags = 0; + + if (cl_io_is_trunc(io)) { + new_size = io->u.ci_setattr.sa_attr.lvb_size; + if (new_size == 0) + enqflags = CEF_DISCARD_DATA; + } else { + if ((io->u.ci_setattr.sa_attr.lvb_mtime >= + io->u.ci_setattr.sa_attr.lvb_ctime) || + (io->u.ci_setattr.sa_attr.lvb_atime >= + io->u.ci_setattr.sa_attr.lvb_ctime)) + return 0; + new_size = 0; + } + cio->u.setattr.cui_local_lock = SETATTR_EXTENT_LOCK; + return ccc_io_one_lock(env, io, enqflags, CLM_WRITE, + new_size, OBD_OBJECT_EOF); } static int vvp_do_vmtruncate(struct inode *inode, size_t size) @@ -319,23 +334,17 @@ static int vvp_do_vmtruncate(struct inode *inode, size_t size) return result; } -static int vvp_io_trunc_start(const struct lu_env *env, - const struct cl_io_slice *ios) +static int vvp_io_setattr_trunc(const struct lu_env *env, + const struct cl_io_slice *ios, + struct inode *inode, loff_t size) { - struct ccc_io *cio = cl2ccc_io(env, ios); struct vvp_io *vio = cl2vvp_io(env, ios); struct cl_io *io = ios->cis_io; - struct inode *inode = ccc_object_inode(io->ci_obj); struct cl_object *obj = ios->cis_obj; - size_t size = io->u.ci_truncate.tr_size; pgoff_t start = cl_index(obj, size); int result; - LASSERT(cio->u.trunc.cui_locks_released); - - LOCK_INODE_MUTEX(inode); DOWN_WRITE_I_ALLOC_SEM(inode); - cio->u.trunc.cui_locks_released = 0; result = vvp_do_vmtruncate(inode, size); @@ -369,14 +378,59 @@ static int vvp_io_trunc_start(const struct lu_env *env, return result; } -static void vvp_io_trunc_end(const struct lu_env *env, - const struct cl_io_slice *ios) +static int vvp_io_setattr_time(const struct lu_env *env, + const struct cl_io_slice *ios) +{ + struct cl_io *io = ios->cis_io; + struct cl_object *obj = io->ci_obj; + struct cl_attr *attr = ccc_env_thread_attr(env); + int result; + unsigned valid = CAT_CTIME; + + cl_object_attr_lock(obj); + attr->cat_ctime = io->u.ci_setattr.sa_attr.lvb_ctime; + if (io->u.ci_setattr.sa_valid & ATTR_ATIME_SET) { + attr->cat_atime = io->u.ci_setattr.sa_attr.lvb_atime; + valid |= CAT_ATIME; + } + if (io->u.ci_setattr.sa_valid & ATTR_MTIME_SET) { + attr->cat_mtime = io->u.ci_setattr.sa_attr.lvb_mtime; + valid |= CAT_MTIME; + } + result = cl_object_attr_set(env, obj, attr, valid); + cl_object_attr_unlock(obj); + + return result; +} + +static int vvp_io_setattr_start(const struct lu_env *env, + const struct cl_io_slice *ios) +{ + struct ccc_io *cio = cl2ccc_io(env, ios); + struct cl_io *io = ios->cis_io; + struct inode *inode = ccc_object_inode(io->ci_obj); + + LASSERT(cio->u.setattr.cui_locks_released); + + LOCK_INODE_MUTEX(inode); + cio->u.setattr.cui_locks_released = 0; + + if (cl_io_is_trunc(io)) + return vvp_io_setattr_trunc(env, ios, inode, + io->u.ci_setattr.sa_attr.lvb_size); + else + return vvp_io_setattr_time(env, ios); +} + +static void vvp_io_setattr_end(const struct lu_env *env, + const struct cl_io_slice *ios) { - struct vvp_io *vio = cl2vvp_io(env, ios); + struct vvp_io *vio = cl2vvp_io(env, ios); struct cl_io *io = ios->cis_io; struct inode *inode = ccc_object_inode(io->ci_obj); - size_t size = io->u.ci_truncate.tr_size; + if (!cl_io_is_trunc(io)) + return; if (vio->cui_partpage != NULL) { cl_page_disown(env, ios->cis_io, vio->cui_partpage); cl_page_put(env, vio->cui_partpage); @@ -387,19 +441,21 @@ static void vvp_io_trunc_end(const struct lu_env *env, * Do vmtruncate again, to remove possible stale pages populated by * competing read threads. bz20645. */ - vvp_do_vmtruncate(inode, size); + vvp_do_vmtruncate(inode, io->u.ci_setattr.sa_attr.lvb_size); } -static void vvp_io_trunc_fini(const struct lu_env *env, - const struct cl_io_slice *ios) +static void vvp_io_setattr_fini(const struct lu_env *env, + const struct cl_io_slice *ios) { struct ccc_io *cio = ccc_env_io(env); + struct cl_io *io = ios->cis_io; struct inode *inode = ccc_object_inode(ios->cis_io->ci_obj); - if (cio->u.trunc.cui_locks_released) { + if (cio->u.setattr.cui_locks_released) { LOCK_INODE_MUTEX(inode); - DOWN_WRITE_I_ALLOC_SEM(inode); - cio->u.trunc.cui_locks_released = 0; + if (cl_io_is_trunc(io)) + DOWN_WRITE_I_ALLOC_SEM(inode); + cio->u.setattr.cui_locks_released = 0; } vvp_io_fini(env, ios); } @@ -614,6 +670,9 @@ static int vvp_io_kernel_fault(struct vvp_fault_io *cfio) return -ENOMEM; } + if (unlikely(cfio->fault.ft_flags & VM_FAULT_RETRY)) + return -EAGAIN; + CERROR("unknow error in page fault!\n"); return -EINVAL; } @@ -649,14 +708,19 @@ static int vvp_io_fault_start(const struct lu_env *env, if (result != 0) return result; - /* must return locked page */ + /* must return unlocked page */ kernel_result = vvp_io_kernel_fault(cfio); if (kernel_result != 0) return kernel_result; + /* Temporarily lock vmpage to keep cl_page_find() happy. */ lock_page(cfio->ft_vmpage); - page = cl_page_find(env, obj, fio->ft_index, cfio->ft_vmpage, - CPT_CACHEABLE); + /* Though we have already held a cl_lock upon this page, but + * it still can be truncated locally. */ + page = ERR_PTR(-EFAULT); + if (likely(cfio->ft_vmpage->mapping != NULL)) + page = cl_page_find(env, obj, fio->ft_index, cfio->ft_vmpage, + CPT_CACHEABLE); unlock_page(cfio->ft_vmpage); if (IS_ERR(page)) { page_cache_release(cfio->ft_vmpage); @@ -718,7 +782,7 @@ static int vvp_io_read_page(const struct lu_env *env, /* Sanity check whether the page is protected by a lock. */ rc = cl_page_is_under_lock(env, io, page); if (rc != -EBUSY) { - CL_PAGE_HEADER(D_WARNING, env, page, "%s: %i\n", + CL_PAGE_HEADER(D_WARNING, env, page, "%s: %d\n", rc == -ENODATA ? "without a lock" : "match failed", rc); if (rc != -ENODATA) @@ -754,7 +818,7 @@ static int vvp_page_sync_io(const struct lu_env *env, struct cl_io *io, cl_2queue_init_page(queue, page); cl_page_clip(env, page, 0, to); - + result = cl_io_submit_sync(env, io, crt, queue, CRP_NORMAL, 0); LASSERT(cl_page_is_owned(page, io)); cl_page_clip(env, page, 0, CFS_PAGE_SIZE); @@ -934,8 +998,12 @@ static int vvp_io_commit_write(const struct lu_env *env, ll_inode_size_lock(inode, 0); if (result == 0) { - if (size > i_size_read(inode)) + if (size > i_size_read(inode)) { cl_isize_write_nolock(inode, size); + CDEBUG(D_VFSTRACE, DFID" updating i_size %lu\n", + PFID(lu_object_fid(&obj->co_lu)), + (unsigned long)size); + } cl_page_export(env, pg, 1); } else { if (size > i_size_read(inode)) @@ -960,12 +1028,12 @@ static const struct cl_io_operations vvp_io_ops = { .cio_start = vvp_io_write_start, .cio_advance = ccc_io_advance }, - [CIT_TRUNC] = { - .cio_fini = vvp_io_trunc_fini, - .cio_iter_init = vvp_io_trunc_iter_init, - .cio_lock = vvp_io_trunc_lock, - .cio_start = vvp_io_trunc_start, - .cio_end = vvp_io_trunc_end + [CIT_SETATTR] = { + .cio_fini = vvp_io_setattr_fini, + .cio_iter_init = vvp_io_setattr_iter_init, + .cio_lock = vvp_io_setattr_lock, + .cio_start = vvp_io_setattr_start, + .cio_end = vvp_io_setattr_end }, [CIT_FAULT] = { .cio_fini = vvp_io_fault_fini, @@ -1015,9 +1083,12 @@ int vvp_io_init(const struct lu_env *env, struct cl_object *obj, cio->cui_tot_nrsegs = 0; ll_stats_ops_tally(sbi, op, count); } - } else if (io->ci_type == CIT_TRUNC) { - /* lockless truncate? */ - ll_stats_ops_tally(sbi, LPROC_LL_TRUNC, 1); + } else if (io->ci_type == CIT_SETATTR) { + if (cl_io_is_trunc(io)) + /* lockless truncate? */ + ll_stats_ops_tally(sbi, LPROC_LL_TRUNC, 1); + else + io->ci_lockreq = CILR_MANDATORY; } RETURN(result); }