Commit Graph

2716 Commits

Author SHA1 Message Date
Brian Behlendorf 4723cec18c Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-06-29 11:14:24 -07:00
Brian Behlendorf a1ccea7c7f Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-29 11:12:03 -07:00
Brian Behlendorf 2eceb0c47a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-29 11:12:00 -07:00
Brian Behlendorf b0c8dc3c75 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-29 11:11:59 -07:00
Brian Behlendorf 46b2d46053 Merge branch 'fix-stack-traverse_visitbp' into refs/top-bases/fix-branch 2010-06-29 11:04:51 -07:00
Brian Behlendorf 34229a2f2a Reduce stack usage for recursive traverse_visitbp()
Due to  limited stack space recursive functions are frowned upon in
the Linux kernel.  However, they often are the most elegant solution
to a problem.  The following code preserves the recursive function
traverse_visitbp() but moves the local variables AND function
arguments to the heap to minimize the stack frame size.  Enough
space is initially allocated on the stack for 20 levels of recursion.
This change does ugly-up-the-code but it reduces the worst case
usage from roughly 4160 bytes to 960 bytes on x86_64 archs.
2010-06-29 11:04:26 -07:00
Brian Behlendorf 03efcb5469 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-06-29 11:02:22 -07:00
Brian Behlendorf b8229898ab Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-29 10:59:58 -07:00
Brian Behlendorf 0a2b049259 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-29 10:59:54 -07:00
Brian Behlendorf ffeafc898e Merge branch 'fix-branch' into refs/top-bases/zfs-branch
Conflicts:

	cmd/ztest/ztest.c
2010-06-29 10:55:38 -07:00
Brian Behlendorf b873e71b0f Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-29 10:29:42 -07:00
Brian Behlendorf 192b36dcfd Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-06-29 10:25:31 -07:00
Brian Behlendorf 9cdd80e387 Revert traverse_impl() changes
These changes are now taken care of by the fix-stack-traverse_impl
topic branch which not only solves the uninit problem but also
moves these locals off the stack and on to the heap.
2010-06-29 10:24:14 -07:00
Brian Behlendorf 96bd9f434d Merge branch 'fix-stack-traverse_impl' into refs/top-bases/fix-branch 2010-06-29 10:21:53 -07:00
Brian Behlendorf 8e2de85a6d Reduce stack usage of traverse_impl()
Stack use reduced from 560 bytes to 128 bytes.
2010-06-29 10:21:21 -07:00
Brian Behlendorf 51a936233f Merge branch 'fix-stack-dsl_dataset_destroy' into refs/top-bases/fix-branch 2010-06-29 10:12:03 -07:00
Brian Behlendorf 7334572416 Reduce stack usage by dsl_dataset_destroy()
Move dsl_dataset_t local variable from the stack to the heap.
This reduces the stack usage of this function from 2048 bytes
to 176 bytes for x84_64 arches.
2010-06-29 10:11:32 -07:00
Brian Behlendorf 4fa43a86d4 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-06-28 11:32:53 -07:00
Brian Behlendorf b2313a226a Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-06-28 11:31:27 -07:00
Brian Behlendorf 759df09df2 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-06-28 11:31:03 -07:00
Brian Behlendorf 61adb3379a Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-06-28 11:30:55 -07:00
Brian Behlendorf c02813baef Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-06-28 11:30:47 -07:00
Brian Behlendorf f32ec2346b Linux bcopy() requires word aligned memory, use memcpy()
Much to my surprise bcopy() under Linux appears to copy the data in
word sized chunks.  It does the right thing but if you buffer is not
a multiple of the word size you will be reading past the end of your
buffer.  Or at least that is what valgrind is reporting.  We should
be using mempcy() anyway on Linux so replace bcopy() with memcpy()
to resolve the issue.

==305== Thread 211:
==305== Invalid read of size 8
==305==    at 0x3BCD28357D: _wordcopy_fwd_dest_aligned (in /lib64/libc-2.11.1.so)
==305==    by 0x3BCD282B05: bcopy (in /lib64/libc-2.11.1.so)
==305==    by 0x58D7FEF: dmu_write (dmu.c:730)
==305==    by 0x591C942: spa_history_write (spa_history.c:165)
==305==    by 0x591D255: spa_history_log_sync (spa_history.c:277)
==305==    by 0x591D545: log_internal (spa_history.c:450)
==305==    by 0x591D5EC: spa_history_log_internal (spa_history.c:475)
==305==    by 0x5902319: dsl_prop_set_sync (dsl_prop.c:707)
==305==    by 0x5906A7D: dsl_sync_task_group_sync (dsl_synctask.c:199)
==305==    by 0x58FF4EC: dsl_pool_sync (dsl_pool.c:376)
==305==    by 0x591744C: spa_sync (spa.c:5365)
==305==    by 0x5922C85: txg_sync_thread (txg.c:414)
2010-06-28 11:26:20 -07:00
Brian Behlendorf 4970b635e8 Revert to original debugging
The ZFS defaults are fine, revert to them.
2010-06-28 10:58:16 -07:00
Brian Behlendorf 643eada5f6 Disable zero-copy in zpios
We need to update this code to use the new API.  For now simply
comment it out until it can be correctly implemented.
2010-06-28 10:53:51 -07:00
Brian Behlendorf f9a7332118 Update kmem_asprintf() and kmem_vasprintf() implementation
On a Linux system simply use the native aprintf and vasprintf
functions respectively.  Also update the call points to correctly
use va_copy() or va_start() as appropriate.
2010-06-28 10:52:22 -07:00
Brian Behlendorf ba79b0e3a3 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-06-28 10:38:41 -07:00
Brian Behlendorf 9e841db04c Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-28 10:37:11 -07:00
Brian Behlendorf 0fc35eb24e Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-06-28 10:36:49 -07:00
Brian Behlendorf 6107ded5d5 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-28 10:36:47 -07:00
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 4a1a3825a7 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-06-21 22:01:59 -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 d5e4063149 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-06-16 14:46:12 -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