| Message ID | 1520507908-16743-4-git-send-email-pl@kamp.de |
|---|---|
| State | New |
| Headers | show |
| Series | block migration fixes | expand |
Peter Lieven <pl@kamp.de> wrote: > this actually limits (as the original commit mesage suggests) the > number of I/O buffers that can be allocated and not the number > of parallel (inflight) I/O requests. > > Signed-off-by: Peter Lieven <pl@kamp.de> Reviewed-by: Juan Quintela <quintela@redhat.com>
* Peter Lieven (pl@kamp.de) wrote: > this actually limits (as the original commit mesage suggests) the > number of I/O buffers that can be allocated and not the number > of parallel (inflight) I/O requests. > > Signed-off-by: Peter Lieven <pl@kamp.de> I've queued 1-3 (which have Juan's R-b). Dave > --- > migration/block.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/migration/block.c b/migration/block.c > index 87bb35c..41b95d1 100644 > --- a/migration/block.c > +++ b/migration/block.c > @@ -36,7 +36,7 @@ > > #define MAX_IS_ALLOCATED_SEARCH (65536 * BDRV_SECTOR_SIZE) > > -#define MAX_INFLIGHT_IO 512 > +#define MAX_IO_BUFFERS 512 > > //#define DEBUG_BLK_MIGRATION > > @@ -775,9 +775,8 @@ static int block_save_iterate(QEMUFile *f, void *opaque) > while ((block_mig_state.submitted + > block_mig_state.read_done) * BLOCK_SIZE < > qemu_file_get_rate_limit(f) && > - (block_mig_state.submitted + > - block_mig_state.read_done) < > - MAX_INFLIGHT_IO) { > + (block_mig_state.submitted + block_mig_state.read_done) < > + MAX_IO_BUFFERS) { > blk_mig_unlock(); > if (block_mig_state.bulk_completed == 0) { > /* first finish the bulk phase */ > -- > 2.7.4 > > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Am 09.03.2018 um 15:58 schrieb Dr. David Alan Gilbert: > * Peter Lieven (pl@kamp.de) wrote: >> this actually limits (as the original commit mesage suggests) the >> number of I/O buffers that can be allocated and not the number >> of parallel (inflight) I/O requests. >> >> Signed-off-by: Peter Lieven <pl@kamp.de> > I've queued 1-3 (which have Juan's R-b). Thank you. It would be good if we find a proper solution for the rest as this is also important. Peter
diff --git a/migration/block.c b/migration/block.c index 87bb35c..41b95d1 100644 --- a/migration/block.c +++ b/migration/block.c @@ -36,7 +36,7 @@ #define MAX_IS_ALLOCATED_SEARCH (65536 * BDRV_SECTOR_SIZE) -#define MAX_INFLIGHT_IO 512 +#define MAX_IO_BUFFERS 512 //#define DEBUG_BLK_MIGRATION @@ -775,9 +775,8 @@ static int block_save_iterate(QEMUFile *f, void *opaque) while ((block_mig_state.submitted + block_mig_state.read_done) * BLOCK_SIZE < qemu_file_get_rate_limit(f) && - (block_mig_state.submitted + - block_mig_state.read_done) < - MAX_INFLIGHT_IO) { + (block_mig_state.submitted + block_mig_state.read_done) < + MAX_IO_BUFFERS) { blk_mig_unlock(); if (block_mig_state.bulk_completed == 0) { /* first finish the bulk phase */
this actually limits (as the original commit mesage suggests) the number of I/O buffers that can be allocated and not the number of parallel (inflight) I/O requests. Signed-off-by: Peter Lieven <pl@kamp.de> --- migration/block.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)