External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-12 07:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: serialize execution of scripts with ebtables cmds

Browse Source 
While testing the SIGHUP handling and reloading of the nwfilter driver, I found that when the filters are rebuilt and mutlipe threads handled the individual interfaces, concurrently running multiple external bash scripts causes strange failures even though the executed ebtables commands are working on different tables for different interfaces. I cannot say for sure where the concurrency problems are caused, but introducing this lock definitely helps.
This commit is contained in:
Stefan Berger 2010-08-13 15:47:10 -04:00
parent 8b4eedc8cd
commit bed3a217f6
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nwfilter/nwfilter_ebiptables_driver.c
View File

@ -104,6 +104,7 @@ static int ebiptablesDriverInit(void);
static void ebiptablesDriverShutdown(void); static void ebiptablesDriverShutdown(void);
static int ebtablesCleanAll(const char *ifname); static int ebtablesCleanAll(const char *ifname);
static virMutex execCLIMutex;
struct ushort_map { struct ushort_map {
unsigned short attr; unsigned short attr;
@ -2309,8 +2310,13 @@ ebiptablesExecCLI(virBufferPtr buf,
return 1; return 1;
argv[0] = filename; argv[0] = filename;
virMutexLock(&execCLIMutex);
rc = virRun(argv, status); rc = virRun(argv, status);
virMutexUnlock(&execCLIMutex);
*status >>= 8; *status >>= 8;
VIR_DEBUG("rc = %d, status = %d",rc, *status); VIR_DEBUG("rc = %d, status = %d",rc, *status);
@ -3163,8 +3169,9 @@ tear_down_tmpebchains:
ebiptablesExecCLI(&buf, &cli_status); ebiptablesExecCLI(&buf, &cli_status);
virNWFilterReportError(VIR_ERR_BUILD_FIREWALL, virNWFilterReportError(VIR_ERR_BUILD_FIREWALL,
"%s", _("Some rules could not be created for "
_("Some rules could not be created.")); "interface %s."),
ifname);
return 1; return 1;
} }
@ -3364,6 +3371,9 @@ ebiptablesDriverInit(void)
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
int cli_status; int cli_status;
if (virMutexInit(&execCLIMutex))
return EINVAL;
bash_cmd_path = virFindFileInPath("bash"); bash_cmd_path = virFindFileInPath("bash");
gawk_cmd_path = virFindFileInPath("gawk"); gawk_cmd_path = virFindFileInPath("gawk");
grep_cmd_path = virFindFileInPath("grep"); grep_cmd_path = virFindFileInPath("grep");