Commit Graph

2730 Commits

Author SHA1 Message Date
Brian Behlendorf 07eb43b53a Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-06-28 10:36:41 -07:00
Brian Behlendorf a6411d4033 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-28 10:36:38 -07:00
Brian Behlendorf 03eab0c703 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-28 10:36:30 -07:00
Brian Behlendorf 712dbf737f Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-28 10:36:24 -07:00
Brian Behlendorf 744af7fa00 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-28 10:36:20 -07:00
Brian Behlendorf 191d5e833a Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-28 10:36:19 -07:00
Brian Behlendorf 8ec85f8aee Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch 2010-06-28 10:36:17 -07:00
Brian Behlendorf 1a967e146f Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-06-28 10:36:16 -07:00
Brian Behlendorf df8d7829a8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-28 10:36:13 -07:00
Brian Behlendorf ef3ec1c9ed Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-06-28 10:36:11 -07:00
Brian Behlendorf 52bb0d8e75 Ensure zio_bad_cksum_t is initialized
This may not strictly be needed but it does keep gcc happy.  We
should keep our eye on this though if the extra bcopy significantly
impacts performance.  It may.
2010-06-28 10:30:38 -07:00
Brian Behlendorf 5b1f2041e5 Silence 3 additional large kmem warnings
The following are 3 cases where move than 2 pages are allocated
with a kmem_alloc()... but not a lot more.  For now we just disable
the warning with KM_NODEBUG and this can be revisted latter to
see if it's worth shrinking the allocation or perhaps moving it
to a slab.
2010-06-28 10:23:42 -07:00
Brian Behlendorf d6ea5e8cef Additional ZVOL cleanup in zvol_set_volsize()
The following cleanup was missed in the first pass when the ZVOL
implementation was updated.  An extra instance of a zvol_state_t
was removed from the stack and the error handling was simplified.
2010-06-28 10:21:24 -07:00
Brian Behlendorf 6914386b85 Never sleep under taskq_dispatch()
There are cases where under Linux it is not safe to sleep in
taskq_dispatch().  Rather than adding Linux specific code to
detect these cases I opted to keep it simple and just never
allow a sleep here.  The impact of this should be minimal.
2010-06-28 10:11:12 -07:00
Brian Behlendorf 0c11631b02 Fix for fix-stack-dmu_objset_snapshot should be 'sn' not '&sn'
I missed a instanse of removing the & operator when reducing the
stack usage in this function.  This unfortunately doesn't cause
a compile warning but it is does cause ztest failures.  Anyway,
update the topic branch to correct this mistake.
2010-06-28 10:06:29 -07:00
Brian Behlendorf e780aad257 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-06-21 22:01:57 -07:00
Brian Behlendorf 06376e3a0e Revert linux-debug-zerocopy real ZC support added 2010-06-21 21:39:06 -07:00
Brian Behlendorf 53e9660c56 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-16 14:45:03 -07:00
Brian Behlendorf 5cac48ae66 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-16 14:45:02 -07:00
Brian Behlendorf 5a46abc9a0 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-16 14:44:50 -07:00
Brian Behlendorf 67c6255292 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-16 14:44:05 -07:00
Brian Behlendorf 76ad38b271 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-16 14:43:43 -07:00
Brian Behlendorf 4aba89bb16 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-16 14:43:35 -07:00
Brian Behlendorf 4af4558675 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-16 14:43:26 -07:00
Brian Behlendorf 8645a8e901 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-16 14:43:21 -07:00
Brian Behlendorf 2f457b7bd0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 14:43:17 -07:00
Brian Behlendorf 8de2671680 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-16 14:43:17 -07:00
Brian Behlendorf 6504afae4a Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch 2010-06-16 14:39:41 -07:00
Brian Behlendorf e163b08ba3 Add fix-stack-dmu_objset_snapshot topic branch
Reduce stack usage by 276 bytes by moving the snaparg struct from the
stack to the heap.  We have limited stack space we must not waste.
2010-06-16 14:39:06 -07:00
Brian Behlendorf a2ba5b83f8 Merge branch 'fix-stack-noinline' into refs/top-bases/fix-branch 2010-06-16 14:35:14 -07:00
Brian Behlendorf bbdb8184ec Add fix-stack-noinline topic branch
Certain function must never be automatically inlined by gcc because
they are stack heavy or called recursively.  This patch flags all
such functions I have found as 'noinline' to prevent gcc from making
the optimization.
2010-06-16 14:34:41 -07:00
Brian Behlendorf f956c97dc3 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-16 14:29:17 -07:00
Brian Behlendorf f83c9f790e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-16 14:29:16 -07:00
Brian Behlendorf 9513d614a5 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-16 14:29:05 -07:00
Brian Behlendorf d30e62105f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-16 14:28:19 -07:00
Brian Behlendorf 17edc470ca Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-16 14:27:56 -07:00
Brian Behlendorf 850510ee8f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-16 14:27:48 -07:00
Brian Behlendorf b76cabbeaf Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-16 14:27:40 -07:00
Brian Behlendorf 76f112175f Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-16 14:27:35 -07:00
Brian Behlendorf 48ca6d3590 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 14:27:31 -07:00
Brian Behlendorf 7f979b27f4 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-16 14:27:30 -07:00
Brian Behlendorf 30c03a0914 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2010-06-16 14:27:29 -07:00
Brian Behlendorf 2115c30515 Revert fix-stack topic branch
This patch will be broken in to several independent stack reductions
and reapplied as new topic branches.
2010-06-16 14:23:31 -07:00
Brian Behlendorf e536586568 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-16 13:54:49 -07:00
Brian Behlendorf 37dfa2ca00 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-16 13:54:48 -07:00
Brian Behlendorf 16dd4c6bb3 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-16 13:54:37 -07:00
Brian Behlendorf 38f71c17a7 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-16 13:53:55 -07:00
Brian Behlendorf 9cebf85651 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-16 13:53:32 -07:00
Brian Behlendorf 2084051282 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-16 13:53:24 -07:00
Brian Behlendorf 2f10c62c32 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-16 13:53:16 -07:00
Brian Behlendorf 9ba17b0b96 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-16 13:53:11 -07:00
Brian Behlendorf aacc00b961 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 13:53:08 -07:00
Brian Behlendorf 6a19e49908 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-16 13:53:07 -07:00
Brian Behlendorf 256505afb0 Merge branch 'fix-stack-dsl_deleg_get' into refs/top-bases/fix-branch 2010-06-16 13:49:55 -07:00
Brian Behlendorf 869764f64d Add fix-stack-dsl_deleg_get topic branch
Reduce stack usage in dsl_deleg_get, gcc flagged it as consuming a
whopping 1040 bytes or potentially 1/4 of a 4K stack.  This patch
moves all the large structures and buffer off the stack and on to
the heap.  This includes 2 zap_cursor_t structs each 52 bytes in
size, 2 zap_attribute_t structs each 280 bytes in size, and 1
256 byte char array.  The total saves on the stack is 880 bytes
after you account for the 5 new pointers added.

Also the source buffer length has been increased from MAXNAMELEN
to MAXNAMELEN+strlen(MOS_DIR_NAME)+1 as described by the comment in
dsl_dir_name().  A buffer overrun may have been possible with the
slightly smaller buffer.
2010-06-16 13:49:25 -07:00
Brian Behlendorf b855fb237f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-16 12:46:20 -07:00
Brian Behlendorf fbe96f9ab0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-16 12:46:19 -07:00
Brian Behlendorf d30efbdef2 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-16 12:46:08 -07:00
Brian Behlendorf 0c636b03c0 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-16 12:45:25 -07:00
Brian Behlendorf 5204c79855 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-16 12:45:03 -07:00
Brian Behlendorf 08415a34fb Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-16 12:44:53 -07:00
Brian Behlendorf 63bf34ba31 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-16 12:44:19 -07:00
Brian Behlendorf 9e35aaedba Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-16 12:44:13 -07:00
Brian Behlendorf 4738ecfcdc Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 12:44:09 -07:00
Brian Behlendorf 1ccdbb250b Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-16 12:44:08 -07:00
Brian Behlendorf 31cc6992c5 Merge branch 'fix-stack-dsl_dir_open_spa' into refs/top-bases/fix-branch 2010-06-16 12:40:39 -07:00
Brian Behlendorf 0c524122bd Add fix-stack-dsl_dir_open_spa topic branch
Reduce stack usage by 256 bytes by moving buf char array from
the stack to the heap.
2010-06-16 12:39:44 -07:00
Brian Behlendorf 4149705c8c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-16 12:18:57 -07:00
Brian Behlendorf d303d824d6 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-16 12:18:56 -07:00
Brian Behlendorf 64b81f7c25 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-16 12:17:51 -07:00
Brian Behlendorf 87af8ae76b Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-16 12:14:37 -07:00
Brian Behlendorf ed15c80b39 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-16 12:13:00 -07:00
Brian Behlendorf 70b7065e93 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-16 12:12:28 -07:00
Brian Behlendorf 0de95c796f Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-16 12:11:55 -07:00
Brian Behlendorf b8ece25717 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-16 12:11:25 -07:00
Brian Behlendorf 9fd12ce4fd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 12:11:21 -07:00
Brian Behlendorf 2b71569742 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-16 12:11:20 -07:00
Brian Behlendorf 877a37d8bd Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-06-16 12:11:18 -07:00
Brian Behlendorf 8a001d8f59 Extra uninit vars flagged by gcc 4.1.2
Newer versions of the compiler are OK with this but for the sake of
older compilers explicitly initialize them.
2010-06-16 11:45:07 -07:00
Brian Behlendorf 916ff9bb97 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-06-16 10:38:58 -07:00
Brian Behlendorf 79577be589 Ensure sys/fm/util.h ia not included
Because of events related changes and the need to access zio_cmd_t
we can't unconditionally include sys/fm/util.h as part of zfs_context.h.
2010-06-16 10:34:40 -07:00
Brian Behlendorf 3fe3e41259 Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch 2010-06-16 10:01:06 -07:00
Brian Behlendorf 6104e13be6 Add linux-spa-thread topic branch
Disable the spa thread under Linux until it can be implemented.
2010-06-16 09:59:39 -07:00
Brian Behlendorf 6fa858c778 Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch 2010-06-16 09:49:06 -07:00
Brian Behlendorf 14d073e298 Add linux-sha2 topic branch for portability
The upstream ZFS code has correctly moved to a faster native sha2
implementation.  Unfortunately, under Linux that's going to be a little
problematic so we revert the code to the more portable version contained
in earlier ZFS releases.  Using the native sha2 implementation in Linux
is possible but the API is slightly different in kernel version user
space depending on which libraries are used.  Ideally, we need a fast
implementation of SHA256 which builds as part of ZFS this shouldn't be
that hard to do but it will take some effort.
2010-06-16 09:47:25 -07:00
Brian Behlendorf e8e324e048 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-14 17:00:43 -07:00
Brian Behlendorf 5de3a200c4 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-14 17:00:42 -07:00
Brian Behlendorf 55b02e4ca6 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-14 17:00:29 -07:00
Brian Behlendorf f224397b56 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-14 16:59:40 -07:00
Brian Behlendorf 09abb3e8ae Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-14 16:59:15 -07:00
Brian Behlendorf 2d15a98cb9 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
Conflicts:

	module/zfs/include/sys/dmu.h
2010-06-14 16:59:02 -07:00
Brian Behlendorf 5edd772c8c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-14 16:58:06 -07:00
Brian Behlendorf 0f3a1ce26e Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
Conflicts:

	module/zfs/include/sys/dmu.h
2010-06-14 16:57:03 -07:00
Brian Behlendorf b41c7ff877 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 16:45:47 -07:00
Brian Behlendorf 7f181ac166 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-14 16:45:46 -07:00
Brian Behlendorf 2f30cc0188 Merge branch 'fix-stack-lzjb' into refs/top-bases/fix-branch 2010-06-14 16:45:33 -07:00
Brian Behlendorf b8cc785fb6 Add fix-stack-lzjb topic branch
Reduce kernel stack usage by lzjb_compress() by moving uint16 array
off the stack and on to the heap.  The exact performance implications
of this I have not measured but we absolutely need to keep stack
usage to a minimum.  If/when this becomes and issue we optimize.
2010-06-14 16:45:01 -07:00
Brian Behlendorf 51322821f3 Merge branch 'fix-kstat-xuio' into refs/top-bases/fix-branch 2010-06-14 16:43:32 -07:00
Brian Behlendorf f61a7ce9e1 Add fix-kstat-xuio topic branch
Move xiou stat structures from a header to the dmu.c source as is
done with all the other kstat interfaces.  This information is local
to dmu.c registered the xuio kstat and should stay that way.
2010-06-14 16:43:01 -07:00
Brian Behlendorf 963518b20f Merge branch 'fix-metaslab' into refs/top-bases/fix-branch 2010-06-14 16:40:45 -07:00