* [PATCH v2] make sample page count configurable @ 2021-05-09 4:58 huangy81 2021-05-09 4:59 ` [PATCH v2] migration/dirtyrate: " huangy81 0 siblings, 1 reply; 3+ messages in thread From: huangy81 @ 2021-05-09 4:58 UTC (permalink / raw) To: qemu-devel Cc: Hyman Huang(黄勇), Dr. David Alan Gilbert, Juan Quintela From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn> This is v2 of introducing sample pages argument to dirty rate interface v2: - do the code clean on the basis of review by David - add qemu version to 6.1 since which the argument introduced - raise the upper limit of sample pages refer as MAX_SAMPLE_PAGE_COUNT v1: - code clean: rename the parameter of the is_sample_valid function Hyman Huang(黄勇) (1): migration/dirtyrate: make sample page count configurable migration/dirtyrate.c | 31 ++++++++++++++++--- migration/dirtyrate.h | 8 ++++- qapi/migration.json | 85 ++++++++++++++++++++++++++++----------------------- 3 files changed, 80 insertions(+), 44 deletions(-) -- 1.8.3.1 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2] migration/dirtyrate: make sample page count configurable 2021-05-09 4:58 [PATCH v2] make sample page count configurable huangy81 @ 2021-05-09 4:59 ` huangy81 2021-05-11 9:35 ` Dr. David Alan Gilbert 0 siblings, 1 reply; 3+ messages in thread From: huangy81 @ 2021-05-09 4:59 UTC (permalink / raw) To: qemu-devel Cc: Hyman Huang(黄勇), Dr. David Alan Gilbert, Juan Quintela From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn> introduce optional sample-pages argument in calc-dirty-rate, making sample page count per GB configurable so that more accurate dirtyrate can be calculated. Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn> --- migration/dirtyrate.c | 31 ++++++++++++++++--- migration/dirtyrate.h | 8 ++++- qapi/migration.json | 85 ++++++++++++++++++++++++++++----------------------- 3 files changed, 80 insertions(+), 44 deletions(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index ccb9814..2ee3890 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -48,6 +48,12 @@ static bool is_sample_period_valid(int64_t sec) return true; } +static bool is_sample_pages_valid(int64_t pages) +{ + return pages >= MIN_SAMPLE_PAGE_COUNT && + pages <= MAX_SAMPLE_PAGE_COUNT; +} + static int dirtyrate_set_state(int *state, int old_state, int new_state) { assert(new_state < DIRTY_RATE_STATUS__MAX); @@ -72,13 +78,15 @@ static struct DirtyRateInfo *query_dirty_rate_info(void) info->status = CalculatingState; info->start_time = DirtyStat.start_time; info->calc_time = DirtyStat.calc_time; + info->sample_pages = DirtyStat.sample_pages; trace_query_dirty_rate_info(DirtyRateStatus_str(CalculatingState)); return info; } -static void init_dirtyrate_stat(int64_t start_time, int64_t calc_time) +static void init_dirtyrate_stat(int64_t start_time, int64_t calc_time, + uint64_t sample_pages) { DirtyStat.total_dirty_samples = 0; DirtyStat.total_sample_count = 0; @@ -86,6 +94,7 @@ static void init_dirtyrate_stat(int64_t start_time, int64_t calc_time) DirtyStat.dirty_rate = -1; DirtyStat.start_time = start_time; DirtyStat.calc_time = calc_time; + DirtyStat.sample_pages = sample_pages; } static void update_dirtyrate_stat(struct RamblockDirtyInfo *info) @@ -361,6 +370,7 @@ void *get_dirtyrate_thread(void *arg) int ret; int64_t start_time; int64_t calc_time; + uint64_t sample_pages; ret = dirtyrate_set_state(&CalculatingState, DIRTY_RATE_STATUS_UNSTARTED, DIRTY_RATE_STATUS_MEASURING); @@ -371,7 +381,8 @@ void *get_dirtyrate_thread(void *arg) start_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) / 1000; calc_time = config.sample_period_seconds; - init_dirtyrate_stat(start_time, calc_time); + sample_pages = config.sample_pages_per_gigabytes; + init_dirtyrate_stat(start_time, calc_time, sample_pages); calculate_dirtyrate(config); @@ -383,7 +394,8 @@ void *get_dirtyrate_thread(void *arg) return NULL; } -void qmp_calc_dirty_rate(int64_t calc_time, Error **errp) +void qmp_calc_dirty_rate(int64_t calc_time, bool has_sample_pages, + int64_t sample_pages, Error **errp) { static struct DirtyRateConfig config; QemuThread thread; @@ -404,6 +416,17 @@ void qmp_calc_dirty_rate(int64_t calc_time, Error **errp) return; } + if (has_sample_pages) { + if (!is_sample_pages_valid(sample_pages)) { + error_setg(errp, "sample-pages is out of range[%d, %d].", + MIN_SAMPLE_PAGE_COUNT, + MAX_SAMPLE_PAGE_COUNT); + return; + } + } else { + sample_pages = DIRTYRATE_DEFAULT_SAMPLE_PAGES; + } + /* * Init calculation state as unstarted. */ @@ -415,7 +438,7 @@ void qmp_calc_dirty_rate(int64_t calc_time, Error **errp) } config.sample_period_seconds = calc_time; - config.sample_pages_per_gigabytes = DIRTYRATE_DEFAULT_SAMPLE_PAGES; + config.sample_pages_per_gigabytes = sample_pages; qemu_thread_create(&thread, "get_dirtyrate", get_dirtyrate_thread, (void *)&config, QEMU_THREAD_DETACHED); } diff --git a/migration/dirtyrate.h b/migration/dirtyrate.h index 6ec4295..e1fd290 100644 --- a/migration/dirtyrate.h +++ b/migration/dirtyrate.h @@ -15,7 +15,6 @@ /* * Sample 512 pages per GB as default. - * TODO: Make it configurable. */ #define DIRTYRATE_DEFAULT_SAMPLE_PAGES 512 @@ -35,6 +34,12 @@ #define MIN_FETCH_DIRTYRATE_TIME_SEC 1 #define MAX_FETCH_DIRTYRATE_TIME_SEC 60 +/* + * Take 1/16 pages in 1G as the maxmum sample page count + */ +#define MIN_SAMPLE_PAGE_COUNT 128 +#define MAX_SAMPLE_PAGE_COUNT 16384 + struct DirtyRateConfig { uint64_t sample_pages_per_gigabytes; /* sample pages per GB */ int64_t sample_period_seconds; /* time duration between two sampling */ @@ -63,6 +68,7 @@ struct DirtyRateStat { int64_t dirty_rate; /* dirty rate in MB/s */ int64_t start_time; /* calculation start time in units of second */ int64_t calc_time; /* time duration of two sampling in units of second */ + uint64_t sample_pages; /* sample pages per GB */ }; void *get_dirtyrate_thread(void *arg); diff --git a/qapi/migration.json b/qapi/migration.json index 0b17cce..b8f0bb5 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1732,45 +1732,6 @@ 'data': [ 'unstarted', 'measuring', 'measured'] } ## -# @DirtyRateInfo: -# -# Information about current dirty page rate of vm. -# -# @dirty-rate: an estimate of the dirty page rate of the VM in units of -# MB/s, present only when estimating the rate has completed. -# -# @status: status containing dirtyrate query status includes -# 'unstarted' or 'measuring' or 'measured' -# -# @start-time: start time in units of second for calculation -# -# @calc-time: time in units of second for sample dirty pages -# -# Since: 5.2 -# -## -{ 'struct': 'DirtyRateInfo', - 'data': {'*dirty-rate': 'int64', - 'status': 'DirtyRateStatus', - 'start-time': 'int64', - 'calc-time': 'int64'} } - -## -# @calc-dirty-rate: -# -# start calculating dirty page rate for vm -# -# @calc-time: time in units of second for sample dirty pages -# -# Since: 5.2 -# -# Example: -# {"command": "calc-dirty-rate", "data": {"calc-time": 1} } -# -## -{ 'command': 'calc-dirty-rate', 'data': {'calc-time': 'int64'} } - -## # @query-dirty-rate: # # query dirty page rate in units of MB/s for vm @@ -1951,3 +1912,49 @@ 'data': { 'job-id': 'str', 'tag': 'str', 'devices': ['str'] } } + +## +# @DirtyRateInfo: +# +# Information about current dirty page rate of vm. +# +# @dirty-rate: an estimate of the dirty page rate of the VM in units of +# MB/s, present only when estimating the rate has completed. +# +# @status: status containing dirtyrate query status includes +# 'unstarted' or 'measuring' or 'measured' +# +# @start-time: start time in units of second for calculation +# +# @calc-time: time in units of second for sample dirty pages +# +# @sample-pages: page count per GB for sample dirty pages +# the default value is 512 +# +# Since: 6.1 +# +## +{ 'struct': 'DirtyRateInfo', + 'data': {'*dirty-rate': 'int64', + 'status': 'DirtyRateStatus', + 'start-time': 'int64', + 'calc-time': 'int64', + 'sample-pages': 'uint64'} } + +## +# @calc-dirty-rate: +# +# start calculating dirty page rate for vm +# +# @calc-time: time in units of second for sample dirty pages +# +# @sample-pages: page count per GB for sample dirty pages +# the default value is 512 +# +# Since: 6.1 +# +# Example: +# {"command": "calc-dirty-rate", "data": {"calc-time": 1, 'sample-pages': 512} } +# +## +{ 'command': 'calc-dirty-rate', 'data': {'calc-time': 'int64', '*sample-pages': 'int'} } -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] migration/dirtyrate: make sample page count configurable 2021-05-09 4:59 ` [PATCH v2] migration/dirtyrate: " huangy81 @ 2021-05-11 9:35 ` Dr. David Alan Gilbert 0 siblings, 0 replies; 3+ messages in thread From: Dr. David Alan Gilbert @ 2021-05-11 9:35 UTC (permalink / raw) To: huangy81; +Cc: armbru, qemu-devel, Juan Quintela * huangy81@chinatelecom.cn (huangy81@chinatelecom.cn) wrote: > From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn> > > introduce optional sample-pages argument in calc-dirty-rate, > making sample page count per GB configurable so that more > accurate dirtyrate can be calculated. > > Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn> The json change is a bit bigger now than the previous version, and it shouldn't be. > --- > migration/dirtyrate.c | 31 ++++++++++++++++--- > migration/dirtyrate.h | 8 ++++- > qapi/migration.json | 85 ++++++++++++++++++++++++++++----------------------- > 3 files changed, 80 insertions(+), 44 deletions(-) > > diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c > index ccb9814..2ee3890 100644 > --- a/migration/dirtyrate.c > +++ b/migration/dirtyrate.c > @@ -48,6 +48,12 @@ static bool is_sample_period_valid(int64_t sec) > return true; > } > > +static bool is_sample_pages_valid(int64_t pages) > +{ > + return pages >= MIN_SAMPLE_PAGE_COUNT && > + pages <= MAX_SAMPLE_PAGE_COUNT; > +} > + > static int dirtyrate_set_state(int *state, int old_state, int new_state) > { > assert(new_state < DIRTY_RATE_STATUS__MAX); > @@ -72,13 +78,15 @@ static struct DirtyRateInfo *query_dirty_rate_info(void) > info->status = CalculatingState; > info->start_time = DirtyStat.start_time; > info->calc_time = DirtyStat.calc_time; > + info->sample_pages = DirtyStat.sample_pages; > > trace_query_dirty_rate_info(DirtyRateStatus_str(CalculatingState)); > > return info; > } > > -static void init_dirtyrate_stat(int64_t start_time, int64_t calc_time) > +static void init_dirtyrate_stat(int64_t start_time, int64_t calc_time, > + uint64_t sample_pages) > { > DirtyStat.total_dirty_samples = 0; > DirtyStat.total_sample_count = 0; > @@ -86,6 +94,7 @@ static void init_dirtyrate_stat(int64_t start_time, int64_t calc_time) > DirtyStat.dirty_rate = -1; > DirtyStat.start_time = start_time; > DirtyStat.calc_time = calc_time; > + DirtyStat.sample_pages = sample_pages; > } > > static void update_dirtyrate_stat(struct RamblockDirtyInfo *info) > @@ -361,6 +370,7 @@ void *get_dirtyrate_thread(void *arg) > int ret; > int64_t start_time; > int64_t calc_time; > + uint64_t sample_pages; > > ret = dirtyrate_set_state(&CalculatingState, DIRTY_RATE_STATUS_UNSTARTED, > DIRTY_RATE_STATUS_MEASURING); > @@ -371,7 +381,8 @@ void *get_dirtyrate_thread(void *arg) > > start_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) / 1000; > calc_time = config.sample_period_seconds; > - init_dirtyrate_stat(start_time, calc_time); > + sample_pages = config.sample_pages_per_gigabytes; > + init_dirtyrate_stat(start_time, calc_time, sample_pages); > > calculate_dirtyrate(config); > > @@ -383,7 +394,8 @@ void *get_dirtyrate_thread(void *arg) > return NULL; > } > > -void qmp_calc_dirty_rate(int64_t calc_time, Error **errp) > +void qmp_calc_dirty_rate(int64_t calc_time, bool has_sample_pages, > + int64_t sample_pages, Error **errp) > { > static struct DirtyRateConfig config; > QemuThread thread; > @@ -404,6 +416,17 @@ void qmp_calc_dirty_rate(int64_t calc_time, Error **errp) > return; > } > > + if (has_sample_pages) { > + if (!is_sample_pages_valid(sample_pages)) { > + error_setg(errp, "sample-pages is out of range[%d, %d].", > + MIN_SAMPLE_PAGE_COUNT, > + MAX_SAMPLE_PAGE_COUNT); > + return; > + } > + } else { > + sample_pages = DIRTYRATE_DEFAULT_SAMPLE_PAGES; > + } > + > /* > * Init calculation state as unstarted. > */ > @@ -415,7 +438,7 @@ void qmp_calc_dirty_rate(int64_t calc_time, Error **errp) > } > > config.sample_period_seconds = calc_time; > - config.sample_pages_per_gigabytes = DIRTYRATE_DEFAULT_SAMPLE_PAGES; > + config.sample_pages_per_gigabytes = sample_pages; > qemu_thread_create(&thread, "get_dirtyrate", get_dirtyrate_thread, > (void *)&config, QEMU_THREAD_DETACHED); > } > diff --git a/migration/dirtyrate.h b/migration/dirtyrate.h > index 6ec4295..e1fd290 100644 > --- a/migration/dirtyrate.h > +++ b/migration/dirtyrate.h > @@ -15,7 +15,6 @@ > > /* > * Sample 512 pages per GB as default. > - * TODO: Make it configurable. > */ > #define DIRTYRATE_DEFAULT_SAMPLE_PAGES 512 > > @@ -35,6 +34,12 @@ > #define MIN_FETCH_DIRTYRATE_TIME_SEC 1 > #define MAX_FETCH_DIRTYRATE_TIME_SEC 60 > > +/* > + * Take 1/16 pages in 1G as the maxmum sample page count > + */ > +#define MIN_SAMPLE_PAGE_COUNT 128 > +#define MAX_SAMPLE_PAGE_COUNT 16384 > + > struct DirtyRateConfig { > uint64_t sample_pages_per_gigabytes; /* sample pages per GB */ > int64_t sample_period_seconds; /* time duration between two sampling */ > @@ -63,6 +68,7 @@ struct DirtyRateStat { > int64_t dirty_rate; /* dirty rate in MB/s */ > int64_t start_time; /* calculation start time in units of second */ > int64_t calc_time; /* time duration of two sampling in units of second */ > + uint64_t sample_pages; /* sample pages per GB */ > }; > > void *get_dirtyrate_thread(void *arg); > diff --git a/qapi/migration.json b/qapi/migration.json > index 0b17cce..b8f0bb5 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -1732,45 +1732,6 @@ > 'data': [ 'unstarted', 'measuring', 'measured'] } > > ## > -# @DirtyRateInfo: > -# > -# Information about current dirty page rate of vm. > -# > -# @dirty-rate: an estimate of the dirty page rate of the VM in units of > -# MB/s, present only when estimating the rate has completed. > -# > -# @status: status containing dirtyrate query status includes > -# 'unstarted' or 'measuring' or 'measured' > -# > -# @start-time: start time in units of second for calculation > -# > -# @calc-time: time in units of second for sample dirty pages > -# > -# Since: 5.2 > -# > -## > -{ 'struct': 'DirtyRateInfo', > - 'data': {'*dirty-rate': 'int64', > - 'status': 'DirtyRateStatus', > - 'start-time': 'int64', > - 'calc-time': 'int64'} } > - > -## > -# @calc-dirty-rate: > -# > -# start calculating dirty page rate for vm > -# > -# @calc-time: time in units of second for sample dirty pages > -# > -# Since: 5.2 > -# > -# Example: > -# {"command": "calc-dirty-rate", "data": {"calc-time": 1} } > -# > -## > -{ 'command': 'calc-dirty-rate', 'data': {'calc-time': 'int64'} } > - > -## I don't see why you're moving the exisitn DirtyRateInfoa nd calc-dirty-rate. > # @query-dirty-rate: > # > # query dirty page rate in units of MB/s for vm > @@ -1951,3 +1912,49 @@ > 'data': { 'job-id': 'str', > 'tag': 'str', > 'devices': ['str'] } } > + > +## > +# @DirtyRateInfo: > +# > +# Information about current dirty page rate of vm. > +# > +# @dirty-rate: an estimate of the dirty page rate of the VM in units of > +# MB/s, present only when estimating the rate has completed. > +# > +# @status: status containing dirtyrate query status includes > +# 'unstarted' or 'measuring' or 'measured' > +# > +# @start-time: start time in units of second for calculation > +# > +# @calc-time: time in units of second for sample dirty pages > +# > +# @sample-pages: page count per GB for sample dirty pages > +# the default value is 512 > +# > +# Since: 6.1 These are still since 5.2; the only difference is the new @sample-pages, so it should be something like: +# @calc-time: time in units of second for sample dirty pages +# +# @sample-pages: page count per GB for sample dirty pages +# the default value is 512 (since 6.1) +# +# Since: 5.2 to indicate just that field has been added. > +## > +{ 'struct': 'DirtyRateInfo', > + 'data': {'*dirty-rate': 'int64', > + 'status': 'DirtyRateStatus', > + 'start-time': 'int64', > + 'calc-time': 'int64', > + 'sample-pages': 'uint64'} } > + > +## > +# @calc-dirty-rate: > +# > +# start calculating dirty page rate for vm > +# > +# @calc-time: time in units of second for sample dirty pages > +# > +# @sample-pages: page count per GB for sample dirty pages > +# the default value is 512 > +# > +# Since: 6.1 > +# > +# Example: > +# {"command": "calc-dirty-rate", "data": {"calc-time": 1, 'sample-pages': 512} } > +# > +## > +{ 'command': 'calc-dirty-rate', 'data': {'calc-time': 'int64', '*sample-pages': 'int'} } > -- > 1.8.3.1 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-11 9:39 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-05-09 4:58 [PATCH v2] make sample page count configurable huangy81 2021-05-09 4:59 ` [PATCH v2] migration/dirtyrate: " huangy81 2021-05-11 9:35 ` Dr. David Alan Gilbert
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).