On Thu, May 01, 2014 at 04:54:40PM +0200, Stefan Hajnoczi wrote:
> Drop the assumption that we're using the main AioContext. Convert
> qemu_aio_set_fd_handler() to aio_set_fd_handler() and qemu_aio_wait() to
> aio_poll().
>
> The .bdrv_detach/attach_aio_context() interfaces also need to be
> implemented to move the socket fd handler from the old to the new
> AioContext.
>
> Cc: MORITA Kazutaka <morita.kazut...@lab.ntt.co.jp>
> Cc: Liu Yuan <namei.u...@gmail.com>
> Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com>
> ---
> block/sheepdog.c | 118
> +++++++++++++++++++++++++++++++++++++------------------
> 1 file changed, 80 insertions(+), 38 deletions(-)
>
> diff --git a/block/sheepdog.c b/block/sheepdog.c
> index 0eb33ee..4727fc1 100644
> --- a/block/sheepdog.c
> +++ b/block/sheepdog.c
> @@ -314,6 +314,7 @@ struct SheepdogAIOCB {
>
> typedef struct BDRVSheepdogState {
> BlockDriverState *bs;
> + AioContext *aio_context;
>
> SheepdogInode inode;
>
> @@ -496,7 +497,7 @@ static void sd_aio_cancel(BlockDriverAIOCB *blockacb)
> sd_finish_aiocb(acb);
> return;
> }
> - qemu_aio_wait();
> + aio_poll(s->aio_context, true);
> }
> }
>
> @@ -582,6 +583,7 @@ static void restart_co_req(void *opaque)
>
> typedef struct SheepdogReqCo {
> int sockfd;
> + AioContext *aio_context;
> SheepdogReq *hdr;
> void *data;
> unsigned int *wlen;
> @@ -602,14 +604,14 @@ static coroutine_fn void do_co_req(void *opaque)
> unsigned int *rlen = srco->rlen;
>
> co = qemu_coroutine_self();
> - qemu_aio_set_fd_handler(sockfd, NULL, restart_co_req, co);
> + aio_set_fd_handler(srco->aio_context, sockfd, NULL, restart_co_req, co);
>
> ret = send_co_req(sockfd, hdr, data, wlen);
> if (ret < 0) {
> goto out;
> }
>
> - qemu_aio_set_fd_handler(sockfd, restart_co_req, NULL, co);
> + aio_set_fd_handler(srco->aio_context, sockfd, restart_co_req, NULL, co);
>
> ret = qemu_co_recv(sockfd, hdr, sizeof(*hdr));
> if (ret != sizeof(*hdr)) {
> @@ -634,18 +636,19 @@ static coroutine_fn void do_co_req(void *opaque)
> out:
> /* there is at most one request for this sockfd, so it is safe to
> * set each handler to NULL. */
> - qemu_aio_set_fd_handler(sockfd, NULL, NULL, NULL);
> + aio_set_fd_handler(srco->aio_context, sockfd, NULL, NULL, NULL);
>
> srco->ret = ret;
> srco->finished = true;
> }
>
> -static int do_req(int sockfd, SheepdogReq *hdr, void *data,
> - unsigned int *wlen, unsigned int *rlen)
> +static int do_req(int sockfd, AioContext *aio_context, SheepdogReq *hdr,
> + void *data, unsigned int *wlen, unsigned int *rlen)
> {
> Coroutine *co;
> SheepdogReqCo srco = {
> .sockfd = sockfd,
> + .aio_context = aio_context,
> .hdr = hdr,
> .data = data,
> .wlen = wlen,
> @@ -660,7 +663,7 @@ static int do_req(int sockfd, SheepdogReq *hdr, void
> *data,
> co = qemu_coroutine_create(do_co_req);
> qemu_coroutine_enter(co, &srco);
> while (!srco.finished) {
> - qemu_aio_wait();
> + aio_poll(aio_context, true);
> }
> }
>
> @@ -712,7 +715,7 @@ static coroutine_fn void reconnect_to_sdog(void *opaque)
> BDRVSheepdogState *s = opaque;
> AIOReq *aio_req, *next;
>
> - qemu_aio_set_fd_handler(s->fd, NULL, NULL, NULL);
> + aio_set_fd_handler(s->aio_context, s->fd, NULL, NULL, NULL);
> close(s->fd);
> s->fd = -1;
>
> @@ -923,7 +926,7 @@ static int get_sheep_fd(BDRVSheepdogState *s)
> return fd;
> }
>
> - qemu_aio_set_fd_handler(fd, co_read_response, NULL, s);
> + aio_set_fd_handler(s->aio_context, fd, co_read_response, NULL, s);
> return fd;
> }
>
> @@ -1093,7 +1096,7 @@ static int find_vdi_name(BDRVSheepdogState *s, const
> char *filename,
> hdr.snapid = snapid;
> hdr.flags = SD_FLAG_CMD_WRITE;
>
> - ret = do_req(fd, (SheepdogReq *)&hdr, buf, &wlen, &rlen);
> + ret = do_req(fd, s->aio_context, (SheepdogReq *)&hdr, buf, &wlen, &rlen);
> if (ret) {
> goto out;
> }
> @@ -1173,7 +1176,8 @@ static void coroutine_fn
> add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req,
>
> qemu_co_mutex_lock(&s->lock);
> s->co_send = qemu_coroutine_self();
> - qemu_aio_set_fd_handler(s->fd, co_read_response, co_write_request, s);
> + aio_set_fd_handler(s->aio_context, s->fd,
> + co_read_response, co_write_request, s);
> socket_set_cork(s->fd, 1);
>
> /* send a header */
> @@ -1191,12 +1195,13 @@ static void coroutine_fn
> add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req,
> }
> out:
> socket_set_cork(s->fd, 0);
> - qemu_aio_set_fd_handler(s->fd, co_read_response, NULL, s);
> + aio_set_fd_handler(s->aio_context, s->fd, co_read_response, NULL, s);
> s->co_send = NULL;
> qemu_co_mutex_unlock(&s->lock);
> }
>
> -static int read_write_object(int fd, char *buf, uint64_t oid, uint8_t copies,
> +static int read_write_object(int fd, AioContext *aio_context, char *buf,
> + uint64_t oid, uint8_t copies,
> unsigned int datalen, uint64_t offset,
> bool write, bool create, uint32_t cache_flags)
> {
> @@ -1229,7 +1234,7 @@ static int read_write_object(int fd, char *buf,
> uint64_t oid, uint8_t copies,
> hdr.offset = offset;
> hdr.copies = copies;
>
> - ret = do_req(fd, (SheepdogReq *)&hdr, buf, &wlen, &rlen);
> + ret = do_req(fd, aio_context, (SheepdogReq *)&hdr, buf, &wlen, &rlen);
> if (ret) {
> error_report("failed to send a request to the sheep");
> return ret;
> @@ -1244,19 +1249,23 @@ static int read_write_object(int fd, char *buf,
> uint64_t oid, uint8_t copies,
> }
> }
>
> -static int read_object(int fd, char *buf, uint64_t oid, uint8_t copies,
> +static int read_object(int fd, AioContext *aio_context, char *buf,
> + uint64_t oid, uint8_t copies,
> unsigned int datalen, uint64_t offset,
> uint32_t cache_flags)
> {
> - return read_write_object(fd, buf, oid, copies, datalen, offset, false,
> + return read_write_object(fd, aio_context, buf, oid, copies,
> + datalen, offset, false,
> false, cache_flags);
> }
>
> -static int write_object(int fd, char *buf, uint64_t oid, uint8_t copies,
> +static int write_object(int fd, AioContext *aio_context, char *buf,
> + uint64_t oid, uint8_t copies,
> unsigned int datalen, uint64_t offset, bool create,
> uint32_t cache_flags)
> {
> - return read_write_object(fd, buf, oid, copies, datalen, offset, true,
> + return read_write_object(fd, aio_context, buf, oid, copies,
> + datalen, offset, true,
> create, cache_flags);
> }
>
> @@ -1279,7 +1288,7 @@ static int reload_inode(BDRVSheepdogState *s, uint32_t
> snapid, const char *tag)
> goto out;
> }
>
> - ret = read_object(fd, (char *)inode, vid_to_vdi_oid(vid),
> + ret = read_object(fd, s->aio_context, (char *)inode, vid_to_vdi_oid(vid),
> s->inode.nr_copies, sizeof(*inode), 0, s->cache_flags);
> if (ret < 0) {
> goto out;
> @@ -1354,6 +1363,22 @@ out:
> }
> }
>
> +static void sd_detach_aio_context(BlockDriverState *bs)
> +{
> + BDRVSheepdogState *s = bs->opaque;
> +
> + aio_set_fd_handler(s->aio_context, s->fd, NULL, NULL, NULL);
> +}
> +
> +static void sd_attach_aio_context(BlockDriverState *bs,
> + AioContext *new_context)
> +{
> + BDRVSheepdogState *s = bs->opaque;
> +
> + s->aio_context = new_context;
> + aio_set_fd_handler(new_context, s->fd, co_read_response, NULL, s);
> +}
> +
> /* TODO Convert to fine grained options */
> static QemuOptsList runtime_opts = {
> .name = "sheepdog",
> @@ -1382,6 +1407,7 @@ static int sd_open(BlockDriverState *bs, QDict
> *options, int flags,
> const char *filename;
>
> s->bs = bs;
> + s->aio_context = bdrv_get_aio_context(bs);
>
> opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
> qemu_opts_absorb_qdict(opts, options, &local_err);
> @@ -1443,8 +1469,8 @@ static int sd_open(BlockDriverState *bs, QDict
> *options, int flags,
> }
>
> buf = g_malloc(SD_INODE_SIZE);
> - ret = read_object(fd, buf, vid_to_vdi_oid(vid), 0, SD_INODE_SIZE, 0,
> - s->cache_flags);
> + ret = read_object(fd, s->aio_context, buf, vid_to_vdi_oid(vid),
> + 0, SD_INODE_SIZE, 0, s->cache_flags);
>
> closesocket(fd);
>
> @@ -1463,7 +1489,7 @@ static int sd_open(BlockDriverState *bs, QDict
> *options, int flags,
> g_free(buf);
> return 0;
> out:
> - qemu_aio_set_fd_handler(s->fd, NULL, NULL, NULL);
> + aio_set_fd_handler(bdrv_get_aio_context(bs), s->fd, NULL, NULL, NULL);
> if (s->fd >= 0) {
> closesocket(s->fd);
> }
> @@ -1505,7 +1531,7 @@ static int do_sd_create(BDRVSheepdogState *s, uint32_t
> *vdi_id, int snapshot)
> hdr.copy_policy = s->inode.copy_policy;
> hdr.copies = s->inode.nr_copies;
>
> - ret = do_req(fd, (SheepdogReq *)&hdr, buf, &wlen, &rlen);
> + ret = do_req(fd, s->aio_context, (SheepdogReq *)&hdr, buf, &wlen, &rlen);
>
> closesocket(fd);
>
> @@ -1751,7 +1777,8 @@ static void sd_close(BlockDriverState *bs)
> hdr.data_length = wlen;
> hdr.flags = SD_FLAG_CMD_WRITE;
>
> - ret = do_req(fd, (SheepdogReq *)&hdr, s->name, &wlen, &rlen);
> + ret = do_req(fd, s->aio_context, (SheepdogReq *)&hdr,
> + s->name, &wlen, &rlen);
>
> closesocket(fd);
>
> @@ -1760,7 +1787,7 @@ static void sd_close(BlockDriverState *bs)
> error_report("%s, %s", sd_strerror(rsp->result), s->name);
> }
>
> - qemu_aio_set_fd_handler(s->fd, NULL, NULL, NULL);
> + aio_set_fd_handler(bdrv_get_aio_context(bs), s->fd, NULL, NULL, NULL);
> closesocket(s->fd);
> g_free(s->host_spec);
> }
> @@ -1794,8 +1821,9 @@ static int sd_truncate(BlockDriverState *bs, int64_t
> offset)
> /* we don't need to update entire object */
> datalen = SD_INODE_SIZE - sizeof(s->inode.data_vdi_id);
> s->inode.vdi_size = offset;
> - ret = write_object(fd, (char *)&s->inode,
> vid_to_vdi_oid(s->inode.vdi_id),
> - s->inode.nr_copies, datalen, 0, false,
> s->cache_flags);
> + ret = write_object(fd, s->aio_context, (char *)&s->inode,
> + vid_to_vdi_oid(s->inode.vdi_id), s->inode.nr_copies,
> + datalen, 0, false, s->cache_flags);
> close(fd);
>
> if (ret < 0) {
> @@ -1861,7 +1889,8 @@ static bool sd_delete(BDRVSheepdogState *s)
> return false;
> }
>
> - ret = do_req(fd, (SheepdogReq *)&hdr, s->name, &wlen, &rlen);
> + ret = do_req(fd, s->aio_context, (SheepdogReq *)&hdr,
> + s->name, &wlen, &rlen);
> closesocket(fd);
> if (ret) {
> return false;
> @@ -1913,8 +1942,8 @@ static int sd_create_branch(BDRVSheepdogState *s)
> goto out;
> }
>
> - ret = read_object(fd, buf, vid_to_vdi_oid(vid), s->inode.nr_copies,
> - SD_INODE_SIZE, 0, s->cache_flags);
> + ret = read_object(fd, s->aio_context, buf, vid_to_vdi_oid(vid),
> + s->inode.nr_copies, SD_INODE_SIZE, 0, s->cache_flags);
>
> closesocket(fd);
>
> @@ -2157,8 +2186,9 @@ static int sd_snapshot_create(BlockDriverState *bs,
> QEMUSnapshotInfo *sn_info)
> goto cleanup;
> }
>
> - ret = write_object(fd, (char *)&s->inode,
> vid_to_vdi_oid(s->inode.vdi_id),
> - s->inode.nr_copies, datalen, 0, false,
> s->cache_flags);
> + ret = write_object(fd, s->aio_context, (char *)&s->inode,
> + vid_to_vdi_oid(s->inode.vdi_id), s->inode.nr_copies,
> + datalen, 0, false, s->cache_flags);
> if (ret < 0) {
> error_report("failed to write snapshot's inode.");
> goto cleanup;
> @@ -2173,8 +2203,9 @@ static int sd_snapshot_create(BlockDriverState *bs,
> QEMUSnapshotInfo *sn_info)
>
> inode = (SheepdogInode *)g_malloc(datalen);
>
> - ret = read_object(fd, (char *)inode, vid_to_vdi_oid(new_vid),
> - s->inode.nr_copies, datalen, 0, s->cache_flags);
> + ret = read_object(fd, s->aio_context, (char *)inode,
> + vid_to_vdi_oid(new_vid), s->inode.nr_copies,
> + datalen, 0, s->cache_flags);
>
> if (ret < 0) {
> error_report("failed to read new inode info. %s", strerror(errno));
> @@ -2277,7 +2308,8 @@ static int sd_snapshot_list(BlockDriverState *bs,
> QEMUSnapshotInfo **psn_tab)
> req.opcode = SD_OP_READ_VDIS;
> req.data_length = max;
>
> - ret = do_req(fd, (SheepdogReq *)&req, vdi_inuse, &wlen, &rlen);
> + ret = do_req(fd, s->aio_context, (SheepdogReq *)&req,
> + vdi_inuse, &wlen, &rlen);
>
> closesocket(fd);
> if (ret) {
> @@ -2302,7 +2334,8 @@ static int sd_snapshot_list(BlockDriverState *bs,
> QEMUSnapshotInfo **psn_tab)
> }
>
> /* we don't need to read entire object */
> - ret = read_object(fd, (char *)&inode, vid_to_vdi_oid(vid),
> + ret = read_object(fd, s->aio_context, (char *)&inode,
> + vid_to_vdi_oid(vid),
> 0, SD_INODE_SIZE - sizeof(inode.data_vdi_id), 0,
> s->cache_flags);
>
> @@ -2364,11 +2397,11 @@ static int do_load_save_vmstate(BDRVSheepdogState *s,
> uint8_t *data,
>
> create = (offset == 0);
> if (load) {
> - ret = read_object(fd, (char *)data, vmstate_oid,
> + ret = read_object(fd, s->aio_context, (char *)data, vmstate_oid,
> s->inode.nr_copies, data_len, offset,
> s->cache_flags);
> } else {
> - ret = write_object(fd, (char *)data, vmstate_oid,
> + ret = write_object(fd, s->aio_context, (char *)data, vmstate_oid,
> s->inode.nr_copies, data_len, offset, create,
> s->cache_flags);
> }
> @@ -2541,6 +2574,9 @@ static BlockDriver bdrv_sheepdog = {
> .bdrv_save_vmstate = sd_save_vmstate,
> .bdrv_load_vmstate = sd_load_vmstate,
>
> + .bdrv_detach_aio_context = sd_detach_aio_context,
> + .bdrv_attach_aio_context = sd_attach_aio_context,
> +
> .create_options = sd_create_options,
> };
>
> @@ -2571,6 +2607,9 @@ static BlockDriver bdrv_sheepdog_tcp = {
> .bdrv_save_vmstate = sd_save_vmstate,
> .bdrv_load_vmstate = sd_load_vmstate,
>
> + .bdrv_detach_aio_context = sd_detach_aio_context,
> + .bdrv_attach_aio_context = sd_attach_aio_context,
> +
> .create_options = sd_create_options,
> };
>
> @@ -2601,6 +2640,9 @@ static BlockDriver bdrv_sheepdog_unix = {
> .bdrv_save_vmstate = sd_save_vmstate,
> .bdrv_load_vmstate = sd_load_vmstate,
>
> + .bdrv_detach_aio_context = sd_detach_aio_context,
> + .bdrv_attach_aio_context = sd_attach_aio_context,
> +
> .create_options = sd_create_options,
> };
>
> --
> 1.9.0
>
Acked-by: Liu Yuan <namei.u...@gmail.com>
Yuan
