Skip to content

Commit 1c29dd9

Browse files
author
Ingo Molnar
committed
Merge branch 'linus' into x86/paravirt-spinlocks
2 parents 3217256 + 14b395e commit 1c29dd9

File tree

1,549 files changed

+148454
-79113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,549 files changed

+148454
-79113
lines changed

‎Documentation/feature-removal-schedule.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,9 +308,31 @@ Who: Matthew Wilcox <willy@linux.intel.com>
308308

309309
---------------------------
310310

311+
What: SCTP_GET_PEER_ADDRS_NUM_OLD, SCTP_GET_PEER_ADDRS_OLD,
312+
SCTP_GET_LOCAL_ADDRS_NUM_OLD, SCTP_GET_LOCAL_ADDRS_OLD
313+
When: June 2009
314+
Why: A newer version of the options have been introduced in 2005 that
315+
removes the limitions of the old API. The sctp library has been
316+
converted to use these new options at the same time. Any user
317+
space app that directly uses the old options should convert to using
318+
the new options.
319+
Who: Vlad Yasevich <vladislav.yasevich@hp.com>
320+
321+
---------------------------
322+
311323
What: CONFIG_THERMAL_HWMON
312324
When: January 2009
313325
Why: This option was introduced just to allow older lm-sensors userspace
314326
to keep working over the upgrade to 2.6.26. At the scheduled time of
315327
removal fixed lm-sensors (2.x or 3.x) should be readily available.
316328
Who: Rene Herman <rene.herman@gmail.com>
329+
330+
---------------------------
331+
332+
What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS
333+
(in net/core/net-sysfs.c)
334+
When: After the only user (hal) has seen a release with the patches
335+
for enough time, probably some time in 2010.
336+
Why: Over 1K .text/.data size reduction, data is available in other
337+
ways (ioctls)
338+
Who: Johannes Berg <johannes@sipsolutions.net>

‎Documentation/filesystems/configfs/configfs.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,10 @@ accomplished via the group operations specified on the group's
233233
config_item_type.
234234

235235
struct configfs_group_operations {
236-
int (*make_item)(struct config_group *group,
237-
const char *name,
238-
struct config_item **new_item);
239-
int (*make_group)(struct config_group *group,
240-
const char *name,
241-
struct config_group **new_group);
236+
struct config_item *(*make_item)(struct config_group *group,
237+
const char *name);
238+
struct config_group *(*make_group)(struct config_group *group,
239+
const char *name);
242240
int (*commit_item)(struct config_item *item);
243241
void (*disconnect_notify)(struct config_group *group,
244242
struct config_item *item);

‎Documentation/filesystems/configfs/configfs_example.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,22 +273,21 @@ static inline struct simple_children *to_simple_children(struct config_item *ite
273273
return item ? container_of(to_config_group(item), struct simple_children, group) : NULL;
274274
}
275275

276-
static int simple_children_make_item(struct config_group *group, const char *name, struct config_item **new_item)
276+
static struct config_item *simple_children_make_item(struct config_group *group, const char *name)
277277
{
278278
struct simple_child *simple_child;
279279

280280
simple_child = kzalloc(sizeof(struct simple_child), GFP_KERNEL);
281281
if (!simple_child)
282-
return -ENOMEM;
282+
return ERR_PTR(-ENOMEM);
283283

284284

285285
config_item_init_type_name(&simple_child->item, name,
286286
&simple_child_type);
287287

288288
simple_child->storeme = 0;
289289

290-
*new_item = &simple_child->item;
291-
return 0;
290+
return &simple_child->item;
292291
}
293292

294293
static struct configfs_attribute simple_children_attr_description = {
@@ -360,21 +359,20 @@ static struct configfs_subsystem simple_children_subsys = {
360359
* children of its own.
361360
*/
362361

363-
static int group_children_make_group(struct config_group *group, const char *name, struct config_group **new_group)
362+
static struct config_group *group_children_make_group(struct config_group *group, const char *name)
364363
{
365364
struct simple_children *simple_children;
366365

367366
simple_children = kzalloc(sizeof(struct simple_children),
368367
GFP_KERNEL);
369368
if (!simple_children)
370-
return -ENOMEM;
369+
return ERR_PTR(-ENOMEM);
371370

372371

373372
config_group_init_type_name(&simple_children->group, name,
374373
&simple_children_type);
375374

376-
*new_group = &simple_children->group;
377-
return 0;
375+
return &simple_children->group;
378376
}
379377

380378
static struct configfs_attribute group_children_attr_description = {

‎Documentation/filesystems/nfs-rdma.txt

Lines changed: 59 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
################################################################################
66

77
Author: NetApp and Open Grid Computing
8-
Date: April 15, 2008
8+
Date: May 29, 2008
99

1010
Table of Contents
1111
~~~~~~~~~~~~~~~~~
@@ -60,39 +60,52 @@ Installation
6060
The procedures described in this document have been tested with
6161
distributions from Red Hat's Fedora Project (http://fedora.redhat.com/).
6262

63-
- Install nfs-utils-1.1.1 or greater on the client
63+
- Install nfs-utils-1.1.2 or greater on the client
6464

65-
An NFS/RDMA mount point can only be obtained by using the mount.nfs
66-
command in nfs-utils-1.1.1 or greater. To see which version of mount.nfs
67-
you are using, type:
65+
An NFS/RDMA mount point can be obtained by using the mount.nfs command in
66+
nfs-utils-1.1.2 or greater (nfs-utils-1.1.1 was the first nfs-utils
67+
version with support for NFS/RDMA mounts, but for various reasons we
68+
recommend using nfs-utils-1.1.2 or greater). To see which version of
69+
mount.nfs you are using, type:
6870

69-
> /sbin/mount.nfs -V
71+
$ /sbin/mount.nfs -V
7072

71-
If the version is less than 1.1.1 or the command does not exist,
72-
then you will need to install the latest version of nfs-utils.
73+
If the version is less than 1.1.2 or the command does not exist,
74+
you should install the latest version of nfs-utils.
7375

7476
Download the latest package from:
7577

7678
http://www.kernel.org/pub/linux/utils/nfs
7779

7880
Uncompress the package and follow the installation instructions.
7981

80-
If you will not be using GSS and NFSv4, the installation process
81-
can be simplified by disabling these features when running configure:
82+
If you will not need the idmapper and gssd executables (you do not need
83+
these to create an NFS/RDMA enabled mount command), the installation
84+
process can be simplified by disabling these features when running
85+
configure:
8286

83-
> ./configure --disable-gss --disable-nfsv4
87+
$ ./configure --disable-gss --disable-nfsv4
8488

85-
For more information on this see the package's README and INSTALL files.
89+
To build nfs-utils you will need the tcp_wrappers package installed. For
90+
more information on this see the package's README and INSTALL files.
8691

8792
After building the nfs-utils package, there will be a mount.nfs binary in
8893
the utils/mount directory. This binary can be used to initiate NFS v2, v3,
89-
or v4 mounts. To initiate a v4 mount, the binary must be called mount.nfs4.
90-
The standard technique is to create a symlink called mount.nfs4 to mount.nfs.
94+
or v4 mounts. To initiate a v4 mount, the binary must be called
95+
mount.nfs4. The standard technique is to create a symlink called
96+
mount.nfs4 to mount.nfs.
9197

92-
NOTE: mount.nfs and therefore nfs-utils-1.1.1 or greater is only needed
98+
This mount.nfs binary should be installed at /sbin/mount.nfs as follows:
99+
100+
$ sudo cp utils/mount/mount.nfs /sbin/mount.nfs
101+
102+
In this location, mount.nfs will be invoked automatically for NFS mounts
103+
by the system mount commmand.
104+
105+
NOTE: mount.nfs and therefore nfs-utils-1.1.2 or greater is only needed
93106
on the NFS client machine. You do not need this specific version of
94107
nfs-utils on the server. Furthermore, only the mount.nfs command from
95-
nfs-utils-1.1.1 is needed on the client.
108+
nfs-utils-1.1.2 is needed on the client.
96109

97110
- Install a Linux kernel with NFS/RDMA
98111

@@ -156,8 +169,8 @@ Check RDMA and NFS Setup
156169
this time. For example, if you are using a Mellanox Tavor/Sinai/Arbel
157170
card:
158171

159-
> modprobe ib_mthca
160-
> modprobe ib_ipoib
172+
$ modprobe ib_mthca
173+
$ modprobe ib_ipoib
161174

162175
If you are using InfiniBand, make sure there is a Subnet Manager (SM)
163176
running on the network. If your IB switch has an embedded SM, you can
@@ -166,18 +179,18 @@ Check RDMA and NFS Setup
166179

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

169-
> cat /sys/class/infiniband/driverX/ports/1/state
182+
$ cat /sys/class/infiniband/driverX/ports/1/state
170183
4: ACTIVE
171184

172185
where driverX is mthca0, ipath5, ehca3, etc.
173186

174187
To further test the InfiniBand software stack, use IPoIB (this
175188
assumes you have two IB hosts named host1 and host2):
176189

177-
host1> ifconfig ib0 a.b.c.x
178-
host2> ifconfig ib0 a.b.c.y
179-
host1> ping a.b.c.y
180-
host2> ping a.b.c.x
190+
host1$ ifconfig ib0 a.b.c.x
191+
host2$ ifconfig ib0 a.b.c.y
192+
host1$ ping a.b.c.y
193+
host2$ ping a.b.c.x
181194

182195
For other device types, follow the appropriate procedures.
183196

@@ -202,55 +215,57 @@ NFS/RDMA Setup
202215
/vol0 192.168.0.47(fsid=0,rw,async,insecure,no_root_squash)
203216
/vol0 192.168.0.0/255.255.255.0(fsid=0,rw,async,insecure,no_root_squash)
204217

205-
The IP address(es) is(are) the client's IPoIB address for an InfiniBand HCA or the
206-
cleint's iWARP address(es) for an RNIC.
218+
The IP address(es) is(are) the client's IPoIB address for an InfiniBand
219+
HCA or the cleint's iWARP address(es) for an RNIC.
207220

208-
NOTE: The "insecure" option must be used because the NFS/RDMA client does not
209-
use a reserved port.
221+
NOTE: The "insecure" option must be used because the NFS/RDMA client does
222+
not use a reserved port.
210223

211224
Each time a machine boots:
212225

213226
- Load and configure the RDMA drivers
214227

215228
For InfiniBand using a Mellanox adapter:
216229

217-
> modprobe ib_mthca
218-
> modprobe ib_ipoib
219-
> ifconfig ib0 a.b.c.d
230+
$ modprobe ib_mthca
231+
$ modprobe ib_ipoib
232+
$ ifconfig ib0 a.b.c.d
220233

221234
NOTE: use unique addresses for the client and server
222235

223236
- Start the NFS server
224237

225-
If the NFS/RDMA server was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in kernel config),
226-
load the RDMA transport module:
238+
If the NFS/RDMA server was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in
239+
kernel config), load the RDMA transport module:
227240

228-
> modprobe svcrdma
241+
$ modprobe svcrdma
229242

230-
Regardless of how the server was built (module or built-in), start the server:
243+
Regardless of how the server was built (module or built-in), start the
244+
server:
231245

232-
> /etc/init.d/nfs start
246+
$ /etc/init.d/nfs start
233247

234248
or
235249

236-
> service nfs start
250+
$ service nfs start
237251

238252
Instruct the server to listen on the RDMA transport:
239253

240-
> echo rdma 2050 > /proc/fs/nfsd/portlist
254+
$ echo rdma 2050 > /proc/fs/nfsd/portlist
241255

242256
- On the client system
243257

244-
If the NFS/RDMA client was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in kernel config),
245-
load the RDMA client module:
258+
If the NFS/RDMA client was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in
259+
kernel config), load the RDMA client module:
246260

247-
> modprobe xprtrdma.ko
261+
$ modprobe xprtrdma.ko
248262

249-
Regardless of how the client was built (module or built-in), issue the mount.nfs command:
263+
Regardless of how the client was built (module or built-in), use this
264+
command to mount the NFS/RDMA server:
250265

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

253-
To verify that the mount is using RDMA, run "cat /proc/mounts" and check the
254-
"proto" field for the given mount.
268+
To verify that the mount is using RDMA, run "cat /proc/mounts" and check
269+
the "proto" field for the given mount.
255270

256271
Congratulations! You're using NFS/RDMA!

0 commit comments

Comments
 (0)