X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fnodemap_handler.c;h=8857a0f4b274656245d494e02acc8543217d556e;hb=6030d0cfb15bfa4cfd7aaee4e3c2a34746424dd2;hp=28f34c91d71115e9bb3d294d8fbe9a89715663ef;hpb=34ba26ea9884df0758f8ec8dd1047b4cf474af09;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/nodemap_handler.c b/lustre/ptlrpc/nodemap_handler.c index 28f34c9..8857a0f 100644 --- a/lustre/ptlrpc/nodemap_handler.c +++ b/lustre/ptlrpc/nodemap_handler.c @@ -22,13 +22,13 @@ /* * Copyright (C) 2013, Trustees of Indiana University * - * Copyright (c) 2014, Intel Corporation. + * Copyright (c) 2017, Intel Corporation. * * Author: Joshua Walgenbach */ #include #include -#include +#include #include #include #include @@ -70,15 +70,16 @@ static void nodemap_destroy(struct lu_nodemap *nodemap) down_read(&active_config->nmc_range_tree_lock); nm_member_reclassify_nodemap(nodemap); up_read(&active_config->nmc_range_tree_lock); + + down_write(&nodemap->nm_idmap_lock); + idmap_delete_tree(nodemap); + up_write(&nodemap->nm_idmap_lock); + mutex_unlock(&active_config_lock); if (!list_empty(&nodemap->nm_member_list)) CWARN("nodemap_destroy failed to reclassify all members\n"); - write_lock(&nodemap->nm_idmap_lock); - idmap_delete_tree(nodemap); - write_unlock(&nodemap->nm_idmap_lock); - nm_member_delete_list(nodemap); OBD_FREE_PTR(nodemap); @@ -92,6 +93,8 @@ static void nodemap_destroy(struct lu_nodemap *nodemap) void nodemap_getref(struct lu_nodemap *nodemap) { atomic_inc(&nodemap->nm_refcount); + CDEBUG(D_INFO, "GETting nodemap %s(p=%p) : new refcount %d\n", + nodemap->nm_name, nodemap, atomic_read(&nodemap->nm_refcount)); } /** @@ -105,6 +108,10 @@ void nodemap_putref(struct lu_nodemap *nodemap) LASSERT(atomic_read(&nodemap->nm_refcount) > 0); + CDEBUG(D_INFO, "PUTting nodemap %s(p=%p) : new refcount %d\n", + nodemap->nm_name, nodemap, + atomic_read(&nodemap->nm_refcount) - 1); + if (atomic_dec_and_test(&nodemap->nm_refcount)) nodemap_destroy(nodemap); } @@ -246,11 +253,30 @@ struct lu_nodemap *nodemap_lookup(const char *name) * \param nid nid to classify * \retval nodemap nodemap containing the nid * \retval default_nodemap default nodemap + * \retval -EINVAL LO nid given without other local nid */ struct lu_nodemap *nodemap_classify_nid(lnet_nid_t nid) { - struct lu_nid_range *range; - struct lu_nodemap *nodemap; + struct lu_nid_range *range; + struct lu_nodemap *nodemap; + int rc; + + ENTRY; + + /* don't use 0@lo, use the first non-lo local NID instead */ + if (nid == LNET_NID_LO_0) { + struct lnet_process_id id; + int i = 0; + + do { + rc = LNetGetId(i++, &id); + if (rc < 0) + RETURN(ERR_PTR(-EINVAL)); + } while (id.nid == LNET_NID_LO_0); + + nid = id.nid; + CDEBUG(D_INFO, "found nid %s\n", libcfs_nid2str(nid)); + } range = range_search(&active_config->nmc_range_tree, nid); if (range != NULL) @@ -258,9 +284,10 @@ struct lu_nodemap *nodemap_classify_nid(lnet_nid_t nid) else nodemap = active_config->nmc_default_nodemap; + LASSERT(nodemap != NULL); nodemap_getref(nodemap); - return nodemap; + RETURN(nodemap); } /** @@ -348,26 +375,35 @@ EXPORT_SYMBOL(nodemap_parse_idmap); * \param nid nid to add to the members * \param exp obd_export structure for the connection * that is being added - * \retval -EINVAL export is NULL + * \retval -EINVAL export is NULL, or has invalid NID * \retval -EEXIST export is already member of a nodemap */ int nodemap_add_member(lnet_nid_t nid, struct obd_export *exp) { struct lu_nodemap *nodemap; - int rc; + int rc = 0; + ENTRY; mutex_lock(&active_config_lock); down_read(&active_config->nmc_range_tree_lock); nodemap = nodemap_classify_nid(nid); - rc = nm_member_add(nodemap, exp); + + if (IS_ERR(nodemap)) { + CWARN("%s: error adding to nodemap, no valid NIDs found\n", + exp->exp_obd->obd_name); + rc = -EINVAL; + } else { + rc = nm_member_add(nodemap, exp); + } up_read(&active_config->nmc_range_tree_lock); mutex_unlock(&active_config_lock); - nodemap_putref(nodemap); + if (!IS_ERR(nodemap)) + nodemap_putref(nodemap); - return rc; + RETURN(rc); } EXPORT_SYMBOL(nodemap_add_member); @@ -412,28 +448,56 @@ EXPORT_SYMBOL(nodemap_del_member); /** * add an idmap to the proper nodemap trees * - * \param name name of nodemap + * \param nodemap nodemap to add idmap to * \param id_type NODEMAP_UID or NODEMAP_GID * \param map array[2] __u32 containing the map values * map[0] is client id * map[1] is the filesystem id * - * \retval 0 on success + * \retval 0 on success + * \retval < 0 if error occurs */ int nodemap_add_idmap_helper(struct lu_nodemap *nodemap, enum nodemap_id_type id_type, const __u32 map[2]) { struct lu_idmap *idmap; + struct lu_idmap *temp; int rc = 0; idmap = idmap_create(map[0], map[1]); if (idmap == NULL) GOTO(out, rc = -ENOMEM); - write_lock(&nodemap->nm_idmap_lock); - idmap_insert(id_type, idmap, nodemap); - write_unlock(&nodemap->nm_idmap_lock); + down_write(&nodemap->nm_idmap_lock); + temp = idmap_insert(id_type, idmap, nodemap); + /* If the new id_client or id_fs is matched, the old idmap and its + * index should be deleted according to its id_client before the new + * idmap is added again. + */ + if (IS_ERR(temp)) + GOTO(out_insert, rc = PTR_ERR(temp)); + if (temp) { + __u32 del_map[2]; + + del_map[0] = temp->id_client; + idmap_delete(id_type, temp, nodemap); + rc = nodemap_idx_idmap_del(nodemap, id_type, del_map); + /* In case there is any corrupted idmap */ + if (!rc || unlikely(rc == -ENOENT)) { + temp = idmap_insert(id_type, idmap, nodemap); + if (IS_ERR(temp)) + rc = PTR_ERR(temp); + else if (!temp) + rc = 0; + else + rc = -EPERM; + } + } +out_insert: + if (rc) + OBD_FREE_PTR(idmap); + up_write(&nodemap->nm_idmap_lock); nm_member_revoke_locks(nodemap); out: @@ -446,6 +510,8 @@ int nodemap_add_idmap(const char *name, enum nodemap_id_type id_type, struct lu_nodemap *nodemap = NULL; int rc; + ENTRY; + mutex_lock(&active_config_lock); nodemap = nodemap_lookup(name); if (IS_ERR(nodemap)) { @@ -464,7 +530,7 @@ int nodemap_add_idmap(const char *name, enum nodemap_id_type id_type, nodemap_putref(nodemap); out: - return rc; + RETURN(rc); } EXPORT_SYMBOL(nodemap_add_idmap); @@ -486,6 +552,8 @@ int nodemap_del_idmap(const char *name, enum nodemap_id_type id_type, struct lu_idmap *idmap = NULL; int rc = 0; + ENTRY; + mutex_lock(&active_config_lock); nodemap = nodemap_lookup(name); if (IS_ERR(nodemap)) { @@ -496,7 +564,7 @@ int nodemap_del_idmap(const char *name, enum nodemap_id_type id_type, if (is_default_nodemap(nodemap)) GOTO(out_putref, rc = -EINVAL); - write_lock(&nodemap->nm_idmap_lock); + down_write(&nodemap->nm_idmap_lock); idmap = idmap_search(nodemap, NODEMAP_CLIENT_TO_FS, id_type, map[0]); if (idmap == NULL) { @@ -505,7 +573,7 @@ int nodemap_del_idmap(const char *name, enum nodemap_id_type id_type, idmap_delete(id_type, idmap, nodemap); rc = nodemap_idx_idmap_del(nodemap, id_type, map); } - write_unlock(&nodemap->nm_idmap_lock); + up_write(&nodemap->nm_idmap_lock); out_putref: mutex_unlock(&active_config_lock); @@ -514,7 +582,7 @@ out_putref: nodemap_putref(nodemap); out: - return rc; + RETURN(rc); } EXPORT_SYMBOL(nodemap_del_idmap); @@ -579,7 +647,7 @@ EXPORT_SYMBOL(nodemap_get_from_exp); * is, return 0. Otherwise, return the squash uid or gid. * * if the nodemap is configured to trusted the ids from the client system, just - * return the passwd id without mapping. + * return the passed id without mapping. * * if by this point, we haven't returned and the nodemap in question is the * default nodemap, return the squash uid or gid. @@ -602,6 +670,12 @@ __u32 nodemap_map_id(struct lu_nodemap *nodemap, if (unlikely(nodemap == NULL)) goto out; + if (nodemap->nmf_map_uid_only && id_type == NODEMAP_GID) + goto out; + + if (nodemap->nmf_map_gid_only && id_type == NODEMAP_UID) + goto out; + if (id == 0) { if (nodemap->nmf_allow_root_access) goto out; @@ -615,10 +689,10 @@ __u32 nodemap_map_id(struct lu_nodemap *nodemap, if (is_default_nodemap(nodemap)) goto squash; - read_lock(&nodemap->nm_idmap_lock); + down_read(&nodemap->nm_idmap_lock); idmap = idmap_search(nodemap, tree_type, id_type, id); if (idmap == NULL) { - read_unlock(&nodemap->nm_idmap_lock); + up_read(&nodemap->nm_idmap_lock); goto squash; } @@ -626,7 +700,7 @@ __u32 nodemap_map_id(struct lu_nodemap *nodemap, found_id = idmap->id_client; else found_id = idmap->id_fs; - read_unlock(&nodemap->nm_idmap_lock); + up_read(&nodemap->nm_idmap_lock); RETURN(found_id); squash: @@ -654,22 +728,24 @@ ssize_t nodemap_map_acl(struct lu_nodemap *nodemap, void *buf, size_t size, enum nodemap_tree_type tree_type) { posix_acl_xattr_header *header = buf; - posix_acl_xattr_entry *entry = &header->a_entries[0]; + posix_acl_xattr_entry *entry = GET_POSIX_ACL_XATTR_ENTRY(header); posix_acl_xattr_entry *new_entry = entry; posix_acl_xattr_entry *end; int count; + ENTRY; + if (!nodemap_active) - return size; + RETURN(size); if (unlikely(nodemap == NULL)) - return size; + RETURN(size); count = posix_acl_xattr_count(size); if (count < 0) - return -EINVAL; + RETURN(-EINVAL); if (count == 0) - return 0; + RETURN(0); for (end = entry + count; entry != end; entry++) { __u16 tag = le16_to_cpu(entry->e_tag); @@ -699,7 +775,7 @@ ssize_t nodemap_map_acl(struct lu_nodemap *nodemap, void *buf, size_t size, new_entry++; } - return (void *)new_entry - (void *)header; + RETURN((void *)new_entry - (void *)header); } EXPORT_SYMBOL(nodemap_map_acl); @@ -741,15 +817,21 @@ int nodemap_add_range_helper(struct nodemap_config *config, } list_add(&range->rn_list, &nodemap->nm_ranges); - nm_member_reclassify_nodemap(config->nmc_default_nodemap); + + /* nodemaps have no members if they aren't on the active config */ + if (config == active_config) + nm_member_reclassify_nodemap(config->nmc_default_nodemap); + up_write(&config->nmc_range_tree_lock); /* if range_id is non-zero, we are loading from disk */ if (range_id == 0) rc = nodemap_idx_range_add(range, nid); - nm_member_revoke_locks(config->nmc_default_nodemap); - nm_member_revoke_locks(nodemap); + if (config == active_config) { + nm_member_revoke_locks(config->nmc_default_nodemap); + nm_member_revoke_locks(nodemap); + } out: return rc; @@ -780,7 +862,7 @@ EXPORT_SYMBOL(nodemap_add_range); /** * delete a range * \param name nodemap name - * \param range_str string containing range + * \param nid nid range * \retval 0 on success * * Delete range from global range tree, and remove it @@ -808,6 +890,10 @@ int nodemap_del_range(const char *name, const lnet_nid_t nid[2]) up_write(&active_config->nmc_range_tree_lock); GOTO(out_putref, rc = -EINVAL); } + if (range->rn_nodemap != nodemap) { + up_write(&active_config->nmc_range_tree_lock); + GOTO(out_putref, rc = -EINVAL); + } rc = nodemap_idx_range_del(range); range_delete(&active_config->nmc_range_tree, range); nm_member_reclassify_nodemap(nodemap); @@ -825,11 +911,190 @@ out: EXPORT_SYMBOL(nodemap_del_range); /** + * set fileset on nodemap + * \param name nodemap to set fileset on + * \param fileset string containing fileset + * \retval 0 on success + * + * set a fileset on the named nodemap + */ +static int nodemap_set_fileset_helper(struct nodemap_config *config, + struct lu_nodemap *nodemap, + const char *fileset) +{ + int rc = 0; + + /* Allow 'fileset=clear' in addition to 'fileset=""' to clear fileset + * because either command 'lctl set_param -P *.*.fileset=""' or + * 'lctl nodemap_set_fileset --fileset ""' can only work correctly + * on MGS, while on other servers, both commands will invoke upcall + * "/usr/sbin/lctl set_param nodemap.default.fileset=" by function + * process_param2_config(), which will cause "no value" error and + * won't clear fileset. + * 'fileset=""' is still kept for compatibility reason. + */ + if (fileset == NULL) + rc = -EINVAL; + else if (fileset[0] == '\0' || strcmp(fileset, "clear") == 0) + nodemap->nm_fileset[0] = '\0'; + else if (fileset[0] != '/') + rc = -EINVAL; + else if (strlcpy(nodemap->nm_fileset, fileset, + sizeof(nodemap->nm_fileset)) >= + sizeof(nodemap->nm_fileset)) + rc = -ENAMETOOLONG; + + return rc; +} + +int nodemap_set_fileset(const char *name, const char *fileset) +{ + struct lu_nodemap *nodemap = NULL; + int rc = 0; + + mutex_lock(&active_config_lock); + nodemap = nodemap_lookup(name); + if (IS_ERR(nodemap)) { + mutex_unlock(&active_config_lock); + GOTO(out, rc = PTR_ERR(nodemap)); + } + + rc = nodemap_set_fileset_helper(active_config, nodemap, fileset); + mutex_unlock(&active_config_lock); + + nodemap_putref(nodemap); +out: + return rc; +} +EXPORT_SYMBOL(nodemap_set_fileset); + +/** + * get fileset defined on nodemap + * \param nodemap nodemap to get fileset from + * \retval fileset name, or NULL if not defined or not activated + * + * get the fileset defined on the nodemap + */ +char *nodemap_get_fileset(const struct lu_nodemap *nodemap) +{ + if (!nodemap_active) + return NULL; + + return (char *)nodemap->nm_fileset; +} +EXPORT_SYMBOL(nodemap_get_fileset); + +static int nodemap_validate_sepol(const char *sepol) +{ + char buf[LUSTRE_NODEMAP_SEPOL_LENGTH + 1]; + char *p = (char *)sepol; + char *q = buf; + char polname[NAME_MAX + 1] = ""; + char hash[SELINUX_POLICY_HASH_LEN + 1] = ""; + unsigned char mode; + unsigned short ver; + + CLASSERT(sizeof(buf) == sizeof(((struct lu_nodemap *)0)->nm_sepol)); + + if (sepol == NULL) + return -EINVAL; + + /* we allow sepol = "" which means clear SELinux policy info */ + if (sepol[0] == '\0') + return 0; + + /* make a copy of sepol, by replacing ':' with space + * so that we can use sscanf over the string + */ + while (p-sepol < sizeof(buf)) { + if (*p == ':') + *q = ' '; + else + *q = *p; + if (*p == '\0') + break; + p++; + q++; + } + if (p-sepol == sizeof(buf)) + return -ENAMETOOLONG; + + if (sscanf(buf, "%1hhu %s %hu %s", &mode, polname, &ver, hash) != 4) + return -EINVAL; + + if (mode != 0 && mode != 1) + return -EINVAL; + + return 0; +} + +/** + * set SELinux policy on nodemap + * \param name nodemap to set SELinux policy info on + * \param sepol string containing SELinux policy info + * \retval 0 on success + * + * set SELinux policy info on the named nodemap + */ +int nodemap_set_sepol(const char *name, const char *sepol) +{ + struct lu_nodemap *nodemap = NULL; + int rc; + + rc = nodemap_validate_sepol(sepol); + if (rc < 0) + GOTO(out, rc); + + mutex_lock(&active_config_lock); + nodemap = nodemap_lookup(name); + if (IS_ERR(nodemap)) { + mutex_unlock(&active_config_lock); + GOTO(out, rc = PTR_ERR(nodemap)); + } + + if (is_default_nodemap(nodemap)) { + /* We do not want nodes in the default nodemap to have + * SELinux restrictions. Sec admin should create dedicated + * nodemap entries for this. + */ + GOTO(out_putref, rc = -EINVAL); + } + + /* truncation cannot happen, as string length was checked in + * nodemap_validate_sepol() + */ + strlcpy(nodemap->nm_sepol, sepol, sizeof(nodemap->nm_sepol)); + +out_putref: + mutex_unlock(&active_config_lock); + nodemap_putref(nodemap); +out: + return rc; +} +EXPORT_SYMBOL(nodemap_set_sepol); + +/** + * get SELinux policy info defined on nodemap + * \param nodemap nodemap to get SELinux policy info from + * \retval SELinux policy info, or NULL if not defined or not activated + * + * get the SELinux policy info defined on the nodemap + */ +const char *nodemap_get_sepol(const struct lu_nodemap *nodemap) +{ + if (is_default_nodemap(nodemap)) + return NULL; + else + return (char *)nodemap->nm_sepol; +} +EXPORT_SYMBOL(nodemap_get_sepol); + +/** * Nodemap constructor * * Creates an lu_nodemap structure and assigns sane default * member values. If this is the default nodemap, the defaults - * are the most restictive in xterms of mapping behavior. Otherwise + * are the most restrictive in terms of mapping behavior. Otherwise * the default flags should be inherited from the default nodemap. * The adds nodemap to nodemap_hash. * @@ -850,6 +1115,7 @@ struct lu_nodemap *nodemap_create(const char *name, struct lu_nodemap *default_nodemap; struct cfs_hash *hash = config->nmc_nodemap_hash; int rc = 0; + ENTRY; default_nodemap = config->nmc_default_nodemap; @@ -886,7 +1152,7 @@ struct lu_nodemap *nodemap_create(const char *name, INIT_LIST_HEAD(&nodemap->nm_member_list); mutex_init(&nodemap->nm_member_list_lock); - rwlock_init(&nodemap->nm_idmap_lock); + init_rwsem(&nodemap->nm_idmap_lock); nodemap->nm_fs_to_client_uidmap = RB_ROOT; nodemap->nm_client_to_fs_uidmap = RB_ROOT; nodemap->nm_fs_to_client_gidmap = RB_ROOT; @@ -903,9 +1169,15 @@ struct lu_nodemap *nodemap_create(const char *name, if (is_default || default_nodemap == NULL) { nodemap->nmf_trust_client_ids = 0; nodemap->nmf_allow_root_access = 0; + nodemap->nmf_deny_unknown = 0; + nodemap->nmf_map_uid_only = 0; + nodemap->nmf_map_gid_only = 0; + nodemap->nmf_enable_audit = 1; nodemap->nm_squash_uid = NODEMAP_NOBODY_UID; nodemap->nm_squash_gid = NODEMAP_NOBODY_GID; + nodemap->nm_fileset[0] = '\0'; + nodemap->nm_sepol[0] = '\0'; if (!is_default) CWARN("adding nodemap '%s' to config without" " default nodemap\n", nodemap->nm_name); @@ -914,25 +1186,62 @@ struct lu_nodemap *nodemap_create(const char *name, default_nodemap->nmf_trust_client_ids; nodemap->nmf_allow_root_access = default_nodemap->nmf_allow_root_access; + nodemap->nmf_deny_unknown = + default_nodemap->nmf_deny_unknown; + nodemap->nmf_map_uid_only = + default_nodemap->nmf_map_uid_only; + nodemap->nmf_map_gid_only = + default_nodemap->nmf_map_gid_only; + nodemap->nmf_enable_audit = + default_nodemap->nmf_enable_audit; nodemap->nm_squash_uid = default_nodemap->nm_squash_uid; nodemap->nm_squash_gid = default_nodemap->nm_squash_gid; + nodemap->nm_fileset[0] = '\0'; + nodemap->nm_sepol[0] = '\0'; } - return nodemap; + RETURN(nodemap); out: CERROR("cannot add nodemap: '%s': rc = %d\n", name, rc); - return ERR_PTR(rc); + RETURN(ERR_PTR(rc)); } /** - * update flag to turn on or off nodemap functions + * Set the nmf_deny_unknown flag to true or false. * \param name nodemap name - * \param admin_string string containing updated value + * \param deny_unknown if true, squashed users will get EACCES + * \retval 0 on success + * + */ +int nodemap_set_deny_unknown(const char *name, bool deny_unknown) +{ + struct lu_nodemap *nodemap = NULL; + int rc = 0; + + mutex_lock(&active_config_lock); + nodemap = nodemap_lookup(name); + mutex_unlock(&active_config_lock); + if (IS_ERR(nodemap)) + GOTO(out, rc = PTR_ERR(nodemap)); + + nodemap->nmf_deny_unknown = deny_unknown; + rc = nodemap_idx_nodemap_update(nodemap); + + nm_member_revoke_locks(nodemap); + nodemap_putref(nodemap); +out: + return rc; +} +EXPORT_SYMBOL(nodemap_set_deny_unknown); + +/** + * Set the nmf_allow_root_access flag to true or false. + * \param name nodemap name + * \param allow_root if true, nodemap will not squash the root user * \retval 0 on success * - * Update admin flag to turn on or off nodemap functions. */ int nodemap_set_allow_root(const char *name, bool allow_root) { @@ -956,13 +1265,12 @@ out: EXPORT_SYMBOL(nodemap_set_allow_root); /** - * updated trust_client_ids flag for nodemap + * Set the nmf_trust_client_ids flag to true or false. * - * \param name nodemap name - * \param trust_string new value for trust flag + * \param name nodemap name + * \param trust_client_ids if true, nodemap will not map its IDs * \retval 0 on success * - * Update the trust_client_ids flag for a nodemap. */ int nodemap_set_trust_client_ids(const char *name, bool trust_client_ids) { @@ -985,11 +1293,47 @@ out: } EXPORT_SYMBOL(nodemap_set_trust_client_ids); +int nodemap_set_mapping_mode(const char *name, enum nodemap_mapping_modes mode) +{ + struct lu_nodemap *nodemap = NULL; + int rc = 0; + + mutex_lock(&active_config_lock); + nodemap = nodemap_lookup(name); + mutex_unlock(&active_config_lock); + if (IS_ERR(nodemap)) + GOTO(out, rc = PTR_ERR(nodemap)); + + switch (mode) { + case NODEMAP_MAP_BOTH: + nodemap->nmf_map_uid_only = 0; + nodemap->nmf_map_gid_only = 0; + break; + case NODEMAP_MAP_UID_ONLY: + nodemap->nmf_map_uid_only = 1; + nodemap->nmf_map_gid_only = 0; + break; + case NODEMAP_MAP_GID_ONLY: + nodemap->nmf_map_uid_only = 0; + nodemap->nmf_map_gid_only = 1; + break; + default: + CWARN("cannot set unknown mapping mode, mode = %d\n", mode); + } + rc = nodemap_idx_nodemap_update(nodemap); + + nm_member_revoke_locks(nodemap); + nodemap_putref(nodemap); +out: + return rc; +} +EXPORT_SYMBOL(nodemap_set_mapping_mode); + /** - * update the squash_uid for a nodemap + * Update the squash_uid for a nodemap. * * \param name nodemap name - * \param uid_string string containing new squash_uid value + * \param uid the new uid to squash unknown users to * \retval 0 on success * * Update the squash_uid for a nodemap. The squash_uid is the uid @@ -1022,7 +1366,7 @@ EXPORT_SYMBOL(nodemap_set_squash_uid); * Update the squash_gid for a nodemap. * * \param name nodemap name - * \param gid_string string containing new squash_gid value + * \param gid the new gid to squash unknown gids to * \retval 0 on success * * Update the squash_gid for a nodemap. The squash_uid is the gid @@ -1064,6 +1408,35 @@ bool nodemap_can_setquota(const struct lu_nodemap *nodemap) EXPORT_SYMBOL(nodemap_can_setquota); /** + * Set the nmf_enable_audit flag to true or false. + * \param name nodemap name + * \param audit_mode if true, allow audit + * \retval 0 on success + * + */ +int nodemap_set_audit_mode(const char *name, bool enable_audit) +{ + struct lu_nodemap *nodemap = NULL; + int rc = 0; + + mutex_lock(&active_config_lock); + nodemap = nodemap_lookup(name); + mutex_unlock(&active_config_lock); + if (IS_ERR(nodemap)) + GOTO(out, rc = PTR_ERR(nodemap)); + + nodemap->nmf_enable_audit = enable_audit; + rc = nodemap_idx_nodemap_update(nodemap); + + nm_member_revoke_locks(nodemap); + nodemap_putref(nodemap); +out: + return rc; +} +EXPORT_SYMBOL(nodemap_set_audit_mode); + + +/** * Add a nodemap * * \param name name of nodemap @@ -1202,10 +1575,31 @@ static int nodemap_cleanup_iter_cb(struct cfs_hash *hs, struct cfs_hash_bd *bd, return 0; } +struct nodemap_config *nodemap_config_alloc(void) +{ + struct nodemap_config *config; + int rc = 0; + + OBD_ALLOC_PTR(config); + if (config == NULL) + return ERR_PTR(-ENOMEM); + + rc = nodemap_init_hash(config); + if (rc != 0) { + OBD_FREE_PTR(config); + return ERR_PTR(rc); + } + + init_rwsem(&config->nmc_range_tree_lock); + + return config; +} +EXPORT_SYMBOL(nodemap_config_alloc); + /** * Walk the nodemap_hash and remove all nodemaps. */ -void nodemap_config_cleanup(struct nodemap_config *config) +void nodemap_config_dealloc(struct nodemap_config *config) { struct lu_nodemap *nodemap = NULL; struct lu_nodemap *nodemap_temp; @@ -1222,45 +1616,31 @@ void nodemap_config_cleanup(struct nodemap_config *config) */ list_for_each_entry_safe(nodemap, nodemap_temp, &nodemap_list_head, nm_list) { + mutex_lock(&active_config_lock); down_write(&config->nmc_range_tree_lock); + + /* move members to new config, requires ac lock */ + nm_member_reclassify_nodemap(nodemap); list_for_each_entry_safe(range, range_temp, &nodemap->nm_ranges, rn_list) range_delete(&config->nmc_range_tree, range); up_write(&config->nmc_range_tree_lock); + mutex_unlock(&active_config_lock); + /* putref must be outside of ac lock if nm could be destroyed */ nodemap_putref(nodemap); } -} - -struct nodemap_config *nodemap_config_alloc(void) -{ - struct nodemap_config *config; - int rc = 0; - - OBD_ALLOC_PTR(config); - if (config == NULL) - return ERR_PTR(-ENOMEM); - - rc = nodemap_init_hash(config); - if (rc != 0) { - OBD_FREE_PTR(config); - return ERR_PTR(rc); - } - - init_rwsem(&config->nmc_range_tree_lock); - - return config; -} - -void nodemap_config_dealloc(struct nodemap_config *config) -{ - nodemap_config_cleanup(config); OBD_FREE_PTR(config); } +EXPORT_SYMBOL(nodemap_config_dealloc); -static int nm_hash_list_cb(struct cfs_hash *hs, struct cfs_hash_bd *bd, - struct hlist_node *hnode, - void *nodemap_list_head) +/* + * callback for cfs_hash_for_each_safe used to convert a nodemap hash to a + * nodemap list, generally for locking purposes as a hash cb can't sleep. + */ +int nm_hash_list_cb(struct cfs_hash *hs, struct cfs_hash_bd *bd, + struct hlist_node *hnode, + void *nodemap_list_head) { struct lu_nodemap *nodemap; @@ -1274,11 +1654,13 @@ void nodemap_config_set_active(struct nodemap_config *config) struct nodemap_config *old_config = active_config; struct lu_nodemap *nodemap; struct lu_nodemap *tmp; + bool revoke_locks; LIST_HEAD(nodemap_list_head); ENTRY; LASSERT(active_config != config); + LASSERT(config->nmc_default_nodemap); mutex_lock(&active_config_lock); @@ -1303,6 +1685,14 @@ void nodemap_config_set_active(struct nodemap_config *config) } } + /* + * We only need to revoke locks if old nodemap was active, and new + * config is now nodemap inactive. nodemap_config_dealloc will + * reclassify exports, triggering a lock revoke if and only if new + * nodemap is active. + */ + revoke_locks = !config->nmc_nodemap_is_active && nodemap_active; + /* if new config is inactive, deactivate live config before switching */ if (!config->nmc_nodemap_is_active) nodemap_active = false; @@ -1315,7 +1705,8 @@ void nodemap_config_set_active(struct nodemap_config *config) if (old_config != NULL) nodemap_config_dealloc(old_config); - nm_member_revoke_all(); + if (revoke_locks) + nm_member_revoke_all(); EXIT; } @@ -1377,7 +1768,7 @@ void nm_member_revoke_all(void) /* revoke_locks sleeps, so can't call in cfs hash cb */ list_for_each_entry_safe(nodemap, tmp, &nodemap_list_head, nm_list) - nm_member_revoke_locks(nodemap); + nm_member_revoke_locks_always(nodemap); mutex_unlock(&active_config_lock); } @@ -1400,6 +1791,9 @@ void nodemap_test_nid(lnet_nid_t nid, char *name_buf, size_t name_len) up_read(&active_config->nmc_range_tree_lock); mutex_unlock(&active_config_lock); + if (IS_ERR(nodemap)) + return; + strncpy(name_buf, nodemap->nm_name, name_len); if (name_len > 0) name_buf[name_len - 1] = '\0'; @@ -1409,20 +1803,21 @@ void nodemap_test_nid(lnet_nid_t nid, char *name_buf, size_t name_len) EXPORT_SYMBOL(nodemap_test_nid); /** - * Returns the id mapping for a given nid/id pair. Useful for testing the + * Passes back the id mapping for a given nid/id pair. Useful for testing the * nodemap configuration to make sure it is working as expected. * * \param nid nid to classify * \param idtype uid or gid * \param client_id id to map to fs + * \param fs_id_buf pointer to save mapped fs_id to * - * \retval the mapped fs_id of the given client_id + * \retval 0 success + * \retval -EINVAL invalid NID */ -__u32 nodemap_test_id(lnet_nid_t nid, enum nodemap_id_type idtype, - __u32 client_id) +int nodemap_test_id(lnet_nid_t nid, enum nodemap_id_type idtype, + __u32 client_id, __u32 *fs_id) { struct lu_nodemap *nodemap; - __u32 fs_id; mutex_lock(&active_config_lock); down_read(&active_config->nmc_range_tree_lock); @@ -1430,10 +1825,13 @@ __u32 nodemap_test_id(lnet_nid_t nid, enum nodemap_id_type idtype, up_read(&active_config->nmc_range_tree_lock); mutex_unlock(&active_config_lock); - fs_id = nodemap_map_id(nodemap, idtype, NODEMAP_CLIENT_TO_FS, + if (IS_ERR(nodemap)) + return PTR_ERR(nodemap); + + *fs_id = nodemap_map_id(nodemap, idtype, NODEMAP_CLIENT_TO_FS, client_id); nodemap_putref(nodemap); - return fs_id; + return 0; } EXPORT_SYMBOL(nodemap_test_id);