X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fnodemap_handler.c;h=159ea99e2c40647d3304cddcf9c712325474befa;hb=5edb883b44ac707528ce2c0bc812d65b9ffb4a50;hp=0443c3b45c822aa62a4cfb91148f496b4e6a7ce0;hpb=1f6cb3534e74f0c9462008c8088b5734b64ed41c;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/nodemap_handler.c b/lustre/ptlrpc/nodemap_handler.c index 0443c3b..159ea99 100644 --- a/lustre/ptlrpc/nodemap_handler.c +++ b/lustre/ptlrpc/nodemap_handler.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include "nodemap_internal.h" @@ -257,24 +256,24 @@ struct lu_nodemap *nodemap_lookup(const char *name) */ 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 (LNET_NETTYP(LNET_NIDNET(nid)) == LOLND) { - struct lnet_process_id id; + if (nid == LNET_NID_LO_0) { + struct lnet_processid id; int i = 0; do { rc = LNetGetId(i++, &id); if (rc < 0) RETURN(ERR_PTR(-EINVAL)); - } while (LNET_NETTYP(LNET_NIDNET(id.nid)) == LOLND); + } while (nid_is_lo0(&id.nid)); - nid = id.nid; + nid = lnet_nid_to_nid4(&id.nid); CDEBUG(D_INFO, "found nid %s\n", libcfs_nid2str(nid)); } @@ -634,7 +633,7 @@ EXPORT_SYMBOL(nodemap_get_from_exp); * mapping function for nodemap idmaps * * \param nodemap lu_nodemap structure defining nodemap - * \param node_type NODEMAP_UID or NODEMAP_GID + * \param node_type NODEMAP_UID or NODEMAP_GID or NODEMAP_PROJID * \param tree_type NODEMAP_CLIENT_TO_FS or * NODEMAP_FS_TO_CLIENT * \param id id to map @@ -670,19 +669,24 @@ __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; - else - goto squash; + goto squash; } + if (id_type == NODEMAP_UID && + !(nodemap->nmf_map_mode & NODEMAP_MAP_UID)) + goto out; + + if (id_type == NODEMAP_GID && + !(nodemap->nmf_map_mode & NODEMAP_MAP_GID)) + goto out; + + if (id_type == NODEMAP_PROJID && + !(nodemap->nmf_map_mode & NODEMAP_MAP_PROJID)) + goto out; + if (nodemap->nmf_trust_client_ids) goto out; @@ -706,8 +710,10 @@ __u32 nodemap_map_id(struct lu_nodemap *nodemap, squash: if (id_type == NODEMAP_UID) RETURN(nodemap->nm_squash_uid); - else + if (id_type == NODEMAP_GID) RETURN(nodemap->nm_squash_gid); + if (id_type == NODEMAP_PROJID) + RETURN(nodemap->nm_squash_projid); out: RETURN(id); } @@ -745,7 +751,8 @@ ssize_t nodemap_map_acl(struct lu_nodemap *nodemap, void *buf, size_t size, if (count < 0) RETURN(-EINVAL); if (count == 0) - RETURN(0); + /* if not proper ACL, do nothing and return initial size */ + RETURN(size); for (end = entry + count; entry != end; entry++) { __u16 tag = le16_to_cpu(entry->e_tag); @@ -807,13 +814,14 @@ int nodemap_add_range_helper(struct nodemap_config *config, } rc = range_insert(&config->nmc_range_tree, range); - if (rc != 0) { - CERROR("cannot insert nodemap range into '%s': rc = %d\n", - nodemap->nm_name, rc); + if (rc) { + CDEBUG_LIMIT(rc == -EEXIST ? D_INFO : D_ERROR, + "cannot insert nodemap range into '%s': rc = %d\n", + nodemap->nm_name, rc); up_write(&config->nmc_range_tree_lock); list_del(&range->rn_list); range_destroy(range); - GOTO(out, rc = -ENOMEM); + GOTO(out, rc); } list_add(&range->rn_list, &nodemap->nm_ranges); @@ -836,6 +844,7 @@ int nodemap_add_range_helper(struct nodemap_config *config, out: return rc; } + int nodemap_add_range(const char *name, const lnet_nid_t nid[2]) { struct lu_nodemap *nodemap = NULL; @@ -994,7 +1003,7 @@ static int nodemap_validate_sepol(const char *sepol) unsigned char mode; unsigned short ver; - CLASSERT(sizeof(buf) == sizeof(((struct lu_nodemap *)0)->nm_sepol)); + BUILD_BUG_ON(sizeof(buf) != sizeof(((struct lu_nodemap *)0)->nm_sepol)); if (sepol == NULL) return -EINVAL; @@ -1129,9 +1138,8 @@ struct lu_nodemap *nodemap_create(const char *name, OBD_ALLOC_PTR(nodemap); if (nodemap == NULL) { - CERROR("cannot allocate memory (%zu bytes)" - "for nodemap '%s'\n", sizeof(*nodemap), - name); + CERROR("cannot allocate memory (%zu bytes) for nodemap '%s'\n", + sizeof(*nodemap), name); GOTO(out, rc = -ENOMEM); } @@ -1157,6 +1165,8 @@ struct lu_nodemap *nodemap_create(const char *name, nodemap->nm_client_to_fs_uidmap = RB_ROOT; nodemap->nm_fs_to_client_gidmap = RB_ROOT; nodemap->nm_client_to_fs_gidmap = RB_ROOT; + nodemap->nm_fs_to_client_projidmap = RB_ROOT; + nodemap->nm_client_to_fs_projidmap = RB_ROOT; if (is_default) { nodemap->nm_id = LUSTRE_NODEMAP_DEFAULT_ID; @@ -1170,12 +1180,15 @@ struct lu_nodemap *nodemap_create(const char *name, 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_map_mode = NODEMAP_MAP_ALL; nodemap->nmf_enable_audit = 1; + nodemap->nmf_forbid_encryption = 0; + nodemap->nmf_readonly_mount = 0; + nodemap->nmf_rbac = NODEMAP_RBAC_ALL; nodemap->nm_squash_uid = NODEMAP_NOBODY_UID; nodemap->nm_squash_gid = NODEMAP_NOBODY_GID; + nodemap->nm_squash_projid = NODEMAP_NOBODY_PROJID; nodemap->nm_fileset[0] = '\0'; nodemap->nm_sepol[0] = '\0'; if (!is_default) @@ -1186,17 +1199,18 @@ 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->nmf_deny_unknown = default_nodemap->nmf_deny_unknown; + nodemap->nmf_map_mode = default_nodemap->nmf_map_mode; + nodemap->nmf_enable_audit = default_nodemap->nmf_enable_audit; + nodemap->nmf_forbid_encryption = + default_nodemap->nmf_forbid_encryption; + nodemap->nmf_readonly_mount = + default_nodemap->nmf_readonly_mount; + nodemap->nmf_rbac = default_nodemap->nmf_rbac; nodemap->nm_squash_uid = default_nodemap->nm_squash_uid; nodemap->nm_squash_gid = default_nodemap->nm_squash_gid; + nodemap->nm_squash_projid = default_nodemap->nm_squash_projid; nodemap->nm_fileset[0] = '\0'; nodemap->nm_sepol[0] = '\0'; } @@ -1293,7 +1307,8 @@ out: } EXPORT_SYMBOL(nodemap_set_trust_client_ids); -int nodemap_set_mapping_mode(const char *name, enum nodemap_mapping_modes mode) +int nodemap_set_mapping_mode(const char *name, + enum nodemap_mapping_modes map_mode) { struct lu_nodemap *nodemap = NULL; int rc = 0; @@ -1304,22 +1319,7 @@ int nodemap_set_mapping_mode(const char *name, enum nodemap_mapping_modes mode) 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); - } + nodemap->nmf_map_mode = map_mode; rc = nodemap_idx_nodemap_update(nodemap); nm_member_revoke_locks(nodemap); @@ -1329,6 +1329,49 @@ out: } EXPORT_SYMBOL(nodemap_set_mapping_mode); +int nodemap_set_rbac(const char *name, enum nodemap_rbac_roles rbac) +{ + struct lu_nodemap *nodemap = NULL; + enum nodemap_rbac_roles old_rbac; + 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)); + + if (is_default_nodemap(nodemap)) + GOTO(put, rc = -EINVAL); + + old_rbac = nodemap->nmf_rbac; + /* if value does not change, do nothing */ + if (rbac == old_rbac) + GOTO(put, rc = 0); + + nodemap->nmf_rbac = rbac; + if (rbac == NODEMAP_RBAC_ALL) + /* if new value is ALL (default), just delete + * NODEMAP_CLUSTER_ROLES idx + */ + rc = nodemap_idx_cluster_roles_del(nodemap); + else if (old_rbac == NODEMAP_RBAC_ALL) + /* if old value is ALL (default), need to insert + * NODEMAP_CLUSTER_ROLES idx + */ + rc = nodemap_idx_cluster_roles_add(nodemap); + else + /* otherwise just update existing NODEMAP_CLUSTER_ROLES idx */ + rc = nodemap_idx_cluster_roles_update(nodemap); + + nm_member_revoke_locks(nodemap); +put: + nodemap_putref(nodemap); +out: + return rc; +} +EXPORT_SYMBOL(nodemap_set_rbac); + /** * Update the squash_uid for a nodemap. * @@ -1369,7 +1412,7 @@ EXPORT_SYMBOL(nodemap_set_squash_uid); * \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 + * Update the squash_gid for a nodemap. The squash_gid is the gid * that the all client gids are mapped to if nodemap is active, * the trust_client_ids flag is not set, and the gid is not in * the idmap tree. @@ -1396,14 +1439,70 @@ out: EXPORT_SYMBOL(nodemap_set_squash_gid); /** - * Returns true if this nodemap has root user access. Always returns true if - * nodemaps are not active. + * Update the squash_projid for a nodemap. + * + * \param name nodemap name + * \param gid the new projid to squash unknown projids to + * \retval 0 on success + * + * Update the squash_projid for a nodemap. The squash_projid is the projid + * that the all client projids are mapped to if nodemap is active, + * the trust_client_ids flag is not set, and the projid is not in + * the idmap tree. + */ +int nodemap_set_squash_projid(const char *name, projid_t projid) +{ + 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->nm_squash_projid = projid; + rc = nodemap_idx_nodemap_update(nodemap); + + nm_member_revoke_locks(nodemap); + nodemap_putref(nodemap); +out: + return rc; +} +EXPORT_SYMBOL(nodemap_set_squash_projid); + +/** + * Check if nodemap allows setting quota. + * + * If nodemap is not active, always allow. + * For user and group quota, allow if the nodemap allows root access. + * For project quota, allow if project id is not squashed or deny_unknown + * is not set. * * \param nodemap nodemap to check access for + * \param qc_type quota type + * \param id client id to map + * \retval true is setquota is allowed, false otherwise */ -bool nodemap_can_setquota(const struct lu_nodemap *nodemap) +bool nodemap_can_setquota(struct lu_nodemap *nodemap, __u32 qc_type, __u32 id) { - return !nodemap_active || (nodemap && nodemap->nmf_allow_root_access); + if (!nodemap_active) + return true; + + if (!nodemap || !nodemap->nmf_allow_root_access || + !(nodemap->nmf_rbac & NODEMAP_RBAC_QUOTA_OPS)) + return false; + + if (qc_type == PRJQUOTA) { + id = nodemap_map_id(nodemap, NODEMAP_PROJID, + NODEMAP_CLIENT_TO_FS, id); + + if (id == nodemap->nm_squash_projid && + nodemap->nmf_deny_unknown) + return false; + } + + return true; } EXPORT_SYMBOL(nodemap_can_setquota); @@ -1435,6 +1534,61 @@ out: } EXPORT_SYMBOL(nodemap_set_audit_mode); +/** + * Set the nmf_forbid_encryption flag to true or false. + * \param name nodemap name + * \param forbid_encryption if true, forbid encryption + * \retval 0 on success + * + */ +int nodemap_set_forbid_encryption(const char *name, bool forbid_encryption) +{ + 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_forbid_encryption = forbid_encryption; + rc = nodemap_idx_nodemap_update(nodemap); + + nm_member_revoke_locks(nodemap); + nodemap_putref(nodemap); +out: + return rc; +} +EXPORT_SYMBOL(nodemap_set_forbid_encryption); + +/** + * Set the nmf_readonly_mount flag to true or false. + * \param name nodemap name + * \param readonly_mount if true, forbid rw mount + * \retval 0 on success + * + */ +int nodemap_set_readonly_mount(const char *name, bool readonly_mount) +{ + 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_readonly_mount = readonly_mount; + rc = nodemap_idx_nodemap_update(nodemap); + + nm_member_revoke_locks(nodemap); + nodemap_putref(nodemap); +out: + return rc; +} +EXPORT_SYMBOL(nodemap_set_readonly_mount); /** * Add a nodemap @@ -1592,6 +1746,8 @@ struct nodemap_config *nodemap_config_alloc(void) init_rwsem(&config->nmc_range_tree_lock); + config->nmc_range_tree.nmrt_range_interval_root = INTERVAL_TREE_ROOT; + return config; } EXPORT_SYMBOL(nodemap_config_alloc);