Commit Graph

2204 Commits

Author SHA1 Message Date
Brian Behlendorf 84633aa1a1 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-05-27 13:53:12 -07:00
Brian Behlendorf 8605817009 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-27 13:53:12 -07:00
Brian Behlendorf 0ee82dae98 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:
	module/zfs/dmu_tx.c
2010-05-27 13:53:07 -07:00
Brian Behlendorf 5cad1e175d Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
Conflicts:
	module/zfs/dmu_tx.c
	module/zfs/txg.c
2010-05-27 13:48:54 -07:00
Brian Behlendorf 028e42b692 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 13:42:00 -07:00
Brian Behlendorf d8e5eb56b8 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-27 13:42:00 -07:00
Brian Behlendorf 1dc4235011 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-05-27 13:40:14 -07:00
Brian Behlendorf 1e32b3c781 Revert feature-commit-cb feature upstream
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 13:39:17 -07:00
Brian Behlendorf 3bd93e7103 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-05-27 13:25:20 -07:00
Brian Behlendorf 099e8e493a Remove feature-pthreads prior to b141 update.
The pthreads change will need to be reworked and reapplied.
This will be easier to do from scratch rather than sort out
the merge.
2010-05-27 13:23:58 -07:00
Brian Behlendorf af12c8fa08 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-05-21 15:31:38 -07:00
Brian Behlendorf 94655e1c30 Use __blk_end_request() in zvol_request() to avoid ZVOL deadlock.
The unlocked version of blk_end_request() should be used in the
zvol_request() error handling to avoid deadlocking the request_queue
queue_lock.  Things get a little more complicated for older kernel
APIs but the compat layer has been updated as well to reflect this.
2010-05-21 15:01:12 -07:00
Brian Behlendorf a221019e82 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-05-20 17:17:42 -07:00
Brian Behlendorf cdd590f8b9 Recreate volume and snapshot /dev links during module load.
Links in /dev for volumes/snapshots were only being created
at volume/snapshot creation time.  Those links are now also
created dynamically at module load time based on the spa config.
In other words all you need to do to get access to your zfs
datasets after a reboot is load the module.  It's magic!
2010-05-20 16:59:02 -07:00
Brian Behlendorf c8d574777d Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-05-20 14:51:13 -07:00
Brian Behlendorf fe3cca82ae Support KM_NODEBUG kmem flag.
It turns out the zil allocates quite large buffers.  This isn't
all the surprising but we need to suppress the warnings until
it's clear what to do about it.
2010-05-20 14:35:02 -07:00
Brian Behlendorf c7068a5d76 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-05-20 10:25:20 -07:00
Brian Behlendorf 4ae64a8acd Move from kmem_alloc() to vmem_alloc().
These two allocations are 16k in size which trips the SPL warning
about large kmem_allocs().  For now simply shift them to a vmem_alloc().
Yes, this has it's own set of problems but this happens infrequently
enough not to be a real issue.  But more importantly it means that
we've flagged this place in the code via this topic branch as a
place which still needs long term work.
2010-05-20 10:06:32 -07:00
Brian Behlendorf 630ce17804 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-05-18 14:23:08 -07:00
Brian Behlendorf 86f961b310 Update all zpios related headers for consistency and correctness. 2010-05-18 14:18:09 -07:00
Brian Behlendorf 91975bc4f9 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-05-18 11:40:29 -07:00
Brian Behlendorf a2c57ce830 Update headers to be correct for public release
This includes adding the copyright where appropriate, author
attribution, and including the Lawrence Livermore National
Security, LLC release code for new/rewritten files.
2010-05-18 11:31:37 -07:00
Brian Behlendorf a1658d8d17 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-05-14 13:31:32 -07:00
Brian Behlendorf bb5e111dde Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-14 13:31:29 -07:00
Brian Behlendorf 08eb7517c4 Remove 3 symbols which no longer need to be exported.
EXPORT_SYMBOL(zfs_ereport_post);
EXPORT_SYMBOL(zfs_post_remove);
EXPORT_SYMBOL(zfs_post_autoreplace);
2010-05-14 13:00:22 -07:00
Brian Behlendorf feb723fa7d Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-05-14 12:55:10 -07:00
Brian Behlendorf 97d19a5e45 Add linux-events topic branch for zevent handling.
This topic branch leverages the Solaris style FMA call points
in ZFS to create a user space visible event notification system
under Linux.  This new system is called zevent and it unifies
all previous Solaris style ereports and sysevent notifications.

Under this Linux specific scheme when a sysevent or ereport event
occurs an nvlist describing the event is created which looks almost
exactly like a Solaris ereport.  These events are queued up in the
kernel when they occur and conditionally logged to the console.
It is then up to a user space application to consume the events
and do whatever it likes with them.

To make this possible the existing /dev/zfs ABI has been extended
with two new ioctls which behave as follows.

* ZFS_IOC_EVENTS_NEXT
Get the next pending event.  The kernel will keep track of the last
event consumed by the file descriptor and provide the next one if
available.  If no new events are available the ioctl() will block
waiting for the next event.  This ioctl may also be called in a
non-blocking mode by setting zc.zc_guid = ZEVENT_NONBLOCK.  In the
non-blocking case if no events are available ENOENT will be returned.
It is possible that ESHUTDOWN will be returned if the ioctl() is
called while module unloading is in progress.  And finally ENOMEM
may occur if the provided nvlist buffer is not large enough to
contain the entire event.

* ZFS_IOC_EVENTS_CLEAR
Clear are events queued by the kernel.  The kernel will keep a fairly
large number of recent events queued, use this ioctl to clear the
in kernel list.  This will effect all user space processes consuming
events.

The zpool command has been extended to use this events ABI with the
'events' subcommand.  You may run 'zpool events -v' to output a
verbose log of all recent events.  This is very similar to the
Solaris 'fmdump -ev' command with the key difference being it also
includes what would be considered sysevents under Solaris.  You
may also run in follow mode with the '-f' option.  To clear the
in kernel event queue use the '-c' option.

$ sudo cmd/zpool/zpool events -fv
TIME                        CLASS
May 13 2010 16:31:15.777711000 ereport.fs.zfs.config.sync
        class = "ereport.fs.zfs.config.sync"
        ena = 0x40982b7897700001
        detector = (embedded nvlist)
                version = 0x0
                scheme = "zfs"
                pool = 0xed976600de75dfa6
        (end detector)

        time = 0x4bec8bc3 0x2e5aed98
        pool = "zpios"
        pool_guid = 0xed976600de75dfa6
        pool_context = 0x0

While the 'zpool events' command is handy for interactive debugging
it is not expected to be the primary consumer of zevents.  This ABI
was primarily added to facilitate the addition of a user space
monitoring daemon.  This daemon would consume all events posted by
the kernel and based on the type of event perform an action.  For
most events simply forwarding them on to syslog is likely enough.
But this interface also cleanly allows for more sophisticated
actions to be taken such as generating an email for a failed drive
2010-05-14 12:40:44 -07:00
Brian Behlendorf 93b00c558f Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
Conflicts:
	module/zfs/zfs_ioctl.c
2010-05-14 11:51:27 -07:00
Brian Behlendorf 0c443b1d13 Create linux-kernel-device topic branch.
This branch contains the majority of the changes required to cleanly
intergrate with Linux style special devices (/dev/zfs).  Mainly this
means dropping all the Solaris style callbacks and replacing them
with the Linux equivilants.  Additionally, this means slightly
expanding the zfs_ioc_* functions to include a 'struct file *' to
allow the tracking of private data for each open file descriptor.
This is very helpful when you need to maintain a little information
about the open file between ioctls().
2010-05-14 11:48:06 -07:00
Brian Behlendorf 3ae75228e3 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
Conflicts:
	module/zfs/zfs_ioctl.c
2010-05-14 11:38:09 -07:00
Brian Behlendorf d18f100fb7 Revert zfs_ioctl.c related changes.
All the changes required to cleanly integrate with linux style
devices are being moved to their own topic branch.  It was abouti
to get to the point where too many topic branches each wanted to
tweak this code and it was getting confusing.  To simplify this
all /dev/zfs device related changes are being moved to the
linux-kernel-device topic branch.
2010-05-14 11:24:36 -07:00
Brian Behlendorf 8e870b63d0 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2010-04-29 13:15:30 -07:00
Brian Behlendorf d6f1146154 Remove changes from linux-have-sysevent to prepare for topic branch removal. 2010-04-29 13:12:25 -07:00
Brian Behlendorf ab2e9b8b7f Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2010-04-29 13:08:10 -07:00
Brian Behlendorf 44ce1eb434 Remove changes from linux-have-fm to prepare for topic branch removal. 2010-04-29 13:04:35 -07:00
Brian Behlendorf d92dfd67f1 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-04-29 12:33:29 -07:00
Brian Behlendorf d4fcfa8cd6 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-04-29 12:32:57 -07:00
Brian Behlendorf 7d37312f6c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-04-29 12:32:49 -07:00
Brian Behlendorf 0bf57f091f Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2010-04-29 12:32:43 -07:00
Brian Behlendorf 0eff4db8b4 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-04-29 12:32:41 -07:00
Brian Behlendorf 756a371a3f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-04-29 12:32:40 -07:00
Brian Behlendorf 2e161f3b31 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-04-29 12:32:10 -07:00
Brian Behlendorf a3b3d2b059 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-04-29 12:32:04 -07:00
Brian Behlendorf 98660aec20 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-04-29 12:32:01 -07:00
Brian Behlendorf aa4a91aef5 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-04-29 12:32:00 -07:00
Brian Behlendorf 354bebb795 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2010-04-29 12:31:59 -07:00
Brian Behlendorf 89154c98f9 Update build system to include nvpair_alloc_fixed.c. 2010-04-29 12:24:25 -07:00
Brian Behlendorf f26fce7b17 Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c 2010-04-29 12:23:12 -07:00
Brian Behlendorf f1a28f535c Export required nv_alloc_fixed symbols. 2010-04-29 12:21:24 -07:00
Brian Behlendorf 9dc83e5f34 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-04-29 12:06:04 -07:00