X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Fvvp_page.c;h=7285045a2f5b641322d573decb86e5d5363d5f02;hp=cc3b57c2527113368b200da8b25d3144d99f1f8a;hb=31819a287dcfc8b11b7623b399e9fb444174602c;hpb=fc0080159c9fea743962a9d060b98d7e449e9495 diff --git a/lustre/llite/vvp_page.c b/lustre/llite/vvp_page.c index cc3b57c..7285045 100644 --- a/lustre/llite/vvp_page.c +++ b/lustre/llite/vvp_page.c @@ -79,18 +79,48 @@ static void vvp_page_fini(const struct lu_env *env, } static void vvp_page_own(const struct lu_env *env, - const struct cl_page_slice *slice, struct cl_io *_) + const struct cl_page_slice *slice, struct cl_io *io) { struct ccc_page *vpg = cl2ccc_page(slice); cfs_page_t *vmpage = vpg->cpg_page; + int count = 0; LASSERT(vmpage != NULL); - lock_page(vmpage); + + /* DEBUG CODE FOR #18881 */ + while (TestSetPageLocked(vmpage)) { + cfs_schedule_timeout(CFS_TASK_INTERRUPTIBLE, + cfs_time_seconds(1)/10); + if (++count > 600) { + CL_PAGE_DEBUG(D_ERROR, env, + cl_page_top(slice->cpl_page), + "XXX page %p blocked on acquiring the" + " lock. process %s/%p, flags %lx,io %p\n", + vmpage, current->comm, current, + vmpage->flags, io); + libcfs_debug_dumpstack(NULL); + if (slice->cpl_page->cp_task) { + cfs_task_t *tsk = slice->cpl_page->cp_task; + LCONSOLE_WARN("The page was owned by %s\n", + tsk->comm); + libcfs_debug_dumpstack(tsk); + } + LCONSOLE_WARN("Reproduced bug #18881,please contact:" + "jay , thanks\n"); + + lock_page(vmpage); + break; + } + } + /* DEBUG CODE END */ + + /* lock_page(vmpage); */ wait_on_page_writeback(vmpage); } static void vvp_page_assume(const struct lu_env *env, - const struct cl_page_slice *slice, struct cl_io *_) + const struct cl_page_slice *slice, + struct cl_io *unused) { cfs_page_t *vmpage = cl2vm_page(slice); @@ -101,7 +131,7 @@ static void vvp_page_assume(const struct lu_env *env, static void vvp_page_unassume(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { cfs_page_t *vmpage = cl2vm_page(slice); @@ -121,7 +151,8 @@ static void vvp_page_disown(const struct lu_env *env, } static void vvp_page_discard(const struct lu_env *env, - const struct cl_page_slice *slice, struct cl_io *_) + const struct cl_page_slice *slice, + struct cl_io *unused) { cfs_page_t *vmpage = cl2vm_page(slice); struct address_space *mapping = vmpage->mapping; @@ -141,7 +172,8 @@ static void vvp_page_discard(const struct lu_env *env, } static int vvp_page_unmap(const struct lu_env *env, - const struct cl_page_slice *slice, struct cl_io *_) + const struct cl_page_slice *slice, + struct cl_io *unused) { cfs_page_t *vmpage = cl2vm_page(slice); __u64 offset = vmpage->index << CFS_PAGE_SHIFT; @@ -176,13 +208,17 @@ static void vvp_page_delete(const struct lu_env *env, } static void vvp_page_export(const struct lu_env *env, - const struct cl_page_slice *slice) + const struct cl_page_slice *slice, + int uptodate) { cfs_page_t *vmpage = cl2vm_page(slice); LASSERT(vmpage != NULL); LASSERT(PageLocked(vmpage)); - SetPageUptodate(vmpage); + if (uptodate) + SetPageUptodate(vmpage); + else + ClearPageUptodate(vmpage); } static int vvp_page_is_vmlocked(const struct lu_env *env, @@ -193,7 +229,7 @@ static int vvp_page_is_vmlocked(const struct lu_env *env, static int vvp_page_prep_read(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { ENTRY; /* Skip the page already marked as PG_uptodate. */ @@ -202,13 +238,14 @@ static int vvp_page_prep_read(const struct lu_env *env, static int vvp_page_prep_write(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { cfs_page_t *vmpage = cl2vm_page(slice); int result; if (clear_page_dirty_for_io(vmpage)) { set_page_writeback(vmpage); + vvp_write_pending(cl2ccc(slice->cpl_obj), cl2ccc_page(slice)); result = 0; } else result = -EALREADY; @@ -249,15 +286,6 @@ static void vvp_page_completion_common(const struct lu_env *env, cl_sync_io_note(anchor, ioret); } else if (clp->cp_type == CPT_CACHEABLE) { /* - * Don't assert the page writeback bit here because the lustre - * file may be as a backend of swap space. in this case, the - * page writeback is set by VM, and obvious we shouldn't clear - * it at all. Fortunately this type of pages are all TRANSIENT - * pages. - */ - LASSERT(!PageWriteback(vmpage)); - - /* * Only mark the page error only when it's a cacheable page * and NOT a sync io. * @@ -287,7 +315,7 @@ static void vvp_page_completion_read(const struct lu_env *env, if (ioret == 0) { /* XXX: do we need this for transient pages? */ if (!cp->cpg_defer_uptodate) - cl_page_export(env, page); + cl_page_export(env, page, 1); } else cp->cpg_defer_uptodate = 0; vvp_page_completion_common(env, cp, ioret); @@ -331,10 +359,8 @@ static void vvp_page_completion_write(const struct lu_env *env, CL_PAGE_HEADER(D_PAGE, env, pg, "completing WRITE with %d\n", ioret); - end_page_writeback(vmpage); - LASSERT(!PageWriteback(vmpage)); - vvp_page_completion_write_common(env, slice, ioret); + end_page_writeback(vmpage); EXIT; } @@ -372,7 +398,8 @@ static int vvp_page_make_ready(const struct lu_env *env, * tree. */ set_page_writeback(vmpage); - + vvp_write_pending(cl2ccc(slice->cpl_obj), + cl2ccc_page(slice)); CL_PAGE_HEADER(D_PAGE, env, pg, "readied\n"); result = 0; } else @@ -444,35 +471,35 @@ static void vvp_transient_page_verify(const struct cl_page *page) static void vvp_transient_page_own(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { vvp_transient_page_verify(slice->cpl_page); } static void vvp_transient_page_assume(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { vvp_transient_page_verify(slice->cpl_page); } static void vvp_transient_page_unassume(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { vvp_transient_page_verify(slice->cpl_page); } static void vvp_transient_page_disown(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { vvp_transient_page_verify(slice->cpl_page); } static void vvp_transient_page_discard(const struct lu_env *env, const struct cl_page_slice *slice, - struct cl_io *_) + struct cl_io *unused) { struct cl_page *page = slice->cpl_page;