X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosc%2Fosc_page.c;h=eb054a9963eb688a45e9247b445779a7e57a8941;hp=2b405f4d9c7ee865cf033080906c237002fdf6c8;hb=df497dc560062a0a0c7178498cba8853843d39f1;hpb=4fcbd1af9ec3b1e5f6424d925f43f0cb2910c3ec diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c index 2b405f4..eb054a9 100644 --- a/lustre/osc/osc_page.c +++ b/lustre/osc/osc_page.c @@ -82,15 +82,15 @@ static int osc_page_is_dlocked(const struct lu_env *env, page = opg->ops_cl.cpl_page; obj = cl2osc(opg->ops_cl.cpl_obj); - flags = LDLM_FL_TEST_LOCK | LDLM_FL_BLOCK_GRANTED; - if (pending) - flags |= LDLM_FL_CBPENDING; - - dlmmode = osc_cl_lock2ldlm(mode) | LCK_PW; - osc_lock_build_res(env, obj, resname); - osc_index2policy(policy, page->cp_obj, page->cp_index, page->cp_index); - return osc_match_base(osc_export(obj), resname, LDLM_EXTENT, policy, - dlmmode, &flags, NULL, lockh, unref); + flags = LDLM_FL_TEST_LOCK | LDLM_FL_BLOCK_GRANTED; + if (pending) + flags |= LDLM_FL_CBPENDING; + + dlmmode = osc_cl_lock2ldlm(mode) | LCK_PW; + osc_lock_build_res(env, obj, resname); + osc_index2policy(policy, page->cp_obj, osc_index(opg), osc_index(opg)); + return osc_match_base(osc_export(obj), resname, LDLM_EXTENT, policy, + dlmmode, &flags, NULL, lockh, unref); } /** @@ -125,10 +125,10 @@ static int osc_page_protected(const struct lu_env *env, hdr = cl_object_header(opg->ops_cl.cpl_obj); descr = &osc_env_info(env)->oti_descr; descr->cld_mode = mode; - descr->cld_start = page->cp_index; - descr->cld_end = page->cp_index; + descr->cld_start = osc_index(opg); + descr->cld_end = osc_index(opg); spin_lock(&hdr->coh_lock_guard); - cfs_list_for_each_entry(scan, &hdr->coh_locks, cll_linkage) { + list_for_each_entry(scan, &hdr->coh_locks, cll_linkage) { /* * Lock-less sub-lock has to be either in HELD state * (when io is actively going on), or in CACHED state, @@ -163,28 +163,20 @@ static int osc_page_protected(const struct lu_env *env, * Page operations. * */ -static void osc_page_fini(const struct lu_env *env, - struct cl_page_slice *slice) -{ - struct osc_page *opg = cl2osc_page(slice); - CDEBUG(D_TRACE, "%p\n", opg); - LASSERT(opg->ops_lock == NULL); -} - static void osc_page_transfer_get(struct osc_page *opg, const char *label) { - struct cl_page *page = cl_page_top(opg->ops_cl.cpl_page); + struct cl_page *page = opg->ops_cl.cpl_page; - LASSERT(!opg->ops_transfer_pinned); - cl_page_get(page); - lu_ref_add_atomic(&page->cp_reference, label, page); - opg->ops_transfer_pinned = 1; + LASSERT(!opg->ops_transfer_pinned); + cl_page_get(page); + lu_ref_add_atomic(&page->cp_reference, label, page); + opg->ops_transfer_pinned = 1; } static void osc_page_transfer_put(const struct lu_env *env, struct osc_page *opg) { - struct cl_page *page = cl_page_top(opg->ops_cl.cpl_page); + struct cl_page *page = opg->ops_cl.cpl_page; if (opg->ops_transfer_pinned) { opg->ops_transfer_pinned = 0; @@ -208,7 +200,7 @@ static void osc_page_transfer_add(const struct lu_env *env, osc_lru_use(osc_cli(obj), opg); spin_lock(&obj->oo_seatbelt); - cfs_list_add(&opg->ops_inflight, &obj->oo_inflight[crt]); + list_add(&opg->ops_inflight, &obj->oo_inflight[crt]); opg->ops_submitter = current; spin_unlock(&obj->oo_seatbelt); } @@ -240,89 +232,29 @@ void osc_index2policy(ldlm_policy_data_t *policy, const struct cl_object *obj, policy->l_extent.end = cl_offset(obj, end + 1) - 1; } -static int osc_page_addref_lock(const struct lu_env *env, - struct osc_page *opg, - struct cl_lock *lock) -{ - struct osc_lock *olock; - int rc; - - LASSERT(opg->ops_lock == NULL); - - olock = osc_lock_at(lock); - if (cfs_atomic_inc_return(&olock->ols_pageref) <= 0) { - cfs_atomic_dec(&olock->ols_pageref); - rc = -ENODATA; - } else { - cl_lock_get(lock); - opg->ops_lock = lock; - rc = 0; - } - return rc; -} - -static void osc_page_putref_lock(const struct lu_env *env, - struct osc_page *opg) -{ - struct cl_lock *lock = opg->ops_lock; - struct osc_lock *olock; - - LASSERT(lock != NULL); - olock = osc_lock_at(lock); - - cfs_atomic_dec(&olock->ols_pageref); - opg->ops_lock = NULL; - - cl_lock_put(env, lock); -} - static int osc_page_is_under_lock(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, pgoff_t *max_index) { - struct cl_lock *lock; - int result = -ENODATA; + struct osc_page *opg = cl2osc_page(slice); + struct cl_lock *lock; + int result = -ENODATA; + ENTRY; - ENTRY; - lock = cl_lock_at_page(env, slice->cpl_obj, slice->cpl_page, - NULL, 1, 0); - if (lock != NULL) { - if (osc_page_addref_lock(env, cl2osc_page(slice), lock) == 0) - result = -EBUSY; + *max_index = 0; + lock = cl_lock_at_pgoff(env, slice->cpl_obj, osc_index(opg), + NULL, 1, 0); + if (lock != NULL) { + *max_index = lock->cll_descr.cld_end; cl_lock_put(env, lock); + result = 0; } - RETURN(result); -} - -static void osc_page_disown(const struct lu_env *env, - const struct cl_page_slice *slice, - struct cl_io *io) -{ - struct osc_page *opg = cl2osc_page(slice); - - if (unlikely(opg->ops_lock)) - osc_page_putref_lock(env, opg); -} - -static void osc_page_completion_read(const struct lu_env *env, - const struct cl_page_slice *slice, - int ioret) -{ - struct osc_page *opg = cl2osc_page(slice); - - if (likely(opg->ops_lock)) - osc_page_putref_lock(env, opg); -} - -static void osc_page_completion_write(const struct lu_env *env, - const struct cl_page_slice *slice, - int ioret) -{ + RETURN(result); } -static const char *osc_list(cfs_list_t *head) +static const char *osc_list(struct list_head *head) { - return cfs_list_empty(head) ? "-" : "+"; + return list_empty(head) ? "-" : "+"; } static inline cfs_time_t osc_submit_duration(struct osc_page *opg) @@ -342,13 +274,13 @@ static int osc_page_print(const struct lu_env *env, struct osc_object *obj = cl2osc(slice->cpl_obj); struct client_obd *cli = &osc_export(obj)->exp_obd->u.cli; - return (*printer)(env, cookie, LUSTRE_OSC_NAME"-page@%p: " + return (*printer)(env, cookie, LUSTRE_OSC_NAME"-page@%p %lu: " "1< %#x %d %u %s %s > " "2< "LPU64" %u %u %#x %#x | %p %p %p > " "3< %s %p %d %lu %d > " "4< %d %d %d %lu %s | %s %s %s %s > " "5< %s %s %s %s | %d %s | %d %s %s>\n", - opg, + opg, osc_index(opg), /* 1 */ oap->oap_magic, oap->oap_cmd, oap->oap_interrupted, @@ -376,9 +308,9 @@ static int osc_page_print(const struct lu_env *env, osc_list(&obj->oo_hp_ready_item), osc_list(&obj->oo_write_item), osc_list(&obj->oo_read_item), - cfs_atomic_read(&obj->oo_nr_reads), + atomic_read(&obj->oo_nr_reads), osc_list(&obj->oo_reading_exts), - cfs_atomic_read(&obj->oo_nr_writes), + atomic_read(&obj->oo_nr_writes), osc_list(&obj->oo_hp_exts), osc_list(&obj->oo_urgent_exts)); } @@ -396,16 +328,16 @@ static void osc_page_delete(const struct lu_env *env, CDEBUG(D_TRACE, "%p\n", opg); osc_page_transfer_put(env, opg); rc = osc_teardown_async_page(env, obj, opg); - if (rc) { - CL_PAGE_DEBUG(D_ERROR, env, cl_page_top(slice->cpl_page), - "Trying to teardown failed: %d\n", rc); - LASSERT(0); - } + if (rc) { + CL_PAGE_DEBUG(D_ERROR, env, slice->cpl_page, + "Trying to teardown failed: %d\n", rc); + LASSERT(0); + } spin_lock(&obj->oo_seatbelt); if (opg->ops_submitter != NULL) { - LASSERT(!cfs_list_empty(&opg->ops_inflight)); - cfs_list_del_init(&opg->ops_inflight); + LASSERT(!list_empty(&opg->ops_inflight)); + list_del_init(&opg->ops_inflight); opg->ops_submitter = NULL; } spin_unlock(&obj->oo_seatbelt); @@ -471,26 +403,16 @@ static int osc_page_flush(const struct lu_env *env, } static const struct cl_page_operations osc_page_ops = { - .cpo_fini = osc_page_fini, .cpo_print = osc_page_print, .cpo_delete = osc_page_delete, .cpo_is_under_lock = osc_page_is_under_lock, - .cpo_disown = osc_page_disown, - .io = { - [CRT_READ] = { - .cpo_completion = osc_page_completion_read - }, - [CRT_WRITE] = { - .cpo_completion = osc_page_completion_write - } - }, .cpo_clip = osc_page_clip, .cpo_cancel = osc_page_cancel, .cpo_flush = osc_page_flush }; int osc_page_init(const struct lu_env *env, struct cl_object *obj, - struct cl_page *page, struct page *vmpage) + struct cl_page *page, pgoff_t index) { struct osc_object *osc = cl2osc(obj); struct osc_page *opg = cl_object_page_slice(obj, page); @@ -499,13 +421,13 @@ int osc_page_init(const struct lu_env *env, struct cl_object *obj, opg->ops_from = 0; opg->ops_to = PAGE_CACHE_SIZE; - result = osc_prep_async_page(osc, opg, vmpage, - cl_offset(obj, page->cp_index)); + result = osc_prep_async_page(osc, opg, page->cp_vmpage, + cl_offset(obj, index)); if (result == 0) { struct osc_io *oio = osc_env_io(env); opg->ops_srvlock = osc_io_srvlock(oio); - cl_page_slice_add(page, &opg->ops_cl, obj, - &osc_page_ops); + cl_page_slice_add(page, &opg->ops_cl, obj, index, + &osc_page_ops); } /* * Cannot assert osc_page_protected() here as read-ahead @@ -516,16 +438,15 @@ int osc_page_init(const struct lu_env *env, struct cl_object *obj, #endif /* ops_inflight and ops_lru are the same field, but it doesn't * hurt to initialize it twice :-) */ - CFS_INIT_LIST_HEAD(&opg->ops_inflight); - CFS_INIT_LIST_HEAD(&opg->ops_lru); + INIT_LIST_HEAD(&opg->ops_inflight); + INIT_LIST_HEAD(&opg->ops_lru); /* reserve an LRU space for this page */ if (page->cp_type == CPT_CACHEABLE && result == 0) { result = osc_lru_reserve(env, osc, opg); if (result == 0) { spin_lock(&osc->oo_tree_lock); - result = radix_tree_insert(&osc->oo_tree, - page->cp_index, opg); + result = radix_tree_insert(&osc->oo_tree, index, opg); if (result == 0) ++osc->oo_npages; spin_unlock(&osc->oo_tree_lock); @@ -544,10 +465,10 @@ int osc_over_unstable_soft_limit(struct client_obd *cli) if (cli == NULL) return 0; - obd_upages = cfs_atomic_read(&obd_unstable_pages); - obd_dpages = cfs_atomic_read(&obd_dirty_pages); + obd_upages = atomic_read(&obd_unstable_pages); + obd_dpages = atomic_read(&obd_dirty_pages); - osc_upages = cfs_atomic_read(&cli->cl_unstable_count); + osc_upages = atomic_read(&cli->cl_unstable_count); /* obd_max_dirty_pages is the max number of (dirty + unstable) * pages allowed at any given time. To simulate an unstable page @@ -623,14 +544,14 @@ static const int lru_shrink_max = 8 << (20 - PAGE_CACHE_SHIFT); /* 8M */ static int osc_cache_too_much(struct client_obd *cli) { struct cl_client_cache *cache = cli->cl_cache; - int pages = cfs_atomic_read(&cli->cl_lru_in_list); + int pages = atomic_read(&cli->cl_lru_in_list); unsigned long budget; - budget = cache->ccc_lru_max / cfs_atomic_read(&cache->ccc_users); + budget = cache->ccc_lru_max / atomic_read(&cache->ccc_users); /* if it's going to run out LRU slots, we should free some, but not * too much to maintain faireness among OSCs. */ - if (cfs_atomic_read(cli->cl_lru_left) < cache->ccc_lru_max >> 4) { + if (atomic_read(cli->cl_lru_left) < cache->ccc_lru_max >> 4) { if (pages >= budget) return lru_shrink_max; else if (pages >= budget / 2) @@ -652,28 +573,28 @@ int lru_queue_work(const struct lu_env *env, void *data) RETURN(0); } -void osc_lru_add_batch(struct client_obd *cli, cfs_list_t *plist) +void osc_lru_add_batch(struct client_obd *cli, struct list_head *plist) { - CFS_LIST_HEAD(lru); + struct list_head lru = LIST_HEAD_INIT(lru); struct osc_async_page *oap; int npages = 0; - cfs_list_for_each_entry(oap, plist, oap_pending_item) { + list_for_each_entry(oap, plist, oap_pending_item) { struct osc_page *opg = oap2osc_page(oap); if (!opg->ops_in_lru) continue; ++npages; - LASSERT(cfs_list_empty(&opg->ops_lru)); - cfs_list_add(&opg->ops_lru, &lru); + LASSERT(list_empty(&opg->ops_lru)); + list_add(&opg->ops_lru, &lru); } if (npages > 0) { client_obd_list_lock(&cli->cl_lru_list_lock); - cfs_list_splice_tail(&lru, &cli->cl_lru_list); - cfs_atomic_sub(npages, &cli->cl_lru_busy); - cfs_atomic_add(npages, &cli->cl_lru_in_list); + list_splice_tail(&lru, &cli->cl_lru_list); + atomic_sub(npages, &cli->cl_lru_busy); + atomic_add(npages, &cli->cl_lru_in_list); client_obd_list_unlock(&cli->cl_lru_list_lock); /* XXX: May set force to be true for better performance */ @@ -684,9 +605,9 @@ void osc_lru_add_batch(struct client_obd *cli, cfs_list_t *plist) static void __osc_lru_del(struct client_obd *cli, struct osc_page *opg) { - LASSERT(cfs_atomic_read(&cli->cl_lru_in_list) > 0); - cfs_list_del_init(&opg->ops_lru); - cfs_atomic_dec(&cli->cl_lru_in_list); + LASSERT(atomic_read(&cli->cl_lru_in_list) > 0); + list_del_init(&opg->ops_lru); + atomic_dec(&cli->cl_lru_in_list); } /** @@ -697,15 +618,15 @@ static void osc_lru_del(struct client_obd *cli, struct osc_page *opg) { if (opg->ops_in_lru) { client_obd_list_lock(&cli->cl_lru_list_lock); - if (!cfs_list_empty(&opg->ops_lru)) { + if (!list_empty(&opg->ops_lru)) { __osc_lru_del(cli, opg); } else { - LASSERT(cfs_atomic_read(&cli->cl_lru_busy) > 0); - cfs_atomic_dec(&cli->cl_lru_busy); + LASSERT(atomic_read(&cli->cl_lru_busy) > 0); + atomic_dec(&cli->cl_lru_busy); } client_obd_list_unlock(&cli->cl_lru_list_lock); - cfs_atomic_inc(cli->cl_lru_left); + atomic_inc(cli->cl_lru_left); /* this is a great place to release more LRU pages if * this osc occupies too many LRU pages and kernel is * stealing one of them. */ @@ -713,7 +634,7 @@ static void osc_lru_del(struct client_obd *cli, struct osc_page *opg) (void)ptlrpcd_queue_work(cli->cl_lru_work); wake_up(&osc_lru_waitq); } else { - LASSERT(cfs_list_empty(&opg->ops_lru)); + LASSERT(list_empty(&opg->ops_lru)); } } @@ -724,11 +645,11 @@ static void osc_lru_use(struct client_obd *cli, struct osc_page *opg) { /* If page is being transfered for the first time, * ops_lru should be empty */ - if (opg->ops_in_lru && !cfs_list_empty(&opg->ops_lru)) { + if (opg->ops_in_lru && !list_empty(&opg->ops_lru)) { client_obd_list_lock(&cli->cl_lru_list_lock); __osc_lru_del(cli, opg); client_obd_list_unlock(&cli->cl_lru_list_lock); - cfs_atomic_inc(&cli->cl_lru_busy); + atomic_inc(&cli->cl_lru_busy); } } @@ -765,39 +686,39 @@ int osc_lru_shrink(const struct lu_env *env, struct client_obd *cli, int rc = 0; ENTRY; - LASSERT(cfs_atomic_read(&cli->cl_lru_in_list) >= 0); - if (cfs_atomic_read(&cli->cl_lru_in_list) == 0 || target <= 0) + LASSERT(atomic_read(&cli->cl_lru_in_list) >= 0); + if (atomic_read(&cli->cl_lru_in_list) == 0 || target <= 0) RETURN(0); if (!force) { - if (cfs_atomic_read(&cli->cl_lru_shrinkers) > 0) + if (atomic_read(&cli->cl_lru_shrinkers) > 0) RETURN(-EBUSY); - if (cfs_atomic_inc_return(&cli->cl_lru_shrinkers) > 1) { - cfs_atomic_dec(&cli->cl_lru_shrinkers); + if (atomic_inc_return(&cli->cl_lru_shrinkers) > 1) { + atomic_dec(&cli->cl_lru_shrinkers); RETURN(-EBUSY); } } else { - cfs_atomic_inc(&cli->cl_lru_shrinkers); + atomic_inc(&cli->cl_lru_shrinkers); } pvec = (struct cl_page **)osc_env_info(env)->oti_pvec; io = &osc_env_info(env)->oti_io; client_obd_list_lock(&cli->cl_lru_list_lock); - maxscan = min(target << 1, cfs_atomic_read(&cli->cl_lru_in_list)); - while (!cfs_list_empty(&cli->cl_lru_list)) { + maxscan = min(target << 1, atomic_read(&cli->cl_lru_in_list)); + while (!list_empty(&cli->cl_lru_list)) { struct cl_page *page; bool will_free = false; if (--maxscan < 0) break; - opg = cfs_list_entry(cli->cl_lru_list.next, struct osc_page, - ops_lru); - page = cl_page_top(opg->ops_cl.cpl_page); + opg = list_entry(cli->cl_lru_list.next, struct osc_page, + ops_lru); + page = opg->ops_cl.cpl_page; if (cl_page_in_use_noref(page)) { - cfs_list_move_tail(&opg->ops_lru, &cli->cl_lru_list); + list_move_tail(&opg->ops_lru, &cli->cl_lru_list); continue; } @@ -846,7 +767,7 @@ int osc_lru_shrink(const struct lu_env *env, struct client_obd *cli, } if (!will_free) { - cfs_list_move_tail(&opg->ops_lru, &cli->cl_lru_list); + list_move_tail(&opg->ops_lru, &cli->cl_lru_list); continue; } @@ -872,9 +793,9 @@ int osc_lru_shrink(const struct lu_env *env, struct client_obd *cli, cl_object_put(env, clobj); } - cfs_atomic_dec(&cli->cl_lru_shrinkers); + atomic_dec(&cli->cl_lru_shrinkers); if (count > 0) { - cfs_atomic_add(count, cli->cl_lru_left); + atomic_add(count, cli->cl_lru_left); wake_up_all(&osc_lru_waitq); } RETURN(count > 0 ? count : rc); @@ -882,7 +803,7 @@ int osc_lru_shrink(const struct lu_env *env, struct client_obd *cli, static inline int max_to_shrink(struct client_obd *cli) { - return min(cfs_atomic_read(&cli->cl_lru_in_list) >> 1, lru_shrink_max); + return min(atomic_read(&cli->cl_lru_in_list) >> 1, lru_shrink_max); } int osc_lru_reclaim(struct client_obd *cli) @@ -895,7 +816,7 @@ int osc_lru_reclaim(struct client_obd *cli) ENTRY; LASSERT(cache != NULL); - LASSERT(!cfs_list_empty(&cache->ccc_lru)); + LASSERT(!list_empty(&cache->ccc_lru)); env = cl_env_nested_get(&nest); if (IS_ERR(env)) @@ -913,26 +834,26 @@ int osc_lru_reclaim(struct client_obd *cli) CDEBUG(D_CACHE, "%s: cli %p no free slots, pages: %d, busy: %d.\n", cli->cl_import->imp_obd->obd_name, cli, - cfs_atomic_read(&cli->cl_lru_in_list), - cfs_atomic_read(&cli->cl_lru_busy)); + atomic_read(&cli->cl_lru_in_list), + atomic_read(&cli->cl_lru_busy)); /* Reclaim LRU slots from other client_obd as it can't free enough * from its own. This should rarely happen. */ spin_lock(&cache->ccc_lru_lock); cache->ccc_lru_shrinkers++; - cfs_list_move_tail(&cli->cl_lru_osc, &cache->ccc_lru); + list_move_tail(&cli->cl_lru_osc, &cache->ccc_lru); - max_scans = cfs_atomic_read(&cache->ccc_users); - while (--max_scans > 0 && !cfs_list_empty(&cache->ccc_lru)) { - cli = cfs_list_entry(cache->ccc_lru.next, struct client_obd, - cl_lru_osc); + max_scans = atomic_read(&cache->ccc_users); + while (--max_scans > 0 && !list_empty(&cache->ccc_lru)) { + cli = list_entry(cache->ccc_lru.next, struct client_obd, + cl_lru_osc); CDEBUG(D_CACHE, "%s: cli %p LRU pages: %d, busy: %d.\n", cli->cl_import->imp_obd->obd_name, cli, - cfs_atomic_read(&cli->cl_lru_in_list), - cfs_atomic_read(&cli->cl_lru_busy)); + atomic_read(&cli->cl_lru_in_list), + atomic_read(&cli->cl_lru_busy)); - cfs_list_move_tail(&cli->cl_lru_osc, &cache->ccc_lru); + list_move_tail(&cli->cl_lru_osc, &cache->ccc_lru); if (osc_cache_too_much(cli) > 0) { spin_unlock(&cache->ccc_lru_lock); @@ -969,8 +890,8 @@ static int osc_lru_reserve(const struct lu_env *env, struct osc_object *obj, goto out; } - LASSERT(cfs_atomic_read(cli->cl_lru_left) >= 0); - while (!cfs_atomic_add_unless(cli->cl_lru_left, -1, 0)) { + LASSERT(atomic_read(cli->cl_lru_left) >= 0); + while (!atomic_add_unless(cli->cl_lru_left, -1, 0)) { /* run out of LRU spaces, try to drop some by itself */ rc = osc_lru_reclaim(cli); @@ -981,7 +902,7 @@ static int osc_lru_reserve(const struct lu_env *env, struct osc_object *obj, cond_resched(); rc = l_wait_event(osc_lru_waitq, - cfs_atomic_read(cli->cl_lru_left) > 0, + atomic_read(cli->cl_lru_left) > 0, &lwi); if (rc < 0) break; @@ -989,7 +910,7 @@ static int osc_lru_reserve(const struct lu_env *env, struct osc_object *obj, out: if (rc >= 0) { - cfs_atomic_inc(&cli->cl_lru_busy); + atomic_inc(&cli->cl_lru_busy); opg->ops_in_lru = 1; rc = 0; }