((void)sizeof(env), (void)sizeof(page), (void)sizeof !!(exp))
#endif /* !INVARIANT_CHECK */
+/* Disable page statistic by default due to huge performance penalty. */
+#ifdef CONFIG_DEBUG_PAGESTATE_TRACKING
+#define CS_PAGE_INC(o, item) \
+ cfs_atomic_inc(&cl_object_site(o)->cs_pages.cs_stats[CS_##item])
+#define CS_PAGE_DEC(o, item) \
+ cfs_atomic_dec(&cl_object_site(o)->cs_pages.cs_stats[CS_##item])
+#define CS_PAGESTATE_INC(o, state) \
+ cfs_atomic_inc(&cl_object_site(o)->cs_pages_state[state])
+#define CS_PAGESTATE_DEC(o, state) \
+ cfs_atomic_dec(&cl_object_site(o)->cs_pages_state[state])
+#else
+#define CS_PAGE_INC(o, item)
+#define CS_PAGE_DEC(o, item)
+#define CS_PAGESTATE_INC(o, state)
+#define CS_PAGESTATE_DEC(o, state)
+#endif
+
/**
* Internal version of cl_page_top, it should be called with page referenced,
- * or coh_page_guard held.
+ * or cp_lock held.
*/
static struct cl_page *cl_page_top_trusted(struct cl_page *page)
{
* Checkless version for trusted users.
*/
if (cfs_atomic_inc_return(&page->cp_ref) == 1)
- cfs_atomic_inc(&cl_object_site(page->cp_obj)->cs_pages.cs_busy);
+ CS_PAGE_INC(page->cp_obj, busy);
}
/**
const struct cl_page_slice *slice;
#ifdef INVARIANT_CHECK
- struct cl_object_header *ch = cl_object_header(page->cp_obj);
-
if (!cfs_atomic_read(&page->cp_ref))
- LASSERT_SPIN_LOCKED(&ch->coh_page_guard);
+ LASSERT_SPIN_LOCKED(&page->cp_lock);
#endif
ENTRY;
hdr = cl_object_header(obj);
pvec = cl_env_info(env)->clt_pvec;
dtype = cl_object_top(obj)->co_lu.lo_dev->ld_type;
- cfs_spin_lock(&hdr->coh_page_guard);
+ spin_lock(&hdr->coh_page_guard);
while ((nr = radix_tree_gang_lookup(&hdr->coh_tree, (void **)pvec,
idx, CLT_PVEC_SIZE)) > 0) {
int end_of_region = 0;
* check that pages weren't truncated (cl_page_own() returns
* error in the latter case).
*/
- cfs_spin_unlock(&hdr->coh_page_guard);
+ spin_unlock(&hdr->coh_page_guard);
tree_lock = 0;
for (i = 0; i < j; ++i) {
if (res != CLP_GANG_OKAY)
break;
- cfs_spin_lock(&hdr->coh_page_guard);
- tree_lock = 1;
- }
- if (tree_lock)
- cfs_spin_unlock(&hdr->coh_page_guard);
- RETURN(res);
+ spin_lock(&hdr->coh_page_guard);
+ tree_lock = 1;
+ }
+ if (tree_lock)
+ spin_unlock(&hdr->coh_page_guard);
+ RETURN(res);
}
EXPORT_SYMBOL(cl_page_gang_lookup);
static void cl_page_free(const struct lu_env *env, struct cl_page *page)
{
struct cl_object *obj = page->cp_obj;
- struct cl_site *site = cl_object_site(obj);
PASSERT(env, page, cfs_list_empty(&page->cp_batch));
PASSERT(env, page, page->cp_owner == NULL);
cfs_list_del_init(page->cp_layers.next);
slice->cpl_ops->cpo_fini(env, slice);
}
- cfs_atomic_dec(&site->cs_pages.cs_total);
-
-#ifdef LUSTRE_PAGESTATE_TRACKING
- cfs_atomic_dec(&site->cs_pages_state[page->cp_state]);
-#endif
+ CS_PAGE_DEC(obj, total);
+ CS_PAGESTATE_DEC(obj, page->cp_state);
lu_object_ref_del_at(&obj->co_lu, page->cp_obj_ref, "cl_page", page);
cl_object_put(env, obj);
lu_ref_fini(&page->cp_reference);
struct cl_page *page;
struct cl_page *err = NULL;
struct lu_object_header *head;
- struct cl_site *site = cl_object_site(o);
int result;
ENTRY;
"cl_page", page);
page->cp_index = ind;
cl_page_state_set_trust(page, CPS_CACHED);
- page->cp_type = type;
- CFS_INIT_LIST_HEAD(&page->cp_layers);
- CFS_INIT_LIST_HEAD(&page->cp_batch);
- CFS_INIT_LIST_HEAD(&page->cp_flight);
- cfs_mutex_init(&page->cp_mutex);
+ spin_lock_init(&page->cp_lock);
+ page->cp_type = type;
+ CFS_INIT_LIST_HEAD(&page->cp_layers);
+ CFS_INIT_LIST_HEAD(&page->cp_batch);
+ CFS_INIT_LIST_HEAD(&page->cp_flight);
+ mutex_init(&page->cp_mutex);
lu_ref_init(&page->cp_reference);
head = o->co_lu.lo_header;
cfs_list_for_each_entry(o, &head->loh_layers,
}
}
if (err == NULL) {
- cfs_atomic_inc(&site->cs_pages.cs_busy);
- cfs_atomic_inc(&site->cs_pages.cs_total);
-
-#ifdef LUSTRE_PAGESTATE_TRACKING
- cfs_atomic_inc(&site->cs_pages_state[CPS_CACHED]);
-#endif
- cfs_atomic_inc(&site->cs_pages.cs_created);
+ CS_PAGE_INC(o, busy);
+ CS_PAGE_INC(o, total);
+ CS_PAGE_INC(o, create);
+ CS_PAGESTATE_DEC(o, CPS_CACHED);
result = 0;
}
} else
struct cl_page *page = NULL;
struct cl_page *ghost = NULL;
struct cl_object_header *hdr;
- struct cl_site *site = cl_object_site(o);
int err;
LASSERT(type == CPT_CACHEABLE || type == CPT_TRANSIENT);
ENTRY;
hdr = cl_object_header(o);
- cfs_atomic_inc(&site->cs_pages.cs_lookup);
+ CS_PAGE_INC(o, lookup);
CDEBUG(D_PAGE, "%lu@"DFID" %p %lx %d\n",
idx, PFID(&hdr->coh_lu.loh_fid), vmpage, vmpage->private, type);
/* fast path. */
if (type == CPT_CACHEABLE) {
+ /* cl_page::cp_lock is used to protect the page state and
+ * refcount, but need an external lock to protect the
+ * child/parent relationship, so vmpage lock must be held for
+ * this purpose. */
+ KLASSERT(PageLocked(vmpage));
/*
* cl_vmpage_page() can be called here without any locks as
*
}
if (page != NULL) {
- cfs_atomic_inc(&site->cs_pages.cs_hit);
+ CS_PAGE_INC(o, hit);
RETURN(page);
}
* XXX optimization: use radix_tree_preload() here, and change tree
* gfp mask to GFP_KERNEL in cl_object_header_init().
*/
- cfs_spin_lock(&hdr->coh_page_guard);
+ spin_lock(&hdr->coh_page_guard);
err = radix_tree_insert(&hdr->coh_tree, idx, page);
if (err != 0) {
ghost = page;
}
hdr->coh_pages++;
}
- cfs_spin_unlock(&hdr->coh_page_guard);
+ spin_unlock(&hdr->coh_page_guard);
if (unlikely(ghost != NULL)) {
- cfs_atomic_dec(&site->cs_pages.cs_busy);
+ CS_PAGE_DEC(o, busy);
cl_page_delete0(env, ghost, 0);
cl_page_free(env, ghost);
}
struct cl_page *page, enum cl_page_state state)
{
enum cl_page_state old;
-#ifdef LUSTRE_PAGESTATE_TRACKING
- struct cl_site *site = cl_object_site(page->cp_obj);
-#endif
/*
* Matrix of allowed state transitions [old][new], for sanity
PASSERT(env, page,
equi(state == CPS_OWNED, page->cp_owner != NULL));
-#ifdef LUSTRE_PAGESTATE_TRACKING
- cfs_atomic_dec(&site->cs_pages_state[page->cp_state]);
- cfs_atomic_inc(&site->cs_pages_state[state]);
-#endif
+ CS_PAGESTATE_DEC(page->cp_obj, page->cp_state);
+ CS_PAGESTATE_INC(page->cp_obj, state);
cl_page_state_set_trust(page, state);
}
EXIT;
*/
void cl_page_get(struct cl_page *page)
{
- ENTRY;
- LASSERT(page->cp_state != CPS_FREEING);
- cl_page_get_trust(page);
- EXIT;
+ ENTRY;
+ cl_page_get_trust(page);
+ EXIT;
}
EXPORT_SYMBOL(cl_page_get);
*/
void cl_page_put(const struct lu_env *env, struct cl_page *page)
{
- struct cl_object_header *hdr;
- struct cl_site *site = cl_object_site(page->cp_obj);
-
PASSERT(env, page, cfs_atomic_read(&page->cp_ref) > !!page->cp_parent);
ENTRY;
CL_PAGE_HEADER(D_TRACE, env, page, "%d\n",
cfs_atomic_read(&page->cp_ref));
- hdr = cl_object_header(cl_object_top(page->cp_obj));
- if (cfs_atomic_dec_and_lock(&page->cp_ref, &hdr->coh_page_guard)) {
- cfs_atomic_dec(&site->cs_pages.cs_busy);
+ if (cfs_atomic_dec_and_lock(&page->cp_ref, &page->cp_lock)) {
+ CS_PAGE_DEC(page->cp_obj, busy);
/* We're going to access the page w/o a reference, but it's
- * ok because we have grabbed the lock coh_page_guard, which
+ * ok because we have grabbed the lock cp_lock, which
* means nobody is able to free this page behind us.
*/
if (page->cp_state == CPS_FREEING) {
/* We drop the page reference and check the page state
- * inside the coh_page_guard. So that if it gets here,
+ * inside the cp_lock. So that if it gets here,
* it is the REALLY last reference to this page.
*/
- cfs_spin_unlock(&hdr->coh_page_guard);
+ spin_unlock(&page->cp_lock);
LASSERT(cfs_atomic_read(&page->cp_ref) == 0);
PASSERT(env, page, page->cp_owner == NULL);
EXIT;
return;
}
- cfs_spin_unlock(&hdr->coh_page_guard);
- }
+ spin_unlock(&page->cp_lock);
+ }
- EXIT;
+ EXIT;
}
EXPORT_SYMBOL(cl_page_put);
*/
struct cl_page *cl_vmpage_page(cfs_page_t *vmpage, struct cl_object *obj)
{
- struct cl_page *page;
- struct cl_object_header *hdr;
+ struct cl_page *top;
+ struct cl_page *page;
ENTRY;
KLASSERT(PageLocked(vmpage));
* This loop assumes that ->private points to the top-most page. This
* can be rectified easily.
*/
- hdr = cl_object_header(cl_object_top(obj));
- cfs_spin_lock(&hdr->coh_page_guard);
- for (page = (void *)vmpage->private;
- page != NULL; page = page->cp_child) {
- if (cl_object_same(page->cp_obj, obj)) {
- cl_page_get_trust(page);
- break;
- }
- }
- cfs_spin_unlock(&hdr->coh_page_guard);
- LASSERT(ergo(page, page->cp_type == CPT_CACHEABLE));
- RETURN(page);
+ top = (struct cl_page *)vmpage->private;
+ if (top == NULL)
+ RETURN(NULL);
+
+ spin_lock(&top->cp_lock);
+ for (page = top; page != NULL; page = page->cp_child) {
+ if (cl_object_same(page->cp_obj, obj)) {
+ cl_page_get_trust(page);
+ break;
+ }
+ }
+ spin_unlock(&top->cp_lock);
+ LASSERT(ergo(page, page->cp_type == CPT_CACHEABLE));
+ RETURN(page);
}
EXPORT_SYMBOL(cl_vmpage_page);
struct cl_object_header *hdr;
hdr = cl_object_header(tmp->cp_obj);
- cfs_spin_lock(&hdr->coh_page_guard);
- value = radix_tree_delete(&hdr->coh_tree,
- tmp->cp_index);
- PASSERT(env, tmp, value == tmp);
- PASSERT(env, tmp, hdr->coh_pages > 0);
- hdr->coh_pages--;
- cfs_spin_unlock(&hdr->coh_page_guard);
+ spin_lock(&hdr->coh_page_guard);
+ value = radix_tree_delete(&hdr->coh_tree,
+ tmp->cp_index);
+ PASSERT(env, tmp, value == tmp);
+ PASSERT(env, tmp, hdr->coh_pages > 0);
+ hdr->coh_pages--;
+ spin_unlock(&hdr->coh_page_guard);
}
}
pg->cp_sync_io = NULL;
cl_sync_io_note(anchor, ioret);
}
-
- /* 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. */
- KLASSERT(ergo(pg->cp_type == CPT_CACHEABLE,
- !PageWriteback(cl_page_vmpage(env, pg))));
EXIT;
}
EXPORT_SYMBOL(cl_page_completion);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff