X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Fosc_cache.c;h=95f68cf9c8fdd7fe2d1d746ad3ee6e5c592ea043;hb=efe523e7bb20db5d990f4dd060c93659e8b95722;hp=019109b2524e17101180e193b783510a70d656df;hpb=e089a515efae3391709b997be889ebe0f3306e9d;p=fs%2Flustre-release.git diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c index 019109b..95f68cf 100644 --- a/lustre/osc/osc_cache.c +++ b/lustre/osc/osc_cache.c @@ -92,9 +92,9 @@ static inline char *ext_flags(struct osc_extent *ext, char *flags) return flags; } -static inline char list_empty_marker(cfs_list_t *list) +static inline char list_empty_marker(struct list_head *list) { - return cfs_list_empty(list) ? '-' : '+'; + return list_empty(list) ? '-' : '+'; } #define EXTSTR "[%lu -> %lu/%lu]" @@ -102,28 +102,28 @@ static inline char list_empty_marker(cfs_list_t *list) static const char *oes_strings[] = { "inv", "active", "cache", "locking", "lockdone", "rpc", "trunc", NULL }; -#define OSC_EXTENT_DUMP(lvl, extent, fmt, ...) do { \ - struct osc_extent *__ext = (extent); \ - char __buf[16]; \ - \ - CDEBUG(lvl, \ - "extent %p@{" EXTSTR ", " \ - "[%d|%d|%c|%s|%s|%p], [%d|%d|%c|%c|%p|%u|%p]} " fmt, \ - /* ----- extent part 0 ----- */ \ - __ext, EXTPARA(__ext), \ - /* ----- part 1 ----- */ \ - cfs_atomic_read(&__ext->oe_refc), \ - cfs_atomic_read(&__ext->oe_users), \ - list_empty_marker(&__ext->oe_link), \ - oes_strings[__ext->oe_state], ext_flags(__ext, __buf), \ - __ext->oe_obj, \ - /* ----- part 2 ----- */ \ - __ext->oe_grants, __ext->oe_nr_pages, \ - list_empty_marker(&__ext->oe_pages), \ - waitqueue_active(&__ext->oe_waitq) ? '+' : '-', \ - __ext->oe_osclock, __ext->oe_mppr, __ext->oe_owner, \ - /* ----- part 4 ----- */ \ - ## __VA_ARGS__); \ +#define OSC_EXTENT_DUMP(lvl, extent, fmt, ...) do { \ + struct osc_extent *__ext = (extent); \ + char __buf[16]; \ + \ + CDEBUG(lvl, \ + "extent %p@{" EXTSTR ", " \ + "[%d|%d|%c|%s|%s|%p], [%d|%d|%c|%c|%p|%u|%p]} " fmt, \ + /* ----- extent part 0 ----- */ \ + __ext, EXTPARA(__ext), \ + /* ----- part 1 ----- */ \ + atomic_read(&__ext->oe_refc), \ + atomic_read(&__ext->oe_users), \ + list_empty_marker(&__ext->oe_link), \ + oes_strings[__ext->oe_state], ext_flags(__ext, __buf), \ + __ext->oe_obj, \ + /* ----- part 2 ----- */ \ + __ext->oe_grants, __ext->oe_nr_pages, \ + list_empty_marker(&__ext->oe_pages), \ + waitqueue_active(&__ext->oe_waitq) ? '+' : '-', \ + __ext->oe_osclock, __ext->oe_mppr, __ext->oe_owner, \ + /* ----- part 4 ----- */ \ + ## __VA_ARGS__); \ } while (0) #undef EASSERTF @@ -184,20 +184,20 @@ static int osc_extent_sanity_check0(struct osc_extent *ext, if (ext->oe_state >= OES_STATE_MAX) GOTO(out, rc = 10); - if (cfs_atomic_read(&ext->oe_refc) <= 0) + if (atomic_read(&ext->oe_refc) <= 0) GOTO(out, rc = 20); - if (cfs_atomic_read(&ext->oe_refc) < cfs_atomic_read(&ext->oe_users)) + if (atomic_read(&ext->oe_refc) < atomic_read(&ext->oe_users)) GOTO(out, rc = 30); switch (ext->oe_state) { case OES_INV: - if (ext->oe_nr_pages > 0 || !cfs_list_empty(&ext->oe_pages)) + if (ext->oe_nr_pages > 0 || !list_empty(&ext->oe_pages)) GOTO(out, rc = 35); GOTO(out, rc = 0); break; case OES_ACTIVE: - if (cfs_atomic_read(&ext->oe_users) == 0) + if (atomic_read(&ext->oe_users) == 0) GOTO(out, rc = 40); if (ext->oe_hp) GOTO(out, rc = 50); @@ -210,7 +210,7 @@ static int osc_extent_sanity_check0(struct osc_extent *ext, if (ext->oe_fsync_wait && !ext->oe_urgent && !ext->oe_hp) GOTO(out, rc = 65); default: - if (cfs_atomic_read(&ext->oe_users) > 0) + if (atomic_read(&ext->oe_users) > 0) GOTO(out, rc = 70); } @@ -240,8 +240,8 @@ static int osc_extent_sanity_check0(struct osc_extent *ext, GOTO(out, rc = 0); page_count = 0; - cfs_list_for_each_entry(oap, &ext->oe_pages, oap_pending_item) { - pgoff_t index = oap2cl_page(oap)->cp_index; + list_for_each_entry(oap, &ext->oe_pages, oap_pending_item) { + pgoff_t index = osc_index(oap2osc(oap)); ++page_count; if (index > ext->oe_end || index < ext->oe_start) GOTO(out, rc = 110); @@ -315,11 +315,11 @@ static struct osc_extent *osc_extent_alloc(struct osc_object *obj) RB_CLEAR_NODE(&ext->oe_node); ext->oe_obj = obj; - cfs_atomic_set(&ext->oe_refc, 1); - cfs_atomic_set(&ext->oe_users, 0); - CFS_INIT_LIST_HEAD(&ext->oe_link); + atomic_set(&ext->oe_refc, 1); + atomic_set(&ext->oe_users, 0); + INIT_LIST_HEAD(&ext->oe_link); ext->oe_state = OES_INV; - CFS_INIT_LIST_HEAD(&ext->oe_pages); + INIT_LIST_HEAD(&ext->oe_pages); init_waitqueue_head(&ext->oe_waitq); ext->oe_osclock = NULL; @@ -333,17 +333,17 @@ static void osc_extent_free(struct osc_extent *ext) static struct osc_extent *osc_extent_get(struct osc_extent *ext) { - LASSERT(cfs_atomic_read(&ext->oe_refc) >= 0); - cfs_atomic_inc(&ext->oe_refc); + LASSERT(atomic_read(&ext->oe_refc) >= 0); + atomic_inc(&ext->oe_refc); return ext; } static void osc_extent_put(const struct lu_env *env, struct osc_extent *ext) { - LASSERT(cfs_atomic_read(&ext->oe_refc) > 0); - if (cfs_atomic_dec_and_test(&ext->oe_refc)) { - LASSERT(cfs_list_empty(&ext->oe_link)); - LASSERT(cfs_atomic_read(&ext->oe_users) == 0); + LASSERT(atomic_read(&ext->oe_refc) > 0); + if (atomic_dec_and_test(&ext->oe_refc)) { + LASSERT(list_empty(&ext->oe_link)); + LASSERT(atomic_read(&ext->oe_users) == 0); LASSERT(ext->oe_state == OES_INV); LASSERT(!ext->oe_intree); @@ -362,9 +362,9 @@ static void osc_extent_put(const struct lu_env *env, struct osc_extent *ext) */ static void osc_extent_put_trust(struct osc_extent *ext) { - LASSERT(cfs_atomic_read(&ext->oe_refc) > 1); + LASSERT(atomic_read(&ext->oe_refc) > 1); LASSERT(osc_object_is_locked(ext->oe_obj)); - cfs_atomic_dec(&ext->oe_refc); + atomic_dec(&ext->oe_refc); } /** @@ -426,7 +426,7 @@ static void osc_extent_insert(struct osc_object *obj, struct osc_extent *ext) else if (ext->oe_start > tmp->oe_end) n = &(*n)->rb_right; else - EASSERTF(0, tmp, EXTSTR, EXTPARA(ext)); + EASSERTF(0, tmp, EXTSTR"\n", EXTPARA(ext)); } rb_link_node(&ext->oe_node, parent, n); rb_insert_color(&ext->oe_node, &obj->oo_root); @@ -457,17 +457,17 @@ static struct osc_extent *osc_extent_hold(struct osc_extent *ext) osc_extent_state_set(ext, OES_ACTIVE); osc_update_pending(obj, OBD_BRW_WRITE, -ext->oe_nr_pages); } - cfs_atomic_inc(&ext->oe_users); - cfs_list_del_init(&ext->oe_link); + atomic_inc(&ext->oe_users); + list_del_init(&ext->oe_link); return osc_extent_get(ext); } static void __osc_extent_remove(struct osc_extent *ext) { LASSERT(osc_object_is_locked(ext->oe_obj)); - LASSERT(cfs_list_empty(&ext->oe_pages)); + LASSERT(list_empty(&ext->oe_pages)); osc_extent_erase(ext); - cfs_list_del_init(&ext->oe_link); + list_del_init(&ext->oe_link); osc_extent_state_set(ext, OES_INV); OSC_EXTENT_DUMP(D_CACHE, ext, "destroyed.\n"); } @@ -521,8 +521,8 @@ static int osc_extent_merge(const struct lu_env *env, struct osc_extent *cur, /* only the following bits are needed to merge */ cur->oe_urgent |= victim->oe_urgent; cur->oe_memalloc |= victim->oe_memalloc; - cfs_list_splice_init(&victim->oe_pages, &cur->oe_pages); - cfs_list_del_init(&victim->oe_link); + list_splice_init(&victim->oe_pages, &cur->oe_pages); + list_del_init(&victim->oe_link); victim->oe_nr_pages = 0; osc_extent_get(victim); @@ -542,11 +542,11 @@ int osc_extent_release(const struct lu_env *env, struct osc_extent *ext) int rc = 0; ENTRY; - LASSERT(cfs_atomic_read(&ext->oe_users) > 0); + LASSERT(atomic_read(&ext->oe_users) > 0); LASSERT(sanity_check(ext) == 0); LASSERT(ext->oe_grants > 0); - if (cfs_atomic_dec_and_lock(&ext->oe_users, &obj->oo_lock)) { + if (atomic_dec_and_lock(&ext->oe_users, &obj->oo_lock)) { LASSERT(ext->oe_state == OES_ACTIVE); if (ext->oe_trunc_pending) { /* a truncate process is waiting for this extent. @@ -564,8 +564,8 @@ int osc_extent_release(const struct lu_env *env, struct osc_extent *ext) osc_extent_merge(env, ext, next_extent(ext)); if (ext->oe_urgent) - cfs_list_move_tail(&ext->oe_link, - &obj->oo_urgent_exts); + list_move_tail(&ext->oe_link, + &obj->oo_urgent_exts); } osc_object_unlock(obj); @@ -639,7 +639,8 @@ struct osc_extent *osc_extent_find(const struct lu_env *env, /* grants has been allocated by caller */ LASSERTF(*grants >= chunksize + cli->cl_extent_tax, "%u/%u/%u.\n", *grants, chunksize, cli->cl_extent_tax); - LASSERTF((max_end - cur->oe_start) < max_pages, EXTSTR, EXTPARA(cur)); + LASSERTF((max_end - cur->oe_start) < max_pages, EXTSTR"\n", + EXTPARA(cur)); restart: osc_object_lock(obj); @@ -657,7 +658,7 @@ restart: /* if covering by different locks, no chance to match */ if (lock != ext->oe_osclock) { EASSERTF(!overlapped(ext, cur), ext, - EXTSTR, EXTPARA(cur)); + EXTSTR"\n", EXTPARA(cur)); ext = next_extent(ext); continue; @@ -678,7 +679,7 @@ restart: * full contain. */ EASSERTF((ext->oe_start <= cur->oe_start && ext->oe_end >= cur->oe_end), - ext, EXTSTR, EXTPARA(cur)); + ext, EXTSTR"\n", EXTPARA(cur)); if (ext->oe_state > OES_CACHE || ext->oe_fsync_wait) { /* for simplicity, we wait for this extent to @@ -811,10 +812,12 @@ int osc_extent_finish(const struct lu_env *env, struct osc_extent *ext, ext->oe_rc = rc ?: ext->oe_nr_pages; EASSERT(ergo(rc == 0, ext->oe_state == OES_RPC), ext); - cfs_list_for_each_entry_safe(oap, tmp, &ext->oe_pages, + + osc_lru_add_batch(cli, &ext->oe_pages); + list_for_each_entry_safe(oap, tmp, &ext->oe_pages, oap_pending_item) { - cfs_list_del_init(&oap->oap_rpc_item); - cfs_list_del_init(&oap->oap_pending_item); + list_del_init(&oap->oap_rpc_item); + list_del_init(&oap->oap_pending_item); if (last_off <= oap->oap_obj_off) { last_off = oap->oap_obj_off; last_count = oap->oap_count; @@ -832,9 +835,9 @@ int osc_extent_finish(const struct lu_env *env, struct osc_extent *ext, /* For short writes we shouldn't count parts of pages that * span a whole chunk on the OST side, or our accounting goes * wrong. Should match the code in filter_grant_check. */ - int offset = oap->oap_page_off & ~CFS_PAGE_MASK; - int count = oap->oap_count + (offset & (blocksize - 1)); - int end = (offset + oap->oap_count) & (blocksize - 1); + int offset = last_off & ~CFS_PAGE_MASK; + int count = last_count + (offset & (blocksize - 1)); + int end = (offset + last_count) & (blocksize - 1); if (end) count += blocksize - end; @@ -896,7 +899,7 @@ static int osc_extent_wait(const struct lu_env *env, struct osc_extent *ext, "%s: wait ext to %d timedout, recovery in progress?\n", osc_export(obj)->exp_obd->obd_name, state); - lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP, NULL); + lwi = LWI_INTR(NULL, NULL); rc = l_wait_event(ext->oe_waitq, extent_wait_cb(ext, state), &lwi); } @@ -943,31 +946,30 @@ static int osc_extent_truncate(struct osc_extent *ext, pgoff_t trunc_index, GOTO(out, rc); /* discard all pages with index greater then trunc_index */ - cfs_list_for_each_entry_safe(oap, tmp, &ext->oe_pages, + list_for_each_entry_safe(oap, tmp, &ext->oe_pages, oap_pending_item) { - struct cl_page *sub = oap2cl_page(oap); - struct cl_page *page = cl_page_top(sub); + pgoff_t index = osc_index(oap2osc(oap)); + struct cl_page *page = oap2cl_page(oap); - LASSERT(cfs_list_empty(&oap->oap_rpc_item)); + LASSERT(list_empty(&oap->oap_rpc_item)); /* only discard the pages with their index greater than * trunc_index, and ... */ - if (sub->cp_index < trunc_index || - (sub->cp_index == trunc_index && partial)) { + if (index < trunc_index || + (index == trunc_index && partial)) { /* accounting how many pages remaining in the chunk * so that we can calculate grants correctly. */ - if (sub->cp_index >> ppc_bits == trunc_chunk) + if (index >> ppc_bits == trunc_chunk) ++pages_in_chunk; continue; } - cfs_list_del_init(&oap->oap_pending_item); + list_del_init(&oap->oap_pending_item); cl_page_get(page); - lu_ref_add(&page->cp_reference, "truncate", cfs_current()); + lu_ref_add(&page->cp_reference, "truncate", current); if (cl_page_own(env, io, page) == 0) { - cl_page_unmap(env, io, page); cl_page_discard(env, io, page); cl_page_disown(env, io, page); } else { @@ -975,7 +977,7 @@ static int osc_extent_truncate(struct osc_extent *ext, pgoff_t trunc_index, LASSERT(0); } - lu_ref_del(&page->cp_reference, "truncate", cfs_current()); + lu_ref_del(&page->cp_reference, "truncate", current); cl_page_put(env, page); --ext->oe_nr_pages; @@ -1047,7 +1049,7 @@ static int osc_extent_make_ready(const struct lu_env *env, OSC_EXTENT_DUMP(D_CACHE, ext, "make ready\n"); - cfs_list_for_each_entry(oap, &ext->oe_pages, oap_pending_item) { + list_for_each_entry(oap, &ext->oe_pages, oap_pending_item) { ++page_count; if (last == NULL || last->oap_obj_off < oap->oap_obj_off) last = oap; @@ -1086,7 +1088,7 @@ static int osc_extent_make_ready(const struct lu_env *env, /* for the rest of pages, we don't need to call osf_refresh_count() * because it's known they are not the last page */ - cfs_list_for_each_entry(oap, &ext->oe_pages, oap_pending_item) { + list_for_each_entry(oap, &ext->oe_pages, oap_pending_item) { if (!(oap->oap_async_flags & ASYNC_COUNT_STABLE)) { oap->oap_count = PAGE_CACHE_SIZE - oap->oap_page_off; spin_lock(&oap->oap_lock); @@ -1170,15 +1172,15 @@ static void osc_extent_tree_dump0(int level, struct osc_object *obj, OSC_EXTENT_DUMP(level, ext, "in tree %d.\n", cnt++); cnt = 1; - cfs_list_for_each_entry(ext, &obj->oo_hp_exts, oe_link) + list_for_each_entry(ext, &obj->oo_hp_exts, oe_link) OSC_EXTENT_DUMP(level, ext, "hp %d.\n", cnt++); cnt = 1; - cfs_list_for_each_entry(ext, &obj->oo_urgent_exts, oe_link) + list_for_each_entry(ext, &obj->oo_urgent_exts, oe_link) OSC_EXTENT_DUMP(level, ext, "urgent %d.\n", cnt++); cnt = 1; - cfs_list_for_each_entry(ext, &obj->oo_reading_exts, oe_link) + list_for_each_entry(ext, &obj->oo_reading_exts, oe_link) OSC_EXTENT_DUMP(level, ext, "reading %d.\n", cnt++); /* osc_object_unlock(obj); */ } @@ -1187,8 +1189,8 @@ static void osc_extent_tree_dump0(int level, struct osc_object *obj, static inline int osc_is_ready(struct osc_object *osc) { - return !cfs_list_empty(&osc->oo_ready_item) || - !cfs_list_empty(&osc->oo_hp_ready_item); + return !list_empty(&osc->oo_ready_item) || + !list_empty(&osc->oo_hp_ready_item); } #define OSC_IO_DEBUG(OSC, STR, args...) \ @@ -1196,10 +1198,10 @@ static inline int osc_is_ready(struct osc_object *osc) (OSC), osc_is_ready(OSC), \ list_empty_marker(&(OSC)->oo_hp_ready_item), \ list_empty_marker(&(OSC)->oo_ready_item), \ - cfs_atomic_read(&(OSC)->oo_nr_writes), \ + atomic_read(&(OSC)->oo_nr_writes), \ list_empty_marker(&(OSC)->oo_hp_exts), \ list_empty_marker(&(OSC)->oo_urgent_exts), \ - cfs_atomic_read(&(OSC)->oo_nr_reads), \ + atomic_read(&(OSC)->oo_nr_reads), \ list_empty_marker(&(OSC)->oo_reading_exts), \ ##args) @@ -1207,7 +1209,7 @@ static int osc_make_ready(const struct lu_env *env, struct osc_async_page *oap, int cmd) { struct osc_page *opg = oap2osc_page(oap); - struct cl_page *page = cl_page_top(oap2cl_page(oap)); + struct cl_page *page = oap2cl_page(oap); int result; LASSERT(cmd == OBD_BRW_WRITE); /* no cached reads */ @@ -1223,7 +1225,7 @@ static int osc_refresh_count(const struct lu_env *env, struct osc_async_page *oap, int cmd) { struct osc_page *opg = oap2osc_page(oap); - struct cl_page *page = oap2cl_page(oap); + pgoff_t index = osc_index(oap2osc(oap)); struct cl_object *obj; struct cl_attr *attr = &osc_env_info(env)->oti_attr; @@ -1241,10 +1243,10 @@ static int osc_refresh_count(const struct lu_env *env, if (result < 0) return result; kms = attr->cat_kms; - if (cl_offset(obj, page->cp_index) >= kms) + if (cl_offset(obj, index) >= kms) /* catch race with truncate */ return 0; - else if (cl_offset(obj, page->cp_index + 1) > kms) + else if (cl_offset(obj, index + 1) > kms) /* catch sub-page write at end of file */ return kms % PAGE_CACHE_SIZE; else @@ -1255,7 +1257,7 @@ static int osc_completion(const struct lu_env *env, struct osc_async_page *oap, int cmd, int rc) { struct osc_page *opg = oap2osc_page(oap); - struct cl_page *page = cl_page_top(oap2cl_page(oap)); + struct cl_page *page = oap2cl_page(oap); struct osc_object *obj = cl2osc(opg->ops_cl.cpl_obj); enum cl_req_type crt; int srvlock; @@ -1263,8 +1265,10 @@ static int osc_completion(const struct lu_env *env, struct osc_async_page *oap, ENTRY; cmd &= ~OBD_BRW_NOQUOTA; - LASSERT(equi(page->cp_state == CPS_PAGEIN, cmd == OBD_BRW_READ)); - LASSERT(equi(page->cp_state == CPS_PAGEOUT, cmd == OBD_BRW_WRITE)); + LASSERTF(equi(page->cp_state == CPS_PAGEIN, cmd == OBD_BRW_READ), + "cp_state:%u, cmd:%d\n", page->cp_state, cmd); + LASSERTF(equi(page->cp_state == CPS_PAGEOUT, cmd == OBD_BRW_WRITE), + "cp_state:%u, cmd:%d\n", page->cp_state, cmd); LASSERT(opg->ops_transfer_pinned); /* @@ -1281,8 +1285,8 @@ static int osc_completion(const struct lu_env *env, struct osc_async_page *oap, spin_lock(&obj->oo_seatbelt); LASSERT(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); @@ -1313,29 +1317,29 @@ static int osc_completion(const struct lu_env *env, struct osc_async_page *oap, RETURN(0); } -#define OSC_DUMP_GRANT(lvl, cli, fmt, args...) do { \ - struct client_obd *__tmp = (cli); \ - CDEBUG(lvl, "%s: grant { dirty: %ld/%ld dirty_pages: %d/%d " \ - "dropped: %ld avail: %ld, reserved: %ld, flight: %d } " \ - "lru {in list: %d, left: %d, waiters: %d }" fmt, \ - __tmp->cl_import->imp_obd->obd_name, \ - __tmp->cl_dirty, __tmp->cl_dirty_max, \ - cfs_atomic_read(&obd_dirty_pages), obd_max_dirty_pages, \ - __tmp->cl_lost_grant, __tmp->cl_avail_grant, \ - __tmp->cl_reserved_grant, __tmp->cl_w_in_flight, \ - cfs_atomic_read(&__tmp->cl_lru_in_list), \ - cfs_atomic_read(&__tmp->cl_lru_busy), \ - cfs_atomic_read(&__tmp->cl_lru_shrinkers), ##args); \ +#define OSC_DUMP_GRANT(lvl, cli, fmt, args...) do { \ + struct client_obd *__tmp = (cli); \ + CDEBUG(lvl, "%s: grant { dirty: %ld/%ld dirty_pages: %d/%d " \ + "dropped: %ld avail: %ld, reserved: %ld, flight: %d }" \ + "lru {in list: %d, left: %d, waiters: %d }" fmt, \ + __tmp->cl_import->imp_obd->obd_name, \ + __tmp->cl_dirty_pages, __tmp->cl_dirty_max_pages, \ + atomic_read(&obd_dirty_pages), obd_max_dirty_pages, \ + __tmp->cl_lost_grant, __tmp->cl_avail_grant, \ + __tmp->cl_reserved_grant, __tmp->cl_w_in_flight, \ + atomic_read(&__tmp->cl_lru_in_list), \ + atomic_read(&__tmp->cl_lru_busy), \ + atomic_read(&__tmp->cl_lru_shrinkers), ##args); \ } while (0) /* caller must hold loi_list_lock */ static void osc_consume_write_grant(struct client_obd *cli, struct brw_page *pga) { - LASSERT(spin_is_locked(&cli->cl_loi_list_lock.lock)); + assert_spin_locked(&cli->cl_loi_list_lock.lock); LASSERT(!(pga->flag & OBD_BRW_FROM_GRANT)); - cfs_atomic_inc(&obd_dirty_pages); - cli->cl_dirty += PAGE_CACHE_SIZE; + atomic_inc(&obd_dirty_pages); + cli->cl_dirty_pages++; pga->flag |= OBD_BRW_FROM_GRANT; CDEBUG(D_CACHE, "using %lu grant credits for brw %p page %p\n", PAGE_CACHE_SIZE, pga, pga->pg); @@ -1349,19 +1353,19 @@ static void osc_release_write_grant(struct client_obd *cli, { ENTRY; - LASSERT(spin_is_locked(&cli->cl_loi_list_lock.lock)); + assert_spin_locked(&cli->cl_loi_list_lock.lock); if (!(pga->flag & OBD_BRW_FROM_GRANT)) { EXIT; return; } pga->flag &= ~OBD_BRW_FROM_GRANT; - cfs_atomic_dec(&obd_dirty_pages); - cli->cl_dirty -= PAGE_CACHE_SIZE; + atomic_dec(&obd_dirty_pages); + cli->cl_dirty_pages--; if (pga->flag & OBD_BRW_NOCACHE) { pga->flag &= ~OBD_BRW_NOCACHE; - cfs_atomic_dec(&obd_dirty_transit_pages); - cli->cl_dirty_transit -= PAGE_CACHE_SIZE; + atomic_dec(&obd_dirty_transit_pages); + cli->cl_dirty_transit--; } EXIT; } @@ -1429,8 +1433,8 @@ static void osc_free_grant(struct client_obd *cli, unsigned int nr_pages, int grant = (1 << cli->cl_chunkbits) + cli->cl_extent_tax; client_obd_list_lock(&cli->cl_loi_list_lock); - cfs_atomic_sub(nr_pages, &obd_dirty_pages); - cli->cl_dirty -= nr_pages << PAGE_CACHE_SHIFT; + atomic_sub(nr_pages, &obd_dirty_pages); + cli->cl_dirty_pages -= nr_pages; cli->cl_lost_grant += lost_grant; if (cli->cl_avail_grant < grant && cli->cl_lost_grant >= grant) { /* borrow some grant from truncate to avoid the case that @@ -1442,7 +1446,7 @@ static void osc_free_grant(struct client_obd *cli, unsigned int nr_pages, client_obd_list_unlock(&cli->cl_loi_list_lock); CDEBUG(D_CACHE, "lost %u grant: %lu avail: %lu dirty: %lu\n", lost_grant, cli->cl_lost_grant, - cli->cl_avail_grant, cli->cl_dirty); + cli->cl_avail_grant, cli->cl_dirty_pages << PAGE_CACHE_SHIFT); } /** @@ -1472,12 +1476,12 @@ static int osc_enter_cache_try(struct client_obd *cli, if (rc < 0) return 0; - if (cli->cl_dirty + PAGE_CACHE_SIZE <= cli->cl_dirty_max && - cfs_atomic_read(&obd_dirty_pages) + 1 <= obd_max_dirty_pages) { + if (cli->cl_dirty_pages < cli->cl_dirty_max_pages && + 1 + atomic_read(&obd_dirty_pages) <= obd_max_dirty_pages) { osc_consume_write_grant(cli, &oap->oap_brw_page); if (transient) { - cli->cl_dirty_transit += PAGE_CACHE_SIZE; - cfs_atomic_inc(&obd_dirty_transit_pages); + cli->cl_dirty_transit++; + atomic_inc(&obd_dirty_transit_pages); oap->oap_brw_flags |= OBD_BRW_NOCACHE; } rc = 1; @@ -1492,7 +1496,7 @@ static int ocw_granted(struct client_obd *cli, struct osc_cache_waiter *ocw) { int rc; client_obd_list_lock(&cli->cl_loi_list_lock); - rc = cfs_list_empty(&ocw->ocw_entry); + rc = list_empty(&ocw->ocw_entry); client_obd_list_unlock(&cli->cl_loi_list_lock); return rc; } @@ -1522,7 +1526,7 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli, /* force the caller to try sync io. this can jump the list * of queued writes and create a discontiguous rpc stream */ if (OBD_FAIL_CHECK(OBD_FAIL_OSC_NO_GRANT) || - cli->cl_dirty_max < PAGE_CACHE_SIZE || + cli->cl_dirty_max_pages == 0 || cli->cl_ar.ar_force_sync || loi->loi_ar.ar_force_sync) GOTO(out, rc = -EDQUOT); @@ -1539,8 +1543,8 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli, init_waitqueue_head(&ocw.ocw_waitq); ocw.ocw_oap = oap; ocw.ocw_grant = bytes; - while (cli->cl_dirty > 0 || cli->cl_w_in_flight > 0) { - cfs_list_add_tail(&ocw.ocw_entry, &cli->cl_cache_waiters); + while (cli->cl_dirty_pages > 0 || cli->cl_w_in_flight > 0) { + list_add_tail(&ocw.ocw_entry, &cli->cl_cache_waiters); ocw.ocw_rc = 0; client_obd_list_unlock(&cli->cl_loi_list_lock); @@ -1573,11 +1577,11 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli, &ocw, rc); break; } - cfs_list_del_init(&ocw.ocw_entry); + list_del_init(&ocw.ocw_entry); GOTO(out, rc); } - LASSERT(cfs_list_empty(&ocw.ocw_entry)); + LASSERT(list_empty(&ocw.ocw_entry)); rc = ocw.ocw_rc; if (rc != -EDQUOT) @@ -1595,22 +1599,21 @@ out: /* caller must hold loi_list_lock */ void osc_wake_cache_waiters(struct client_obd *cli) { - cfs_list_t *l, *tmp; + struct list_head *l, *tmp; struct osc_cache_waiter *ocw; ENTRY; - cfs_list_for_each_safe(l, tmp, &cli->cl_cache_waiters) { - ocw = cfs_list_entry(l, struct osc_cache_waiter, ocw_entry); - cfs_list_del_init(&ocw->ocw_entry); + list_for_each_safe(l, tmp, &cli->cl_cache_waiters) { + ocw = list_entry(l, struct osc_cache_waiter, ocw_entry); + list_del_init(&ocw->ocw_entry); ocw->ocw_rc = -EDQUOT; /* we can't dirty more */ - if ((cli->cl_dirty + PAGE_CACHE_SIZE > cli->cl_dirty_max) || - (cfs_atomic_read(&obd_dirty_pages) + 1 > - obd_max_dirty_pages)) { + if ((cli->cl_dirty_pages >= cli->cl_dirty_max_pages) || + (1 + atomic_read(&obd_dirty_pages) > obd_max_dirty_pages)) { CDEBUG(D_CACHE, "no dirty room: dirty: %ld " - "osc max %ld, sys max %d\n", cli->cl_dirty, - cli->cl_dirty_max, obd_max_dirty_pages); + "osc max %ld, sys max %d\n", cli->cl_dirty_pages, + cli->cl_dirty_max_pages, obd_max_dirty_pages); goto wakeup; } @@ -1630,7 +1633,7 @@ wakeup: static int osc_max_rpc_in_flight(struct client_obd *cli, struct osc_object *osc) { - int hprpc = !!cfs_list_empty(&osc->oo_hp_exts); + int hprpc = !!list_empty(&osc->oo_hp_exts); return rpcs_in_flight(cli) >= cli->cl_max_rpcs_in_flight + hprpc; } @@ -1651,39 +1654,39 @@ static int osc_makes_rpc(struct client_obd *cli, struct osc_object *osc, invalid_import = 1; if (cmd & OBD_BRW_WRITE) { - if (cfs_atomic_read(&osc->oo_nr_writes) == 0) + if (atomic_read(&osc->oo_nr_writes) == 0) RETURN(0); if (invalid_import) { CDEBUG(D_CACHE, "invalid import forcing RPC\n"); RETURN(1); } - if (!cfs_list_empty(&osc->oo_hp_exts)) { + if (!list_empty(&osc->oo_hp_exts)) { CDEBUG(D_CACHE, "high prio request forcing RPC\n"); RETURN(1); } - if (!cfs_list_empty(&osc->oo_urgent_exts)) { + if (!list_empty(&osc->oo_urgent_exts)) { CDEBUG(D_CACHE, "urgent request forcing RPC\n"); RETURN(1); } /* trigger a write rpc stream as long as there are dirtiers * waiting for space. as they're waiting, they're not going to * create more pages to coalesce with what's waiting.. */ - if (!cfs_list_empty(&cli->cl_cache_waiters)) { + if (!list_empty(&cli->cl_cache_waiters)) { CDEBUG(D_CACHE, "cache waiters forcing RPC\n"); RETURN(1); } - if (cfs_atomic_read(&osc->oo_nr_writes) >= + if (atomic_read(&osc->oo_nr_writes) >= cli->cl_max_pages_per_rpc) RETURN(1); } else { - if (cfs_atomic_read(&osc->oo_nr_reads) == 0) + if (atomic_read(&osc->oo_nr_reads) == 0) RETURN(0); if (invalid_import) { CDEBUG(D_CACHE, "invalid import forcing RPC\n"); RETURN(1); } /* all read are urgent. */ - if (!cfs_list_empty(&osc->oo_reading_exts)) + if (!list_empty(&osc->oo_reading_exts)) RETURN(1); } @@ -1694,28 +1697,29 @@ static void osc_update_pending(struct osc_object *obj, int cmd, int delta) { struct client_obd *cli = osc_cli(obj); if (cmd & OBD_BRW_WRITE) { - cfs_atomic_add(delta, &obj->oo_nr_writes); - cfs_atomic_add(delta, &cli->cl_pending_w_pages); - LASSERT(cfs_atomic_read(&obj->oo_nr_writes) >= 0); + atomic_add(delta, &obj->oo_nr_writes); + atomic_add(delta, &cli->cl_pending_w_pages); + LASSERT(atomic_read(&obj->oo_nr_writes) >= 0); } else { - cfs_atomic_add(delta, &obj->oo_nr_reads); - cfs_atomic_add(delta, &cli->cl_pending_r_pages); - LASSERT(cfs_atomic_read(&obj->oo_nr_reads) >= 0); + atomic_add(delta, &obj->oo_nr_reads); + atomic_add(delta, &cli->cl_pending_r_pages); + LASSERT(atomic_read(&obj->oo_nr_reads) >= 0); } OSC_IO_DEBUG(obj, "update pending cmd %d delta %d.\n", cmd, delta); } static int osc_makes_hprpc(struct osc_object *obj) { - return !cfs_list_empty(&obj->oo_hp_exts); + return !list_empty(&obj->oo_hp_exts); } -static void on_list(cfs_list_t *item, cfs_list_t *list, int should_be_on) +static void on_list(struct list_head *item, struct list_head *list, + int should_be_on) { - if (cfs_list_empty(item) && should_be_on) - cfs_list_add_tail(item, list); - else if (!cfs_list_empty(item) && !should_be_on) - cfs_list_del_init(item); + if (list_empty(item) && should_be_on) + list_add_tail(item, list); + else if (!list_empty(item) && !should_be_on) + list_del_init(item); } /* maintain the osc's cli list membership invariants so that osc_send_oap_rpc @@ -1734,10 +1738,10 @@ static int __osc_list_maint(struct client_obd *cli, struct osc_object *osc) } on_list(&osc->oo_write_item, &cli->cl_loi_write_list, - cfs_atomic_read(&osc->oo_nr_writes) > 0); + atomic_read(&osc->oo_nr_writes) > 0); on_list(&osc->oo_read_item, &cli->cl_loi_read_list, - cfs_atomic_read(&osc->oo_nr_reads) > 0); + atomic_read(&osc->oo_nr_reads) > 0); return osc_is_ready(osc); } @@ -1818,7 +1822,8 @@ static void osc_ap_completion(const struct lu_env *env, struct client_obd *cli, * - extent must be compatible with previous ones */ static int try_to_add_extent_for_io(struct client_obd *cli, - struct osc_extent *ext, cfs_list_t *rpclist, + struct osc_extent *ext, + struct list_head *rpclist, int *pc, unsigned int *max_pages) { struct osc_extent *tmp; @@ -1831,8 +1836,8 @@ static int try_to_add_extent_for_io(struct client_obd *cli, if (*pc + ext->oe_nr_pages > *max_pages) RETURN(0); - cfs_list_for_each_entry(tmp, rpclist, oe_link) { - EASSERT(tmp->oe_owner == cfs_current(), tmp); + list_for_each_entry(tmp, rpclist, oe_link) { + EASSERT(tmp->oe_owner == current, tmp); #if 0 if (overlapped(tmp, ext)) { OSC_EXTENT_DUMP(D_ERROR, tmp, "overlapped %p.\n", ext); @@ -1849,8 +1854,8 @@ static int try_to_add_extent_for_io(struct client_obd *cli, } *pc += ext->oe_nr_pages; - cfs_list_move_tail(&ext->oe_link, rpclist); - ext->oe_owner = cfs_current(); + list_move_tail(&ext->oe_link, rpclist); + ext->oe_owner = current; RETURN(1); } @@ -1867,7 +1872,7 @@ static int try_to_add_extent_for_io(struct client_obd *cli, * 5. Traverse the extent tree from the 1st extent; * 6. Above steps exit if there is no space in this RPC. */ -static int get_write_extents(struct osc_object *obj, cfs_list_t *rpclist) +static int get_write_extents(struct osc_object *obj, struct list_head *rpclist) { struct client_obd *cli = osc_cli(obj); struct osc_extent *ext; @@ -1875,9 +1880,9 @@ static int get_write_extents(struct osc_object *obj, cfs_list_t *rpclist) unsigned int max_pages = cli->cl_max_pages_per_rpc; LASSERT(osc_object_is_locked(obj)); - while (!cfs_list_empty(&obj->oo_hp_exts)) { - ext = cfs_list_entry(obj->oo_hp_exts.next, struct osc_extent, - oe_link); + while (!list_empty(&obj->oo_hp_exts)) { + ext = list_entry(obj->oo_hp_exts.next, struct osc_extent, + oe_link); LASSERT(ext->oe_state == OES_CACHE); if (!try_to_add_extent_for_io(cli, ext, rpclist, &page_count, &max_pages)) @@ -1887,9 +1892,9 @@ static int get_write_extents(struct osc_object *obj, cfs_list_t *rpclist) if (page_count == max_pages) return page_count; - while (!cfs_list_empty(&obj->oo_urgent_exts)) { - ext = cfs_list_entry(obj->oo_urgent_exts.next, - struct osc_extent, oe_link); + while (!list_empty(&obj->oo_urgent_exts)) { + ext = list_entry(obj->oo_urgent_exts.next, + struct osc_extent, oe_link); if (!try_to_add_extent_for_io(cli, ext, rpclist, &page_count, &max_pages)) return page_count; @@ -1899,7 +1904,7 @@ static int get_write_extents(struct osc_object *obj, cfs_list_t *rpclist) while ((ext = next_extent(ext)) != NULL) { if ((ext->oe_state != OES_CACHE) || - (!cfs_list_empty(&ext->oe_link) && + (!list_empty(&ext->oe_link) && ext->oe_owner != NULL)) continue; @@ -1915,7 +1920,7 @@ static int get_write_extents(struct osc_object *obj, cfs_list_t *rpclist) while (ext != NULL) { if ((ext->oe_state != OES_CACHE) || /* this extent may be already in current rpclist */ - (!cfs_list_empty(&ext->oe_link) && ext->oe_owner != NULL)) { + (!list_empty(&ext->oe_link) && ext->oe_owner != NULL)) { ext = next_extent(ext); continue; } @@ -1933,7 +1938,7 @@ static int osc_send_write_rpc(const struct lu_env *env, struct client_obd *cli, struct osc_object *osc, pdl_policy_t pol) { - CFS_LIST_HEAD(rpclist); + struct list_head rpclist = LIST_HEAD_INIT(rpclist); struct osc_extent *ext; struct osc_extent *tmp; struct osc_extent *first = NULL; @@ -1945,14 +1950,14 @@ osc_send_write_rpc(const struct lu_env *env, struct client_obd *cli, LASSERT(osc_object_is_locked(osc)); page_count = get_write_extents(osc, &rpclist); - LASSERT(equi(page_count == 0, cfs_list_empty(&rpclist))); + LASSERT(equi(page_count == 0, list_empty(&rpclist))); - if (cfs_list_empty(&rpclist)) + if (list_empty(&rpclist)) RETURN(0); osc_update_pending(osc, OBD_BRW_WRITE, -page_count); - cfs_list_for_each_entry(ext, &rpclist, oe_link) { + list_for_each_entry(ext, &rpclist, oe_link) { LASSERT(ext->oe_state == OES_CACHE || ext->oe_state == OES_LOCK_DONE); if (ext->oe_state == OES_CACHE) @@ -1965,11 +1970,11 @@ osc_send_write_rpc(const struct lu_env *env, struct client_obd *cli, * lock order is page lock -> object lock. */ osc_object_unlock(osc); - cfs_list_for_each_entry_safe(ext, tmp, &rpclist, oe_link) { + list_for_each_entry_safe(ext, tmp, &rpclist, oe_link) { if (ext->oe_state == OES_LOCKING) { rc = osc_extent_make_ready(env, ext); if (unlikely(rc < 0)) { - cfs_list_del_init(&ext->oe_link); + list_del_init(&ext->oe_link); osc_extent_finish(env, ext, 0, rc); continue; } @@ -1982,10 +1987,10 @@ osc_send_write_rpc(const struct lu_env *env, struct client_obd *cli, } } - if (!cfs_list_empty(&rpclist)) { + if (!list_empty(&rpclist)) { LASSERT(page_count > 0); rc = osc_build_rpc(env, cli, &rpclist, OBD_BRW_WRITE, pol); - LASSERT(cfs_list_empty(&rpclist)); + LASSERT(list_empty(&rpclist)); } osc_object_lock(osc); @@ -2008,14 +2013,14 @@ osc_send_read_rpc(const struct lu_env *env, struct client_obd *cli, { struct osc_extent *ext; struct osc_extent *next; - CFS_LIST_HEAD(rpclist); + struct list_head rpclist = LIST_HEAD_INIT(rpclist); int page_count = 0; unsigned int max_pages = cli->cl_max_pages_per_rpc; int rc = 0; ENTRY; LASSERT(osc_object_is_locked(osc)); - cfs_list_for_each_entry_safe(ext, next, + list_for_each_entry_safe(ext, next, &osc->oo_reading_exts, oe_link) { EASSERT(ext->oe_state == OES_LOCK_DONE, ext); if (!try_to_add_extent_for_io(cli, ext, &rpclist, &page_count, @@ -2028,12 +2033,12 @@ osc_send_read_rpc(const struct lu_env *env, struct client_obd *cli, osc_update_pending(osc, OBD_BRW_READ, -page_count); - if (!cfs_list_empty(&rpclist)) { + if (!list_empty(&rpclist)) { osc_object_unlock(osc); LASSERT(page_count > 0); rc = osc_build_rpc(env, cli, &rpclist, OBD_BRW_READ, pol); - LASSERT(cfs_list_empty(&rpclist)); + LASSERT(list_empty(&rpclist)); osc_object_lock(osc); } @@ -2041,9 +2046,9 @@ osc_send_read_rpc(const struct lu_env *env, struct client_obd *cli, } #define list_to_obj(list, item) ({ \ - cfs_list_t *__tmp = (list)->next; \ - cfs_list_del_init(__tmp); \ - cfs_list_entry(__tmp, struct osc_object, oo_##item); \ + struct list_head *__tmp = (list)->next; \ + list_del_init(__tmp); \ + list_entry(__tmp, struct osc_object, oo_##item); \ }) /* This is called by osc_check_rpcs() to find which objects have pages that @@ -2055,26 +2060,26 @@ static struct osc_object *osc_next_obj(struct client_obd *cli) /* First return objects that have blocked locks so that they * will be flushed quickly and other clients can get the lock, * then objects which have pages ready to be stuffed into RPCs */ - if (!cfs_list_empty(&cli->cl_loi_hp_ready_list)) + if (!list_empty(&cli->cl_loi_hp_ready_list)) RETURN(list_to_obj(&cli->cl_loi_hp_ready_list, hp_ready_item)); - if (!cfs_list_empty(&cli->cl_loi_ready_list)) + if (!list_empty(&cli->cl_loi_ready_list)) RETURN(list_to_obj(&cli->cl_loi_ready_list, ready_item)); /* then if we have cache waiters, return all objects with queued * writes. This is especially important when many small files * have filled up the cache and not been fired into rpcs because * they don't pass the nr_pending/object threshhold */ - if (!cfs_list_empty(&cli->cl_cache_waiters) && - !cfs_list_empty(&cli->cl_loi_write_list)) + if (!list_empty(&cli->cl_cache_waiters) && + !list_empty(&cli->cl_loi_write_list)) RETURN(list_to_obj(&cli->cl_loi_write_list, write_item)); /* then return all queued objects when we have an invalid import * so that they get flushed */ if (cli->cl_import == NULL || cli->cl_import->imp_invalid) { - if (!cfs_list_empty(&cli->cl_loi_write_list)) + if (!list_empty(&cli->cl_loi_write_list)) RETURN(list_to_obj(&cli->cl_loi_write_list, write_item)); - if (!cfs_list_empty(&cli->cl_loi_read_list)) + if (!list_empty(&cli->cl_loi_read_list)) RETURN(list_to_obj(&cli->cl_loi_read_list, read_item)); } @@ -2102,8 +2107,7 @@ static void osc_check_rpcs(const struct lu_env *env, struct client_obd *cli, cl_object_get(obj); client_obd_list_unlock(&cli->cl_loi_list_lock); - lu_object_ref_add_at(&obj->co_lu, &link, "check", - cfs_current()); + lu_object_ref_add_at(&obj->co_lu, &link, "check", current); /* attempt some read/write balancing by alternating between * reads and writes in an object. The makes_rpc checks here @@ -2144,8 +2148,7 @@ static void osc_check_rpcs(const struct lu_env *env, struct client_obd *cli, osc_object_unlock(osc); osc_list_maint(cli, osc); - lu_object_ref_del_at(&obj->co_lu, &link, "check", - cfs_current()); + lu_object_ref_del_at(&obj->co_lu, &link, "check", current); cl_object_put(env, obj); client_obd_list_lock(&cli->cl_loi_list_lock); @@ -2163,11 +2166,11 @@ static int osc_io_unplug0(const struct lu_env *env, struct client_obd *cli, if (!async) { /* disable osc_lru_shrink() temporarily to avoid * potential stack overrun problem. LU-2859 */ - cfs_atomic_inc(&cli->cl_lru_shrinkers); + atomic_inc(&cli->cl_lru_shrinkers); client_obd_list_lock(&cli->cl_loi_list_lock); osc_check_rpcs(env, cli, pol); client_obd_list_unlock(&cli->cl_loi_list_lock); - cfs_atomic_dec(&cli->cl_lru_shrinkers); + atomic_dec(&cli->cl_lru_shrinkers); } else { CDEBUG(D_CACHE, "Queue writeback work for client %p.\n", cli); LASSERT(cli->cl_writeback_work != NULL); @@ -2210,8 +2213,8 @@ int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops, if (!client_is_remote(exp) && cfs_capable(CFS_CAP_SYS_RESOURCE)) oap->oap_brw_flags = OBD_BRW_NOQUOTA; - CFS_INIT_LIST_HEAD(&oap->oap_pending_item); - CFS_INIT_LIST_HEAD(&oap->oap_rpc_item); + INIT_LIST_HEAD(&oap->oap_pending_item); + INIT_LIST_HEAD(&oap->oap_rpc_item); spin_lock_init(&oap->oap_lock); CDEBUG(D_INFO, "oap %p page %p obj off "LPU64"\n", @@ -2241,8 +2244,8 @@ int osc_queue_async_io(const struct lu_env *env, struct cl_io *io, if (cli->cl_import == NULL || cli->cl_import->imp_invalid) RETURN(-EIO); - if (!cfs_list_empty(&oap->oap_pending_item) || - !cfs_list_empty(&oap->oap_rpc_item)) + if (!list_empty(&oap->oap_pending_item) || + !list_empty(&oap->oap_rpc_item)) RETURN(-EBUSY); /* Set the OBD_BRW_SRVLOCK before the page is queued. */ @@ -2285,7 +2288,7 @@ int osc_queue_async_io(const struct lu_env *env, struct cl_io *io, OSC_IO_DEBUG(osc, "oap %p page %p added for cmd %d\n", oap, oap->oap_page, oap->oap_cmd & OBD_BRW_RWMASK); - index = oap2cl_page(oap)->cp_index; + index = osc_index(oap2osc(oap)); /* Add this page into extent by the following steps: * 1. if there exists an active extent for this IO, mostly this page @@ -2378,7 +2381,7 @@ int osc_queue_async_io(const struct lu_env *env, struct cl_io *io, else LASSERT(ext->oe_srvlock == ops->ops_srvlock); ++ext->oe_nr_pages; - cfs_list_add_tail(&oap->oap_pending_item, &ext->oe_pages); + list_add_tail(&oap->oap_pending_item, &ext->oe_pages); osc_object_unlock(osc); } RETURN(rc); @@ -2395,20 +2398,20 @@ int osc_teardown_async_page(const struct lu_env *env, LASSERT(oap->oap_magic == OAP_MAGIC); CDEBUG(D_INFO, "teardown oap %p page %p at index %lu.\n", - oap, ops, oap2cl_page(oap)->cp_index); + oap, ops, osc_index(oap2osc(oap))); osc_object_lock(obj); - if (!cfs_list_empty(&oap->oap_rpc_item)) { + if (!list_empty(&oap->oap_rpc_item)) { CDEBUG(D_CACHE, "oap %p is not in cache.\n", oap); rc = -EBUSY; - } else if (!cfs_list_empty(&oap->oap_pending_item)) { - ext = osc_extent_lookup(obj, oap2cl_page(oap)->cp_index); + } else if (!list_empty(&oap->oap_pending_item)) { + ext = osc_extent_lookup(obj, osc_index(oap2osc(oap))); /* only truncated pages are allowed to be taken out. * See osc_extent_truncate() and osc_cache_truncate_start() * for details. */ if (ext != NULL && ext->oe_state != OES_TRUNC) { OSC_EXTENT_DUMP(D_ERROR, ext, "trunc at %lu.\n", - oap2cl_page(oap)->cp_index); + osc_index(oap2osc(oap))); rc = -EBUSY; } } @@ -2431,7 +2434,7 @@ int osc_flush_async_page(const struct lu_env *env, struct cl_io *io, struct osc_extent *ext = NULL; struct osc_object *obj = cl2osc(ops->ops_cl.cpl_obj); struct cl_page *cp = ops->ops_cl.cpl_page; - pgoff_t index = cp->cp_index; + pgoff_t index = osc_index(ops); struct osc_async_page *oap = &ops->ops_oap; bool unplug = false; int rc = 0; @@ -2447,8 +2450,7 @@ int osc_flush_async_page(const struct lu_env *env, struct cl_io *io, switch (ext->oe_state) { case OES_RPC: case OES_LOCK_DONE: - CL_PAGE_DEBUG(D_ERROR, env, cl_page_top(cp), - "flush an in-rpc page?\n"); + CL_PAGE_DEBUG(D_ERROR, env, cp, "flush an in-rpc page?\n"); LASSERT(0); break; case OES_LOCKING: @@ -2460,12 +2462,18 @@ int osc_flush_async_page(const struct lu_env *env, struct cl_io *io, * really sending the RPC. */ case OES_TRUNC: /* race with truncate, page will be redirtied */ + case OES_ACTIVE: + /* The extent is active so we need to abort and let the caller + * re-dirty the page. If we continued on here, and we were the + * one making the extent active, we could deadlock waiting for + * the page writeback to clear but it won't because the extent + * is active and won't be written out. */ GOTO(out, rc = -EAGAIN); default: break; } - rc = cl_page_prep(env, io, cl_page_top(cp), CRT_WRITE); + rc = cl_page_prep(env, io, cp, CRT_WRITE); if (rc) GOTO(out, rc); @@ -2480,8 +2488,8 @@ int osc_flush_async_page(const struct lu_env *env, struct cl_io *io, if (ext->oe_state == OES_CACHE) { OSC_EXTENT_DUMP(D_CACHE, ext, "flush page %p make it urgent.\n", oap); - if (cfs_list_empty(&ext->oe_link)) - cfs_list_add_tail(&ext->oe_link, &obj->oo_urgent_exts); + if (list_empty(&ext->oe_link)) + list_add_tail(&ext->oe_link, &obj->oo_urgent_exts); unplug = true; } rc = 0; @@ -2509,8 +2517,8 @@ int osc_cancel_async_page(const struct lu_env *env, struct osc_page *ops) struct client_obd *cli = osc_cli(obj); struct osc_extent *ext; struct osc_extent *found = NULL; - cfs_list_t *plist; - pgoff_t index = oap2cl_page(oap)->cp_index; + struct list_head *plist; + pgoff_t index = osc_index(ops); int rc = -EBUSY; int cmd; ENTRY; @@ -2527,7 +2535,7 @@ int osc_cancel_async_page(const struct lu_env *env, struct osc_page *ops) plist = &obj->oo_reading_exts; cmd = OBD_BRW_READ; } - cfs_list_for_each_entry(ext, plist, oe_link) { + list_for_each_entry(ext, plist, oe_link) { if (ext->oe_start <= index && ext->oe_end >= index) { LASSERT(ext->oe_state == OES_LOCK_DONE); /* For OES_LOCK_DONE state extent, it has already held @@ -2537,7 +2545,7 @@ int osc_cancel_async_page(const struct lu_env *env, struct osc_page *ops) } } if (found != NULL) { - cfs_list_del_init(&found->oe_link); + list_del_init(&found->oe_link); osc_update_pending(obj, cmd, -found->oe_nr_pages); osc_object_unlock(obj); @@ -2561,7 +2569,7 @@ int osc_cancel_async_page(const struct lu_env *env, struct osc_page *ops) } int osc_queue_sync_pages(const struct lu_env *env, struct osc_object *obj, - cfs_list_t *list, int cmd, int brw_flags) + struct list_head *list, int cmd, int brw_flags) { struct client_obd *cli = osc_cli(obj); struct osc_extent *ext; @@ -2572,20 +2580,20 @@ int osc_queue_sync_pages(const struct lu_env *env, struct osc_object *obj, pgoff_t end = 0; ENTRY; - cfs_list_for_each_entry(oap, list, oap_pending_item) { - struct cl_page *cp = oap2cl_page(oap); - if (cp->cp_index > end) - end = cp->cp_index; - if (cp->cp_index < start) - start = cp->cp_index; + list_for_each_entry(oap, list, oap_pending_item) { + pgoff_t index = osc_index(oap2osc(oap)); + if (index > end) + end = index; + if (index < start) + start = index; ++page_count; mppr <<= (page_count > mppr); } ext = osc_extent_alloc(obj); if (ext == NULL) { - cfs_list_for_each_entry(oap, list, oap_pending_item) { - cfs_list_del_init(&oap->oap_pending_item); + list_for_each_entry(oap, list, oap_pending_item) { + list_del_init(&oap->oap_pending_item); osc_ap_completion(env, cli, oap, 0, -ENOMEM); } RETURN(-ENOMEM); @@ -2599,21 +2607,21 @@ int osc_queue_sync_pages(const struct lu_env *env, struct osc_object *obj, ext->oe_srvlock = !!(brw_flags & OBD_BRW_SRVLOCK); ext->oe_nr_pages = page_count; ext->oe_mppr = mppr; - cfs_list_splice_init(list, &ext->oe_pages); + list_splice_init(list, &ext->oe_pages); osc_object_lock(obj); /* Reuse the initial refcount for RPC, don't drop it */ osc_extent_state_set(ext, OES_LOCK_DONE); if (cmd & OBD_BRW_WRITE) { - cfs_list_add_tail(&ext->oe_link, &obj->oo_urgent_exts); + list_add_tail(&ext->oe_link, &obj->oo_urgent_exts); osc_update_pending(obj, OBD_BRW_WRITE, page_count); } else { - cfs_list_add_tail(&ext->oe_link, &obj->oo_reading_exts); + list_add_tail(&ext->oe_link, &obj->oo_reading_exts); osc_update_pending(obj, OBD_BRW_READ, page_count); } osc_object_unlock(obj); - osc_io_unplug(env, cli, obj, PDL_POLICY_ROUND); + osc_io_unplug_async(env, cli, obj); RETURN(0); } @@ -2627,7 +2635,7 @@ int osc_cache_truncate_start(const struct lu_env *env, struct osc_io *oio, struct osc_extent *ext; struct osc_extent *waiting = NULL; pgoff_t index; - CFS_LIST_HEAD(list); + struct list_head list = LIST_HEAD_INIT(list); int result = 0; bool partial; ENTRY; @@ -2674,8 +2682,8 @@ again: osc_update_pending(obj, OBD_BRW_WRITE, -ext->oe_nr_pages); } - EASSERT(cfs_list_empty(&ext->oe_link), ext); - cfs_list_add_tail(&ext->oe_link, &list); + EASSERT(list_empty(&ext->oe_link), ext); + list_add_tail(&ext->oe_link, &list); ext = next_extent(ext); } @@ -2683,11 +2691,11 @@ again: osc_list_maint(cli, obj); - while (!cfs_list_empty(&list)) { + while (!list_empty(&list)) { int rc; - ext = cfs_list_entry(list.next, struct osc_extent, oe_link); - cfs_list_del_init(&ext->oe_link); + ext = list_entry(list.next, struct osc_extent, oe_link); + list_del_init(&ext->oe_link); /* extent may be in OES_ACTIVE state because inode mutex * is released before osc_io_end() in file write case */ @@ -2760,7 +2768,7 @@ void osc_cache_truncate_end(const struct lu_env *env, struct osc_io *oio, osc_extent_state_set(ext, OES_CACHE); if (ext->oe_fsync_wait && !ext->oe_urgent) { ext->oe_urgent = 1; - cfs_list_move_tail(&ext->oe_link, &obj->oo_urgent_exts); + list_move_tail(&ext->oe_link, &obj->oo_urgent_exts); unplug = true; } osc_update_pending(obj, OBD_BRW_WRITE, ext->oe_nr_pages); @@ -2841,7 +2849,7 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj, pgoff_t start, pgoff_t end, int hp, int discard) { struct osc_extent *ext; - CFS_LIST_HEAD(discard_list); + struct list_head discard_list = LIST_HEAD_INIT(discard_list); bool unplug = false; int result = 0; ENTRY; @@ -2861,7 +2869,7 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj, case OES_CACHE: result += ext->oe_nr_pages; if (!discard) { - cfs_list_t *list = NULL; + struct list_head *list = NULL; if (hp) { EASSERT(!ext->oe_hp, ext); ext->oe_hp = 1; @@ -2871,7 +2879,7 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj, list = &obj->oo_urgent_exts; } if (list != NULL) - cfs_list_move_tail(&ext->oe_link, list); + list_move_tail(&ext->oe_link, list); unplug = true; } else { /* the only discarder is lock cancelling, so @@ -2879,8 +2887,8 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj, EASSERT(ext->oe_start >= start && ext->oe_max_end <= end, ext); osc_extent_state_set(ext, OES_LOCKING); - ext->oe_owner = cfs_current(); - cfs_list_move_tail(&ext->oe_link, + ext->oe_owner = current; + list_move_tail(&ext->oe_link, &discard_list); osc_update_pending(obj, OBD_BRW_WRITE, -ext->oe_nr_pages); @@ -2905,14 +2913,14 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj, } osc_object_unlock(obj); - LASSERT(ergo(!discard, cfs_list_empty(&discard_list))); - if (!cfs_list_empty(&discard_list)) { + LASSERT(ergo(!discard, list_empty(&discard_list))); + if (!list_empty(&discard_list)) { struct osc_extent *tmp; int rc; osc_list_maint(osc_cli(obj), obj); - cfs_list_for_each_entry_safe(ext, tmp, &discard_list, oe_link) { - cfs_list_del_init(&ext->oe_link); + list_for_each_entry_safe(ext, tmp, &discard_list, oe_link) { + list_del_init(&ext->oe_link); EASSERT(ext->oe_state == OES_LOCKING, ext); /* Discard caching pages. We don't actually write this @@ -2944,4 +2952,206 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj, RETURN(result); } +/** + * Returns a list of pages by a given [start, end] of \a obj. + * + * \param resched If not NULL, then we give up before hogging CPU for too + * long and set *resched = 1, in that case caller should implement a retry + * logic. + * + * Gang tree lookup (radix_tree_gang_lookup()) optimization is absolutely + * crucial in the face of [offset, EOF] locks. + * + * Return at least one page in @queue unless there is no covered page. + */ +int osc_page_gang_lookup(const struct lu_env *env, struct cl_io *io, + struct osc_object *osc, pgoff_t start, pgoff_t end, + osc_page_gang_cbt cb, void *cbdata) +{ + struct osc_page *ops; + void **pvec; + pgoff_t idx; + unsigned int nr; + unsigned int i; + unsigned int j; + int res = CLP_GANG_OKAY; + bool tree_lock = true; + ENTRY; + + idx = start; + pvec = osc_env_info(env)->oti_pvec; + spin_lock(&osc->oo_tree_lock); + while ((nr = radix_tree_gang_lookup(&osc->oo_tree, pvec, + idx, OTI_PVEC_SIZE)) > 0) { + struct cl_page *page; + bool end_of_region = false; + + for (i = 0, j = 0; i < nr; ++i) { + ops = pvec[i]; + pvec[i] = NULL; + + idx = osc_index(ops); + if (idx > end) { + end_of_region = true; + break; + } + + page = ops->ops_cl.cpl_page; + LASSERT(page->cp_type == CPT_CACHEABLE); + if (page->cp_state == CPS_FREEING) + continue; + + cl_page_get(page); + lu_ref_add_atomic(&page->cp_reference, + "gang_lookup", current); + pvec[j++] = ops; + } + ++idx; + + /* + * Here a delicate locking dance is performed. Current thread + * holds a reference to a page, but has to own it before it + * can be placed into queue. Owning implies waiting, so + * radix-tree lock is to be released. After a wait one has to + * check that pages weren't truncated (cl_page_own() returns + * error in the latter case). + */ + spin_unlock(&osc->oo_tree_lock); + tree_lock = false; + + for (i = 0; i < j; ++i) { + ops = pvec[i]; + if (res == CLP_GANG_OKAY) + res = (*cb)(env, io, ops, cbdata); + + page = ops->ops_cl.cpl_page; + lu_ref_del(&page->cp_reference, "gang_lookup", current); + cl_page_put(env, page); + } + if (nr < OTI_PVEC_SIZE || end_of_region) + break; + + if (res == CLP_GANG_OKAY && need_resched()) + res = CLP_GANG_RESCHED; + if (res != CLP_GANG_OKAY) + break; + + spin_lock(&osc->oo_tree_lock); + tree_lock = true; + } + if (tree_lock) + spin_unlock(&osc->oo_tree_lock); + RETURN(res); +} + +/** + * Check if page @page is covered by an extra lock or discard it. + */ +static int check_and_discard_cb(const struct lu_env *env, struct cl_io *io, + struct osc_page *ops, void *cbdata) +{ + struct osc_thread_info *info = osc_env_info(env); + struct cl_lock *lock = cbdata; + pgoff_t index; + + index = osc_index(ops); + if (index >= info->oti_fn_index) { + struct cl_lock *tmp; + struct cl_page *page = ops->ops_cl.cpl_page; + + /* refresh non-overlapped index */ + tmp = cl_lock_at_pgoff(env, lock->cll_descr.cld_obj, index, + lock, 1, 0); + if (tmp != NULL) { + /* Cache the first-non-overlapped index so as to skip + * all pages within [index, oti_fn_index). This + * is safe because if tmp lock is canceled, it will + * discard these pages. */ + info->oti_fn_index = tmp->cll_descr.cld_end + 1; + if (tmp->cll_descr.cld_end == CL_PAGE_EOF) + info->oti_fn_index = CL_PAGE_EOF; + cl_lock_put(env, tmp); + } else if (cl_page_own(env, io, page) == 0) { + /* discard the page */ + cl_page_discard(env, io, page); + cl_page_disown(env, io, page); + } else { + LASSERT(page->cp_state == CPS_FREEING); + } + } + + info->oti_next_index = index + 1; + return CLP_GANG_OKAY; +} + +static int discard_cb(const struct lu_env *env, struct cl_io *io, + struct osc_page *ops, void *cbdata) +{ + struct osc_thread_info *info = osc_env_info(env); + struct cl_lock *lock = cbdata; + struct cl_page *page = ops->ops_cl.cpl_page; + + LASSERT(lock->cll_descr.cld_mode >= CLM_WRITE); + + /* page is top page. */ + info->oti_next_index = osc_index(ops) + 1; + if (cl_page_own(env, io, page) == 0) { + KLASSERT(ergo(page->cp_type == CPT_CACHEABLE, + !PageDirty(cl_page_vmpage(page)))); + + /* discard the page */ + cl_page_discard(env, io, page); + cl_page_disown(env, io, page); + } else { + LASSERT(page->cp_state == CPS_FREEING); + } + + return CLP_GANG_OKAY; +} + +/** + * Discard pages protected by the given lock. This function traverses radix + * tree to find all covering pages and discard them. If a page is being covered + * by other locks, it should remain in cache. + * + * If error happens on any step, the process continues anyway (the reasoning + * behind this being that lock cancellation cannot be delayed indefinitely). + */ +int osc_lock_discard_pages(const struct lu_env *env, struct osc_lock *ols) +{ + struct osc_thread_info *info = osc_env_info(env); + struct cl_io *io = &info->oti_io; + struct cl_object *osc = ols->ols_cl.cls_obj; + struct cl_lock *lock = ols->ols_cl.cls_lock; + struct cl_lock_descr *descr = &lock->cll_descr; + osc_page_gang_cbt cb; + int res; + int result; + + ENTRY; + + io->ci_obj = cl_object_top(osc); + io->ci_ignore_layout = 1; + result = cl_io_init(env, io, CIT_MISC, io->ci_obj); + if (result != 0) + GOTO(out, result); + + cb = descr->cld_mode == CLM_READ ? check_and_discard_cb : discard_cb; + info->oti_fn_index = info->oti_next_index = descr->cld_start; + do { + res = osc_page_gang_lookup(env, io, cl2osc(osc), + info->oti_next_index, descr->cld_end, + cb, (void *)lock); + if (info->oti_next_index > descr->cld_end) + break; + + if (res == CLP_GANG_RESCHED) + cond_resched(); + } while (res != CLP_GANG_OKAY); +out: + cl_io_fini(env, io); + RETURN(result); +} + + /** @} osc */