Merge commit 'origin/master'

N: Linus Torvalds

E: torvalds@linux-foundation.org

D: Original kernel hacker

S: 12725 SW Millikan Way, Suite 400

S: Beaverton, Oregon 97005

S: Portland, Oregon 97005

S: USA

N: Marcelo Tosatti

<!-- !Edrivers/usb/gadget/epautoconf.c -->

</sect1>

<sect1 id="composite"><title>Composite Device Framework</title>

<para>The core API is sufficient for writing drivers for composite

USB devices (with more than one function in a given configuration),

and also multi-configuration devices (also more than one function,

but not necessarily sharing a given configuration).

There is however an optional framework which makes it easier to

reuse and combine functions.

</para>

<para>Devices using this framework provide a <emphasis>struct

usb_composite_driver</emphasis>, which in turn provides one or

more <emphasis>struct usb_configuration</emphasis> instances.

Each such configuration includes at least one

<emphasis>struct usb_function</emphasis>, which packages a user

visible role such as "network link" or "mass storage device".

Management functions may also exist, such as "Device Firmware

Upgrade".

</para>

!Iinclude/linux/usb/composite.h

!Edrivers/usb/gadget/composite.c

</sect1>

<sect1 id="functions"><title>Composite Device Functions</title>

<para>At this writing, a few of the current gadget drivers have

been converted to this framework.

Near-term plans include converting all of them, except for "gadgetfs".

</para>

!Edrivers/usb/gadget/f_acm.c

!Edrivers/usb/gadget/f_serial.c

</sect1>

</chapter>

<chapter id="controllers"><title>Peripheral Controller Drivers</title>

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

What:	SCTP_GET_PEER_ADDRS_NUM_OLD, SCTP_GET_PEER_ADDRS_OLD,

	SCTP_GET_LOCAL_ADDRS_NUM_OLD, SCTP_GET_LOCAL_ADDRS_OLD

When: 	June 2009

Why:    A newer version of the options have been introduced in 2005 that

	removes the limitions of the old API.  The sctp library has been

        converted to use these new options at the same time.  Any user

	space app that directly uses the old options should convert to using

	the new options.

Who:	Vlad Yasevich <vladislav.yasevich@hp.com>

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

What:	CONFIG_THERMAL_HWMON

When:	January 2009

Why:	This option was introduced just to allow older lm-sensors userspace

	to keep working over the upgrade to 2.6.26. At the scheduled time of

	removal fixed lm-sensors (2.x or 3.x) should be readily available.

Who:	Rene Herman <rene.herman@gmail.com>

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

What:	Code that is now under CONFIG_WIRELESS_EXT_SYSFS

	(in net/core/net-sysfs.c)

When:	After the only user (hal) has seen a release with the patches

	for enough time, probably some time in 2010.

Why:	Over 1K .text/.data size reduction, data is available in other

	ways (ioctls)

Who:	Johannes Berg <johannes@sipsolutions.net>

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

What: CONFIG_NF_CT_ACCT

When: 2.6.29

Why:  Accounting can now be enabled/disabled without kernel recompilation.

      Currently used only to set a default value for a feature that is also

      controlled by a kernel/module/sysfs/sysctl parameter.

Who:  Krzysztof Piotr Oledzki <ole@ans.pl>

	simple_child = kzalloc(sizeof(struct simple_child), GFP_KERNEL);

	if (!simple_child)

		return NULL;

		return ERR_PTR(-ENOMEM);

	config_item_init_type_name(&simple_child->item, name,

	simple_children = kzalloc(sizeof(struct simple_children),

				  GFP_KERNEL);

	if (!simple_children)

		return NULL;

		return ERR_PTR(-ENOMEM);

	config_group_init_type_name(&simple_children->group, name,

################################################################################

 Author: NetApp and Open Grid Computing

 Date: April 15, 2008

 Date: May 29, 2008

Table of Contents

~~~~~~~~~~~~~~~~~

    The procedures described in this document have been tested with

    distributions from Red Hat's Fedora Project (http://fedora.redhat.com/).

  - Install nfs-utils-1.1.1 or greater on the client

  - Install nfs-utils-1.1.2 or greater on the client

    An NFS/RDMA mount point can only be obtained by using the mount.nfs

    command in nfs-utils-1.1.1 or greater. To see which version of mount.nfs

    you are using, type:

    An NFS/RDMA mount point can be obtained by using the mount.nfs command in

    nfs-utils-1.1.2 or greater (nfs-utils-1.1.1 was the first nfs-utils

    version with support for NFS/RDMA mounts, but for various reasons we

    recommend using nfs-utils-1.1.2 or greater). To see which version of

    mount.nfs you are using, type:

    > /sbin/mount.nfs -V

    $ /sbin/mount.nfs -V

    If the version is less than 1.1.1 or the command does not exist,

    then you will need to install the latest version of nfs-utils.

    If the version is less than 1.1.2 or the command does not exist,

    you should install the latest version of nfs-utils.

    Download the latest package from:

    Uncompress the package and follow the installation instructions.

    If you will not be using GSS and NFSv4, the installation process

    can be simplified by disabling these features when running configure:

    If you will not need the idmapper and gssd executables (you do not need

    these to create an NFS/RDMA enabled mount command), the installation

    process can be simplified by disabling these features when running

    configure:

    > ./configure --disable-gss --disable-nfsv4

    $ ./configure --disable-gss --disable-nfsv4

    For more information on this see the package's README and INSTALL files.

    To build nfs-utils you will need the tcp_wrappers package installed. For

    more information on this see the package's README and INSTALL files.

    After building the nfs-utils package, there will be a mount.nfs binary in

    the utils/mount directory. This binary can be used to initiate NFS v2, v3,

    or v4 mounts. To initiate a v4 mount, the binary must be called mount.nfs4.

    The standard technique is to create a symlink called mount.nfs4 to mount.nfs.

    or v4 mounts. To initiate a v4 mount, the binary must be called

    mount.nfs4.  The standard technique is to create a symlink called

    mount.nfs4 to mount.nfs.

    NOTE: mount.nfs and therefore nfs-utils-1.1.1 or greater is only needed

    This mount.nfs binary should be installed at /sbin/mount.nfs as follows:

    $ sudo cp utils/mount/mount.nfs /sbin/mount.nfs

    In this location, mount.nfs will be invoked automatically for NFS mounts

    by the system mount commmand.

    NOTE: mount.nfs and therefore nfs-utils-1.1.2 or greater is only needed

    on the NFS client machine. You do not need this specific version of

    nfs-utils on the server. Furthermore, only the mount.nfs command from

    nfs-utils-1.1.1 is needed on the client.

    nfs-utils-1.1.2 is needed on the client.

  - Install a Linux kernel with NFS/RDMA

    this time. For example, if you are using a Mellanox Tavor/Sinai/Arbel

    card:

    > modprobe ib_mthca

    > modprobe ib_ipoib

    $ modprobe ib_mthca

    $ modprobe ib_ipoib

    If you are using InfiniBand, make sure there is a Subnet Manager (SM)

    running on the network. If your IB switch has an embedded SM, you can

    If an SM is running on your network, you should see the following:

    > cat /sys/class/infiniband/driverX/ports/1/state

    $ cat /sys/class/infiniband/driverX/ports/1/state

    4: ACTIVE

    where driverX is mthca0, ipath5, ehca3, etc.

    To further test the InfiniBand software stack, use IPoIB (this

    assumes you have two IB hosts named host1 and host2):

    host1> ifconfig ib0 a.b.c.x

    host2> ifconfig ib0 a.b.c.y

    host1> ping a.b.c.y

    host2> ping a.b.c.x

    host1$ ifconfig ib0 a.b.c.x

    host2$ ifconfig ib0 a.b.c.y

    host1$ ping a.b.c.y

    host2$ ping a.b.c.x

    For other device types, follow the appropriate procedures.

    /vol0   192.168.0.47(fsid=0,rw,async,insecure,no_root_squash)

    /vol0   192.168.0.0/255.255.255.0(fsid=0,rw,async,insecure,no_root_squash)

    The IP address(es) is(are) the client's IPoIB address for an InfiniBand HCA or the

    cleint's iWARP address(es) for an RNIC.

    The IP address(es) is(are) the client's IPoIB address for an InfiniBand

    HCA or the cleint's iWARP address(es) for an RNIC.

    NOTE: The "insecure" option must be used because the NFS/RDMA client does not

    use a reserved port.

    NOTE: The "insecure" option must be used because the NFS/RDMA client does

    not use a reserved port.

 Each time a machine boots:

    For InfiniBand using a Mellanox adapter:

    > modprobe ib_mthca

    > modprobe ib_ipoib

    > ifconfig ib0 a.b.c.d

    $ modprobe ib_mthca

    $ modprobe ib_ipoib

    $ ifconfig ib0 a.b.c.d

    NOTE: use unique addresses for the client and server

  - Start the NFS server

    If the NFS/RDMA server was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in kernel config),

    load the RDMA transport module:

    If the NFS/RDMA server was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in

    kernel config), load the RDMA transport module:

    > modprobe svcrdma

    $ modprobe svcrdma

    Regardless of how the server was built (module or built-in), start the server:

    Regardless of how the server was built (module or built-in), start the

    server:

    > /etc/init.d/nfs start

    $ /etc/init.d/nfs start

    or

    > service nfs start

    $ service nfs start

    Instruct the server to listen on the RDMA transport:

    > echo rdma 2050 > /proc/fs/nfsd/portlist

    $ echo rdma 2050 > /proc/fs/nfsd/portlist

  - On the client system

    If the NFS/RDMA client was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in kernel config),

    load the RDMA client module:

    If the NFS/RDMA client was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in

    kernel config), load the RDMA client module:

    > modprobe xprtrdma.ko

    $ modprobe xprtrdma.ko

    Regardless of how the client was built (module or built-in), issue the mount.nfs command:

    Regardless of how the client was built (module or built-in), use this

    command to mount the NFS/RDMA server:

    > /path/to/your/mount.nfs <IPoIB-server-name-or-address>:/<export> /mnt -i -o rdma,port=2050

    $ mount -o rdma,port=2050 <IPoIB-server-name-or-address>:/<export> /mnt

    To verify that the mount is using RDMA, run "cat /proc/mounts" and check the

    "proto" field for the given mount.

    To verify that the mount is using RDMA, run "cat /proc/mounts" and check

    the "proto" field for the given mount.

  Congratulations! You're using NFS/RDMA!