* [RFC] migration/dirtyrate: check malloc() return
@ 2022-04-10 3:58 jianchunfu
2022-04-10 6:00 ` Richard Henderson
0 siblings, 1 reply; 3+ messages in thread
From: jianchunfu @ 2022-04-10 3:58 UTC (permalink / raw)
To: quintela, dgilbert; +Cc: qemu-devel, jianchunfu
Handling potential memory allocation failures in dirtyrate.
Signed-off-by: jianchunfu <jianchunfu@cmss.chinamobile.com>
---
migration/dirtyrate.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
index aace12a787..5dd40f32c8 100644
--- a/migration/dirtyrate.c
+++ b/migration/dirtyrate.c
@@ -523,9 +523,17 @@ static void calculate_dirtyrate_dirty_ring(struct DirtyRateConfig config)
}
dirty_pages = malloc(sizeof(*dirty_pages) * nvcpu);
+ if (!dirty_pages) {
+ error_report("malloc dirty pages for vcpus failed.");
+ exit(1);
+ }
DirtyStat.dirty_ring.nvcpu = nvcpu;
DirtyStat.dirty_ring.rates = malloc(sizeof(DirtyRateVcpu) * nvcpu);
+ if (!DirtyStat.dirty_ring.rates) {
+ error_report("malloc dirty rates for vcpu ring failed.");
+ exit(1);
+ }
dirtyrate_global_dirty_log_start();
--
2.18.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [RFC] migration/dirtyrate: check malloc() return
2022-04-10 3:58 [RFC] migration/dirtyrate: check malloc() return jianchunfu
@ 2022-04-10 6:00 ` Richard Henderson
2022-04-11 15:22 ` Alex Bennée
0 siblings, 1 reply; 3+ messages in thread
From: Richard Henderson @ 2022-04-10 6:00 UTC (permalink / raw)
To: jianchunfu, quintela, dgilbert; +Cc: qemu-devel
On 4/9/22 20:58, jianchunfu wrote:
> Handling potential memory allocation failures in dirtyrate.
>
> Signed-off-by: jianchunfu <jianchunfu@cmss.chinamobile.com>
> ---
> migration/dirtyrate.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
> index aace12a787..5dd40f32c8 100644
> --- a/migration/dirtyrate.c
> +++ b/migration/dirtyrate.c
> @@ -523,9 +523,17 @@ static void calculate_dirtyrate_dirty_ring(struct DirtyRateConfig config)
> }
>
> dirty_pages = malloc(sizeof(*dirty_pages) * nvcpu);
> + if (!dirty_pages) {
> + error_report("malloc dirty pages for vcpus failed.");
> + exit(1);
> + }
>
> DirtyStat.dirty_ring.nvcpu = nvcpu;
> DirtyStat.dirty_ring.rates = malloc(sizeof(DirtyRateVcpu) * nvcpu);
> + if (!DirtyStat.dirty_ring.rates) {
> + error_report("malloc dirty rates for vcpu ring failed.");
> + exit(1);
> + }
You might as well use g_new(), which handles the sizeof and multiplication, and error
reporting.
r~
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [RFC] migration/dirtyrate: check malloc() return
2022-04-10 6:00 ` Richard Henderson
@ 2022-04-11 15:22 ` Alex Bennée
0 siblings, 0 replies; 3+ messages in thread
From: Alex Bennée @ 2022-04-11 15:22 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, jianchunfu, dgilbert, quintela
Richard Henderson <richard.henderson@linaro.org> writes:
> On 4/9/22 20:58, jianchunfu wrote:
>> Handling potential memory allocation failures in dirtyrate.
>> Signed-off-by: jianchunfu <jianchunfu@cmss.chinamobile.com>
>> ---
>> migration/dirtyrate.c | 8 ++++++++
>> 1 file changed, 8 insertions(+)
>> diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
>> index aace12a787..5dd40f32c8 100644
>> --- a/migration/dirtyrate.c
>> +++ b/migration/dirtyrate.c
>> @@ -523,9 +523,17 @@ static void calculate_dirtyrate_dirty_ring(struct DirtyRateConfig config)
>> }
>> dirty_pages = malloc(sizeof(*dirty_pages) * nvcpu);
>> + if (!dirty_pages) {
>> + error_report("malloc dirty pages for vcpus failed.");
>> + exit(1);
>> + }
>> DirtyStat.dirty_ring.nvcpu = nvcpu;
>> DirtyStat.dirty_ring.rates = malloc(sizeof(DirtyRateVcpu) * nvcpu);
>> + if (!DirtyStat.dirty_ring.rates) {
>> + error_report("malloc dirty rates for vcpu ring failed.");
>> + exit(1);
>> + }
>
> You might as well use g_new(), which handles the sizeof and
> multiplication, and error reporting.
It will also assert if the alloc fails. If this is an allocation QEMU
can recover from then you need to use the try_new variants of the
g_malloc/new functions. However here we are exiting so no actual check
is needed as the g_malloc will exit for us.
--
Alex Bennée
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-11 15:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-10 3:58 [RFC] migration/dirtyrate: check malloc() return jianchunfu
2022-04-10 6:00 ` Richard Henderson
2022-04-11 15:22 ` Alex Bennée
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).