LU-5092 nodemap: add structure to hold nodemap config

[fs/lustre-release.git] / lustre / ptlrpc / nodemap_internal.h

diff --git a/lustre/ptlrpc/nodemap_internal.h b/lustre/ptlrpc/nodemap_internal.h
index 01a812e..86c55b0 100644 (file)
--- a/lustre/ptlrpc/nodemap_internal.h
+++ b/lustre/ptlrpc/nodemap_internal.h
@@ -46,11 +46,12 @@ struct lprocfs_static_vars;
 extern struct proc_dir_entry *proc_lustre_nodemap_root;
 /* flag if nodemap is active */
 extern bool nodemap_active;
-/* lock for range interval tree, used in nodemap_lproc.c */
-extern rwlock_t nm_range_tree_lock;
+
+extern struct mutex active_config_lock;
+extern struct nodemap_config *active_config;
 
 struct lu_nid_range {
-       /* unique id set my mgs */
+       /* unique id set by mgs */
        unsigned int             rn_id;
        /* lu_nodemap containing this range */
        struct lu_nodemap       *rn_nodemap;
@@ -71,16 +72,62 @@ struct lu_idmap {
        struct rb_node  id_fs_to_client;
 };
 
+struct nodemap_range_tree {
+       struct interval_node *nmrt_range_interval_root;
+       unsigned int nmrt_range_highest_id;
+};
+
+struct nodemap_config {
+       /* Highest numerical lu_nodemap.nm_id defined */
+       unsigned int nmc_nodemap_highest_id;
+
+       /* Simple flag to determine if nodemaps are active */
+       bool nmc_nodemap_is_active;
+
+       /* Pointer to default nodemap as it is needed more often */
+       struct lu_nodemap *nmc_default_nodemap;
+
+       /**
+        * Lock required to access the range tree.
+        */
+       struct rw_semaphore nmc_range_tree_lock;
+       struct nodemap_range_tree nmc_range_tree;
+
+       /**
+        * Hash keyed on nodemap name containing all
+        * nodemaps
+        */
+       struct cfs_hash *nmc_nodemap_hash;
+};
+
+struct nodemap_config *nodemap_config_alloc(void);
+void nodemap_config_dealloc(struct nodemap_config *config);
+void nodemap_config_set_active(struct nodemap_config *config);
+struct lu_nodemap *nodemap_create(const char *name,
+                                 struct nodemap_config *config,
+                                 bool is_default);
+void nodemap_putref(struct lu_nodemap *nodemap);
+struct lu_nodemap *nodemap_lookup(const char *name);
+
 int nodemap_procfs_init(void);
-int lprocfs_nodemap_register(const char *name, bool is_default_nodemap,
-                            struct lu_nodemap *nodemap);
-struct lu_nid_range *range_create(lnet_nid_t min, lnet_nid_t max,
+void nodemap_procfs_exit(void);
+int lprocfs_nodemap_register(struct lu_nodemap *nodemap,
+                            bool is_default_nodemap);
+void lprocfs_nodemap_remove(struct nodemap_pde *nodemap_pde);
+struct lu_nid_range *nodemap_range_find(lnet_nid_t start_nid,
+                                       lnet_nid_t end_nid);
+struct lu_nid_range *range_create(struct nodemap_range_tree *nm_range_tree,
+                                 lnet_nid_t start_nid, lnet_nid_t end_nid,
                                  struct lu_nodemap *nodemap);
 void range_destroy(struct lu_nid_range *range);
-int range_insert(struct lu_nid_range *data);
-void range_delete(struct lu_nid_range *data);
-struct lu_nid_range *range_search(lnet_nid_t nid);
-struct lu_nid_range *range_find(lnet_nid_t start_nid, lnet_nid_t end_nid);
+int range_insert(struct nodemap_range_tree *nm_range_tree,
+                struct lu_nid_range *data);
+void range_delete(struct nodemap_range_tree *nm_range_tree,
+                 struct lu_nid_range *data);
+struct lu_nid_range *range_search(struct nodemap_range_tree *nm_range_tree,
+                                 lnet_nid_t nid);
+struct lu_nid_range *range_find(struct nodemap_range_tree *nm_range_tree,
+                               lnet_nid_t start_nid, lnet_nid_t end_nid);
 int range_parse_nidstring(char *range_string, lnet_nid_t *start_nid,
                          lnet_nid_t *end_nid);
 void range_init_tree(void);
@@ -94,17 +141,17 @@ struct lu_idmap *idmap_search(struct lu_nodemap *nodemap,
                              enum nodemap_tree_type,
                              enum nodemap_id_type id_type,
                              __u32 id);
-int nodemap_cleanup_nodemaps(void);
-int nm_member_init_hash(struct lu_nodemap *nodemap);
 int nm_member_add(struct lu_nodemap *nodemap, struct obd_export *exp);
 void nm_member_del(struct lu_nodemap *nodemap, struct obd_export *exp);
-void nm_member_delete_hash(struct lu_nodemap *nodemap);
+void nm_member_delete_list(struct lu_nodemap *nodemap);
+struct lu_nodemap *nodemap_classify_nid(lnet_nid_t nid);
 void nm_member_reclassify_nodemap(struct lu_nodemap *nodemap);
 void nm_member_revoke_locks(struct lu_nodemap *nodemap);
 void nm_member_revoke_all(void);
 
 struct rb_node *nm_rb_next_postorder(const struct rb_node *node);
 struct rb_node *nm_rb_first_postorder(const struct rb_root *root);
+void nodemap_putref(struct lu_nodemap *nodemap);
 
 #define nm_rbtree_postorder_for_each_entry_safe(pos, n,                        \
                                                root, field)            \