#include <obd.h>
#include "llite_internal.h"
#include "vvp_internal.h"
+#include <linux/kallsyms.h>
/*****************************************************************************
*
.ldt_ctx_tags = LCT_CL_THREAD
};
+#ifndef HAVE_ACCOUNT_PAGE_DIRTIED_EXPORT
+unsigned int (*vvp_account_page_dirtied)(struct page *page,
+ struct address_space *mapping);
+#endif
+
/**
* A mutex serializing calls to vvp_inode_fini() under extreme memory
* pressure, when environments cannot be allocated.
if (rc != 0)
goto out_kmem;
+#ifndef HAVE_ACCOUNT_PAGE_DIRTIED_EXPORT
+ /*
+ * Kernel v5.2-5678-gac1c3e4 no longer exports account_page_dirtied
+ */
+ vvp_account_page_dirtied = (void *)
+ kallsyms_lookup_name("account_page_dirtied");
+ BUG_ON(!vvp_account_page_dirtied);
+#endif
+
return 0;
out_kmem:
*
****************************************************************************/
-struct vvp_pgcache_id {
- unsigned vpi_bucket;
- unsigned vpi_depth;
- uint32_t vpi_index;
-
- unsigned vpi_curdep;
- struct lu_object_header *vpi_obj;
-};
-
struct vvp_seq_private {
struct ll_sb_info *vsp_sbi;
struct lu_env *vsp_env;
u16 vsp_refcheck;
struct cl_object *vsp_clob;
- struct vvp_pgcache_id vvp_id;
+ struct rhashtable_iter vsp_iter;
+ u32 vsp_page_index;
/*
* prev_pos is the 'pos' of the last object returned
* by ->start of ->next.
loff_t vvp_prev_pos;
};
-static int vvp_pgcache_obj_get(struct cfs_hash *hs, struct cfs_hash_bd *bd,
- struct hlist_node *hnode, void *data)
-{
- struct vvp_pgcache_id *id = data;
- struct lu_object_header *hdr = cfs_hash_object(hs, hnode);
-
- if (lu_object_is_dying(hdr))
- return 0;
-
- if (id->vpi_curdep-- > 0)
- return 0; /* continue */
-
- cfs_hash_get(hs, hnode);
- id->vpi_obj = hdr;
- return 1;
-}
-
-static struct cl_object *vvp_pgcache_obj(const struct lu_env *env,
- struct lu_device *dev,
- struct vvp_pgcache_id *id)
-{
- LASSERT(lu_device_is_cl(dev));
-
- id->vpi_obj = NULL;
- id->vpi_curdep = id->vpi_depth;
-
- cfs_hash_hlist_for_each(dev->ld_site->ls_obj_hash, id->vpi_bucket,
- vvp_pgcache_obj_get, id);
- if (id->vpi_obj != NULL) {
- struct lu_object *lu_obj;
-
- lu_obj = lu_object_locate(id->vpi_obj, dev->ld_type);
- if (lu_obj != NULL) {
- lu_object_ref_add(lu_obj, "dump", current);
- return lu2cl(lu_obj);
- }
- lu_object_put(env, lu_object_top(id->vpi_obj));
- }
- return NULL;
-}
-
static struct page *vvp_pgcache_current(struct vvp_seq_private *priv)
{
struct lu_device *dev = &priv->vsp_sbi->ll_cl->cd_lu_dev;
+ struct lu_object_header *h;
+ struct page *vmpage = NULL;
- while (1) {
+ rhashtable_walk_start(&priv->vsp_iter);
+ while ((h = rhashtable_walk_next(&priv->vsp_iter)) != NULL) {
struct inode *inode;
- struct page *vmpage;
int nr;
if (!priv->vsp_clob) {
- struct cl_object *clob;
-
- while ((clob = vvp_pgcache_obj(priv->vsp_env, dev, &priv->vvp_id)) == NULL &&
- ++(priv->vvp_id.vpi_bucket) < CFS_HASH_NHLIST(dev->ld_site->ls_obj_hash))
- priv->vvp_id.vpi_depth = 0;
- if (!clob)
- return NULL;
- priv->vsp_clob = clob;
- priv->vvp_id.vpi_index = 0;
+ struct lu_object *lu_obj;
+
+ lu_obj = lu_object_get_first(h, dev);
+ if (!lu_obj)
+ continue;
+
+ priv->vsp_clob = lu2cl(lu_obj);
+ lu_object_ref_add(lu_obj, "dump", current);
+ priv->vsp_page_index = 0;
}
inode = vvp_object_inode(priv->vsp_clob);
- nr = find_get_pages_contig(inode->i_mapping, priv->vvp_id.vpi_index, 1, &vmpage);
+ nr = find_get_pages_contig(inode->i_mapping,
+ priv->vsp_page_index, 1, &vmpage);
if (nr > 0) {
- priv->vvp_id.vpi_index = vmpage->index;
- return vmpage;
+ priv->vsp_page_index = vmpage->index;
+ break;
}
lu_object_ref_del(&priv->vsp_clob->co_lu, "dump", current);
cl_object_put(priv->vsp_env, priv->vsp_clob);
priv->vsp_clob = NULL;
- priv->vvp_id.vpi_index = 0;
- priv->vvp_id.vpi_depth++;
+ priv->vsp_page_index = 0;
}
+ rhashtable_walk_stop(&priv->vsp_iter);
+ return vmpage;
}
#define seq_page_flag(seq, page, flag, has_flags) do { \
static void vvp_pgcache_rewind(struct vvp_seq_private *priv)
{
if (priv->vvp_prev_pos) {
- memset(&priv->vvp_id, 0, sizeof(priv->vvp_id));
+ struct lu_site *s = priv->vsp_sbi->ll_cl->cd_lu_dev.ld_site;
+
+ rhashtable_walk_exit(&priv->vsp_iter);
+ rhashtable_walk_enter(&s->ls_obj_hash, &priv->vsp_iter);
priv->vvp_prev_pos = 0;
if (priv->vsp_clob) {
lu_object_ref_del(&priv->vsp_clob->co_lu, "dump",
static struct page *vvp_pgcache_next_page(struct vvp_seq_private *priv)
{
- priv->vvp_id.vpi_index += 1;
+ priv->vsp_page_index += 1;
return vvp_pgcache_current(priv);
}
/* Return the current item */;
} else {
WARN_ON(*pos != priv->vvp_prev_pos + 1);
- priv->vvp_id.vpi_index += 1;
+ priv->vsp_page_index += 1;
}
priv->vvp_prev_pos = *pos;
struct vvp_seq_private *priv = f->private;
WARN_ON(*pos != priv->vvp_prev_pos);
-
+ *pos += 1;
priv->vvp_prev_pos = *pos;
return vvp_pgcache_next_page(priv);
}
static int vvp_dump_pgcache_seq_open(struct inode *inode, struct file *filp)
{
struct vvp_seq_private *priv;
+ struct lu_site *s;
priv = __seq_open_private(filp, &vvp_pgcache_ops, sizeof(*priv));
if (!priv)
priv->vsp_sbi = inode->i_private;
priv->vsp_env = cl_env_get(&priv->vsp_refcheck);
priv->vsp_clob = NULL;
- memset(&priv->vvp_id, 0, sizeof(priv->vvp_id));
if (IS_ERR(priv->vsp_env)) {
int err = PTR_ERR(priv->vsp_env);
return err;
}
+ s = priv->vsp_sbi->ll_cl->cd_lu_dev.ld_site;
+ rhashtable_walk_enter(&s->ls_obj_hash, &priv->vsp_iter);
+
return 0;
}
lu_object_ref_del(&priv->vsp_clob->co_lu, "dump", current);
cl_object_put(priv->vsp_env, priv->vsp_clob);
}
-
cl_env_put(priv->vsp_env, &priv->vsp_refcheck);
+ rhashtable_walk_exit(&priv->vsp_iter);
return seq_release_private(inode, file);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff