From: Roman Kagan <rvkagan@yandex-team.ru>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com>,
yc-core@yandex-team.ru
Subject: [PATCH 7/7] block/nbd: stop manipulating in_flight counter
Date: Mon, 15 Mar 2021 09:06:11 +0300 [thread overview]
Message-ID: <20210315060611.2989049-8-rvkagan@yandex-team.ru> (raw)
In-Reply-To: <20210315060611.2989049-1-rvkagan@yandex-team.ru>
As the reconnect logic no longer interferes with drained sections, it
appears unnecessary to explicitly manipulate the in_flight counter.
Fixes: 5ad81b4946 ("nbd: Restrict connection_co reentrance")
Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
---
block/nbd.c | 6 ------
nbd/client.c | 2 --
2 files changed, 8 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index a5a9e4aca5..3a22f5d897 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -311,7 +311,6 @@ static void nbd_client_attach_aio_context_bh(void *opaque)
if (s->connection_co) {
qemu_aio_coroutine_enter(bs->aio_context, s->connection_co);
}
- bdrv_dec_in_flight(bs);
}
static void nbd_client_attach_aio_context(BlockDriverState *bs,
@@ -327,7 +326,6 @@ static void nbd_client_attach_aio_context(BlockDriverState *bs,
qio_channel_attach_aio_context(QIO_CHANNEL(s->ioc), new_context);
}
- bdrv_inc_in_flight(bs);
/*
* Need to wait here for the BH to run because the BH must run while the
@@ -643,11 +641,9 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s)
goto out;
}
- bdrv_dec_in_flight(s->bs);
ret = nbd_client_handshake(s->bs, &local_err);
- bdrv_inc_in_flight(s->bs);
out:
s->connect_status = ret;
@@ -759,7 +755,6 @@ static coroutine_fn void nbd_connection_entry(void *opaque)
qemu_co_queue_restart_all(&s->free_sema);
nbd_recv_coroutines_wake_all(s);
- bdrv_dec_in_flight(s->bs);
s->connection_co = NULL;
if (s->ioc) {
@@ -2307,7 +2302,6 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,
nbd_init_connect_thread(s);
s->connection_co = qemu_coroutine_create(nbd_connection_entry, s);
- bdrv_inc_in_flight(bs);
aio_co_schedule(bdrv_get_aio_context(bs), s->connection_co);
return 0;
diff --git a/nbd/client.c b/nbd/client.c
index 0c2db4bcba..30d5383cb1 100644
--- a/nbd/client.c
+++ b/nbd/client.c
@@ -1434,9 +1434,7 @@ nbd_read_eof(BlockDriverState *bs, QIOChannel *ioc, void *buffer, size_t size,
len = qio_channel_readv(ioc, &iov, 1, errp);
if (len == QIO_CHANNEL_ERR_BLOCK) {
- bdrv_dec_in_flight(bs);
qio_channel_yield(ioc, G_IO_IN);
- bdrv_inc_in_flight(bs);
continue;
} else if (len < 0) {
return -EIO;
--
2.30.2
next prev parent reply other threads:[~2021-03-15 6:09 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 6:06 [PATCH 0/7] block/nbd: decouple reconnect from drain Roman Kagan
2021-03-15 6:06 ` [PATCH 1/7] block/nbd: avoid touching freed connect_thread Roman Kagan
2021-03-15 15:40 ` Vladimir Sementsov-Ogievskiy
2021-03-16 15:29 ` Roman Kagan
2021-04-06 16:21 ` Vladimir Sementsov-Ogievskiy
2021-03-15 6:06 ` [PATCH 2/7] block/nbd: use uniformly nbd_client_connecting_wait Roman Kagan
2021-03-15 15:48 ` Vladimir Sementsov-Ogievskiy
2021-03-15 6:06 ` [PATCH 3/7] block/nbd: assert attach/detach runs in the proper context Roman Kagan
2021-03-15 16:41 ` Vladimir Sementsov-Ogievskiy
2021-03-15 19:57 ` Roman Kagan
2021-03-15 6:06 ` [PATCH 4/7] block/nbd: transfer reconnection stuff across aio_context switch Roman Kagan
2021-03-15 6:06 ` [PATCH 5/7] block/nbd: better document a case in nbd_co_establish_connection Roman Kagan
2021-03-15 6:06 ` [PATCH 6/7] block/nbd: decouple reconnect from drain Roman Kagan
2021-03-15 20:10 ` Vladimir Sementsov-Ogievskiy
2021-03-16 16:03 ` Roman Kagan
2021-03-16 18:09 ` Vladimir Sementsov-Ogievskiy
2021-03-26 6:16 ` Roman Kagan
2021-03-15 6:06 ` Roman Kagan [this message]
2021-03-15 20:15 ` [PATCH 7/7] block/nbd: stop manipulating in_flight counter Vladimir Sementsov-Ogievskiy
2021-03-16 16:08 ` Roman Kagan
2021-03-16 18:37 ` Vladimir Sementsov-Ogievskiy
2021-03-26 7:41 ` Roman Kagan
2021-03-15 19:45 ` [PATCH 0/7] block/nbd: decouple reconnect from drain Vladimir Sementsov-Ogievskiy
2021-03-16 15:52 ` Roman Kagan
2021-03-16 14:41 ` Eric Blake
2021-03-16 16:10 ` Roman Kagan
2021-03-17 8:35 ` Vladimir Sementsov-Ogievskiy
2021-03-26 8:07 ` Roman Kagan
2021-04-07 7:45 ` Roman Kagan
2021-04-07 10:13 ` Vladimir Sementsov-Ogievskiy
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=20210315060611.2989049-8-rvkagan@yandex-team.ru \
--to=rvkagan@yandex-team.ru \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
--cc=yc-core@yandex-team.ru \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).