From: Tejun Heo <tj@kernel.org> To: jaxboe@fusionio.com, linux-fsdevel@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, hch@lst.de, James. Cc: Tejun Heo <tj@kernle.org>, Tejun Heo <tj@kernel.org> Subject: [PATCH 2/5] virtio_blk: implement REQ_FLUSH/FUA support Date: Mon, 16 Aug 2010 18:52:00 +0200 [thread overview] Message-ID: <1281977523-19335-3-git-send-email-tj@kernel.org> (raw) In-Reply-To: <1281977523-19335-1-git-send-email-tj@kernel.org> From: Tejun Heo <tj@kernle.org> Remove now unused REQ_HARDBARRIER support and implement REQ_FLUSH/FUA support instead. A new feature flag VIRTIO_BLK_F_FUA is added to indicate the support for FUA. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Michael S. Tsirkin <mst@redhat.com> --- drivers/block/virtio_blk.c | 26 ++++++++++++-------------- include/linux/virtio_blk.h | 6 +++++- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index d10b635..ed0fb7d 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -128,9 +128,6 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk, } } - if (vbr->req->cmd_flags & REQ_HARDBARRIER) - vbr->out_hdr.type |= VIRTIO_BLK_T_BARRIER; - sg_set_buf(&vblk->sg[out++], &vbr->out_hdr, sizeof(vbr->out_hdr)); /* @@ -157,6 +154,8 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk, if (rq_data_dir(vbr->req) == WRITE) { vbr->out_hdr.type |= VIRTIO_BLK_T_OUT; out += num; + if (req->cmd_flags & REQ_FUA) + vbr->out_hdr.type |= VIRTIO_BLK_T_FUA; } else { vbr->out_hdr.type |= VIRTIO_BLK_T_IN; in += num; @@ -307,6 +306,7 @@ static int __devinit virtblk_probe(struct virtio_device *vdev) { struct virtio_blk *vblk; struct request_queue *q; + unsigned int flush; int err; u64 cap; u32 v, blk_size, sg_elems, opt_io_size; @@ -388,15 +388,13 @@ static int __devinit virtblk_probe(struct virtio_device *vdev) vblk->disk->driverfs_dev = &vdev->dev; index++; - /* - * If the FLUSH feature is supported we do have support for - * flushing a volatile write cache on the host. Use that to - * implement write barrier support; otherwise, we must assume - * that the host does not perform any kind of volatile write - * caching. - */ + /* configure queue flush support */ + flush = 0; if (virtio_has_feature(vdev, VIRTIO_BLK_F_FLUSH)) - blk_queue_flush(q, REQ_FLUSH); + flush |= REQ_FLUSH; + if (virtio_has_feature(vdev, VIRTIO_BLK_F_FUA)) + flush |= REQ_FUA; + blk_queue_flush(q, flush); /* If disk is read-only in the host, the guest should obey */ if (virtio_has_feature(vdev, VIRTIO_BLK_F_RO)) @@ -515,9 +513,9 @@ static const struct virtio_device_id id_table[] = { }; static unsigned int features[] = { - VIRTIO_BLK_F_BARRIER, VIRTIO_BLK_F_SEG_MAX, VIRTIO_BLK_F_SIZE_MAX, - VIRTIO_BLK_F_GEOMETRY, VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE, - VIRTIO_BLK_F_SCSI, VIRTIO_BLK_F_FLUSH, VIRTIO_BLK_F_TOPOLOGY + VIRTIO_BLK_F_SEG_MAX, VIRTIO_BLK_F_SIZE_MAX, VIRTIO_BLK_F_GEOMETRY, + VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE, VIRTIO_BLK_F_SCSI, + VIRTIO_BLK_F_FLUSH, VIRTIO_BLK_F_TOPOLOGY, VIRTIO_BLK_F_FUA, }; /* diff --git a/include/linux/virtio_blk.h b/include/linux/virtio_blk.h index 167720d..f453f3c 100644 --- a/include/linux/virtio_blk.h +++ b/include/linux/virtio_blk.h @@ -16,6 +16,7 @@ #define VIRTIO_BLK_F_SCSI 7 /* Supports scsi command passthru */ #define VIRTIO_BLK_F_FLUSH 9 /* Cache flush command support */ #define VIRTIO_BLK_F_TOPOLOGY 10 /* Topology information is available */ +#define VIRTIO_BLK_F_FUA 11 /* Forced Unit Access write support */ #define VIRTIO_BLK_ID_BYTES 20 /* ID string length */ @@ -70,7 +71,10 @@ struct virtio_blk_config { #define VIRTIO_BLK_T_FLUSH 4 /* Get device ID command */ -#define VIRTIO_BLK_T_GET_ID 8 +#define VIRTIO_BLK_T_GET_ID 8 + +/* FUA command */ +#define VIRTIO_BLK_T_FUA 16 /* Barrier before this op. */ #define VIRTIO_BLK_T_BARRIER 0x80000000 -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Tejun Heo <tj@kernel.org> To: jaxboe@fusionio.com, linux-fsdevel@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, hch@lst.de, James.Bottomley@suse.de, tytso@mit.edu, chris.mason@oracle.com, swhiteho@redhat.com, konishi.ryusuke@lab.ntt.co.jp, dm-devel@redhat.com, vst@vlnb.net, jack@suse.cz, rwheeler@redhat.com, hare@suse.de, neilb@suse.de, rusty@rustcorp.com.au, mst@redhat.com Cc: Tejun Heo <tj@kernle.org>, Tejun Heo <tj@kernel.org> Subject: [PATCH 2/5] virtio_blk: implement REQ_FLUSH/FUA support Date: Mon, 16 Aug 2010 18:52:00 +0200 [thread overview] Message-ID: <1281977523-19335-3-git-send-email-tj@kernel.org> (raw) In-Reply-To: <1281977523-19335-1-git-send-email-tj@kernel.org> From: Tejun Heo <tj@kernle.org> Remove now unused REQ_HARDBARRIER support and implement REQ_FLUSH/FUA support instead. A new feature flag VIRTIO_BLK_F_FUA is added to indicate the support for FUA. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Michael S. Tsirkin <mst@redhat.com> --- drivers/block/virtio_blk.c | 26 ++++++++++++-------------- include/linux/virtio_blk.h | 6 +++++- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index d10b635..ed0fb7d 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -128,9 +128,6 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk, } } - if (vbr->req->cmd_flags & REQ_HARDBARRIER) - vbr->out_hdr.type |= VIRTIO_BLK_T_BARRIER; - sg_set_buf(&vblk->sg[out++], &vbr->out_hdr, sizeof(vbr->out_hdr)); /* @@ -157,6 +154,8 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk, if (rq_data_dir(vbr->req) == WRITE) { vbr->out_hdr.type |= VIRTIO_BLK_T_OUT; out += num; + if (req->cmd_flags & REQ_FUA) + vbr->out_hdr.type |= VIRTIO_BLK_T_FUA; } else { vbr->out_hdr.type |= VIRTIO_BLK_T_IN; in += num; @@ -307,6 +306,7 @@ static int __devinit virtblk_probe(struct virtio_device *vdev) { struct virtio_blk *vblk; struct request_queue *q; + unsigned int flush; int err; u64 cap; u32 v, blk_size, sg_elems, opt_io_size; @@ -388,15 +388,13 @@ static int __devinit virtblk_probe(struct virtio_device *vdev) vblk->disk->driverfs_dev = &vdev->dev; index++; - /* - * If the FLUSH feature is supported we do have support for - * flushing a volatile write cache on the host. Use that to - * implement write barrier support; otherwise, we must assume - * that the host does not perform any kind of volatile write - * caching. - */ + /* configure queue flush support */ + flush = 0; if (virtio_has_feature(vdev, VIRTIO_BLK_F_FLUSH)) - blk_queue_flush(q, REQ_FLUSH); + flush |= REQ_FLUSH; + if (virtio_has_feature(vdev, VIRTIO_BLK_F_FUA)) + flush |= REQ_FUA; + blk_queue_flush(q, flush); /* If disk is read-only in the host, the guest should obey */ if (virtio_has_feature(vdev, VIRTIO_BLK_F_RO)) @@ -515,9 +513,9 @@ static const struct virtio_device_id id_table[] = { }; static unsigned int features[] = { - VIRTIO_BLK_F_BARRIER, VIRTIO_BLK_F_SEG_MAX, VIRTIO_BLK_F_SIZE_MAX, - VIRTIO_BLK_F_GEOMETRY, VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE, - VIRTIO_BLK_F_SCSI, VIRTIO_BLK_F_FLUSH, VIRTIO_BLK_F_TOPOLOGY + VIRTIO_BLK_F_SEG_MAX, VIRTIO_BLK_F_SIZE_MAX, VIRTIO_BLK_F_GEOMETRY, + VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE, VIRTIO_BLK_F_SCSI, + VIRTIO_BLK_F_FLUSH, VIRTIO_BLK_F_TOPOLOGY, VIRTIO_BLK_F_FUA, }; /* diff --git a/include/linux/virtio_blk.h b/include/linux/virtio_blk.h index 167720d..f453f3c 100644 --- a/include/linux/virtio_blk.h +++ b/include/linux/virtio_blk.h @@ -16,6 +16,7 @@ #define VIRTIO_BLK_F_SCSI 7 /* Supports scsi command passthru */ #define VIRTIO_BLK_F_FLUSH 9 /* Cache flush command support */ #define VIRTIO_BLK_F_TOPOLOGY 10 /* Topology information is available */ +#define VIRTIO_BLK_F_FUA 11 /* Forced Unit Access write support */ #define VIRTIO_BLK_ID_BYTES 20 /* ID string length */ @@ -70,7 +71,10 @@ struct virtio_blk_config { #define VIRTIO_BLK_T_FLUSH 4 /* Get device ID command */ -#define VIRTIO_BLK_T_GET_ID 8 +#define VIRTIO_BLK_T_GET_ID 8 + +/* FUA command */ +#define VIRTIO_BLK_T_FUA 16 /* Barrier before this op. */ #define VIRTIO_BLK_T_BARRIER 0x80000000 -- 1.7.1
next prev parent reply other threads:[~2010-08-16 16:52 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-08-16 16:51 [RFC PATCHSET block#for-2.6.36-post] block: convert to REQ_FLUSH/FUA Tejun Heo 2010-08-16 16:51 ` Tejun Heo 2010-08-16 16:51 ` [PATCH 1/5] block/loop: implement REQ_FLUSH/FUA support Tejun Heo 2010-08-16 16:51 ` Tejun Heo 2010-08-16 16:51 ` Tejun Heo 2010-08-16 16:52 ` [PATCH 2/5] virtio_blk: " Tejun Heo 2010-08-16 16:52 ` Tejun Heo [this message] 2010-08-16 16:52 ` Tejun Heo 2010-08-16 18:33 ` Christoph Hellwig 2010-08-17 8:17 ` Tejun Heo 2010-08-17 13:23 ` Christoph Hellwig 2010-08-17 16:22 ` Tejun Heo 2010-08-18 10:22 ` Rusty Russell 2010-08-17 1:16 ` Rusty Russell 2010-08-17 8:18 ` Tejun Heo 2010-08-19 15:14 ` [PATCH 2/5 UPDATED] virtio_blk: drop REQ_HARDBARRIER support Tejun Heo 2010-08-16 16:52 ` [PATCH 3/5] lguest: replace VIRTIO_F_BARRIER support with VIRTIO_F_FLUSH/FUA support Tejun Heo 2010-08-16 16:52 ` Tejun Heo 2010-08-16 16:52 ` Tejun Heo 2010-08-19 15:15 ` [PATCH 3/5] lguest: replace VIRTIO_F_BARRIER support with VIRTIO_F_FLUSH support Tejun Heo 2010-08-16 16:52 ` [PATCH 4/5] md: implment REQ_FLUSH/FUA support Tejun Heo 2010-08-16 16:52 ` Tejun Heo 2010-08-16 16:52 ` Tejun Heo 2010-08-24 5:41 ` Neil Brown 2010-08-25 11:22 ` [PATCH UPDATED " Tejun Heo 2010-08-25 11:42 ` Neil Brown 2010-08-16 16:52 ` [PATCH 5/5] dm: implement " Tejun Heo 2010-08-16 16:52 ` Tejun Heo 2010-08-16 19:02 ` Mike Snitzer 2010-08-17 9:33 ` Tejun Heo 2010-08-17 13:13 ` Christoph Hellwig 2010-08-17 14:07 ` Mike Snitzer 2010-08-17 16:51 ` Tejun Heo 2010-08-17 18:21 ` Mike Snitzer 2010-08-17 18:21 ` Mike Snitzer 2010-08-18 6:32 ` Tejun Heo 2010-08-19 10:32 ` Kiyoshi Ueda 2010-08-19 15:45 ` Tejun Heo 2010-08-16 16:52 ` Tejun Heo 2010-08-18 9:53 ` [RFC PATCHSET block#for-2.6.36-post] block: convert to REQ_FLUSH/FUA Christoph Hellwig 2010-08-18 14:26 ` James Bottomley 2010-08-18 14:33 ` Christoph Hellwig 2010-08-19 15:37 ` FUJITA Tomonori 2010-08-19 15:41 ` Christoph Hellwig 2010-08-19 15:56 ` FUJITA Tomonori 2010-08-23 16:47 ` Christoph Hellwig 2010-08-24 9:51 ` Lars Ellenberg 2010-08-24 15:45 ` Philipp Reisner [not found] ` <20101022083511.GA7853@lst.de> 2010-10-23 11:18 ` [GIT PULL] convert DRBD " Philipp Reisner 2010-10-23 11:21 ` Christoph Hellwig 2010-10-23 16:48 ` Jens Axboe 2010-10-23 16:59 ` [PATCH] block: remove REQ_HARDBARRIER Christoph Hellwig 2010-10-23 17:17 ` Matthew Wilcox 2010-10-23 19:07 ` Jens Axboe 2010-10-24 11:58 ` Christoph Hellwig 2010-11-10 13:42 ` Christoph Hellwig 2010-11-10 13:59 ` Jens Axboe 2010-10-23 19:08 ` Jens Axboe 2010-10-25 8:54 ` Tejun Heo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1281977523-19335-3-git-send-email-tj@kernel.org \ --to=tj@kernel.org \ --cc=hch@lst.de \ --cc=jaxboe@fusionio.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-ide@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-raid@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=tj@kernle.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.