ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sheepdog: simplify inflight_aio_head management 

Add to the list in add_aio_request and, indirectly, resend_aioreq.  Inline
free_aio_req in the caller, it does not simply undo alloc_aio_req's job.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20161129113245.32724-5-pbonzini@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
This commit is contained in:
Paolo Bonzini 2016-11-29 12:32:44 +01:00 committed by Jeff Cody
parent 28ddd08cd6
commit c4080e9391
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
block/sheepdog.c
View File

@ -479,16 +479,6 @@ static inline AIOReq *alloc_aio_req(BDRVSheepdogState *s, SheepdogAIOCB *acb,
return aio_req; return aio_req;
} }
static inline void free_aio_req(BDRVSheepdogState *s, AIOReq *aio_req)
{
SheepdogAIOCB *acb = aio_req->aiocb;
QLIST_REMOVE(aio_req, aio_siblings);
g_free(aio_req);
acb->nr_pending--;
}
static void sd_aio_setup(SheepdogAIOCB *acb, BDRVSheepdogState *s, static void sd_aio_setup(SheepdogAIOCB *acb, BDRVSheepdogState *s,
QEMUIOVector *qiov, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, int64_t sector_num, int nb_sectors,
int type) int type)
@ -730,7 +720,6 @@ static coroutine_fn void reconnect_to_sdog(void *opaque)
while (!QLIST_EMPTY(&s->failed_aio_head)) { while (!QLIST_EMPTY(&s->failed_aio_head)) {
aio_req = QLIST_FIRST(&s->failed_aio_head); aio_req = QLIST_FIRST(&s->failed_aio_head);
QLIST_REMOVE(aio_req, aio_siblings); QLIST_REMOVE(aio_req, aio_siblings);
QLIST_INSERT_HEAD(&s->inflight_aio_head, aio_req, aio_siblings);
resend_aioreq(s, aio_req); resend_aioreq(s, aio_req);
} }
} }
@ -825,6 +814,7 @@ static void coroutine_fn aio_read_response(void *opaque)
*/ */
s->co_recv = NULL; s->co_recv = NULL;
QLIST_REMOVE(aio_req, aio_siblings);
switch (rsp.result) { switch (rsp.result) {
case SD_RES_SUCCESS: case SD_RES_SUCCESS:
break; break;
@ -849,8 +839,9 @@ static void coroutine_fn aio_read_response(void *opaque)
break; break;
} }
free_aio_req(s, aio_req); g_free(aio_req);
if (!acb->nr_pending) {
if (!--acb->nr_pending) {
/* /*
* We've finished all requests which belong to the AIOCB, so * We've finished all requests which belong to the AIOCB, so
* we can switch back to sd_co_readv/writev now. * we can switch back to sd_co_readv/writev now.
@ -1110,6 +1101,8 @@ static void coroutine_fn add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req,
uint64_t old_oid = aio_req->base_oid; uint64_t old_oid = aio_req->base_oid;
bool create = aio_req->create; bool create = aio_req->create;
QLIST_INSERT_HEAD(&s->inflight_aio_head, aio_req, aio_siblings);
if (!nr_copies) { if (!nr_copies) {
error_report("bug"); error_report("bug");
} }
@ -1983,7 +1976,6 @@ static void coroutine_fn sd_write_done(SheepdogAIOCB *acb)
iov.iov_len = sizeof(s->inode); iov.iov_len = sizeof(s->inode);
aio_req = alloc_aio_req(s, acb, vid_to_vdi_oid(s->inode.vdi_id), aio_req = alloc_aio_req(s, acb, vid_to_vdi_oid(s->inode.vdi_id),
data_len, offset, 0, false, 0, offset); data_len, offset, 0, false, 0, offset);
QLIST_INSERT_HEAD(&s->inflight_aio_head, aio_req, aio_siblings);
add_aio_request(s, aio_req, &iov, 1, AIOCB_WRITE_UDATA); add_aio_request(s, aio_req, &iov, 1, AIOCB_WRITE_UDATA);
if (--acb->nr_pending) { if (--acb->nr_pending) {
qemu_coroutine_yield(); qemu_coroutine_yield();
@ -2185,8 +2177,6 @@ static void coroutine_fn sd_co_rw_vector(SheepdogAIOCB *acb)
old_oid, old_oid,
acb->aiocb_type == AIOCB_DISCARD_OBJ ? acb->aiocb_type == AIOCB_DISCARD_OBJ ?
0 : done); 0 : done);
QLIST_INSERT_HEAD(&s->inflight_aio_head, aio_req, aio_siblings);
add_aio_request(s, aio_req, acb->qiov->iov, acb->qiov->niov, add_aio_request(s, aio_req, acb->qiov->iov, acb->qiov->niov,
acb->aiocb_type); acb->aiocb_type);
done: done:
@ -2280,7 +2270,6 @@ static int coroutine_fn sd_co_flush_to_disk(BlockDriverState *bs)
acb.nr_pending++; acb.nr_pending++;
aio_req = alloc_aio_req(s, &acb, vid_to_vdi_oid(s->inode.vdi_id), aio_req = alloc_aio_req(s, &acb, vid_to_vdi_oid(s->inode.vdi_id),
0, 0, 0, false, 0, 0); 0, 0, 0, false, 0, 0);
QLIST_INSERT_HEAD(&s->inflight_aio_head, aio_req, aio_siblings);
add_aio_request(s, aio_req, NULL, 0, acb.aiocb_type); add_aio_request(s, aio_req, NULL, 0, acb.aiocb_type);
if (--acb.nr_pending) { if (--acb.nr_pending) {