RFC Virtio draft III
Get series with b4
b4 am [email protected]Versions newest first
- v1 RFC Latest0 of 3 patches 4 repliesIn review
Patches in v1 No applies recorded yet
None of the 3 patches the cover letter announces are in this archive.
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH RFC 0/3] Virtio draft III
In this episode, Rusty tries to NAPI-ize the driver and discovers that virtio callbacks are a bad idea: NAPI needs to turn interrupts off and still be able to query for new incoming packets.
Changes to core:
1) Back to "interrupt" model with get_inbuf()/get_outbuf() calls.
2) Clearer rules for locking: in calls cannot overlap, out calls cannot overlap, but in can overlap out.
3) Methods for suppressing/enabling "interrupt" calls.
Changes to example net driver:
1) NAPI, locking is now correct (and there is none)
Changes to example block driver:
1) Relay SCSI ioctls (particularly CDROMEJECT) for optional server support (VIRTIO_BLK_T_SCSI_CMD).
2) /dev/vb -> /dev/vd.
3) Barrier support.
4) Header w/ definitions can be included from userspace.
Here's the inter-diff for the three:
include/linux/virtio.h +61 -21
@@ -7,69 +7,109 @@/** * virtio_device - description and routines to drive a virtual device. -* @lock: the lock to hold before calling any functions. * @dev: the underlying struct device. * @ops: the operations for this virtual device. +* @driver_ops: set by the driver for callbacks. * @priv: private pointer for the driver to use. */ struct virtio_device { -spinlock_t lock;struct device *dev;struct virtio_ops *ops; +struct virtio_driver_ops *driver_ops;void *priv; };/** +* virtio_driver_ops - driver callbacks for a virtual device. +* @in: inbufs have been completed. +* Usually called from an interrupt handler. +* Return false to suppress further inbuf callbacks. +* @out: outbufs have been completed. +* Usually called from an interrupt handler. +* Return false to suppress further outbuf callbacks. +*/ +struct virtio_driver_ops { +bool (*in)(struct virtio_device *dev); +bool (*out)(struct virtio_device *dev); +}; + +enum virtio_dir { +VIRTIO_IN =0x1 , +VIRTIO_OUT =0x2 , +}; + +/** * virtio_ops - virtio abstraction layer * @add_outbuf: prepare to send data to the other end: * vdev: the virtio_device * sg: the description of the buffer(s). * num: the size of the sg array. -* cb: the function to call once the outbuf is finished & detached. -* data: the token to hand to the cb function. -* Returns a unique id or an error. Note that the callback will be -* called with the lock held, and possibly in an interrupt handler. +* data: the token returned by the get_outbuf function. +* Returns a unique id or an error. * @add_inbuf: prepare to receive data from the other end: * vdev: the virtio_device * sg: the description of the buffer(s). * num: the size of the sg array. -* cb: the function to call once the inbuf is finished & detached. -* data: the token to hand to the cb function. -* Returns a unique id or an error (eg. -ENOSPC). Note that the -* callback will be called with the lock held, and possibly in an -* interrupt handler. -* @sync: update after add_inbuf/add_outbuf +* data: the token returned by the get_inbuf function. +* Returns a unique id or an error (eg. -ENOSPC). +* @sync: update after add_inbuf and/or add_outbuf * vdev: the virtio_device we're talking about. +* inout: VIRTIO_IN and/or VIRTIO_OUT * After one or more add_inbuf/add_outbuf calls, invoke this to kick * the virtio layer. +* @get_outbuf: get the next used outbuf. +* vdev: the virtio_device we're talking about. +* len: the length written into the outbuf +* Returns NULL or the "data" token handed to add_outbuf (which has been +* detached). +* @get_inbuf: get the next used inbuf. +* vdev: the virtio_device we're talking about. +* len: the length read from the inbuf +* Returns NULL or the "data" token handed to add_inbuf (which has been +* detached). * @detach_outbuf: make sure sent sg can no longer be read. * vdev: the virtio_device we're talking about. * id: the id returned from add_outbuf. -* This is not necessary (or valid!) if the outbuf callback has -* already fired. +* This is usually used for shutdown. Don't try to detach twice. * @detach_inbuf: make sure sent sg can no longer be written to. * vdev: the virtio_device we're talking about. * id: the id returned from add_inbuf. -* This is not necessary (or valid!) if the outbuf callback has -* already fired. +* This is usually used for shutdown. Don't try to detach twice. +* @restart_in: restart calls to driver_ops->in after it returned false. +* vdev: the virtio_device we're talking about. +* This returns "false" (and doesn't re-enable) if there are pending +* inbufs, to avoid a race. +* @restart_out: restart calls to driver_ops->out after it returned false. +* vdev: the virtio_device we're talking about. +* This returns "false" (and doesn't re-enable) if there are pending +* outbufs, to avoid a race. +* +* Locking rules are straightforward: the driver is responsible for +* locking. Outbuf operations can be called in parallel to inbuf +* operations, but no two outbuf operations nor two inbuf operations +* may be invoked simultaneously. +* +* All operations can be called in any context. */ struct virtio_ops {unsigned long (*add_outbuf)(struct virtio_device *vdev,const struct scatterlist sg[],unsigned int num, -void (*cb)(struct virtio_device *vdev, -void *data,unsigned len),void *data);unsigned long (*add_inbuf)(struct virtio_device *vdev,struct scatterlist sg[],unsigned int num, -void (*cb)(struct virtio_device *vdev, -void *data,unsigned len),void *data); -void (*sync)(struct virtio_device *vdev); +void (*sync)(struct virtio_device *vdev,enum virtio_dir inout); + +void *(*get_outbuf)(struct virtio_device *vdev,unsigned int *len); +void *(*get_inbuf)(struct virtio_device *vdev,unsigned int *len);void (*detach_outbuf)(struct virtio_device *vdev,unsigned long id);void (*detach_inbuf)(struct virtio_device *vdev,unsigned long id); + +bool (*restart_in)(struct virtio_device *vdev); +bool (*restart_out)(struct virtio_device *vdev); };#endif /* _LINUX_VIRTIO_H */
drivers/net/virtio_net.c +92 -58
248 lines not on this page · raw message
drivers/block/virtio_blk.c +152 -66
363 lines not on this page · raw message
include/linux/virtio_blk.h +21 -10
@@ -3,26 +3,37 @@#include <linux/types.h> -struct gendisk ; -struct virtio_device ; -struct hd_geometry ; + +#define VIRTIO_BLK_T_READ 0 +#define VIRTIO_BLK_T_WRITE 1 +#define VIRTIO_BLK_T_SCSI_CMD 3 +#define VIRTIO_BLK_T_BARRIER 0x80000000/* Barrier before this op. */ /* This is the first element of the scatter-gather list. */ struct virtio_blk_outhdr { -/* 0 == read, 1 == write */ -u32 type; +/* VIRTIO_BLK_T* */ +__u32 type; +/* io priority. */ +__u32 ioprio;/* Sector (ie. 512 byte offset) */ -unsigned long sector; +__u64 sector;/* Where to put reply. */ -unsigned long id; +__u64 id; }; +#define VIRTIO_BLK_S_OK 0 +#define VIRTIO_BLK_S_IOERR 1 +#define VIRTIO_BLK_S_UNSUPP 2 +struct virtio_blk_inhdr { -/* 1 = OK, 0 = not ok. */ -unsigned long status; +unsigned char status; }; +#ifdef __KERNEL__ +struct gendisk ; +struct virtio_device ; +struct gendisk *virtblk_probe (struct virtio_device *vdev);void virtblk_remove (struct gendisk *disk); - +#endif /* __KERNEL__ */ #endif /* _LINUX_VIRTIO_BLK_H */
only in patch2:
unchanged:
include/linux/Kbuild +1 -0
@@ -341,6 +341,7 @@ unifdef-y += utsname.h unifdef-y += utsname.h unifdef-y += videodev2.h unifdef-y += videodev.h +unifdef-y += virtio_blk.h unifdef-y += wait.h unifdef-y += wanrouter.h unifdef-y += watchdog.h
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/