On 06/04/2017 23:37, Kevin Wolf wrote:
> We used to poll BHs in earlier times. Commit 99723548 ('block: add BDS
> field to count in-flight requests') changed this, without an explanation
> in the commit message.
>
> Paolo, is this simply a bug in that commit, or do you rely on it
> somewhere? I remember that you wanted to get rid of some aio_poll()
> calls a while ago.
It was replaced by the bdrv_inc_in_flight/bdrv_dec_in_flight calls in
bdrv_aio_prw and bdrv_co_complete.
These let bdrv_drain complete the invocation of the callbacks. But
block_job_defer_to_main_loop is different because it schedules the
bottom half in another QEMU AioContext (the main thread's).
Since he's here with me, I'll ask Fam exactly what's happening. Stefan
also found something not too convincing in his review.
Paolo
>> block/io.c | 7 ++++++-
>> 1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/block/io.c b/block/io.c
>> index 2709a70..b9cfd18 100644
>> --- a/block/io.c
>> +++ b/block/io.c
>> @@ -228,7 +228,12 @@ void bdrv_drained_begin(BlockDriverState *bs)
>> bdrv_parent_drained_begin(bs);
>> }
>>
>> - bdrv_drain_recurse(bs);
>> + while (true) {
>> + if (!bdrv_drain_recurse(bs) &&
>> + !aio_poll(bdrv_get_aio_context(bs), false)) {
>> + break;
>> + }
>
> The indentation is off here.
>
>> + }
>> }
>
> The old code had this in what is now the BDRV_POLL_WHILE() call in
> bdrv_drain_recurse(). I think it makes more sense there, saves you a
> loop here and fixes bdrv_drain_all_begin() at the same time.
>
> Kevin
>
>
