Whamcloud - gitweb
LU-8130 lu_object: convert lu_object cache to rhashtable
[fs/lustre-release.git] / lustre / llite / vvp_dev.c
index 9f193b7..b9daf52 100644 (file)
@@ -40,6 +40,7 @@
 #include <obd.h>
 #include "llite_internal.h"
 #include "vvp_internal.h"
+#include <linux/kallsyms.h>
 
 /*****************************************************************************
  *
@@ -53,7 +54,6 @@
  */
 
 static struct kmem_cache *ll_thread_kmem;
-struct kmem_cache *vvp_lock_kmem;
 struct kmem_cache *vvp_object_kmem;
 static struct kmem_cache *vvp_session_kmem;
 static struct kmem_cache *vvp_thread_kmem;
@@ -65,11 +65,6 @@ static struct lu_kmem_descr vvp_caches[] = {
                .ckd_size  = sizeof(struct ll_thread_info),
        },
        {
-               .ckd_cache = &vvp_lock_kmem,
-               .ckd_name  = "vvp_lock_kmem",
-               .ckd_size  = sizeof(struct vvp_lock),
-       },
-       {
                .ckd_cache = &vvp_object_kmem,
                .ckd_name  = "vvp_object_kmem",
                .ckd_size  = sizeof(struct vvp_object),
@@ -271,6 +266,11 @@ struct lu_device_type vvp_device_type = {
         .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.
@@ -287,6 +287,15 @@ int vvp_global_init(void)
        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:
@@ -361,137 +370,61 @@ int cl_sb_fini(struct super_block *sb)
 
 /****************************************************************************
  *
- * /proc/fs/lustre/llite/$MNT/dump_page_cache
+ * debugfs/lustre/llite/$MNT/dump_page_cache
  *
  ****************************************************************************/
 
-/*
- * To represent contents of a page cache as a byte stream, following
- * information if encoded in 64bit offset:
- *
- *       - file hash bucket in lu_site::ls_hash[]       28bits
- *
- *       - how far file is from bucket head              4bits
- *
- *       - page index                                   32bits
- *
- * First two data identify a file in the cache uniquely.
- */
-
-#define PGC_OBJ_SHIFT (32 + 4)
-#define PGC_DEPTH_SHIFT (32)
-
-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 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 void vvp_pgcache_id_unpack(loff_t pos, struct vvp_pgcache_id *id)
+static struct page *vvp_pgcache_current(struct vvp_seq_private *priv)
 {
-       CLASSERT(sizeof(pos) == sizeof(__u64));
+       struct lu_device *dev = &priv->vsp_sbi->ll_cl->cd_lu_dev;
+       struct lu_object_header *h;
+       struct page *vmpage = NULL;
 
-       id->vpi_index  = pos & 0xffffffff;
-       id->vpi_depth  = (pos >> PGC_DEPTH_SHIFT) & 0xf;
-       id->vpi_bucket = ((unsigned long long)pos >> PGC_OBJ_SHIFT);
-}
+       rhashtable_walk_start(&priv->vsp_iter);
+       while ((h = rhashtable_walk_next(&priv->vsp_iter)) != NULL) {
+               struct inode *inode;
+               int nr;
 
-static loff_t vvp_pgcache_id_pack(struct vvp_pgcache_id *id)
-{
-        return
-                ((__u64)id->vpi_index) |
-                ((__u64)id->vpi_depth  << PGC_DEPTH_SHIFT) |
-                ((__u64)id->vpi_bucket << PGC_OBJ_SHIFT);
-}
-
-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 (!priv->vsp_clob) {
+                       struct lu_object *lu_obj;
 
-        if (id->vpi_curdep-- > 0)
-                return 0; /* continue */
+                       lu_obj = lu_object_get_first(h, dev);
+                       if (!lu_obj)
+                               continue;
 
-        if (lu_object_is_dying(hdr))
-                return 1;
-
-        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_depth &= 0xf;
-       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) {
+                       priv->vsp_clob = lu2cl(lu_obj);
                        lu_object_ref_add(lu_obj, "dump", current);
-                       return lu2cl(lu_obj);
+                       priv->vsp_page_index = 0;
                }
-               lu_object_put(env, lu_object_top(id->vpi_obj));
 
-       } else if (id->vpi_curdep > 0) {
-               id->vpi_depth = 0xf;
-       }
-       return NULL;
-}
-
-static loff_t vvp_pgcache_find(const struct lu_env *env,
-                              struct lu_device *dev, loff_t pos)
-{
-       struct cl_object     *clob;
-       struct lu_site       *site;
-       struct vvp_pgcache_id id;
-
-       site = dev->ld_site;
-       vvp_pgcache_id_unpack(pos, &id);
-
-       while (1) {
-               if (id.vpi_bucket >= CFS_HASH_NHLIST(site->ls_obj_hash))
-                       return ~0ULL;
-               clob = vvp_pgcache_obj(env, dev, &id);
-               if (clob != NULL) {
-                       struct inode *inode = vvp_object_inode(clob);
-                       struct page *vmpage;
-                       int nr;
-
-                       nr = find_get_pages_contig(inode->i_mapping,
-                                                  id.vpi_index, 1, &vmpage);
-                       if (nr > 0) {
-                               id.vpi_index = vmpage->index;
-                               /* Cant support over 16T file */
-                               nr = !(vmpage->index > 0xffffffff);
-                               put_page(vmpage);
-                       }
-
-                       lu_object_ref_del(&clob->co_lu, "dump", current);
-                       cl_object_put(env, clob);
-                       if (nr > 0)
-                               return vvp_pgcache_id_pack(&id);
+               inode = vvp_object_inode(priv->vsp_clob);
+               nr = find_get_pages_contig(inode->i_mapping,
+                                          priv->vsp_page_index, 1, &vmpage);
+               if (nr > 0) {
+                       priv->vsp_page_index = vmpage->index;
+                       break;
                }
-               /* to the next object. */
-               ++id.vpi_depth;
-               id.vpi_depth &= 0xf;
-               if (id.vpi_depth == 0 && ++id.vpi_bucket == 0)
-                       return ~0ULL;
-               id.vpi_index = 0;
+               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->vsp_page_index = 0;
        }
+       rhashtable_walk_stop(&priv->vsp_iter);
+       return vmpage;
 }
 
 #define seq_page_flag(seq, page, flag, has_flags) do {                  \
@@ -532,92 +465,75 @@ static void vvp_pgcache_page_show(const struct lu_env *env,
 
 static int vvp_pgcache_show(struct seq_file *f, void *v)
 {
-       loff_t                   pos;
-       struct ll_sb_info       *sbi;
-       struct cl_object        *clob;
-       struct lu_env           *env;
-       struct vvp_pgcache_id    id;
-       __u16                    refcheck;
-       int                      result;
-
-       env = cl_env_get(&refcheck);
-       if (!IS_ERR(env)) {
-               pos = *(loff_t *) v;
-               vvp_pgcache_id_unpack(pos, &id);
-               sbi = f->private;
-               clob = vvp_pgcache_obj(env, &sbi->ll_cl->cd_lu_dev, &id);
-               if (clob != NULL) {
-                       struct inode *inode = vvp_object_inode(clob);
-                       struct cl_page *page = NULL;
-                       struct page *vmpage;
-
-                       result = find_get_pages_contig(inode->i_mapping,
-                                                     id.vpi_index, 1, &vmpage);
-                       if (result > 0) {
-                               lock_page(vmpage);
-                               page = cl_vmpage_page(vmpage, clob);
-                               unlock_page(vmpage);
-
-                               put_page(vmpage);
-                       }
-
-                       seq_printf(f, "%8x@"DFID": ", id.vpi_index,
-                                  PFID(lu_object_fid(&clob->co_lu)));
-                       if (page != NULL) {
-                               vvp_pgcache_page_show(env, f, page);
-                               cl_page_put(env, page);
-                       } else
-                               seq_puts(f, "missing\n");
-                       lu_object_ref_del(&clob->co_lu, "dump", current);
-                       cl_object_put(env, clob);
-               } else
-                       seq_printf(f, "%llx missing\n", pos);
-               cl_env_put(env, &refcheck);
-               result = 0;
-       } else
-               result = PTR_ERR(env);
-       return result;
+       struct vvp_seq_private *priv = f->private;
+       struct page *vmpage = v;
+       struct cl_page *page;
+
+       seq_printf(f, "%8lx@" DFID ": ", vmpage->index,
+                  PFID(lu_object_fid(&priv->vsp_clob->co_lu)));
+       lock_page(vmpage);
+       page = cl_vmpage_page(vmpage, priv->vsp_clob);
+       unlock_page(vmpage);
+       put_page(vmpage);
+
+       if (page) {
+               vvp_pgcache_page_show(priv->vsp_env, f, page);
+               cl_page_put(priv->vsp_env, page);
+       } else {
+               seq_puts(f, "missing\n");
+       }
+
+       return 0;
 }
 
-static void *vvp_pgcache_start(struct seq_file *f, loff_t *pos)
+static void vvp_pgcache_rewind(struct vvp_seq_private *priv)
 {
-        struct ll_sb_info *sbi;
-        struct lu_env     *env;
-       __u16              refcheck;
+       if (priv->vvp_prev_pos) {
+               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",
+                                         current);
+                       cl_object_put(priv->vsp_env, priv->vsp_clob);
+               }
+               priv->vsp_clob = NULL;
+       }
+}
 
-        sbi = f->private;
+static struct page *vvp_pgcache_next_page(struct vvp_seq_private *priv)
+{
+       priv->vsp_page_index += 1;
+       return vvp_pgcache_current(priv);
+}
 
-        env = cl_env_get(&refcheck);
-        if (!IS_ERR(env)) {
-                sbi = f->private;
-                if (sbi->ll_site->ls_obj_hash->hs_cur_bits > 64 - PGC_OBJ_SHIFT)
-                        pos = ERR_PTR(-EFBIG);
-                else {
-                        *pos = vvp_pgcache_find(env, &sbi->ll_cl->cd_lu_dev,
-                                                *pos);
-                        if (*pos == ~0ULL)
-                                pos = NULL;
-                }
-                cl_env_put(env, &refcheck);
-        }
-        return pos;
+static void *vvp_pgcache_start(struct seq_file *f, loff_t *pos)
+{
+       struct vvp_seq_private *priv = f->private;
+
+       if (*pos == 0) {
+               vvp_pgcache_rewind(priv);
+       } else if (*pos == priv->vvp_prev_pos) {
+               /* Return the current item */;
+       } else {
+               WARN_ON(*pos != priv->vvp_prev_pos + 1);
+               priv->vsp_page_index += 1;
+       }
+
+       priv->vvp_prev_pos = *pos;
+       return vvp_pgcache_current(priv);
 }
 
 static void *vvp_pgcache_next(struct seq_file *f, void *v, loff_t *pos)
 {
-        struct ll_sb_info *sbi;
-        struct lu_env     *env;
-       __u16              refcheck;
+       struct vvp_seq_private *priv = f->private;
 
-        env = cl_env_get(&refcheck);
-        if (!IS_ERR(env)) {
-                sbi = f->private;
-                *pos = vvp_pgcache_find(env, &sbi->ll_cl->cd_lu_dev, *pos + 1);
-                if (*pos == ~0ULL)
-                        pos = NULL;
-                cl_env_put(env, &refcheck);
-        }
-        return pos;
+       WARN_ON(*pos != priv->vvp_prev_pos);
+       *pos += 1;
+       priv->vvp_prev_pos = *pos;
+       return vvp_pgcache_next_page(priv);
 }
 
 static void vvp_pgcache_stop(struct seq_file *f, void *v)
@@ -634,22 +550,47 @@ static struct seq_operations vvp_pgcache_ops = {
 
 static int vvp_dump_pgcache_seq_open(struct inode *inode, struct file *filp)
 {
-       struct ll_sb_info       *sbi = PDE_DATA(inode);
-       struct seq_file         *seq;
-       int                     result;
-
-       result = seq_open(filp, &vvp_pgcache_ops);
-       if (result == 0) {
-               seq = filp->private_data;
-               seq->private = sbi;
+       struct vvp_seq_private *priv;
+       struct lu_site *s;
+
+       priv = __seq_open_private(filp, &vvp_pgcache_ops, sizeof(*priv));
+       if (!priv)
+               return -ENOMEM;
+
+       priv->vsp_sbi = inode->i_private;
+       priv->vsp_env = cl_env_get(&priv->vsp_refcheck);
+       priv->vsp_clob = NULL;
+       if (IS_ERR(priv->vsp_env)) {
+               int err = PTR_ERR(priv->vsp_env);
+
+               seq_release_private(inode, filp);
+               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;
+}
+
+static int vvp_dump_pgcache_seq_release(struct inode *inode, struct file *file)
+{
+       struct seq_file *seq = file->private_data;
+       struct vvp_seq_private *priv = seq->private;
+
+       if (priv->vsp_clob) {
+               lu_object_ref_del(&priv->vsp_clob->co_lu, "dump", current);
+               cl_object_put(priv->vsp_env, priv->vsp_clob);
        }
-       return result;
+       cl_env_put(priv->vsp_env, &priv->vsp_refcheck);
+       rhashtable_walk_exit(&priv->vsp_iter);
+       return seq_release_private(inode, file);
 }
 
 const struct file_operations vvp_dump_pgcache_file_ops = {
-        .owner   = THIS_MODULE,
-        .open    = vvp_dump_pgcache_seq_open,
-        .read    = seq_read,
-        .llseek         = seq_lseek,
-        .release = seq_release,
+       .owner   = THIS_MODULE,
+       .open    = vvp_dump_pgcache_seq_open,
+       .read    = seq_read,
+       .llseek  = seq_lseek,
+       .release = vvp_dump_pgcache_seq_release,
 };