X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flustre_nodemap.h;h=44527a0e4e42d74c4d6024f510151dd2e12bbfa9;hp=221f8d78a81d3ea980fa220e1f18c45ee37a1612;hb=be7efb4ce06996444c08914305a73833a7123eeb;hpb=1c7f9caa99df3082a3e506673721d359147843d3 diff --git a/lustre/include/lustre_nodemap.h b/lustre/include/lustre_nodemap.h index 221f8d7..44527a0 100644 --- a/lustre/include/lustre_nodemap.h +++ b/lustre/include/lustre_nodemap.h @@ -27,8 +27,9 @@ #ifndef _LUSTRE_NODEMAP_H #define _LUSTRE_NODEMAP_H +#include + #define LUSTRE_NODEMAP_NAME "nodemap" -#define LUSTRE_NODEMAP_NAME_LENGTH 16 #define LUSTRE_NODEMAP_DEFAULT_ID 0 @@ -47,6 +48,12 @@ enum nodemap_tree_type { NODEMAP_CLIENT_TO_FS, }; +struct nodemap_pde { + char npe_name[LUSTRE_NODEMAP_NAME_LENGTH + 1]; + struct proc_dir_entry *npe_proc_entry; + struct list_head npe_list_member; +}; + /** The nodemap id 0 will be the default nodemap. It will have a configuration * set by the MGS, but no ranges will be allowed as all NIDs that do not map * will be added to the default nodemap @@ -57,10 +64,8 @@ struct lu_nodemap { char nm_name[LUSTRE_NODEMAP_NAME_LENGTH + 1]; /* flags to govern nodemap behavior */ bool nmf_trust_client_ids:1, - nmf_allow_root_access:1, - nmf_block_lookups:1, - nmf_hmac_required:1, - nmf_encryption_required:1; + nmf_deny_unknown:1, + nmf_allow_root_access:1; /* unique ID set by MGS */ unsigned int nm_id; /* nodemap ref counter */ @@ -81,16 +86,27 @@ struct lu_nodemap { struct rb_root nm_fs_to_client_gidmap; /* GID map keyed by remote UID */ struct rb_root nm_client_to_fs_gidmap; - /* proc directory entry */ - struct proc_dir_entry *nm_proc_entry; /* attached client members of this nodemap */ struct mutex nm_member_list_lock; struct list_head nm_member_list; /* access by nodemap name */ struct hlist_node nm_hash; + struct nodemap_pde *nm_pde_data; + /* fileset the nodes of this nodemap are restricted to */ + char nm_fileset[PATH_MAX+1]; + + /* used when loading/unloading nodemaps */ + struct list_head nm_list; +}; - /* used when unloading nodemaps */ - struct list_head nm_list; +/* Store handles to local MGC storage to save config locally. In future + * versions of nodemap, mgc will receive the config directly and so this might + * not be needed. + */ +struct nm_config_file { + struct local_oid_storage *ncf_los; + struct dt_object *ncf_obj; + struct list_head ncf_list; }; void nodemap_activate(const bool value); @@ -104,6 +120,7 @@ int nodemap_add_range(const char *name, const lnet_nid_t nid[2]); int nodemap_del_range(const char *name, const lnet_nid_t nid[2]); int nodemap_set_allow_root(const char *name, bool allow_root); int nodemap_set_trust_client_ids(const char *name, bool trust_client_ids); +int nodemap_set_deny_unknown(const char *name, bool deny_unknown); int nodemap_set_squash_uid(const char *name, uid_t uid); int nodemap_set_squash_gid(const char *name, gid_t gid); bool nodemap_can_setquota(const struct lu_nodemap *nodemap); @@ -111,12 +128,82 @@ int nodemap_add_idmap(const char *name, enum nodemap_id_type id_type, const __u32 map[2]); int nodemap_del_idmap(const char *name, enum nodemap_id_type id_type, const __u32 map[2]); +int nodemap_set_fileset(const char *name, const char *fileset); +char *nodemap_get_fileset(const struct lu_nodemap *nodemap); __u32 nodemap_map_id(struct lu_nodemap *nodemap, enum nodemap_id_type id_type, enum nodemap_tree_type tree_type, __u32 id); ssize_t nodemap_map_acl(struct lu_nodemap *nodemap, void *buf, size_t size, enum nodemap_tree_type tree_type); +#ifdef HAVE_SERVER_SUPPORT void nodemap_test_nid(lnet_nid_t nid, char *name_buf, size_t name_len); -__u32 nodemap_test_id(lnet_nid_t nid, enum nodemap_id_type idtype, - __u32 client_id); +#else +#define nodemap_test_nid(nid, name_buf, name_len) do {} while(0) +#endif +int nodemap_test_id(lnet_nid_t nid, enum nodemap_id_type idtype, + __u32 client_id, __u32 *fs_id); + +enum nm_config_file_type { + NCFT_MGS, + NCFT_TGT, +}; +struct nm_config_file *nm_config_file_register(const struct lu_env *env, + struct dt_object *obj, + struct local_oid_storage *los, + enum nm_config_file_type ncf_type); +void nm_config_file_deregister(const struct lu_env *env, + struct nm_config_file *ncf, + enum nm_config_file_type ncf_type); +struct lu_nodemap *nodemap_get_from_exp(struct obd_export *exp); +void nodemap_putref(struct lu_nodemap *nodemap); + +#ifdef HAVE_SERVER_SUPPORT +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_mgc(struct nodemap_config *config); + +int nodemap_process_idx_pages(struct nodemap_config *config, union lu_page *lip, + struct lu_nodemap **recent_nodemap); + +struct dt_device; +int nodemap_fs_init(const struct lu_env *env, struct dt_device *dev, + struct obd_device *obd, struct local_oid_storage *los); +void nodemap_fs_fini(const struct lu_env *env, struct obd_device *obd); +#else /* disable nodemap processing in MGC of non-servers */ +static inline int nodemap_process_idx_pages(void *config, + union lu_page *lip, + struct lu_nodemap **recent_nodemap) +{ return 0; } +#endif /* HAVE_SERVER_SUPPORT */ + +int nodemap_get_config_req(struct obd_device *mgs_obd, + struct ptlrpc_request *req); #endif /* _LUSTRE_NODEMAP_H */