[v4] colo-compare bugfixes

[PATCH v4 4/6] net/colo-compare.c: Only hexdump packets if tracing is enabled

Posted by Lukas Straub 5 years, 9 months ago

Else the log will be flooded if there is a lot of network
traffic.

Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
---
 net/colo-compare.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index 2a4e7f7c4e..56db3d3bfc 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -483,10 +483,12 @@ sec:
         g_queue_push_head(&conn->primary_list, ppkt);
         g_queue_push_head(&conn->secondary_list, spkt);
 
-        qemu_hexdump((char *)ppkt->data, stderr,
-                     "colo-compare ppkt", ppkt->size);
-        qemu_hexdump((char *)spkt->data, stderr,
-                     "colo-compare spkt", spkt->size);
+        if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
+            qemu_hexdump((char *)ppkt->data, stderr,
+                        "colo-compare ppkt", ppkt->size);
+            qemu_hexdump((char *)spkt->data, stderr,
+                        "colo-compare spkt", spkt->size);
+        }
 
         colo_compare_inconsistency_notify(s);
     }
-- 
2.20.1

Re: [PATCH v4 4/6] net/colo-compare.c: Only hexdump packets if tracing is enabled

Posted by Philippe Mathieu-Daudé 5 years, 9 months ago

On 5/4/20 12:28 PM, Lukas Straub wrote:
> Else the log will be flooded if there is a lot of network
> traffic.
> 
> Signed-off-by: Lukas Straub <lukasstraub2@web.de>
> Reviewed-by: Zhang Chen <chen.zhang@intel.com>
> ---
>   net/colo-compare.c | 10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/net/colo-compare.c b/net/colo-compare.c
> index 2a4e7f7c4e..56db3d3bfc 100644
> --- a/net/colo-compare.c
> +++ b/net/colo-compare.c
> @@ -483,10 +483,12 @@ sec:
>           g_queue_push_head(&conn->primary_list, ppkt);
>           g_queue_push_head(&conn->secondary_list, spkt);
>   
> -        qemu_hexdump((char *)ppkt->data, stderr,
> -                     "colo-compare ppkt", ppkt->size);
> -        qemu_hexdump((char *)spkt->data, stderr,
> -                     "colo-compare spkt", spkt->size);
> +        if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> +            qemu_hexdump((char *)ppkt->data, stderr,
> +                        "colo-compare ppkt", ppkt->size);
> +            qemu_hexdump((char *)spkt->data, stderr,
> +                        "colo-compare spkt", spkt->size);
> +        }
>   
>           colo_compare_inconsistency_notify(s);
>       }
>

Re: [PATCH v4 4/6] net/colo-compare.c: Only hexdump packets if tracing is enabled

Posted by Philippe Mathieu-Daudé 5 years, 9 months ago

On 5/4/20 1:27 PM, Philippe Mathieu-Daudé wrote:
> On 5/4/20 12:28 PM, Lukas Straub wrote:
>> Else the log will be flooded if there is a lot of network
>> traffic.
>>
>> Signed-off-by: Lukas Straub <lukasstraub2@web.de>
>> Reviewed-by: Zhang Chen <chen.zhang@intel.com>
>> ---
>>   net/colo-compare.c | 10 ++++++----
>>   1 file changed, 6 insertions(+), 4 deletions(-)
>>
>> diff --git a/net/colo-compare.c b/net/colo-compare.c
>> index 2a4e7f7c4e..56db3d3bfc 100644
>> --- a/net/colo-compare.c
>> +++ b/net/colo-compare.c
>> @@ -483,10 +483,12 @@ sec:
>>           g_queue_push_head(&conn->primary_list, ppkt);
>>           g_queue_push_head(&conn->secondary_list, spkt);
>> -        qemu_hexdump((char *)ppkt->data, stderr,
>> -                     "colo-compare ppkt", ppkt->size);
>> -        qemu_hexdump((char *)spkt->data, stderr,
>> -                     "colo-compare spkt", spkt->size);
>> +        if 
>> (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
> 
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> 
>> +            qemu_hexdump((char *)ppkt->data, stderr,
>> +                        "colo-compare ppkt", ppkt->size);
>> +            qemu_hexdump((char *)spkt->data, stderr,
>> +                        "colo-compare spkt", spkt->size);
>> +        }
>>           colo_compare_inconsistency_notify(s);
>>       }
>>

[PATCH v4 1/6] net/colo-compare.c: Create event_bh with the right AioContext
[PATCH v4 2/6] chardev/char.c: Use qemu_co_sleep_ns if in coroutine
[PATCH v4 3/6] net/colo-compare.c: Fix deadlock in compare_chr_send
[PATCH v4 4/6] net/colo-compare.c: Only hexdump packets if tracing is enabled
[PATCH v4 5/6] net/colo-compare.c, softmmu/vl.c: Check that colo-compare is active
[PATCH v4 6/6] net/colo-compare.c: Correct ordering in complete and finalize