Whamcloud - gitweb
LU-3319 procfs: move llite proc handling over to seq_file
[fs/lustre-release.git] / lustre / llite / vvp_dev.c
index bdb4cc8..ec31e0c 100644 (file)
@@ -36,6 +36,7 @@
  * cl_device and cl_device_type implementation for VVP layer.
  *
  *   Author: Nikita Danilov <nikita.danilov@sun.com>
+ *   Author: Jinshan Xiong <jinshan.xiong@intel.com>
  */
 
 #define DEBUG_SUBSYSTEM S_LLITE
@@ -60,8 +61,8 @@
  * "llite_" (var. "ll_") prefix.
  */
 
-cfs_mem_cache_t *vvp_thread_kmem;
-static cfs_mem_cache_t *vvp_session_kmem;
+struct kmem_cache *vvp_thread_kmem;
+static struct kmem_cache *vvp_session_kmem;
 static struct lu_kmem_descr vvp_caches[] = {
         {
                 .ckd_cache = &vvp_thread_kmem,
@@ -79,14 +80,14 @@ static struct lu_kmem_descr vvp_caches[] = {
 };
 
 static void *vvp_key_init(const struct lu_context *ctx,
-                          struct lu_context_key *key)
+                         struct lu_context_key *key)
 {
-        struct vvp_thread_info *info;
+       struct vvp_thread_info *info;
 
-        OBD_SLAB_ALLOC_PTR_GFP(info, vvp_thread_kmem, CFS_ALLOC_IO);
-        if (info == NULL)
-                info = ERR_PTR(-ENOMEM);
-        return info;
+       OBD_SLAB_ALLOC_PTR_GFP(info, vvp_thread_kmem, __GFP_IO);
+       if (info == NULL)
+               info = ERR_PTR(-ENOMEM);
+       return info;
 }
 
 static void vvp_key_fini(const struct lu_context *ctx,
@@ -97,14 +98,14 @@ static void vvp_key_fini(const struct lu_context *ctx,
 }
 
 static void *vvp_session_key_init(const struct lu_context *ctx,
-                                  struct lu_context_key *key)
+                                 struct lu_context_key *key)
 {
-        struct vvp_session *session;
+       struct vvp_session *session;
 
-        OBD_SLAB_ALLOC_PTR_GFP(session, vvp_session_kmem, CFS_ALLOC_IO);
-        if (session == NULL)
-                session = ERR_PTR(-ENOMEM);
-        return session;
+       OBD_SLAB_ALLOC_PTR_GFP(session, vvp_session_kmem, __GFP_IO);
+       if (session == NULL)
+               session = ERR_PTR(-ENOMEM);
+       return session;
 }
 
 static void vvp_session_key_fini(const struct lu_context *ctx,
@@ -319,78 +320,73 @@ static int vvp_pgcache_obj_get(cfs_hash_t *hs, cfs_hash_bd_t *bd,
 }
 
 static struct cl_object *vvp_pgcache_obj(const struct lu_env *env,
-                                         struct lu_device *dev,
-                                         struct vvp_pgcache_id *id)
+                                        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) {
-                        lu_object_ref_add(lu_obj, "dump", cfs_current());
-                        return lu2cl(lu_obj);
-                }
-                lu_object_put(env, lu_object_top(id->vpi_obj));
-
-        } else if (id->vpi_curdep > 0) {
-                id->vpi_depth = 0xf;
-        }
-        return NULL;
+       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) {
+                       lu_object_ref_add(lu_obj, "dump", current);
+                       return lu2cl(lu_obj);
+               }
+               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 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 cl_object_header *hdr;
-                        int                      nr;
-                        struct cl_page          *pg;
-
-                        /* got an object. Find next page. */
-                        hdr = cl_object_header(clob);
-
-                       spin_lock(&hdr->coh_page_guard);
-                        nr = radix_tree_gang_lookup(&hdr->coh_tree,
-                                                    (void **)&pg,
-                                                    id.vpi_index, 1);
-                        if (nr > 0) {
-                                id.vpi_index = pg->cp_index;
-                                /* Cant support over 16T file */
-                                nr = !(pg->cp_index > 0xffffffff);
-                        }
-                       spin_unlock(&hdr->coh_page_guard);
-
-                        lu_object_ref_del(&clob->co_lu, "dump", cfs_current());
-                        cl_object_put(env, clob);
-                        if (nr > 0)
-                                return vvp_pgcache_id_pack(&id);
-                }
-                /* 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;
-        }
+       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 = ccc_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);
+                               page_cache_release(vmpage);
+                       }
+
+                       lu_object_ref_del(&clob->co_lu, "dump", current);
+                       cl_object_put(env, clob);
+                       if (nr > 0)
+                               return vvp_pgcache_id_pack(&id);
+               }
+               /* 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;
+       }
 }
 
 #define seq_page_flag(seq, page, flag, has_flags) do {                  \
@@ -401,76 +397,82 @@ static loff_t vvp_pgcache_find(const struct lu_env *env,
 } while(0)
 
 static void vvp_pgcache_page_show(const struct lu_env *env,
-                                  struct seq_file *seq, struct cl_page *page)
+                                 struct seq_file *seq, struct cl_page *page)
 {
-        struct ccc_page *cpg;
-        cfs_page_t      *vmpage;
-        int              has_flags;
-
-        cpg = cl2ccc_page(cl_page_at(page, &vvp_device_type));
-        vmpage = cpg->cpg_page;
-        seq_printf(seq," %5i | %p %p %s %s %s %s | %p %lu/%u(%p) %lu %u [",
-                   0 /* gen */,
-                   cpg, page,
-                   "none",
-                   cpg->cpg_write_queued ? "wq" : "- ",
-                   cpg->cpg_defer_uptodate ? "du" : "- ",
-                   PageWriteback(vmpage) ? "wb" : "-",
-                   vmpage, vmpage->mapping->host->i_ino,
-                   vmpage->mapping->host->i_generation,
-                   vmpage->mapping->host, vmpage->index,
-                   page_count(vmpage));
-        has_flags = 0;
-        seq_page_flag(seq, vmpage, locked, has_flags);
-        seq_page_flag(seq, vmpage, error, has_flags);
-        seq_page_flag(seq, vmpage, referenced, has_flags);
-        seq_page_flag(seq, vmpage, uptodate, has_flags);
-        seq_page_flag(seq, vmpage, dirty, has_flags);
-        seq_page_flag(seq, vmpage, writeback, has_flags);
-        seq_printf(seq, "%s]\n", has_flags ? "" : "-");
+       struct ccc_page *cpg;
+       struct page      *vmpage;
+       int              has_flags;
+
+       cpg = cl2ccc_page(cl_page_at(page, &vvp_device_type));
+       vmpage = cpg->cpg_page;
+       seq_printf(seq, " %5i | %p %p %s %s %s %s | %p "DFID"(%p) %lu %u [",
+                  0 /* gen */,
+                  cpg, page,
+                  "none",
+                  cpg->cpg_write_queued ? "wq" : "- ",
+                  cpg->cpg_defer_uptodate ? "du" : "- ",
+                  PageWriteback(vmpage) ? "wb" : "-",
+                  vmpage,
+                  PFID(ll_inode2fid(vmpage->mapping->host)),
+                  vmpage->mapping->host, vmpage->index,
+                  page_count(vmpage));
+       has_flags = 0;
+       seq_page_flag(seq, vmpage, locked, has_flags);
+       seq_page_flag(seq, vmpage, error, has_flags);
+       seq_page_flag(seq, vmpage, referenced, has_flags);
+       seq_page_flag(seq, vmpage, uptodate, has_flags);
+       seq_page_flag(seq, vmpage, dirty, has_flags);
+       seq_page_flag(seq, vmpage, writeback, has_flags);
+       seq_printf(seq, "%s]\n", has_flags ? "" : "-");
 }
 
 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 cl_page          *page;
-        struct cl_object_header *hdr;
-        struct vvp_pgcache_id    id;
-        int                      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) {
-                        hdr = cl_object_header(clob);
-
-                       spin_lock(&hdr->coh_page_guard);
-                       page = cl_page_lookup(hdr, id.vpi_index);
-                       spin_unlock(&hdr->coh_page_guard);
-
-                        seq_printf(f, "%8x@"DFID": ",
-                                   id.vpi_index, PFID(&hdr->coh_lu.loh_fid));
-                        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", cfs_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;
+       loff_t                   pos;
+       struct ll_sb_info       *sbi;
+       struct cl_object        *clob;
+       struct lu_env           *env;
+       struct vvp_pgcache_id    id;
+       int                      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 = ccc_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);
+
+                               page_cache_release(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;
 }
 
 static void *vvp_pgcache_start(struct seq_file *f, loff_t *pos)
@@ -528,17 +530,16 @@ static struct seq_operations vvp_pgcache_ops = {
 
 static int vvp_dump_pgcache_seq_open(struct inode *inode, struct file *filp)
 {
-        struct proc_dir_entry *dp  = PDE(inode);
-        struct ll_sb_info     *sbi = dp->data;
-        struct seq_file       *seq;
-        int                    result;
-
-        result = seq_open(filp, &vvp_pgcache_ops);
-        if (result == 0) {
-                seq = filp->private_data;
-                seq->private = sbi;
-        }
-        return result;
+       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;
+       }
+       return result;
 }
 
 struct file_operations vvp_dump_pgcache_file_ops = {