Commit Graph

842 Commits

Author SHA1 Message Date
Brian Behlendorf d7a3b8f11a Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-10-16 10:46:09 -07:00
Brian Behlendorf 58d6f53677 Minor bug wholedisk is only valid for VDEV_DISK types. 2009-10-16 10:41:40 -07:00
Brian Behlendorf 69c211131d Refresh autogen products 2009-10-15 16:46:45 -07:00
Brian Behlendorf 126f4128e2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-15 16:46:01 -07:00
Brian Behlendorf 7190c77120 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-10-15 16:45:41 -07:00
Brian Behlendorf af214824d3 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-10-15 16:45:19 -07:00
Brian Behlendorf 295d45555e Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-10-15 16:45:13 -07:00
Brian Behlendorf 3d24809465 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-15 16:45:11 -07:00
Brian Behlendorf c1b4a1ef92 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-10-15 16:43:40 -07:00
Brian Behlendorf 48d1b0c5ab Cleanly integrate ZFS tools with libblkid.
The majority of this this patch concerns itself with doing a direct
replacement of Solaris's libdiskmgt library with libblkid+libefi.
You'll notice that this patch removes all libdiskmgt code instead of
ifdef'ing it out.  This was done to minimize any confusion when reading
the code because it seems unlikely we will ever port libdiskmgt to Linux.

Despite the replacement the behavior of the tools should have remained
the same with one exception.  For the moment, we are unable to check
the partitions of devices which have an MBR style partition table when
creating a filesystem.  If a non-efi partition sceme is detected on a
whole disk device we prompt the user to explicity use the force option.
It would not be a ton of work to make the tool aware of MBR style
partitions if this becomes a problem.

I've done basic sanity checking for various configurations and all
the issues I'm aware of have been addressed.  Even things like blkid
misidentifing a disk as ext3 when it is added to a zfs pool.  I'm
careful to always zero out the first 4k of any new zfs partition.  That
all said this is all new code and while it looks like it's working right
for me we should keep an eye on it for any strange behavior.
2009-10-15 16:28:47 -07:00
Brian Behlendorf a09d33e929 Update build system for libblkid integration 2009-10-15 16:25:18 -07:00
Brian Behlendorf d5c9d50ffd Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-15 09:38:54 -07:00
Brian Behlendorf 702a78ed33 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-10-15 09:38:51 -07:00
Brian Behlendorf 172ca0a7f1 Remove topic branch linux-have-libdiskmgt 2009-10-15 09:34:17 -07:00
Brian Behlendorf 4a704a81ac Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-14 16:32:19 -07:00
Brian Behlendorf c4726e7ad2 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-10-14 16:32:16 -07:00
Brian Behlendorf 992be351d5 Changes required to integrate libefi in to Linux.
The major change here is to fix up libefi to be linux aware.  For
the most part this wasn't too hard but there were a few major issues.

First off I needed to handle the DKIOCGMEDIAINFO and DKIOCINFO ioctls.
There is no direct equivilant for these ioctls under linux.  To handle
this I added wrapper functions which under Solaris simple call the ioctls.
But under Linux dig around the system a little bit getting the needed
info to fill in the requested structures.

Secondly the efi_ioctl() call was adapted such that under linux it directly
read or writes out the partition table.  Under Solaris this work was
handed off to the kernel via an ioctl.  In the efi_write() case we also
ensure we prompt the kernel via BLKRRPART to re-scan the new partition
table.  The libefi generated partition tables are correct but older
versions of ~parted-1.8.1 can not read them without a small patch.
The kernel and fdisk are able to read them just fine.

Thirdly efi_alloc_and_init() which is used by zpool to determine if a
device is a 'wholedisk' was updated to be linux aware.  This check is
performed by using the partition number for the device, which the
partition number is 0 on linux it is a 'wholedisk'.  However, certain
device type such as the loopback and ram disks needed to be excluded
because they do not support partitioning.

Forthly the zpool command was made symlink aware so it can correctly
resolve udev entries such as /dev/disk/by-*/*.  This symlinks are
fully expanded ensuring all block devices are recognized.  When a
when a 'wholedisk' block device is detected we now properly write
out an efi label and place zfs in the first partition (0th slice).
This partition is created 1MiB in to the disk to ensure it is aligned
nicely with all high end block devices I'm aware of.

This all works for me now but it did take quite a bit of work to get
it all sorted out.  It would not surprise me if certain special cases
were missed so we should keep any eye of for any odd behavior.
2009-10-14 16:07:48 -07:00
Brian Behlendorf d1e18d0e3b Refresh autogen products 2009-10-14 16:00:33 -07:00
Brian Behlendorf 81609e1773 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-14 15:59:46 -07:00
Brian Behlendorf c56b485f66 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-10-14 15:59:26 -07:00
Brian Behlendorf 1e5d0220d0 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-10-14 15:59:03 -07:00
Brian Behlendorf 245e7692f7 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-14 15:58:55 -07:00
Brian Behlendorf 293fe80262 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-10-14 15:57:27 -07:00
Brian Behlendorf aa587c8437 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-10-14 15:57:13 -07:00
Brian Behlendorf 09a8c99097 Additional build system update for libefi library.
This include updating all the Makefile.am to have the correct
include paths and libraries.  In addition, the zlib m4 macro was
updated to more correctly integrate with the Makefiles.  And I
added two new macros libblkid and libuuid which will be needed by
subsequent commits for blkid and uuid support respectively.  The
blkid support is optional, the uuid support is mandatory for libefi.
2009-10-14 15:47:41 -07:00
Brian Behlendorf 00c6a706a5 Refresh autogen products 2009-10-09 16:46:19 -07:00
Brian Behlendorf 8dc5609e72 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-09 16:44:47 -07:00
Brian Behlendorf 2fd5a539e9 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-10-09 16:44:27 -07:00
Brian Behlendorf 89eadc4abd Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-10-09 16:44:01 -07:00
Brian Behlendorf 81ec3f8951 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-09 16:43:53 -07:00
Brian Behlendorf c4dff3c807 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-10-09 16:42:23 -07:00
Brian Behlendorf 8b6b31f3e4 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-10-09 16:42:09 -07:00
Brian Behlendorf cb91bbe6ce Additional set of build system tweaks for libefi library. 2009-10-09 16:37:32 -07:00
Brian Behlendorf 28cdfd90ef Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-09 16:13:31 -07:00
Brian Behlendorf caed68da36 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-10-09 16:13:11 -07:00
Brian Behlendorf 8fbaf287d7 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-10-09 16:10:02 -07:00
Brian Behlendorf 7c073d0a7d Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-09 16:09:54 -07:00
Brian Behlendorf 2fbcf94bce Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-10-09 16:08:24 -07:00
Brian Behlendorf a740d2a8f7 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/Makefile.am
2009-10-09 16:06:51 -07:00
Brian Behlendorf a0337cfcd8 Add libefi library in to the build system. 2009-10-09 15:58:45 -07:00
Brian Behlendorf 0d8bb46b58 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-09 15:03:53 -07:00
Brian Behlendorf 6ef15db027 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-10-09 15:03:50 -07:00
Brian Behlendorf f73cff230f Reverting changes on linux-have-libefi topic branch. 2009-10-09 14:59:05 -07:00
Brian Behlendorf ae556c9174 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-08-18 13:01:34 -07:00
Brian Behlendorf 6e43f5a80b Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:

	module/zfs/rrwlock.c
	module/zfs/zfs_ioctl.c
2009-08-18 12:59:17 -07:00
Brian Behlendorf 543989b909 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-08-18 12:35:28 -07:00
Brian Behlendorf 8b02e1a43f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-18 12:35:12 -07:00
Brian Behlendorf 2d067983d6 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-18 12:29:48 -07:00
Brian Behlendorf f301459f0e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-08-18 12:29:32 -07:00
Brian Behlendorf c67303e092 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/dsl_dataset.c
	module/zfs/rrwlock.c
	module/zfs/spa_history.c
	module/zfs/zfs_ioctl.c
2009-08-18 12:26:09 -07:00
Brian Behlendorf 50c623ccef Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-18 12:10:55 -07:00
Brian Behlendorf b99b422796 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-08-18 12:08:58 -07:00
Brian Behlendorf c5b5d32d69 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Conflicts:

	module/zfs/vdev_raidz.c
2009-08-18 12:06:21 -07:00
Brian Behlendorf e5e4fadc34 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:

	module/zfs/dmu.c
	module/zfs/dsl_deleg.c
	module/zfs/rrwlock.c
	module/zfs/vdev_raidz.c
2009-08-18 12:04:53 -07:00
Brian Behlendorf 0f80e41c89 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:

	module/zfs/spa_misc.c
	module/zfs/vdev_label.c
2009-08-18 11:55:36 -07:00
Brian Behlendorf 45d1cae3b8 Rebase master to b121 2009-08-18 11:43:27 -07:00
Brian Behlendorf 1f8a43f7a2 Refresh autogen products 2009-08-17 21:58:33 -07:00
Brian Behlendorf 12b522c4f7 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-08-14 10:26:34 -07:00
Brian Behlendorf 720bca0b05 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-08-14 10:26:01 -07:00
Brian Behlendorf 61c813aae2 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-08-14 10:25:23 -07:00
Brian Behlendorf 91f8f3fcf5 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-14 10:25:07 -07:00
Brian Behlendorf 2439a6dfe8 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-14 10:22:47 -07:00
Brian Behlendorf fdeb55c22b Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-08-14 10:22:35 -07:00
Brian Behlendorf feb385e65c Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-08-14 10:22:13 -07:00
Brian Behlendorf 503a1a983c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-14 10:22:10 -07:00
Brian Behlendorf bd586322cc Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-08-14 10:22:08 -07:00
Brian Behlendorf f9bab26542 Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2009-08-14 10:22:07 -07:00
Brian Behlendorf e6b541db64 All calls to ftruncate() must have their return code checked.
Under FC11 rpm builds by default add the --fortify-source option which
ensures that functions flagged with certain attributes must have their
return codes checked.  Normally this is just a warning but we always
build with -Werror so this is fatal.  Simply wrap the function in a
verify call to ensure we catch a failure if there is one.
2009-08-14 10:11:03 -07:00
Brian Behlendorf 5ad5798f92 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-08-04 15:59:15 -07:00
Brian Behlendorf 0803564cbe Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-08-04 15:58:39 -07:00
Brian Behlendorf ddc0a2d4fe Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-08-04 15:57:58 -07:00
Brian Behlendorf 4eae170dc5 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-04 15:57:44 -07:00
Brian Behlendorf e86a0e8ad1 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-04 15:55:06 -07:00
Brian Behlendorf d41ab91034 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-08-04 15:54:53 -07:00
Brian Behlendorf 72fc3eca7e Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-08-04 15:54:25 -07:00
Brian Behlendorf f88cbd6535 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-04 15:54:21 -07:00
Brian Behlendorf 8c28ed9bff Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-08-04 15:54:19 -07:00
Brian Behlendorf 7069d048a0 Revert kthreads based on pthread thread specific data due to failure.
With this patch applied I get the following failure 100% of the time,
I'd prefer to debug it and keep moving forward but I do not have the
time right now so I'm reverting the patch to the version which worked.
Ricardo please fix.

(gdb) bt
0  ztest_dmu_write_parallel (za=0x2aaaac898960) at
../../cmd/ztest/ztest.c:2566
1  0x0000000000405a79 in ztest_thread (arg=<value optimized out>)
    at ../../cmd/ztest/ztest.c:3862
2  0x00002b2e6a7a841d in zk_thread_helper (arg=<value optimized out>)
    at ../../lib/libzpool/kernel.c:131
3  0x000000379be06367 in start_thread (arg=<value optimized out>)
    at pthread_create.c:297
4  0x000000379b2d30ad in clone () from /lib64/libc.so.6
2009-08-04 15:42:24 -07:00
Brian Behlendorf 3d8212e5de Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-08-04 14:44:03 -07:00
Brian Behlendorf ca59cc5c82 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-08-04 14:43:29 -07:00
Brian Behlendorf 91960068e0 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-08-04 14:42:49 -07:00
Brian Behlendorf 94fd6b5326 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-04 14:42:33 -07:00
Brian Behlendorf 4576ca6889 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-04 14:39:53 -07:00
Brian Behlendorf 2484ccf4ac Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-08-04 14:39:40 -07:00
Brian Behlendorf 139ca4655e Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-08-04 14:39:11 -07:00
Brian Behlendorf 3e5388907b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-04 14:39:07 -07:00
Brian Behlendorf 9aedfd95f6 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-08-04 14:39:06 -07:00
Brian Behlendorf 0ebcbe2e74 Revert unneeded ztest_resume() prototype changes to match upstream. 2009-08-04 14:29:50 -07:00
Ricardo M. Correia c0ce3b40f2 Reimplement user kthreads based on pthread thread specific data.
This resolves previous scalabily concerns about the cost of calling
curthread which previously required a list walk.  The kthread address
is now tracked as thread specific data which can be quickly returned.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-08-04 13:55:15 -07:00
Brian Behlendorf 535dab57d2 Refresh autogen products. 2009-07-29 17:54:49 -07:00
Brian Behlendorf 24f0f6da93 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-21 14:52:49 -07:00
Brian Behlendorf 04591d82bb Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-21 14:52:46 -07:00
Brian Behlendorf efb9868b69 Pretty-up the 'make check' output
Reasonable output from 'make check' now looks roughly like this.  The
big change is the consolidation of the all the zpion test results in
to a single table which can be easily scanned for failures/problems.

==================================== ZTEST ====================================

5 vdevs, 7 datasets, 23 threads, 300 seconds...
Pass   1,  SIGKILL,   1 ENOSPC, 13.8% of  238M used,  17% done,    4m07s to go
Pass   2,  SIGKILL,   1 ENOSPC, 23.7% of  238M used,  38% done,    3m04s to go
Pass   3,  SIGKILL,   0 ENOSPC, 27.0% of  238M used,  66% done,    1m42s to go
Pass   4,  SIGKILL,   0 ENOSPC, 27.4% of  238M used,  75% done,    1m14s to go
Pass   5,  SIGKILL,   0 ENOSPC, 27.9% of  238M used,  89% done,      32s to go
Pass   6, Complete,   0 ENOSPC, 14.0% of  476M used, 100% done,       0s to go
5 killed, 1 completed, 83% kill rate

==================================== ZPIOS ====================================

status    name        id        wr-data wr-ch   wr-bw   rd-data rd-ch   rd-bw
-------------------------------------------------------------------------------
PASS:     file-raid0   0        64m     64      13.04m  64m     64    842.22m
PASS:     file-raid10  0        64m     64      134.19m 64m     64    842.22m
PASS:     file-raidz   0        64m     64      87.56m  64m     64    853.45m
PASS:     file-raidz2  0        64m     64      134.19m 64m     64    853.45m
PASS:     lo-raid0     0        64m     64      429.59m 64m     64    14.63m
PASS:     lo-raid10    0        64m     64      397.57m 64m     64    771.19m
PASS:     lo-raidz     0        64m     64      206.48m 64m     64    688.27m
PASS:     lo-raidz2    0        64m     64      14.34m  64m     64    711.21m
2009-07-21 14:41:35 -07:00
Brian Behlendorf a206ec3415 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-21 10:35:28 -07:00
Brian Behlendorf 6af0c921a6 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-21 10:35:24 -07:00
Brian Behlendorf 43ad6bb2ad Register compat ioctl handlers for zpios + 32-bit safe timespec.
A compat ioctl handler for zpios was added which simply passes the
ioctl on to the usual handler.  The IOWR macro's correctly handle
this.  Additionally replace the use of 'struct timespec' which uses
longs internally and is therefore different sizes on 32-bit vs 64-bit
objects with 'struct zpios_timespec_t'.  This custom structure uses
uint32_t types internally and is safe to pass through an ioctl.  The
helper functions for this new type were also moved to a common place
so they may be used safely by the user or kernel code.
2009-07-21 10:22:47 -07:00
Brian Behlendorf 8feebe7d65 Refresh autogen products 2009-07-16 10:29:59 -07:00
Brian Behlendorf 30d179c272 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-14 14:40:27 -07:00
Brian Behlendorf 3b65f6fab8 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-14 14:39:38 -07:00
Brian Behlendorf 24f65b670e Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-14 14:38:54 -07:00