Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f63d395d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-3.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client updates for Linux 3.4 from Trond Myklebust:
 "New features include:
   - Add NFS client support for containers.

     This should enable most of the necessary functionality, including
     lockd support, and support for rpc.statd, NFSv4 idmapper and
     RPCSEC_GSS upcalls into the correct network namespace from which
     the mount system call was issued.

   - NFSv4 idmapper scalability improvements

     Base the idmapper cache on the keyring interface to allow
     concurrent access to idmapper entries.  Start the process of
     migrating users from the single-threaded daemon-based approach to
     the multi-threaded request-key based approach.

   - NFSv4.1 implementation id.

     Allows the NFSv4.1 client and server to mutually identify each
     other for logging and debugging purposes.

   - Support the 'vers=4.1' mount option for mounting NFSv4.1 instead of
     having to use the more counterintuitive 'vers=4,minorversion=1'.

   - SUNRPC tracepoints.

     Start the process of adding tracepoints in order to improve
     debugging of the RPC layer.

   - pNFS object layout support for autologin.

  Important bugfixes include:

   - Fix a bug in rpc_wake_up/rpc_wake_up_status that caused them to
     fail to wake up all tasks when applied to priority waitqueues.

   - Ensure that we handle read delegations correctly, when we try to
     truncate a file.

   - A number of fixes for NFSv4 state manager loops (mostly to do with
     delegation recovery)."

* tag 'nfs-for-3.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (224 commits)
  NFS: fix sb->s_id in nfs debug prints
  xprtrdma: Remove assumption that each segment is <= PAGE_SIZE
  xprtrdma: The transport should not bug-check when a dup reply is received
  pnfs-obj: autologin: Add support for protocol autologin
  NFS: Remove nfs4_setup_sequence from generic rename code
  NFS: Remove nfs4_setup_sequence from generic unlink code
  NFS: Remove nfs4_setup_sequence from generic read code
  NFS: Remove nfs4_setup_sequence from generic write code
  NFS: Fix more NFS debug related build warnings
  SUNRPC/LOCKD: Fix build warnings when CONFIG_SUNRPC_DEBUG is undefined
  nfs: non void functions must return a value
  SUNRPC: Kill compiler warning when RPC_DEBUG is unset
  SUNRPC/NFS: Add Kbuild dependencies for NFS_DEBUG/RPC_DEBUG
  NFS: Use cond_resched_lock() to reduce latencies in the commit scans
  NFSv4: It is not safe to dereference lsp->ls_state in release_lockowner
  NFS: ncommit count is being double decremented
  SUNRPC: We must not use list_for_each_entry_safe() in rpc_wake_up()
  Try using machine credentials for RENEW calls
  NFSv4.1: Fix a few issues in filelayout_commit_pagelist
  NFSv4.1: Clean ups and bugfixes for the pNFS read/writeback/commit code
  ...
parents 643ac9fc 5a7c9eec

Documentation/filesystems/nfs/idmapper.txt

+14 −6
Original line number Diff line number Diff line
@@ -4,13 +4,21 @@ ID Mapper 
=========

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

translation and initialize a key with the resulting information.

performing an upcall to userspace to request the information.  There are two

ways NFS could obtain this information: placing a call to /sbin/request-key

or by placing a call to the rpc.idmap daemon.



NFS will attempt to call /sbin/request-key first.  If this succeeds, the

result will be cached using the generic request-key cache.  This call should

only fail if /etc/request-key.conf is not configured for the id_resolver key

type, see the "Configuring" section below if you wish to use the request-key

method.



If the call to /sbin/request-key fails (if /etc/request-key.conf is not

configured with the id_resolver key type), then the idmapper will ask the

legacy rpc.idmap daemon for the id mapping.  This result will be stored

in a custom NFS idmap cache.



 NFS_USE_NEW_IDMAPPER must be selected when configuring the kernel to use this

 feature.



===========

Configuring

Documentation/filesystems/nfs/pnfs.txt

+54 −0
Original line number Diff line number Diff line
@@ -53,3 +53,57 @@ lseg maintains an extra reference corresponding to the NFS_LSEG_VALID 
bit which holds it in the pnfs_layout_hdr's list.  When the final lseg

is removed from the pnfs_layout_hdr's list, the NFS_LAYOUT_DESTROYED

bit is set, preventing any new lsegs from being added.



layout drivers

--------------



PNFS utilizes what is called layout drivers. The STD defines 3 basic

layout types: "files" "objects" and "blocks". For each of these types

there is a layout-driver with a common function-vectors table which

are called by the nfs-client pnfs-core to implement the different layout

types.



Files-layout-driver code is in: fs/nfs/nfs4filelayout.c && nfs4filelayoutdev.c

Objects-layout-deriver code is in: fs/nfs/objlayout/.. directory

Blocks-layout-deriver code is in: fs/nfs/blocklayout/.. directory



objects-layout setup

--------------------



As part of the full STD implementation the objlayoutdriver.ko needs, at times,

to automatically login to yet undiscovered iscsi/osd devices. For this the

driver makes up-calles to a user-mode script called *osd_login*



The path_name of the script to use is by default:

	/sbin/osd_login.

This name can be overridden by the Kernel module parameter:

	objlayoutdriver.osd_login_prog



If Kernel does not find the osd_login_prog path it will zero it out

and will not attempt farther logins. An admin can then write new value

to the objlayoutdriver.osd_login_prog Kernel parameter to re-enable it.



The /sbin/osd_login is part of the nfs-utils package, and should usually

be installed on distributions that support this Kernel version.



The API to the login script is as follows:

	Usage: $0 -u <URI> -o <OSDNAME> -s <SYSTEMID>

	Options:

		-u		target uri e.g. iscsi://<ip>:<port>

				(allways exists)

				(More protocols can be defined in the future.

				 The client does not interpret this string it is

				 passed unchanged as recieved from the Server)

		-o		osdname of the requested target OSD

				(Might be empty)

				(A string which denotes the OSD name, there is a

				 limit of 64 chars on this string)

		-s 		systemid of the requested target OSD

				(Might be empty)

				(This string, if not empty is always an hex

				 representation of the 20 bytes osd_system_id)



blocks-layout setup

-------------------



TODO: Document the setup needs of the blocks layout driver

Documentation/kernel-parameters.txt

+23 −0
Original line number Diff line number Diff line
@@ -1672,6 +1672,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			of returning the full 64-bit number.

			The default is to return 64-bit inode numbers.



	nfs.max_session_slots=

			[NFSv4.1] Sets the maximum number of session slots

			the client will attempt to negotiate with the server.

			This limits the number of simultaneous RPC requests

			that the client can send to the NFSv4.1 server.

			Note that there is little point in setting this

			value higher than the max_tcp_slot_table_limit.



	nfs.nfs4_disable_idmapping=

			[NFSv4] When set to the default of '1', this option

			ensures that both the RPC level authentication
@@ -1685,6 +1693,21 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			back to using the idmapper.

			To turn off this behaviour, set the value to '0'.



	nfs.send_implementation_id =

			[NFSv4.1] Send client implementation identification

			information in exchange_id requests.

			If zero, no implementation identification information

			will be sent.

			The default is to send the implementation identification

			information.





	objlayoutdriver.osd_login_prog=

			[NFS] [OBJLAYOUT] sets the pathname to the program which

			is used to automatically discover and login into new

			osd-targets. Please see:

			Documentation/filesystems/pnfs.txt for more explanations



	nmi_debug=	[KNL,AVR32,SH] Specify one or more actions to take

			when a NMI is triggered.

			Format: [state][,regs][,debounce][,die]

fs/lockd/clnt4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ static struct rpc_procinfo nlm4_procedures[] = { 
	PROC(GRANTED_RES,	res,		norep),

};



struct rpc_version	nlm_version4 = {

const struct rpc_version nlm_version4 = {

	.number		= 4,

	.nrprocs	= ARRAY_SIZE(nlm4_procedures),

	.procs		= nlm4_procedures,

fs/lockd/clntlock.c

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ struct nlm_host *nlmclnt_init(const struct nlmclnt_initdata *nlm_init) 


	host = nlmclnt_lookup_host(nlm_init->address, nlm_init->addrlen,

				   nlm_init->protocol, nlm_version,

				   nlm_init->hostname, nlm_init->noresvport);

				   nlm_init->hostname, nlm_init->noresvport,

				   nlm_init->net);

	if (host == NULL) {

		lockd_down();

		return ERR_PTR(-ENOLCK);