X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fvvp_page.c;h=90c9417c1bf2d2a5853d4423131474a1a6a74515;hb=2b294992edce5af7b79d4300ed3aa1ea6a8db850;hp=4b85a234a3e21b7a2d7ea67923666d5e4ec9a8e4;hpb=98060d83459ba10409f295898f0ec917f938b4d3;p=fs%2Flustre-release.git diff --git a/lustre/llite/vvp_page.c b/lustre/llite/vvp_page.c index 4b85a23..90c9417 100644 --- a/lustre/llite/vvp_page.c +++ b/lustre/llite/vvp_page.c @@ -27,7 +27,7 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -41,13 +41,9 @@ #define DEBUG_SUBSYSTEM S_LLITE -#ifndef __KERNEL__ -# error This file is kernel only. -#endif #include -#include - +#include "llite_internal.h" #include "vvp_internal.h" /***************************************************************************** @@ -58,32 +54,32 @@ static void vvp_page_fini_common(struct ccc_page *cp) { - cfs_page_t *vmpage = cp->cpg_page; + struct page *vmpage = cp->cpg_page; - LASSERT(vmpage != NULL); - page_cache_release(vmpage); + LASSERT(vmpage != NULL); + page_cache_release(vmpage); } static void vvp_page_fini(const struct lu_env *env, - struct cl_page_slice *slice) + struct cl_page_slice *slice) { - struct ccc_page *cp = cl2ccc_page(slice); - cfs_page_t *vmpage = cp->cpg_page; + struct ccc_page *cp = cl2ccc_page(slice); + struct page *vmpage = cp->cpg_page; - /* - * vmpage->private was already cleared when page was moved into - * VPG_FREEING state. - */ - LASSERT((struct cl_page *)vmpage->private != slice->cpl_page); - vvp_page_fini_common(cp); + /* + * vmpage->private was already cleared when page was moved into + * VPG_FREEING state. + */ + LASSERT((struct cl_page *)vmpage->private != slice->cpl_page); + vvp_page_fini_common(cp); } static int vvp_page_own(const struct lu_env *env, const struct cl_page_slice *slice, struct cl_io *io, int nonblock) { - struct ccc_page *vpg = cl2ccc_page(slice); - cfs_page_t *vmpage = vpg->cpg_page; + struct ccc_page *vpg = cl2ccc_page(slice); + struct page *vmpage = vpg->cpg_page; LASSERT(vmpage != NULL); if (nonblock) { @@ -104,111 +100,93 @@ static int vvp_page_own(const struct lu_env *env, } static void vvp_page_assume(const struct lu_env *env, - const struct cl_page_slice *slice, - struct cl_io *unused) + const struct cl_page_slice *slice, + struct cl_io *unused) { - cfs_page_t *vmpage = cl2vm_page(slice); + struct page *vmpage = cl2vm_page(slice); - LASSERT(vmpage != NULL); - LASSERT(PageLocked(vmpage)); - wait_on_page_writeback(vmpage); + LASSERT(vmpage != NULL); + LASSERT(PageLocked(vmpage)); + wait_on_page_writeback(vmpage); } static void vvp_page_unassume(const struct lu_env *env, - const struct cl_page_slice *slice, - struct cl_io *unused) + const struct cl_page_slice *slice, + struct cl_io *unused) { - cfs_page_t *vmpage = cl2vm_page(slice); + struct page *vmpage = cl2vm_page(slice); - LASSERT(vmpage != NULL); - LASSERT(PageLocked(vmpage)); + LASSERT(vmpage != NULL); + LASSERT(PageLocked(vmpage)); } static void vvp_page_disown(const struct lu_env *env, - const struct cl_page_slice *slice, struct cl_io *io) + const struct cl_page_slice *slice, struct cl_io *io) { - cfs_page_t *vmpage = cl2vm_page(slice); + struct page *vmpage = cl2vm_page(slice); - LASSERT(vmpage != NULL); - LASSERT(PageLocked(vmpage)); + LASSERT(vmpage != NULL); + LASSERT(PageLocked(vmpage)); - unlock_page(cl2vm_page(slice)); + unlock_page(cl2vm_page(slice)); } static void vvp_page_discard(const struct lu_env *env, const struct cl_page_slice *slice, struct cl_io *unused) { - cfs_page_t *vmpage = cl2vm_page(slice); - struct address_space *mapping; - struct ccc_page *cpg = cl2ccc_page(slice); - - LASSERT(vmpage != NULL); - LASSERT(PageLocked(vmpage)); + struct page *vmpage = cl2vm_page(slice); + struct ccc_page *cpg = cl2ccc_page(slice); - mapping = vmpage->mapping; - - if (cpg->cpg_defer_uptodate && !cpg->cpg_ra_used) - ll_ra_stats_inc(mapping, RA_STAT_DISCARDED); - - /* - * truncate_complete_page() calls - * a_ops->invalidatepage()->cl_page_delete()->vvp_page_delete(). - */ - truncate_complete_page(mapping, vmpage); -} - -static int vvp_page_unmap(const struct lu_env *env, - const struct cl_page_slice *slice, - struct cl_io *unused) -{ - cfs_page_t *vmpage = cl2vm_page(slice); - __u64 offset; - - LASSERT(vmpage != NULL); - LASSERT(PageLocked(vmpage)); + LASSERT(vmpage != NULL); + LASSERT(PageLocked(vmpage)); - offset = vmpage->index << CFS_PAGE_SHIFT; + if (cpg->cpg_defer_uptodate && !cpg->cpg_ra_used) + ll_ra_stats_inc(vmpage->mapping->host, RA_STAT_DISCARDED); - /* - * XXX is it safe to call this with the page lock held? - */ - ll_teardown_mmaps(vmpage->mapping, offset, offset + CFS_PAGE_SIZE); - return 0; + ll_invalidate_page(vmpage); } static void vvp_page_delete(const struct lu_env *env, const struct cl_page_slice *slice) { - cfs_page_t *vmpage = cl2vm_page(slice); - struct inode *inode = vmpage->mapping->host; - struct cl_object *obj = slice->cpl_obj; + struct page *vmpage = cl2vm_page(slice); + struct inode *inode = vmpage->mapping->host; + struct cl_object *obj = slice->cpl_obj; + struct cl_page *page = slice->cpl_page; + int refc; - LASSERT(PageLocked(vmpage)); - LASSERT((struct cl_page *)vmpage->private == slice->cpl_page); - LASSERT(inode == ccc_object_inode(obj)); - - vvp_write_complete(cl2ccc(obj), cl2ccc_page(slice)); - ClearPagePrivate(vmpage); - vmpage->private = 0; - /* - * Reference from vmpage to cl_page is removed, but the reference back - * is still here. It is removed later in vvp_page_fini(). - */ + LASSERT(PageLocked(vmpage)); + LASSERT((struct cl_page *)vmpage->private == page); + LASSERT(inode == ccc_object_inode(obj)); + + vvp_write_complete(cl2ccc(obj), cl2ccc_page(slice)); + + /* Drop the reference count held in vvp_page_init */ + refc = atomic_dec_return(&page->cp_ref); + LASSERTF(refc >= 1, "page = %p, refc = %d\n", page, refc); + + ClearPageUptodate(vmpage); + ClearPagePrivate(vmpage); + vmpage->private = 0; + /* + * Reference from vmpage to cl_page is removed, but the reference back + * is still here. It is removed later in vvp_page_fini(). + */ } static void vvp_page_export(const struct lu_env *env, - const struct cl_page_slice *slice, - int uptodate) + const struct cl_page_slice *slice, + int uptodate) { - cfs_page_t *vmpage = cl2vm_page(slice); + struct page *vmpage = cl2vm_page(slice); - LASSERT(vmpage != NULL); - LASSERT(PageLocked(vmpage)); - if (uptodate) - SetPageUptodate(vmpage); - else - ClearPageUptodate(vmpage); + LASSERT(vmpage != NULL); + LASSERT(PageLocked(vmpage)); + if (uptodate) + SetPageUptodate(vmpage); + else + ClearPageUptodate(vmpage); } static int vvp_page_is_vmlocked(const struct lu_env *env, @@ -230,7 +208,7 @@ static int vvp_page_prep_write(const struct lu_env *env, const struct cl_page_slice *slice, struct cl_io *unused) { - cfs_page_t *vmpage = cl2vm_page(slice); + struct page *vmpage = cl2vm_page(slice); LASSERT(PageLocked(vmpage)); LASSERT(!PageDirty(vmpage)); @@ -247,7 +225,7 @@ static int vvp_page_prep_write(const struct lu_env *env, * This takes inode as a separate argument, because inode on which error is to * be set can be different from \a vmpage inode in case of direct-io. */ -static void vvp_vmpage_error(struct inode *inode, cfs_page_t *vmpage, int ioret) +static void vvp_vmpage_error(struct inode *inode, struct page *vmpage, int ioret) { struct ccc_object *obj = cl_inode2ccc(inode); @@ -274,8 +252,8 @@ static void vvp_page_completion_read(const struct lu_env *env, int ioret) { struct ccc_page *cp = cl2ccc_page(slice); - cfs_page_t *vmpage = cp->cpg_page; - struct cl_page *page = cl_page_top(slice->cpl_page); + struct page *vmpage = cp->cpg_page; + struct cl_page *page = slice->cpl_page; struct inode *inode = ccc_object_inode(page->cp_obj); ENTRY; @@ -301,10 +279,10 @@ static void vvp_page_completion_write(const struct lu_env *env, const struct cl_page_slice *slice, int ioret) { - struct ccc_page *cp = cl2ccc_page(slice); - struct cl_page *pg = slice->cpl_page; - cfs_page_t *vmpage = cp->cpg_page; - ENTRY; + struct ccc_page *cp = cl2ccc_page(slice); + struct cl_page *pg = slice->cpl_page; + struct page *vmpage = cp->cpg_page; + ENTRY; LASSERT(ergo(pg->cp_sync_io != NULL, PageLocked(vmpage))); LASSERT(PageWriteback(vmpage)); @@ -352,7 +330,7 @@ static void vvp_page_completion_write(const struct lu_env *env, static int vvp_page_make_ready(const struct lu_env *env, const struct cl_page_slice *slice) { - cfs_page_t *vmpage = cl2vm_page(slice); + struct page *vmpage = cl2vm_page(slice); struct cl_page *pg = slice->cpl_page; int result = 0; @@ -378,12 +356,29 @@ static int vvp_page_make_ready(const struct lu_env *env, RETURN(result); } +static int vvp_page_is_under_lock(const struct lu_env *env, + const struct cl_page_slice *slice, + struct cl_io *io, pgoff_t *max_index) +{ + ENTRY; + + if (io->ci_type == CIT_READ || io->ci_type == CIT_WRITE || + io->ci_type == CIT_FAULT) { + struct ccc_io *cio = ccc_env_io(env); + + if (unlikely(cio->cui_fd->fd_flags & LL_FILE_GROUP_LOCKED)) + *max_index = CL_PAGE_EOF; + } + RETURN(0); +} + + static int vvp_page_print(const struct lu_env *env, const struct cl_page_slice *slice, void *cookie, lu_printer_t printer) { - struct ccc_page *vp = cl2ccc_page(slice); - cfs_page_t *vmpage = vp->cpg_page; + struct ccc_page *vp = cl2ccc_page(slice); + struct page *vmpage = vp->cpg_page; (*printer)(env, cookie, LUSTRE_VVP_NAME"-page@%p(%d:%d:%d) " "vm@%p ", @@ -405,15 +400,13 @@ static const struct cl_page_operations vvp_page_ops = { .cpo_assume = vvp_page_assume, .cpo_unassume = vvp_page_unassume, .cpo_disown = vvp_page_disown, - .cpo_vmpage = ccc_page_vmpage, .cpo_discard = vvp_page_discard, .cpo_delete = vvp_page_delete, - .cpo_unmap = vvp_page_unmap, .cpo_export = vvp_page_export, .cpo_is_vmlocked = vvp_page_is_vmlocked, .cpo_fini = vvp_page_fini, .cpo_print = vvp_page_print, - .cpo_is_under_lock = ccc_page_is_under_lock, + .cpo_is_under_lock = vvp_page_is_under_lock, .io = { [CRT_READ] = { .cpo_prep = vvp_page_prep_read, @@ -430,9 +423,6 @@ static const struct cl_page_operations vvp_page_ops = { static void vvp_transient_page_verify(const struct cl_page *page) { - struct inode *inode = ccc_object_inode(page->cp_obj); - - LASSERT(!mutex_trylock(&inode->i_mutex)); } static int vvp_transient_page_own(const struct lu_env *env, @@ -506,56 +496,56 @@ static void vvp_transient_page_fini(const struct lu_env *env, struct ccc_object *clobj = cl2ccc(clp->cp_obj); vvp_page_fini_common(cp); - LASSERT(!mutex_trylock(&clobj->cob_inode->i_mutex)); - clobj->cob_transient_pages--; + atomic_dec(&clobj->cob_transient_pages); } static const struct cl_page_operations vvp_transient_page_ops = { - .cpo_own = vvp_transient_page_own, - .cpo_assume = vvp_transient_page_assume, - .cpo_unassume = vvp_transient_page_unassume, - .cpo_disown = vvp_transient_page_disown, - .cpo_discard = vvp_transient_page_discard, - .cpo_vmpage = ccc_page_vmpage, - .cpo_fini = vvp_transient_page_fini, - .cpo_is_vmlocked = vvp_transient_page_is_vmlocked, - .cpo_print = vvp_page_print, - .cpo_is_under_lock = ccc_page_is_under_lock, - .io = { - [CRT_READ] = { - .cpo_prep = ccc_transient_page_prep, - .cpo_completion = vvp_transient_page_completion, - }, - [CRT_WRITE] = { - .cpo_prep = ccc_transient_page_prep, - .cpo_completion = vvp_transient_page_completion, - } - } + .cpo_own = vvp_transient_page_own, + .cpo_assume = vvp_transient_page_assume, + .cpo_unassume = vvp_transient_page_unassume, + .cpo_disown = vvp_transient_page_disown, + .cpo_discard = vvp_transient_page_discard, + .cpo_fini = vvp_transient_page_fini, + .cpo_is_vmlocked = vvp_transient_page_is_vmlocked, + .cpo_print = vvp_page_print, + .cpo_is_under_lock = vvp_page_is_under_lock, + .io = { + [CRT_READ] = { + .cpo_prep = ccc_transient_page_prep, + .cpo_completion = vvp_transient_page_completion, + }, + [CRT_WRITE] = { + .cpo_prep = ccc_transient_page_prep, + .cpo_completion = vvp_transient_page_completion, + } + } }; int vvp_page_init(const struct lu_env *env, struct cl_object *obj, - struct cl_page *page, cfs_page_t *vmpage) + struct cl_page *page, pgoff_t index) { struct ccc_page *cpg = cl_object_page_slice(obj, page); + struct page *vmpage = page->cp_vmpage; CLOBINVRNT(env, obj, ccc_object_invariant(obj)); cpg->cpg_page = vmpage; page_cache_get(vmpage); - CFS_INIT_LIST_HEAD(&cpg->cpg_pending_linkage); + INIT_LIST_HEAD(&cpg->cpg_pending_linkage); if (page->cp_type == CPT_CACHEABLE) { + /* in cache, decref in vvp_page_delete */ + atomic_inc(&page->cp_ref); SetPagePrivate(vmpage); vmpage->private = (unsigned long)page; - cl_page_slice_add(page, &cpg->cpg_cl, obj, + cl_page_slice_add(page, &cpg->cpg_cl, obj, index, &vvp_page_ops); } else { struct ccc_object *clobj = cl2ccc(obj); - LASSERT(!mutex_trylock(&clobj->cob_inode->i_mutex)); - cl_page_slice_add(page, &cpg->cpg_cl, obj, + cl_page_slice_add(page, &cpg->cpg_cl, obj, index, &vvp_transient_page_ops); - clobj->cob_transient_pages++; + atomic_inc(&clobj->cob_transient_pages); } return 0; }