| Message ID | 20210315060611.2989049-2-rvkagan@yandex-team.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block/nbd: decouple reconnect from drain | expand |
15.03.2021 09:06, Roman Kagan wrote: > When the NBD connection is being torn down, the connection thread gets > canceled and "detached", meaning it is about to get freed. > > If this happens while the connection coroutine yielded waiting for the > connection thread to complete, when it resumes it may access the > invalidated connection thread data. > > To prevent this, revalidate the ->connect_thread pointer in > nbd_co_establish_connection_cancel before using after the the yield. > > Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru> Seems possible. Do you have a reproducer? Would be great to make an iotest. > --- > block/nbd.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/block/nbd.c b/block/nbd.c > index c26dc5a54f..447d176b76 100644 > --- a/block/nbd.c > +++ b/block/nbd.c > @@ -486,6 +486,15 @@ nbd_co_establish_connection(BlockDriverState *bs, Error **errp) > s->wait_connect = true; > qemu_coroutine_yield(); > > + /* > + * If nbd_co_establish_connection_cancel had a chance to run it may have > + * invalidated ->connect_thread. > + */ > + thr = s->connect_thread; > + if (!thr) { > + return -ECONNABORTED; > + } > + > qemu_mutex_lock(&thr->mutex); > > switch (thr->state) { > Patch looks a bit like s->connect_thread may become something other than NULL during the yield.. But it can't actually. Maybe it will be possible with further patches? Anyway, make sense to me: Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
On Mon, Mar 15, 2021 at 06:40:12PM +0300, Vladimir Sementsov-Ogievskiy wrote: > 15.03.2021 09:06, Roman Kagan wrote: > > When the NBD connection is being torn down, the connection thread gets > > canceled and "detached", meaning it is about to get freed. > > > > If this happens while the connection coroutine yielded waiting for the > > connection thread to complete, when it resumes it may access the > > invalidated connection thread data. > > > > To prevent this, revalidate the ->connect_thread pointer in > > nbd_co_establish_connection_cancel before using after the the yield. > > > > Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru> > > Seems possible. Do you have a reproducer? Would be great to make an iotest. It triggered on me in iotest 277, but seems to be timing-dependent. I'll see if I can do it reliable. Thanks, Roman.
15.03.2021 09:06, Roman Kagan wrote: > When the NBD connection is being torn down, the connection thread gets > canceled and "detached", meaning it is about to get freed. > > If this happens while the connection coroutine yielded waiting for the > connection thread to complete, when it resumes it may access the > invalidated connection thread data. > > To prevent this, revalidate the ->connect_thread pointer in > nbd_co_establish_connection_cancel before using after the the yield. > > Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru> > --- > block/nbd.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/block/nbd.c b/block/nbd.c > index c26dc5a54f..447d176b76 100644 > --- a/block/nbd.c > +++ b/block/nbd.c > @@ -486,6 +486,15 @@ nbd_co_establish_connection(BlockDriverState *bs, Error **errp) > s->wait_connect = true; > qemu_coroutine_yield(); > > + /* > + * If nbd_co_establish_connection_cancel had a chance to run it may have > + * invalidated ->connect_thread. > + */ > + thr = s->connect_thread; > + if (!thr) { > + return -ECONNABORTED; nbd_co_establish_connection() tends to return -1 or 0, not -errno, so -1 is better here. Still it doesn't really matter. > + } > + > qemu_mutex_lock(&thr->mutex); > > switch (thr->state) { >
diff --git a/block/nbd.c b/block/nbd.c index c26dc5a54f..447d176b76 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -486,6 +486,15 @@ nbd_co_establish_connection(BlockDriverState *bs, Error **errp) s->wait_connect = true; qemu_coroutine_yield(); + /* + * If nbd_co_establish_connection_cancel had a chance to run it may have + * invalidated ->connect_thread. + */ + thr = s->connect_thread; + if (!thr) { + return -ECONNABORTED; + } + qemu_mutex_lock(&thr->mutex); switch (thr->state) {
When the NBD connection is being torn down, the connection thread gets canceled and "detached", meaning it is about to get freed. If this happens while the connection coroutine yielded waiting for the connection thread to complete, when it resumes it may access the invalidated connection thread data. To prevent this, revalidate the ->connect_thread pointer in nbd_co_establish_connection_cancel before using after the the yield. Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru> --- block/nbd.c | 9 +++++++++ 1 file changed, 9 insertions(+)