* [PATCH 0/2] Enable the in-kernel id mapping to be on by default (ver #2) @ 2011-11-12 15:53 Steve Dickson 2011-11-12 15:53 ` [PATCH 1/2] Enable the in-kernel ID mapping upcall mechanism Steve Dickson 2011-11-12 15:53 ` [PATCH 2/2] idmapper.txt: Fix the upcall binary name Steve Dickson 0 siblings, 2 replies; 5+ messages in thread From: Steve Dickson @ 2011-11-12 15:53 UTC (permalink / raw) To: Linux NFS Mailing List In this version I updated idmapper.txt to specify the timeout with the '-k' flag. Steve Dickson (2): Enable the in-kernel ID mapping upcall mechanism idmapper.txt: Fix the upcall binary name. Documentation/filesystems/nfs/idmapper.txt | 26 +++++++++++++------------- fs/nfs/Kconfig | 10 ++-------- 2 files changed, 15 insertions(+), 21 deletions(-) -- 1.7.7 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] Enable the in-kernel ID mapping upcall mechanism 2011-11-12 15:53 [PATCH 0/2] Enable the in-kernel id mapping to be on by default (ver #2) Steve Dickson @ 2011-11-12 15:53 ` Steve Dickson 2011-11-12 15:53 ` [PATCH 2/2] idmapper.txt: Fix the upcall binary name Steve Dickson 1 sibling, 0 replies; 5+ messages in thread From: Steve Dickson @ 2011-11-12 15:53 UTC (permalink / raw) To: Linux NFS Mailing List To solve deadlocks that can occur between the rpc.idmapd daemon and the kernel, enables the in-kernel upcall mechanism that uses the key rings to store the user/group ids. Signed-off-by: Steve Dickson <steved@redhat.com> --- fs/nfs/Kconfig | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig index dbcd821..94ad028 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig @@ -134,12 +134,6 @@ config NFS_USE_KERNEL_DNS default y config NFS_USE_NEW_IDMAPPER - bool "Use the new idmapper upcall routine" + bool "Use the 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. + default y -- 1.7.7 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] idmapper.txt: Fix the upcall binary name. 2011-11-12 15:53 [PATCH 0/2] Enable the in-kernel id mapping to be on by default (ver #2) Steve Dickson 2011-11-12 15:53 ` [PATCH 1/2] Enable the in-kernel ID mapping upcall mechanism Steve Dickson @ 2011-11-12 15:53 ` Steve Dickson 1 sibling, 0 replies; 5+ messages in thread From: Steve Dickson @ 2011-11-12 15:53 UTC (permalink / raw) To: Linux NFS Mailing List The binary that handles the upcalls from is kernel is called nfsidmap not nfs.idmap. The '-k' flag is now used to specify the timeout Signed-off-by: Steve Dickson <steved@redhat.com> --- Documentation/filesystems/nfs/idmapper.txt | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Documentation/filesystems/nfs/idmapper.txt b/Documentation/filesystems/nfs/idmapper.txt index 120fd3c..18276ef 100644 --- a/Documentation/filesystems/nfs/idmapper.txt +++ b/Documentation/filesystems/nfs/idmapper.txt @@ -6,7 +6,7 @@ Id mapper is used by NFS to translate user and group ids into names, and to translate user and group names into ids. Part of this translation involves performing an upcall to userspace to request the information. Id mapper will user request-key to perform this upcall and cache the result. The program -/usr/sbin/nfs.idmap should be called by request-key, and will perform the +/usr/sbin/nfsidmap should be called by request-key, and will perform the translation and initialize a key with the resulting information. NFS_USE_NEW_IDMAPPER must be selected when configuring the kernel to use this @@ -20,12 +20,12 @@ direct the upcall. The following line should be added: #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... #====== ======= =============== =============== =============================== -create id_resolver * * /usr/sbin/nfs.idmap %k %d 600 +create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d -This will direct all id_resolver requests to the program /usr/sbin/nfs.idmap. -The last parameter, 600, defines how many seconds into the future the key will -expire. This parameter is optional for /usr/sbin/nfs.idmap. When the timeout -is not specified, nfs.idmap will default to 600 seconds. +This will direct all id_resolver requests to the program /usr/sbin/nfsidmap. +The '-k 600' arguemnt defines how many seconds into the future the key will +expire. This parameter is optional for /usr/sbin/nfsidmap. When the timeout +is not specified, nfsidmap will default to 600 seconds. id mapper uses for key descriptions: uid: Find the UID for the given user @@ -39,29 +39,29 @@ would edit your request-key.conf so it look similar to this: #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... #====== ======= =============== =============== =============================== -create id_resolver uid:* * /some/other/program %k %d 600 -create id_resolver * * /usr/sbin/nfs.idmap %k %d 600 +create id_resolver uid:* * /some/other/program %k %d +create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d Notice that the new line was added above the line for the generic program. request-key will find the first matching line and corresponding program. In this case, /some/other/program will handle all uid lookups and -/usr/sbin/nfs.idmap will handle gid, user, and group lookups. +/usr/sbin/nfsidmap will handle gid, user, and group lookups. See <file:Documentation/security/keys-request-key.txt> for more information about the request-key function. ========= -nfs.idmap +nfsidmap ========= -nfs.idmap is designed to be called by request-key, and should not be run "by +nfsidmap is designed to be called by request-key, and should not be run "by hand". This program takes two arguments, a serialized key and a key description. The serialized key is first converted into a key_serial_t, and then passed as an argument to keyctl_instantiate (both are part of keyutils.h). -The actual lookups are performed by functions found in nfsidmap.h. nfs.idmap +The actual lookups are performed by functions found in nfsidmap.h. nfsidmap determines the correct function to call by looking at the first part of the description string. For example, a uid lookup description will appear as "uid:user@domain". -nfs.idmap will return 0 if the key was instantiated, and non-zero otherwise. +nfsidmap will return 0 if the key was instantiated, and non-zero otherwise. -- 1.7.7 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 0/2] Enable the in-kernel id mapping to be on by default. @ 2011-11-10 20:26 Steve Dickson 2011-11-10 20:26 ` [PATCH 2/2] idmapper.txt: Fix the upcall binary name Steve Dickson 0 siblings, 1 reply; 5+ messages in thread From: Steve Dickson @ 2011-11-10 20:26 UTC (permalink / raw) To: Linux NFS Mailing list This patch set enables the in-kernel id mapping upcall mechanism, which will fix deadlocks that can occur between the rpc.idmapd daemon and the kernel. This set also correct the binary name in the kernel documentation Steve Dickson (2): Enable the in-kernel ID mapping upcall mechanism Renamed the binary that handles the upcalls to /usr/sbin/nfsidmap Documentation/filesystems/nfs/idmapper.txt | 22 +++++++++++----------- fs/nfs/Kconfig | 10 ++-------- 2 files changed, 13 insertions(+), 19 deletions(-) -- 1.7.6.4 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] idmapper.txt: Fix the upcall binary name. 2011-11-10 20:26 [PATCH 0/2] Enable the in-kernel id mapping to be on by default Steve Dickson @ 2011-11-10 20:26 ` Steve Dickson 2011-11-10 20:42 ` Bryan Schumaker 0 siblings, 1 reply; 5+ messages in thread From: Steve Dickson @ 2011-11-10 20:26 UTC (permalink / raw) To: Linux NFS Mailing list The binary that handles the upcalls from is kernel is called nfsidmap not nfs.idmap. Signed-off-by: Steve Dickson <steved@redhat.com> --- Documentation/filesystems/nfs/idmapper.txt | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Documentation/filesystems/nfs/idmapper.txt b/Documentation/filesystems/nfs/idmapper.txt index 120fd3c..9c1925a 100644 --- a/Documentation/filesystems/nfs/idmapper.txt +++ b/Documentation/filesystems/nfs/idmapper.txt @@ -6,7 +6,7 @@ Id mapper is used by NFS to translate user and group ids into names, and to translate user and group names into ids. Part of this translation involves performing an upcall to userspace to request the information. Id mapper will user request-key to perform this upcall and cache the result. The program -/usr/sbin/nfs.idmap should be called by request-key, and will perform the +/usr/sbin/nfsidmap should be called by request-key, and will perform the translation and initialize a key with the resulting information. NFS_USE_NEW_IDMAPPER must be selected when configuring the kernel to use this @@ -20,12 +20,12 @@ direct the upcall. The following line should be added: #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... #====== ======= =============== =============== =============================== -create id_resolver * * /usr/sbin/nfs.idmap %k %d 600 +create id_resolver * * /usr/sbin/nfsidmap %k %d 600 -This will direct all id_resolver requests to the program /usr/sbin/nfs.idmap. +This will direct all id_resolver requests to the program /usr/sbin/nfsidmap. The last parameter, 600, defines how many seconds into the future the key will -expire. This parameter is optional for /usr/sbin/nfs.idmap. When the timeout -is not specified, nfs.idmap will default to 600 seconds. +expire. This parameter is optional for /usr/sbin/nfsidmap. When the timeout +is not specified, nfsidmap will default to 600 seconds. id mapper uses for key descriptions: uid: Find the UID for the given user @@ -40,28 +40,28 @@ would edit your request-key.conf so it look similar to this: #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... #====== ======= =============== =============== =============================== create id_resolver uid:* * /some/other/program %k %d 600 -create id_resolver * * /usr/sbin/nfs.idmap %k %d 600 +create id_resolver * * /usr/sbin/nfsidmap %k %d 600 Notice that the new line was added above the line for the generic program. request-key will find the first matching line and corresponding program. In this case, /some/other/program will handle all uid lookups and -/usr/sbin/nfs.idmap will handle gid, user, and group lookups. +/usr/sbin/nfsidmap will handle gid, user, and group lookups. See <file:Documentation/security/keys-request-key.txt> for more information about the request-key function. ========= -nfs.idmap +nfsidmap ========= -nfs.idmap is designed to be called by request-key, and should not be run "by +nfsidmap is designed to be called by request-key, and should not be run "by hand". This program takes two arguments, a serialized key and a key description. The serialized key is first converted into a key_serial_t, and then passed as an argument to keyctl_instantiate (both are part of keyutils.h). -The actual lookups are performed by functions found in nfsidmap.h. nfs.idmap +The actual lookups are performed by functions found in nfsidmap.h. nfsidmap determines the correct function to call by looking at the first part of the description string. For example, a uid lookup description will appear as "uid:user@domain". -nfs.idmap will return 0 if the key was instantiated, and non-zero otherwise. +nfsidmap will return 0 if the key was instantiated, and non-zero otherwise. -- 1.7.6.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] idmapper.txt: Fix the upcall binary name. 2011-11-10 20:26 ` [PATCH 2/2] idmapper.txt: Fix the upcall binary name Steve Dickson @ 2011-11-10 20:42 ` Bryan Schumaker 0 siblings, 0 replies; 5+ messages in thread From: Bryan Schumaker @ 2011-11-10 20:42 UTC (permalink / raw) To: Steve Dickson; +Cc: Linux NFS Mailing list On Thu 10 Nov 2011 03:26:03 PM EST, Steve Dickson wrote: > The binary that handles the upcalls from is kernel is called > nfsidmap not nfs.idmap. I'm surprised this wasn't changed when the binary name changed. Good catch! - Bryan > > Signed-off-by: Steve Dickson <steved@redhat.com> > --- > Documentation/filesystems/nfs/idmapper.txt | 22 +++++++++++----------- > 1 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/Documentation/filesystems/nfs/idmapper.txt b/Documentation/filesystems/nfs/idmapper.txt > index 120fd3c..9c1925a 100644 > --- a/Documentation/filesystems/nfs/idmapper.txt > +++ b/Documentation/filesystems/nfs/idmapper.txt > @@ -6,7 +6,7 @@ Id mapper is used by NFS to translate user and group ids into names, and to > translate user and group names into ids. Part of this translation involves > performing an upcall to userspace to request the information. Id mapper will > user request-key to perform this upcall and cache the result. The program > -/usr/sbin/nfs.idmap should be called by request-key, and will perform the > +/usr/sbin/nfsidmap should be called by request-key, and will perform the > translation and initialize a key with the resulting information. > > NFS_USE_NEW_IDMAPPER must be selected when configuring the kernel to use this > @@ -20,12 +20,12 @@ direct the upcall. The following line should be added: > > #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... > #====== ======= =============== =============== =============================== > -create id_resolver * * /usr/sbin/nfs.idmap %k %d 600 > +create id_resolver * * /usr/sbin/nfsidmap %k %d 600 > > -This will direct all id_resolver requests to the program /usr/sbin/nfs.idmap. > +This will direct all id_resolver requests to the program /usr/sbin/nfsidmap. > The last parameter, 600, defines how many seconds into the future the key will > -expire. This parameter is optional for /usr/sbin/nfs.idmap. When the timeout > -is not specified, nfs.idmap will default to 600 seconds. > +expire. This parameter is optional for /usr/sbin/nfsidmap. When the timeout > +is not specified, nfsidmap will default to 600 seconds. > > id mapper uses for key descriptions: > uid: Find the UID for the given user > @@ -40,28 +40,28 @@ would edit your request-key.conf so it look similar to this: > #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... > #====== ======= =============== =============== =============================== > create id_resolver uid:* * /some/other/program %k %d 600 > -create id_resolver * * /usr/sbin/nfs.idmap %k %d 600 > +create id_resolver * * /usr/sbin/nfsidmap %k %d 600 > > Notice that the new line was added above the line for the generic program. > request-key will find the first matching line and corresponding program. In > this case, /some/other/program will handle all uid lookups and > -/usr/sbin/nfs.idmap will handle gid, user, and group lookups. > +/usr/sbin/nfsidmap will handle gid, user, and group lookups. > > See <file:Documentation/security/keys-request-key.txt> for more information > about the request-key function. > > > ========= > -nfs.idmap > +nfsidmap > ========= > -nfs.idmap is designed to be called by request-key, and should not be run "by > +nfsidmap is designed to be called by request-key, and should not be run "by > hand". This program takes two arguments, a serialized key and a key > description. The serialized key is first converted into a key_serial_t, and > then passed as an argument to keyctl_instantiate (both are part of keyutils.h). > > -The actual lookups are performed by functions found in nfsidmap.h. nfs.idmap > +The actual lookups are performed by functions found in nfsidmap.h. nfsidmap > determines the correct function to call by looking at the first part of the > description string. For example, a uid lookup description will appear as > "uid:user@domain". > > -nfs.idmap will return 0 if the key was instantiated, and non-zero otherwise. > +nfsidmap will return 0 if the key was instantiated, and non-zero otherwise. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-11-12 15:53 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-11-12 15:53 [PATCH 0/2] Enable the in-kernel id mapping to be on by default (ver #2) Steve Dickson 2011-11-12 15:53 ` [PATCH 1/2] Enable the in-kernel ID mapping upcall mechanism Steve Dickson 2011-11-12 15:53 ` [PATCH 2/2] idmapper.txt: Fix the upcall binary name Steve Dickson -- strict thread matches above, loose matches on Subject: below -- 2011-11-10 20:26 [PATCH 0/2] Enable the in-kernel id mapping to be on by default Steve Dickson 2011-11-10 20:26 ` [PATCH 2/2] idmapper.txt: Fix the upcall binary name Steve Dickson 2011-11-10 20:42 ` Bryan Schumaker
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox