* [Qemu-devel] [PATCH v3] mirror: correct buf_size
@ 2015-05-15 1:37 Wen Congyang
2015-05-15 1:53 ` Fam Zheng
2015-05-15 6:45 ` Paolo Bonzini
0 siblings, 2 replies; 5+ messages in thread
From: Wen Congyang @ 2015-05-15 1:37 UTC (permalink / raw)
To: qemu-devl, Paolo Bonzini, Fam Zheng; +Cc: Kevin Wolf, Jeff Cody
If bus_size is less than 0, the command fails.
If buf_size % granularity is not 0, mirror_free_init() will
do dangerous things.
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
block/mirror.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/block/mirror.c b/block/mirror.c
index 58f391a..7732f8b 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -671,6 +671,10 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
return;
}
+ if (buf_size < 0) {
+ error_setg(errp, "Invalid parameter '%s'", "buf-size");
+ return;
+ }
s = block_job_create(driver, bs, speed, cb, opaque, errp);
if (!s) {
@@ -684,7 +688,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
s->is_none_mode = is_none_mode;
s->base = base;
s->granularity = granularity;
- s->buf_size = MAX(buf_size, granularity);
+ s->buf_size = ROUND_UP(buf_size, granularity);
s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);
if (!s->dirty_bitmap) {
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v3] mirror: correct buf_size
2015-05-15 1:37 [Qemu-devel] [PATCH v3] mirror: correct buf_size Wen Congyang
@ 2015-05-15 1:53 ` Fam Zheng
2015-05-15 6:45 ` Paolo Bonzini
1 sibling, 0 replies; 5+ messages in thread
From: Fam Zheng @ 2015-05-15 1:53 UTC (permalink / raw)
To: Wen Congyang; +Cc: Kevin Wolf, Paolo Bonzini, Jeff Cody, qemu-devl
On Fri, 05/15 09:37, Wen Congyang wrote:
> If bus_size is less than 0, the command fails.
> If buf_size % granularity is not 0, mirror_free_init() will
> do dangerous things.
>
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> ---
> block/mirror.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/block/mirror.c b/block/mirror.c
> index 58f391a..7732f8b 100644
> --- a/block/mirror.c
> +++ b/block/mirror.c
> @@ -671,6 +671,10 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
> return;
> }
>
> + if (buf_size < 0) {
> + error_setg(errp, "Invalid parameter '%s'", "buf-size");
Just "Invalid parameter 'buf-size'", If you fix that,
Reviewed-by: Fam Zheng <famz@redhat.com>
> + return;
> + }
>
> s = block_job_create(driver, bs, speed, cb, opaque, errp);
> if (!s) {
> @@ -684,7 +688,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
> s->is_none_mode = is_none_mode;
> s->base = base;
> s->granularity = granularity;
> - s->buf_size = MAX(buf_size, granularity);
> + s->buf_size = ROUND_UP(buf_size, granularity);
>
> s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);
> if (!s->dirty_bitmap) {
> --
> 2.1.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v3] mirror: correct buf_size
2015-05-15 1:37 [Qemu-devel] [PATCH v3] mirror: correct buf_size Wen Congyang
2015-05-15 1:53 ` Fam Zheng
@ 2015-05-15 6:45 ` Paolo Bonzini
2015-05-15 6:53 ` Wen Congyang
1 sibling, 1 reply; 5+ messages in thread
From: Paolo Bonzini @ 2015-05-15 6:45 UTC (permalink / raw)
To: Wen Congyang, qemu-devl, Fam Zheng; +Cc: Kevin Wolf, Jeff Cody
On 15/05/2015 03:37, Wen Congyang wrote:
> If bus_size is less than 0, the command fails.
> If buf_size % granularity is not 0, mirror_free_init() will
> do dangerous things.
>
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> ---
> block/mirror.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/block/mirror.c b/block/mirror.c
> index 58f391a..7732f8b 100644
> --- a/block/mirror.c
> +++ b/block/mirror.c
> @@ -671,6 +671,10 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
> return;
> }
>
> + if (buf_size < 0) {
This should be <=.
Jeff, can you adjust when committing?
Paolo
> + error_setg(errp, "Invalid parameter '%s'", "buf-size");
> + return;
> + }
>
> s = block_job_create(driver, bs, speed, cb, opaque, errp);
> if (!s) {
> @@ -684,7 +688,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
> s->is_none_mode = is_none_mode;
> s->base = base;
> s->granularity = granularity;
> - s->buf_size = MAX(buf_size, granularity);
> + s->buf_size = ROUND_UP(buf_size, granularity);
>
> s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);
> if (!s->dirty_bitmap) {
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v3] mirror: correct buf_size
2015-05-15 6:45 ` Paolo Bonzini
@ 2015-05-15 6:53 ` Wen Congyang
2015-05-15 7:26 ` Paolo Bonzini
0 siblings, 1 reply; 5+ messages in thread
From: Wen Congyang @ 2015-05-15 6:53 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devl, Fam Zheng; +Cc: Kevin Wolf, Jeff Cody
On 05/15/2015 02:45 PM, Paolo Bonzini wrote:
>
>
> On 15/05/2015 03:37, Wen Congyang wrote:
>> If bus_size is less than 0, the command fails.
>> If buf_size % granularity is not 0, mirror_free_init() will
>> do dangerous things.
>>
>> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
>> ---
>> block/mirror.c | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/block/mirror.c b/block/mirror.c
>> index 58f391a..7732f8b 100644
>> --- a/block/mirror.c
>> +++ b/block/mirror.c
>> @@ -671,6 +671,10 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
>> return;
>> }
>>
>> + if (buf_size < 0) {
>
> This should be <=.
But commit_active_start() passes 0...
Thanks
Wen Congyang
>
> Jeff, can you adjust when committing?
>
> Paolo
>
>> + error_setg(errp, "Invalid parameter '%s'", "buf-size");
>> + return;
>> + }
>>
>> s = block_job_create(driver, bs, speed, cb, opaque, errp);
>> if (!s) {
>> @@ -684,7 +688,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
>> s->is_none_mode = is_none_mode;
>> s->base = base;
>> s->granularity = granularity;
>> - s->buf_size = MAX(buf_size, granularity);
>> + s->buf_size = ROUND_UP(buf_size, granularity);
>>
>> s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);
>> if (!s->dirty_bitmap) {
>>
> .
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v3] mirror: correct buf_size
2015-05-15 6:53 ` Wen Congyang
@ 2015-05-15 7:26 ` Paolo Bonzini
0 siblings, 0 replies; 5+ messages in thread
From: Paolo Bonzini @ 2015-05-15 7:26 UTC (permalink / raw)
To: Wen Congyang, qemu-devl, Fam Zheng; +Cc: Kevin Wolf, Jeff Cody
On 15/05/2015 08:53, Wen Congyang wrote:
> On 05/15/2015 02:45 PM, Paolo Bonzini wrote:
>>
>>
>> On 15/05/2015 03:37, Wen Congyang wrote:
>>> If bus_size is less than 0, the command fails.
>>> If buf_size % granularity is not 0, mirror_free_init() will
>>> do dangerous things.
>>>
>>> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
>>> ---
>>> block/mirror.c | 6 +++++-
>>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/block/mirror.c b/block/mirror.c
>>> index 58f391a..7732f8b 100644
>>> --- a/block/mirror.c
>>> +++ b/block/mirror.c
>>> @@ -671,6 +671,10 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
>>> return;
>>> }
>>>
>>> + if (buf_size < 0) {
>>
>> This should be <=.
>
> But commit_active_start() passes 0...
This was changed to granularity by MAX, while it would be 0 after
ROUND_UP. The right value would be DEFAULT_MIRROR_BUF_SIZE.
block_commit should have an optional buf_size, but for now I guess you
can change a 0 to DEFAULT_MIRROR_BUF_SIZE in mirror_start_job, and let
qmp_drive_mirror do this:
if (!has_buf_size) {
- buf_size = DEFAULT_MIRROR_BUF_SIZE;
+ buf_size = 0;
}
Paolo
> Thanks
> Wen Congyang
>
>>
>> Jeff, can you adjust when committing?
>>
>> Paolo
>>
>>> + error_setg(errp, "Invalid parameter '%s'", "buf-size");
>>> + return;
>>> + }
>>>
>>> s = block_job_create(driver, bs, speed, cb, opaque, errp);
>>> if (!s) {
>>> @@ -684,7 +688,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
>>> s->is_none_mode = is_none_mode;
>>> s->base = base;
>>> s->granularity = granularity;
>>> - s->buf_size = MAX(buf_size, granularity);
>>> + s->buf_size = ROUND_UP(buf_size, granularity);
>>>
>>> s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);
>>> if (!s->dirty_bitmap) {
>>>
>> .
>>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-05-15 7:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-15 1:37 [Qemu-devel] [PATCH v3] mirror: correct buf_size Wen Congyang
2015-05-15 1:53 ` Fam Zheng
2015-05-15 6:45 ` Paolo Bonzini
2015-05-15 6:53 ` Wen Congyang
2015-05-15 7:26 ` Paolo Bonzini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.