1. Patchew
  2. Libvirt
  3. View series

[libvirt] [PATCH] nwfilter: fix deadlock on firewalld restart/reload

Nikolay Shirokovskiy posted 1 patch 6 years, 5 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/1509364172-79169-1-git-send-email-nshirokovskiy@virtuozzo.com
src/nwfilter/nwfilter_driver.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
[libvirt] [PATCH] nwfilter: fix deadlock on firewalld restart/reload
Posted by Nikolay Shirokovskiy 6 years, 5 months ago 
Deadlock scenario:

1. domain is being started and domain driver takes read lock
for nwfilter update lock thru virNWFilterReadLockFilterUpdates.

2. firewalld restarted and event loop hangs trying to take write lock
for nwfilter update lock in nwfilterStateReload.

This is deadlock because for thread 1 to proceed we need a
response from qemu/timeout but whole event loop is stuck by 2.

Let's just offload nwfilter driver reload to a distinct thread.
Besides resolving a deadlock this change offloads rather heavy
operation (many hypervisor drivers X many domains for a driver)
off the event loop.
---

 Concrete stacktrace.

 Thread 17 (Thread 0x7fbd5a22d880 (LWP 7329)):
 0  0x00007fbd56bb903e in pthread_rwlock_wrlock () from /lib64/libpthread.so.0
 1  0x00007fbd3d511297 in nwfilterStateReload () from /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so
 2  0x00007fbd3d511355 in nwfilterFirewalldDBusFilter () from /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so
 3  0x00007fbd57bc5dfe in dbus_connection_dispatch () from /lib64/libdbus-1.so.3
 4  0x00007fbd5953e641 in virDBusWatchCallback () from /lib64/libvirt.so.0
 5  0x00007fbd5954868e in virEventPollRunOnce () from /lib64/libvirt.so.0
 6  0x00007fbd59547942 in virEventRunDefaultImpl () from /lib64/libvirt.so.0
 7  0x00007fbd596a94ed in virNetDaemonRun () from /lib64/libvirt.so.0
 8  0x00007fbd5a28b07c in main ()

 Thread 3 (Thread 0x7fbd49553700 (LWP 8029)):
 0  0x00007fbd56bb96d5 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0
 1  0x00007fbd59596816 in virCondWait () from /lib64/libvirt.so.0
 2  0x00007fbd3d0183db in qemuMonitorSend () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
 3  0x00007fbd3d02c8d0 in qemuMonitorJSONCommandWithFd () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
 4  0x00007fbd3d02e1a1 in qemuMonitorJSONSetCapabilities () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
 5  0x00007fbd3cff965c in qemuConnectMonitor () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
 6  0x00007fbd3cffcb70 in qemuProcessWaitForMonitor () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
 7  0x00007fbd3d004668 in qemuProcessLaunch () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
 8  0x00007fbd3d0062a8 in qemuProcessStart () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
 9  0x00007fbd3d0679cb in qemuDomainObjStart.constprop.50 () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
 10 0x00007fbd3d068106 in qemuDomainCreateWithFlags () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
 11 0x00007fbd5964247d in virDomainCreateWithFlags () from /lib64/libvirt.so.0
 12 0x00007fbd5a2a3b81 in remoteDispatchDomainCreateWithFlagsHelper ()
 13 0x00007fbd596af3c3 in virNetServerProgramDispatch () from /lib64/libvirt.so.0
 14 0x00007fbd5a2c56cd in virNetServerHandleJob ()
 15 0x00007fbd59597221 in virThreadPoolWorker () from /lib64/libvirt.so.0
 16 0x00007fbd595965a8 in virThreadHelper () from /lib64/libvirt.so.0
 17 0x00007fbd56bb5dc5 in start_thread () from /lib64/libpthread.so.0
 18 0x00007fbd568e473d in clone () from /lib64/libc.so.6

 src/nwfilter/nwfilter_driver.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 2f9a51c..bcb4400 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -81,6 +81,12 @@ static void nwfilterDriverUnlock(void)
 
 #if HAVE_FIREWALLD
 
+static void
+nwfilterStateReloadAdapter(void *opaque ATTRIBUTE_UNUSED)
+{
+    nwfilterStateReload();
+}
+
 static DBusHandlerResult
 nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED,
                             DBusMessage *message,
@@ -90,8 +96,12 @@ nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED,
                                "NameOwnerChanged") ||
         dbus_message_is_signal(message, "org.fedoraproject.FirewallD1",
                                "Reloaded")) {
+        virThread thread;
+
         VIR_DEBUG("Reload in nwfilter_driver because of firewalld.");
-        nwfilterStateReload();
+        if (virThreadCreate(&thread, false, nwfilterStateReloadAdapter, NULL) < 0)
+            VIR_ERROR(_("Could not create thread. Network filter "
+                        "driver reload failed"));
     }
 
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-- 
1.8.3.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] nwfilter: fix deadlock on firewalld restart/reload
Posted by John Ferlan 6 years, 4 months ago 

On 10/30/2017 07:49 AM, Nikolay Shirokovskiy wrote:
> Deadlock scenario:
> 
> 1. domain is being started and domain driver takes read lock
> for nwfilter update lock thru virNWFilterReadLockFilterUpdates.
> 
> 2. firewalld restarted and event loop hangs trying to take write lock
> for nwfilter update lock in nwfilterStateReload.
> 
> This is deadlock because for thread 1 to proceed we need a
> response from qemu/timeout but whole event loop is stuck by 2.
> 
> Let's just offload nwfilter driver reload to a distinct thread.
> Besides resolving a deadlock this change offloads rather heavy
> operation (many hypervisor drivers X many domains for a driver)
> off the event loop.
> ---
> 
>  Concrete stacktrace.
> 
>  Thread 17 (Thread 0x7fbd5a22d880 (LWP 7329)):
>  0  0x00007fbd56bb903e in pthread_rwlock_wrlock () from /lib64/libpthread.so.0
>  1  0x00007fbd3d511297 in nwfilterStateReload () from /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so
>  2  0x00007fbd3d511355 in nwfilterFirewalldDBusFilter () from /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so
>  3  0x00007fbd57bc5dfe in dbus_connection_dispatch () from /lib64/libdbus-1.so.3
>  4  0x00007fbd5953e641 in virDBusWatchCallback () from /lib64/libvirt.so.0
>  5  0x00007fbd5954868e in virEventPollRunOnce () from /lib64/libvirt.so.0
>  6  0x00007fbd59547942 in virEventRunDefaultImpl () from /lib64/libvirt.so.0
>  7  0x00007fbd596a94ed in virNetDaemonRun () from /lib64/libvirt.so.0
>  8  0x00007fbd5a28b07c in main ()
> 
>  Thread 3 (Thread 0x7fbd49553700 (LWP 8029)):
>  0  0x00007fbd56bb96d5 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0
>  1  0x00007fbd59596816 in virCondWait () from /lib64/libvirt.so.0
>  2  0x00007fbd3d0183db in qemuMonitorSend () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>  3  0x00007fbd3d02c8d0 in qemuMonitorJSONCommandWithFd () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>  4  0x00007fbd3d02e1a1 in qemuMonitorJSONSetCapabilities () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>  5  0x00007fbd3cff965c in qemuConnectMonitor () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>  6  0x00007fbd3cffcb70 in qemuProcessWaitForMonitor () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>  7  0x00007fbd3d004668 in qemuProcessLaunch () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>  8  0x00007fbd3d0062a8 in qemuProcessStart () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>  9  0x00007fbd3d0679cb in qemuDomainObjStart.constprop.50 () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>  10 0x00007fbd3d068106 in qemuDomainCreateWithFlags () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>  11 0x00007fbd5964247d in virDomainCreateWithFlags () from /lib64/libvirt.so.0
>  12 0x00007fbd5a2a3b81 in remoteDispatchDomainCreateWithFlagsHelper ()
>  13 0x00007fbd596af3c3 in virNetServerProgramDispatch () from /lib64/libvirt.so.0
>  14 0x00007fbd5a2c56cd in virNetServerHandleJob ()
>  15 0x00007fbd59597221 in virThreadPoolWorker () from /lib64/libvirt.so.0
>  16 0x00007fbd595965a8 in virThreadHelper () from /lib64/libvirt.so.0
>  17 0x00007fbd56bb5dc5 in start_thread () from /lib64/libpthread.so.0
>  18 0x00007fbd568e473d in clone () from /lib64/libc.so.6
> 
>  src/nwfilter/nwfilter_driver.c | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 

Oh joy - nwfilter driver problems... As evidenced by the duration this
patch has been on list, everyone's favorite driver to avoid :-)...  And
of course dbus/firewalld interactions - run, run away!

So while this seems reasonable - is it possible that we could have
multiple threads created from nwfilterFirewalldDBusFilter callbacks?
That is, theoretically thinking - this should only happen once, but it
doesn't stop firewalld reloads from occurring multiple times and
generating multiple callbacks, right?

To be "safer" - what if we grabbed nwfilterDriverLock and added some
sort of flag to set/check whether a thread was already created -
releasing the lock after. Once successfully starting the thread
obviously the flag gets set. Then in the thread once the Reload has
completed we can once again grab the lock, clear the flag, and release
the lock.

Or is this "overthinking" the problem?

John

> diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
> index 2f9a51c..bcb4400 100644
> --- a/src/nwfilter/nwfilter_driver.c
> +++ b/src/nwfilter/nwfilter_driver.c
> @@ -81,6 +81,12 @@ static void nwfilterDriverUnlock(void)
>  
>  #if HAVE_FIREWALLD
>  
> +static void
> +nwfilterStateReloadAdapter(void *opaque ATTRIBUTE_UNUSED)
> +{
> +    nwfilterStateReload();
> +}
> +

2 blank lines too...

>  static DBusHandlerResult
>  nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED,
>                              DBusMessage *message,
> @@ -90,8 +96,12 @@ nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED,
>                                 "NameOwnerChanged") ||
>          dbus_message_is_signal(message, "org.fedoraproject.FirewallD1",
>                                 "Reloaded")) {
> +        virThread thread;
> +
>          VIR_DEBUG("Reload in nwfilter_driver because of firewalld.");
> -        nwfilterStateReload();
> +        if (virThreadCreate(&thread, false, nwfilterStateReloadAdapter, NULL) < 0)
> +            VIR_ERROR(_("Could not create thread. Network filter "
> +                        "driver reload failed"));

So the caller doesn't really care what gets returned?  If some sort of
failure was returned - does that kill firewalld?  Not an area I tend to
think about that often, so I'm curious.

Tks -

John
>      }
>  
>      return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
> 

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] nwfilter: fix deadlock on firewalld restart/reload
Posted by Nikolay Shirokovskiy 6 years, 4 months ago 

On 06.12.2017 20:49, John Ferlan wrote:
> 
> 
> On 10/30/2017 07:49 AM, Nikolay Shirokovskiy wrote:
>> Deadlock scenario:
>>
>> 1. domain is being started and domain driver takes read lock
>> for nwfilter update lock thru virNWFilterReadLockFilterUpdates.
>>
>> 2. firewalld restarted and event loop hangs trying to take write lock
>> for nwfilter update lock in nwfilterStateReload.
>>
>> This is deadlock because for thread 1 to proceed we need a
>> response from qemu/timeout but whole event loop is stuck by 2.
>>
>> Let's just offload nwfilter driver reload to a distinct thread.
>> Besides resolving a deadlock this change offloads rather heavy
>> operation (many hypervisor drivers X many domains for a driver)
>> off the event loop.
>> ---
>>
>>  Concrete stacktrace.
>>
>>  Thread 17 (Thread 0x7fbd5a22d880 (LWP 7329)):
>>  0  0x00007fbd56bb903e in pthread_rwlock_wrlock () from /lib64/libpthread.so.0
>>  1  0x00007fbd3d511297 in nwfilterStateReload () from /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so
>>  2  0x00007fbd3d511355 in nwfilterFirewalldDBusFilter () from /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so
>>  3  0x00007fbd57bc5dfe in dbus_connection_dispatch () from /lib64/libdbus-1.so.3
>>  4  0x00007fbd5953e641 in virDBusWatchCallback () from /lib64/libvirt.so.0
>>  5  0x00007fbd5954868e in virEventPollRunOnce () from /lib64/libvirt.so.0
>>  6  0x00007fbd59547942 in virEventRunDefaultImpl () from /lib64/libvirt.so.0
>>  7  0x00007fbd596a94ed in virNetDaemonRun () from /lib64/libvirt.so.0
>>  8  0x00007fbd5a28b07c in main ()
>>
>>  Thread 3 (Thread 0x7fbd49553700 (LWP 8029)):
>>  0  0x00007fbd56bb96d5 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0
>>  1  0x00007fbd59596816 in virCondWait () from /lib64/libvirt.so.0
>>  2  0x00007fbd3d0183db in qemuMonitorSend () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>>  3  0x00007fbd3d02c8d0 in qemuMonitorJSONCommandWithFd () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>>  4  0x00007fbd3d02e1a1 in qemuMonitorJSONSetCapabilities () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>>  5  0x00007fbd3cff965c in qemuConnectMonitor () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>>  6  0x00007fbd3cffcb70 in qemuProcessWaitForMonitor () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>>  7  0x00007fbd3d004668 in qemuProcessLaunch () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>>  8  0x00007fbd3d0062a8 in qemuProcessStart () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>>  9  0x00007fbd3d0679cb in qemuDomainObjStart.constprop.50 () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>>  10 0x00007fbd3d068106 in qemuDomainCreateWithFlags () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so
>>  11 0x00007fbd5964247d in virDomainCreateWithFlags () from /lib64/libvirt.so.0
>>  12 0x00007fbd5a2a3b81 in remoteDispatchDomainCreateWithFlagsHelper ()
>>  13 0x00007fbd596af3c3 in virNetServerProgramDispatch () from /lib64/libvirt.so.0
>>  14 0x00007fbd5a2c56cd in virNetServerHandleJob ()
>>  15 0x00007fbd59597221 in virThreadPoolWorker () from /lib64/libvirt.so.0
>>  16 0x00007fbd595965a8 in virThreadHelper () from /lib64/libvirt.so.0
>>  17 0x00007fbd56bb5dc5 in start_thread () from /lib64/libpthread.so.0
>>  18 0x00007fbd568e473d in clone () from /lib64/libc.so.6
>>
>>  src/nwfilter/nwfilter_driver.c | 12 +++++++++++-
>>  1 file changed, 11 insertions(+), 1 deletion(-)
>>
> 
> Oh joy - nwfilter driver problems... As evidenced by the duration this
> patch has been on list, everyone's favorite driver to avoid :-)...  And
> of course dbus/firewalld interactions - run, run away!
> 
> So while this seems reasonable - is it possible that we could have
> multiple threads created from nwfilterFirewalldDBusFilter callbacks?

Yes but this is correct AFAIK. All reload events should be handled. What
if at the time second event is delivered first thread is not yet finished
but already reloaded nwfilter state and it is based on firewalld state before
second reload?

> That is, theoretically thinking - this should only happen once, but it
> doesn't stop firewalld reloads from occurring multiple times and
> generating multiple callbacks, right?
> 
> To be "safer" - what if we grabbed nwfilterDriverLock and added some
> sort of flag to set/check whether a thread was already created -
> releasing the lock after. Once successfully starting the thread
> obviously the flag gets set. Then in the thread once the Reload has
> completed we can once again grab the lock, clear the flag, and release
> the lock.

But you are right that reload threads needs to be coordinated because nwfilterStateReload
does not take nwfilterDriverLock right from the start so they can interfare. So looks
like patch need to be expanded for this case.

> 
> Or is this "overthinking" the problem?



> 
> John
> 
>> diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
>> index 2f9a51c..bcb4400 100644
>> --- a/src/nwfilter/nwfilter_driver.c
>> +++ b/src/nwfilter/nwfilter_driver.c
>> @@ -81,6 +81,12 @@ static void nwfilterDriverUnlock(void)
>>  
>>  #if HAVE_FIREWALLD
>>  
>> +static void
>> +nwfilterStateReloadAdapter(void *opaque ATTRIBUTE_UNUSED)
>> +{
>> +    nwfilterStateReload();
>> +}
>> +
> 
> 2 blank lines too...
> 
>>  static DBusHandlerResult
>>  nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED,
>>                              DBusMessage *message,
>> @@ -90,8 +96,12 @@ nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED,
>>                                 "NameOwnerChanged") ||
>>          dbus_message_is_signal(message, "org.fedoraproject.FirewallD1",
>>                                 "Reloaded")) {
>> +        virThread thread;
>> +
>>          VIR_DEBUG("Reload in nwfilter_driver because of firewalld.");
>> -        nwfilterStateReload();
>> +        if (virThreadCreate(&thread, false, nwfilterStateReloadAdapter, NULL) < 0)
>> +            VIR_ERROR(_("Could not create thread. Network filter "
>> +                        "driver reload failed"));
> 
> So the caller doesn't really care what gets returned?  If some sort of
> failure was returned - does that kill firewalld?  Not an area I tend to
> think about that often, so I'm curious.
> 

Libvirt always return DBUS_HANDLER_RESULT_NOT_YET_HANDLED so that event will be passed to other
filters too. Other option is "handled" and "can not process". I guess libvirt could use
"can not process" in case of errors but this is a matter of a different patch. However "can not process"
does not play well with spawing a thread without join as this patch suggests. But we can cause
reproccessing if we want by other means to besides dbus library.

See [1] and [2].

[1] https://dbus.freedesktop.org/doc/api/html/group__DBusConnection.html#gae00f581e5487408cb294bf71826aff86
[2] https://dbus.freedesktop.org/doc/api/html/group__DBusShared.html#ga8244b29230187624c24986c24edab1de

>>      }
>>  
>>      return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
>>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.