NFS: new idmapper
Subsystems (3)
PATCH 1/1 NFS: new idmapper
NFS new idmapper
This patch creates a new idmapper system that uses the request-key function to place a call into userspace to map user and group ids to names. The old idmapper was single threaded, which prevented more than one request from running at a single time. This means that a user would have to wait for an upcall to finish before accessing a cached result.
The upcall result is stored on a keyring of type id_resolver. See the file Documentation/filesystems/nfs/idmapper.txt for instructions.
Signed-off-by Bryan Schumaker <[email protected]>
---
Documentation/filesystems/nfs/00-INDEX +2 -0
@@ -14,3 +14,5 @@ nfsroot.txt - short guide on setting up a diskless box with NFS root filesystem. rpc-cache.txt - introduction to the caching mechanisms in the sunrpc layer. +idmapper.txt + - information for configuring request-keys to be used by idmapper
Documentation/filesystems/nfs/idmapper.txt new file +68 -0
68 lines not on this page · raw message
fs/nfs/Kconfig +11 -0
@@ -117,3 +117,14 @@ config NFS_USE_KERNEL_DNS select DNS_RESOLVER select KEYS default y + +config NFS_USE_NEW_IDMAPPER + bool "Use the new idmapper upcall routine" + depends on NFS_V4 && KEYS + help + Say Y here if you want NFS to use the new idmapper upcall functions. + You will need /sbin/request-key (usually provided by the keyutils + package). For details, read + <file:Documentation/filesystems/nfs/idmapper.txt>. + + If you are unsure, say N.
fs/nfs/idmap.c +205 -2
227 lines not on this page · raw message
fs/nfs/inode.c +7 -0
@@ -1521,6 +1521,10 @@ static int __init init_nfs_fs(void) {int err; + err =nfs_idmap_init (); +if (err <0 ) + goto out9; + err =nfs_dns_resolver_init ();if (err <0 ) goto out8;
@@ -1585,6 +1589,8 @@ out6: out7:nfs_dns_resolver_destroy (); out8: +nfs_idmap_quit (); +out9:return err; }
@@ -1597,6 +1603,7 @@ static void __exit exit_nfs_fs(void)nfs_destroy_nfspagecache ();nfs_fscache_unregister ();nfs_dns_resolver_destroy (); +nfs_idmap_quit ();#ifdef CONFIG_PROC_FS rpc_proc_unregister ("nfs" );#endif
fs/nfs/nfs4xdr.c +2 -2
@@ -816,7 +816,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, constif (iap->ia_valid &ATTR_MODE ) len +=4 ;if (iap->ia_valid &ATTR_UID ) { - owner_namelen =nfs_map_uid_to_name (server->nfs_client, iap->ia_uid, owner_name); + owner_namelen =nfs_map_uid_to_name (server->nfs_client, iap->ia_uid, owner_name,IDMAP_NAMESZ );if (owner_namelen <0 ) {dprintk ("nfs: couldn't resolve uid %d to string\n" , iap->ia_uid);
@@ -828,7 +828,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const len +=4 + (XDR_QUADLEN (owner_namelen) <<2 ); }if (iap->ia_valid &ATTR_GID ) { - owner_grouplen =nfs_map_gid_to_group (server->nfs_client, iap->ia_gid, owner_group); + owner_grouplen =nfs_map_gid_to_group (server->nfs_client, iap->ia_gid, owner_group,IDMAP_NAMESZ );if (owner_grouplen <0 ) {dprintk ("nfs: couldn't resolve gid %d to string\n" , iap->ia_gid);
fs/nfs/sysctl.c +2 -0
@@ -32,6 +32,7 @@ static ctl_table nfs_cb_sysctls[] = { .extra1 = (int *)&nfs_set_port_min, .extra2 = (int *)&nfs_set_port_max, }, +#ifndef CONFIG_NFS_USE_NEW_IDMAPPER { .procname = "idmap_cache_timeout", .data = &nfs_idmap_cache_timeout,
@@ -39,6 +40,7 @@ static ctl_table nfs_cb_sysctls[] = { .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, +#endif /* CONFIG_NFS_USE_NEW_IDMAPPER */ #endif { .procname = "nfs_mountpoint_timeout",
include/linux/nfs_idmap.h +29 -2
@@ -66,13 +66,40 @@ struct idmap_msg {/* Forward declaration to make this header independent of others */ struct nfs_client ; +#ifdef CONFIG_NFS_USE_NEW_IDMAPPER + +int nfs_idmap_init (void ); +void nfs_idmap_quit (void ); + +static inline int nfs_idmap_new (struct nfs_client *clp) +{ +return 0 ; +} + +static inline void nfs_idmap_delete (struct nfs_client *clp) +{ +} + +#else /* CONFIG_NFS_USE_NEW_IDMAPPER not set */ + +static inline int nfs_idmap_init (void ) +{ +return 0 ; +} + +static inline void nfs_idmap_quit (void ) +{ +} +int nfs_idmap_new (struct nfs_client *);void nfs_idmap_delete (struct nfs_client *); +#endif /* CONFIG_NFS_USE_NEW_IDMAPPER */ +int nfs_map_name_to_uid (struct nfs_client *,const char *,size_t ,__u32 *);int nfs_map_group_to_gid (struct nfs_client *,const char *,size_t ,__u32 *); -int nfs_map_uid_to_name (struct nfs_client *,__u32 ,char *); -int nfs_map_gid_to_group (struct nfs_client *,__u32 ,char *); +int nfs_map_uid_to_name (struct nfs_client *,__u32 ,char *,size_t ); +int nfs_map_gid_to_group (struct nfs_client *,__u32 ,char *,size_t );extern unsigned int nfs_idmap_cache_timeout;#endif /* __KERNEL__ */