[Qemu-devel] [PATCH] vhost-user-test: added proper TestServer *dest initialization in test_migrate()

[Qemu-devel] [PATCH] vhost-user-test: added proper TestServer *dest initialization in test_migrate()

[Emanuele Giuseppe Esposito]

server->bus in _test_server_free() could be NULL, since TestServer *dest in test_migrate() was not properly initialized like TestServer *s.
Added init_virtio_dev(dest) and uninit_virtio_dev(dest), so the fields are properly set and when test_server_free(dest); is called, they can be correctly freed.

The reason for that is init_virtio_dev() calls qpci_init_pc(), that creates a QPCIBusPC * (returned as QPCIBus *), while test_server_free() calls qpci_free_pc(),
that frees the QPCIBus *. Not calling init_virtio_dev() would leave the QPCIBus * of TestServer unset.

Problem came out once I modified  pci-pc.c and pci-pc.h, modifying QPCIBusPC by adding another field before QPCIBus bus. Re-running the tests showed vhost-user-test failing.

Signed-off-by: Emanuele Giuseppe Esposito <esposem@usi.ch>
---
 tests/vhost-user-test.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index bbc8091..4d71d5e 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -545,6 +545,7 @@ static gboolean _test_server_free(TestServer *server)
     g_free(server->mig_path);
 
     g_free(server->chr_name);
+    g_assert(server->bus);
     qpci_free_pc(server->bus);
 
     g_free(server);
@@ -706,6 +707,7 @@ static void test_migrate(void)
     g_free(cmd);
 
     init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC);
+    init_virtio_dev(dest, 1u << VIRTIO_NET_F_MAC);
     wait_for_fds(s);
     size = get_log_size(s);
     g_assert_cmpint(size, ==, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * 8));
@@ -761,6 +763,7 @@ static void test_migrate(void)
     read_guest_mem_server(dest);
 
     uninit_virtio_dev(s);
+    uninit_virtio_dev(dest);
 
     g_source_destroy(source);
     g_source_unref(source);
-- 
2.7.4

Re: [Qemu-devel] [PATCH] vhost-user-test: added proper TestServer *dest initialization in test_migrate()

[Laurent Vivier]

On 26/06/2018 16:18, Emanuele Giuseppe Esposito wrote:
> server->bus in _test_server_free() could be NULL, since TestServer *dest in test_migrate() was not properly initialized like TestServer *s.
> Added init_virtio_dev(dest) and uninit_virtio_dev(dest), so the fields are properly set and when test_server_free(dest); is called, they can be correctly freed.
> 
> The reason for that is init_virtio_dev() calls qpci_init_pc(), that creates a QPCIBusPC * (returned as QPCIBus *), while test_server_free() calls qpci_free_pc(),
> that frees the QPCIBus *. Not calling init_virtio_dev() would leave the QPCIBus * of TestServer unset.
> 
> Problem came out once I modified  pci-pc.c and pci-pc.h, modifying QPCIBusPC by adding another field before QPCIBus bus. Re-running the tests showed vhost-user-test failing.
> 
> Signed-off-by: Emanuele Giuseppe Esposito <esposem@usi.ch>

Reviewed-by: Laurent Vivier <lvivier@redhat.com>

I'm wondering if we have to have the same email address in both "From:"
and "Signed-off-by"?

Thanks,
Laurent

Re: [Qemu-devel] [PATCH] vhost-user-test: added proper TestServer *dest initialization in test_migrate()

[Philippe Mathieu-Daudé]

Hi Emanuele,

On 06/26/2018 11:18 AM, Emanuele Giuseppe Esposito wrote:
> server->bus in _test_server_free() could be NULL, since TestServer *dest in test_migrate() was not properly initialized like TestServer *s.
> Added init_virtio_dev(dest) and uninit_virtio_dev(dest), so the fields are properly set and when test_server_free(dest); is called, they can be correctly freed.
> 
> The reason for that is init_virtio_dev() calls qpci_init_pc(), that creates a QPCIBusPC * (returned as QPCIBus *), while test_server_free() calls qpci_free_pc(),
> that frees the QPCIBus *. Not calling init_virtio_dev() would leave the QPCIBus * of TestServer unset.

Good finding.

> 
> Problem came out once I modified  pci-pc.c and pci-pc.h, modifying QPCIBusPC by adding another field before QPCIBus bus. Re-running the tests showed vhost-user-test failing.

Please use lines < 80 characters in your commit messages if possible (72
is a good candidate).

> 
> Signed-off-by: Emanuele Giuseppe Esposito <esposem@usi.ch>
> ---
>  tests/vhost-user-test.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
> index bbc8091..4d71d5e 100644
> --- a/tests/vhost-user-test.c
> +++ b/tests/vhost-user-test.c
> @@ -545,6 +545,7 @@ static gboolean _test_server_free(TestServer *server)
>      g_free(server->mig_path);
>  
>      g_free(server->chr_name);
> +    g_assert(server->bus);

Wouldn't this assert be better placed in qpci_free_pc()?

>      qpci_free_pc(server->bus);
>  
>      g_free(server);
> @@ -706,6 +707,7 @@ static void test_migrate(void)
>      g_free(cmd);
>  
>      init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC);
> +    init_virtio_dev(dest, 1u << VIRTIO_NET_F_MAC);
>      wait_for_fds(s);
>      size = get_log_size(s);
>      g_assert_cmpint(size, ==, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * 8));
> @@ -761,6 +763,7 @@ static void test_migrate(void)
>      read_guest_mem_server(dest);
>  
>      uninit_virtio_dev(s);
> +    uninit_virtio_dev(dest);
>  
>      g_source_destroy(source);
>      g_source_unref(source);
> 

For the virtio part:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Regards,

Phil.

Re: [Qemu-devel] [PATCH] vhost-user-test: added proper TestServer *dest initialization in test_migrate()

[Paolo Bonzini]

On 26/06/2018 16:18, Emanuele Giuseppe Esposito wrote:
> server->bus in _test_server_free() could be NULL, since TestServer *dest in test_migrate() was not properly initialized like TestServer *s.
> Added init_virtio_dev(dest) and uninit_virtio_dev(dest), so the fields are properly set and when test_server_free(dest); is called, they can be correctly freed.
> 
> The reason for that is init_virtio_dev() calls qpci_init_pc(), that creates a QPCIBusPC * (returned as QPCIBus *), while test_server_free() calls qpci_free_pc(),
> that frees the QPCIBus *. Not calling init_virtio_dev() would leave the QPCIBus * of TestServer unset.
> 
> Problem came out once I modified  pci-pc.c and pci-pc.h, modifying QPCIBusPC by adding another field before QPCIBus bus. Re-running the tests showed vhost-user-test failing.
> 
> Signed-off-by: Emanuele Giuseppe Esposito <esposem@usi.ch>
> ---
>  tests/vhost-user-test.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
> index bbc8091..4d71d5e 100644
> --- a/tests/vhost-user-test.c
> +++ b/tests/vhost-user-test.c
> @@ -545,6 +545,7 @@ static gboolean _test_server_free(TestServer *server)
>      g_free(server->mig_path);
>  
>      g_free(server->chr_name);
> +    g_assert(server->bus);
>      qpci_free_pc(server->bus);
>  
>      g_free(server);
> @@ -706,6 +707,7 @@ static void test_migrate(void)
>      g_free(cmd);
>  
>      init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC);
> +    init_virtio_dev(dest, 1u << VIRTIO_NET_F_MAC);
>      wait_for_fds(s);
>      size = get_log_size(s);
>      g_assert_cmpint(size, ==, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * 8));
> @@ -761,6 +763,7 @@ static void test_migrate(void)
>      read_guest_mem_server(dest);
>  
>      uninit_virtio_dev(s);
> +    uninit_virtio_dev(dest);
>  
>      g_source_destroy(source);
>      g_source_unref(source);
> 

Queued for 3.0, thanks.

Paolo

Re: [Qemu-devel] [PATCH] vhost-user-test: added proper TestServer *dest initialization in test_migrate()

[Paolo Bonzini]

On 27/06/2018 12:05, Laurent Vivier wrote:
> On 26/06/2018 16:18, Emanuele Giuseppe Esposito wrote:
>> server->bus in _test_server_free() could be NULL, since TestServer *dest in test_migrate() was not properly initialized like TestServer *s.
>> Added init_virtio_dev(dest) and uninit_virtio_dev(dest), so the fields are properly set and when test_server_free(dest); is called, they can be correctly freed.
>>
>> The reason for that is init_virtio_dev() calls qpci_init_pc(), that creates a QPCIBusPC * (returned as QPCIBus *), while test_server_free() calls qpci_free_pc(),
>> that frees the QPCIBus *. Not calling init_virtio_dev() would leave the QPCIBus * of TestServer unset.
>>
>> Problem came out once I modified  pci-pc.c and pci-pc.h, modifying QPCIBusPC by adding another field before QPCIBus bus. Re-running the tests showed vhost-user-test failing.
>>
>> Signed-off-by: Emanuele Giuseppe Esposito <esposem@usi.ch>
> 
> Reviewed-by: Laurent Vivier <lvivier@redhat.com>
> 
> I'm wondering if we have to have the same email address in both "From:"
> and "Signed-off-by"?
> 
> Thanks,
> Laurent
> 

Yes, it's better.  I have adjusted the Signed-off-by line.

Thanks,

Paolo