[Devel] [PATCH RHEL7 COMMIT] ploop: add a separate queue for discard bio-s (v2)
Konstantin Khorenko
khorenko at virtuozzo.com
Fri May 22 07:45:38 PDT 2015
The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.5.5
------>
commit 7642ae514c8ccfbd962a4a6b42e84bd93ef33e69
Author: Andrey Smetanin <asmetanin at virtuozzo.com>
Date: Fri May 22 18:45:38 2015 +0400
ploop: add a separate queue for discard bio-s (v2)
When I created support of discard requests, process_bio_queue is
called from ploop_thread. So I use ploop_quiesce&ploop_relax for
synchronization. Now it is called from ploop_make_request too,
so my synchronization doesn't work any more.
The race was added by
diff-ploop-converting-bio-into-ploop-request-in-function-ploop_make_request.
This patch adds a separate queue for discard requests, which is handled
only from ploop_thread(). In addition we get ability to postpone discard bio-s,
while we are handling others. So we will not fail, if a bio is received while
another one is processed. In a future this will allow us to handle more than
one bio concurrently.
v2: fix comments from Maxim
> Also, ploop_preq_drop() and ploop_complete_request() must wake up ploop-thread
> if !bio_list_empty(&plo->bio_discard_list) as well.
Note: this patch is a correct version of fa6f3b8595f13c13eebd452bc0947754ac249c2c.
Logical condition inside mitigation_timeout() fixed -
"((plo->bio_head && !bio_list_empty(&plo->bio_discard_list))" ->
"((plo->bio_head || !bio_list_empty(&plo->bio_discard_list))", that was added
by mistake inside fa6f3b8595f13c13eebd452bc0947754ac249c2c.
https://jira.sw.ru/browse/PSBM-27676
Signed-off-by: Andrew Vagin <avagin at openvz.org>
Acked-by: Maxim Patlasov <mpatlasov at parallels.com>
---
drivers/block/ploop/dev.c | 56 +++++++++++++++++++++++++++++++++++-------
drivers/block/ploop/freeblks.c | 5 ++++
drivers/block/ploop/freeblks.h | 1 +
drivers/block/ploop/sysfs.c | 6 +++++
include/linux/ploop/ploop.h | 2 ++
5 files changed, 61 insertions(+), 9 deletions(-)
diff --git a/drivers/block/ploop/dev.c b/drivers/block/ploop/dev.c
index cd91d2c..5baffbb 100644
--- a/drivers/block/ploop/dev.c
+++ b/drivers/block/ploop/dev.c
@@ -119,8 +119,9 @@ static void mitigation_timeout(unsigned long data)
spin_lock_irq(&plo->lock);
if (test_bit(PLOOP_S_WAIT_PROCESS, &plo->state) &&
(!list_empty(&plo->entry_queue) ||
- (plo->bio_head && !list_empty(&plo->free_list))) &&
- waitqueue_active(&plo->waitq))
+ ((plo->bio_head || !bio_list_empty(&plo->bio_discard_list)) &&
+ !list_empty(&plo->free_list))) &&
+ waitqueue_active(&plo->waitq))
wake_up_interruptible(&plo->waitq);
spin_unlock_irq(&plo->lock);
}
@@ -239,7 +240,8 @@ void ploop_preq_drop(struct ploop_device * plo, struct list_head *drop_list,
if (waitqueue_active(&plo->req_waitq))
wake_up(&plo->req_waitq);
else if (test_bit(PLOOP_S_WAIT_PROCESS, &plo->state) &&
- waitqueue_active(&plo->waitq) && plo->bio_head)
+ waitqueue_active(&plo->waitq) &&
+ (plo->bio_head || !bio_list_empty(&plo->bio_discard_list)))
wake_up_interruptible(&plo->waitq);
ploop_uncongest(plo);
@@ -521,6 +523,7 @@ ploop_bio_queue(struct ploop_device * plo, struct bio * bio,
BIO_ENDIO(plo->queue, bio, err);
list_add(&preq->list, &plo->free_list);
plo->bio_qlen--;
+ plo->bio_discard_qlen--;
plo->bio_total--;
return;
}
@@ -758,6 +761,29 @@ static void ploop_unplug(struct blk_plug_cb *cb, bool from_schedule)
kfree(cb);
}
+static void
+process_discard_bio_queue(struct ploop_device * plo, struct list_head *drop_list)
+{
+ bool discard = test_bit(PLOOP_S_DISCARD, &plo->state);
+
+ while (!list_empty(&plo->free_list)) {
+ struct bio *tmp;
+
+ /* Only one discard bio can be handled concurrently */
+ if (discard && ploop_discard_is_inprogress(plo->fbd))
+ return;
+
+ tmp = bio_list_pop(&plo->bio_discard_list);
+ if (tmp == NULL)
+ break;
+
+ /* If PLOOP_S_DISCARD isn't set, ploop_bio_queue
+ * will complete it with a proper error.
+ */
+ ploop_bio_queue(plo, tmp, drop_list);
+ }
+}
+
static void ploop_make_request(struct request_queue *q, struct bio *bio)
{
struct bio * nbio;
@@ -845,6 +871,12 @@ static void ploop_make_request(struct request_queue *q, struct bio *bio)
return;
}
+ if (bio->bi_rw & REQ_DISCARD) {
+ bio_list_add(&plo->bio_discard_list, bio);
+ plo->bio_discard_qlen++;
+ goto queued;
+ }
+
/* Write tracking in fast path does not work at the moment. */
if (unlikely(test_bit(PLOOP_S_TRACK, &plo->state) &&
(bio->bi_rw & WRITE)))
@@ -866,9 +898,6 @@ static void ploop_make_request(struct request_queue *q, struct bio *bio)
if (unlikely(nbio == NULL))
goto queue;
- if (bio->bi_rw & REQ_DISCARD)
- goto queue;
-
/* Try to merge before checking for fastpath. Maybe, this
* is not wise.
*/
@@ -950,6 +979,7 @@ queue:
/* second chance to merge requests */
process_bio_queue(plo, &drop_list);
+queued:
/* If main thread is waiting for requests, wake it up.
* But try to mitigate wakeups, delaying wakeup for some short
* time.
@@ -958,6 +988,8 @@ queue:
/* Synchronous requests are not batched. */
if (plo->entry_qlen > plo->tune.batch_entry_qlen ||
(bio->bi_rw & (REQ_SYNC|REQ_FLUSH|REQ_FUA)) ||
+ (!bio_list_empty(&plo->bio_discard_list) &&
+ !list_empty(&plo->free_list)) ||
!current->plug) {
wake_up_interruptible(&plo->waitq);
} else if (!timer_pending(&plo->mitigation_timer)) {
@@ -1268,7 +1300,9 @@ static void ploop_complete_request(struct ploop_request * preq)
if (waitqueue_active(&plo->req_waitq))
wake_up(&plo->req_waitq);
else if (test_bit(PLOOP_S_WAIT_PROCESS, &plo->state) &&
- waitqueue_active(&plo->waitq) && plo->bio_head)
+ waitqueue_active(&plo->waitq) &&
+ (plo->bio_head ||
+ !bio_list_empty(&plo->bio_discard_list)))
wake_up_interruptible(&plo->waitq);
}
plo->bio_total -= nr_completed;
@@ -2540,7 +2574,8 @@ static void ploop_wait(struct ploop_device * plo, int once, struct blk_plug *plu
(!test_bit(PLOOP_S_ATTENTION, &plo->state) ||
!plo->active_reqs))
break;
- } else if (plo->bio_head) {
+ } else if (plo->bio_head ||
+ !bio_list_empty(&plo->bio_discard_list)) {
/* ready_queue and entry_queue are empty, but
* bio list not. Obviously, we'd like to process
* bio_list instead of sleeping */
@@ -2640,6 +2675,7 @@ static int ploop_thread(void * data)
BUG_ON (!list_empty(&drop_list));
process_bio_queue(plo, &drop_list);
+ process_discard_bio_queue(plo, &drop_list);
if (!list_empty(&drop_list)) {
spin_unlock_irq(&plo->lock);
@@ -2716,7 +2752,8 @@ static int ploop_thread(void * data)
* no requests are in process or in entry queue
*/
if (kthread_should_stop() && !plo->active_reqs &&
- list_empty(&plo->entry_queue) && !plo->bio_head)
+ list_empty(&plo->entry_queue) && !plo->bio_head &&
+ bio_list_empty(&plo->bio_discard_list))
break;
wait_more:
@@ -4602,6 +4639,7 @@ static struct ploop_device *__ploop_dev_alloc(int index)
track_init(plo);
KOBJECT_INIT(&plo->kobj, &ploop_ktype);
atomic_inc(&plo_count);
+ bio_list_init(&plo->bio_discard_list);
dk->major = ploop_major;
dk->first_minor = index << PLOOP_PART_SHIFT;
diff --git a/drivers/block/ploop/freeblks.c b/drivers/block/ploop/freeblks.c
index b3a5908..cf48d3a 100644
--- a/drivers/block/ploop/freeblks.c
+++ b/drivers/block/ploop/freeblks.c
@@ -1081,3 +1081,8 @@ int ploop_discard_add_bio(struct ploop_freeblks_desc *fbd, struct bio *bio)
return 0;
}
+
+int ploop_discard_is_inprogress(struct ploop_freeblks_desc *fbd)
+{
+ return fbd && fbd->fbd_dbl.head != NULL;
+}
diff --git a/drivers/block/ploop/freeblks.h b/drivers/block/ploop/freeblks.h
index 5b03eec..63591d0 100644
--- a/drivers/block/ploop/freeblks.h
+++ b/drivers/block/ploop/freeblks.h
@@ -12,6 +12,7 @@ int ploop_fb_add_reloc_extent(struct ploop_freeblks_desc *fbd, cluster_t clu, ib
void ploop_fb_lost_range_init(struct ploop_freeblks_desc *fbd, iblock_t first_lost_iblk);
void ploop_fb_relocation_start(struct ploop_freeblks_desc *fbd, __u32 n_scanned);
int ploop_discard_add_bio(struct ploop_freeblks_desc *fbd, struct bio *bio);
+int ploop_discard_is_inprogress(struct ploop_freeblks_desc *fbd);
/* avoid direct access to freeblks internals */
int ploop_fb_get_n_relocated(struct ploop_freeblks_desc *fbd);
diff --git a/drivers/block/ploop/sysfs.c b/drivers/block/ploop/sysfs.c
index 07a4829..8b3e818 100644
--- a/drivers/block/ploop/sysfs.c
+++ b/drivers/block/ploop/sysfs.c
@@ -269,6 +269,11 @@ static u32 show_queued_bios(struct ploop_device * plo)
return plo->bio_qlen;
}
+static u32 show_discard_bios(struct ploop_device * plo)
+{
+ return plo->bio_discard_qlen;
+}
+
static u32 show_active_reqs(struct ploop_device * plo)
{
return plo->active_reqs;
@@ -461,6 +466,7 @@ static struct attribute *state_attributes[] = {
_A(fmt_version),
_A(total_bios),
_A(queued_bios),
+ _A(discard_bios),
_A(active_reqs),
_A(entry_reqs),
_A(entry_read_sync_reqs),
diff --git a/include/linux/ploop/ploop.h b/include/linux/ploop/ploop.h
index 0f67d06..b8c7130 100644
--- a/include/linux/ploop/ploop.h
+++ b/include/linux/ploop/ploop.h
@@ -350,6 +350,8 @@ struct ploop_device
struct bio *bio_head;
struct bio *bio_tail;
struct bio *bio_sync;
+ struct bio_list bio_discard_list;
+ int bio_discard_qlen;
int bio_qlen;
int bio_total;
More information about the Devel
mailing list