[ovs-dev] [PATCH] datapath-windows: Updated WFP system provider handling

Eitan Eliahu eliahue at vmware.com
Mon Mar 23 00:31:37 UTC 2015


Hi Sorin,
Thank you for posting this change.
Here are few comments:
[1] Please call OvsTunnelEngineClose(&handle) only if the handle is not zero. (you might want to add an assertion if it zero).
[2] I'm somewhat confused about the registration for engine state change. As I understand you check the state of the engine and if it is running you open the engine handle (in the context of the foreground thread). However, you subscribe to state change anyway and you open the handle to the engine from the callback function too.
Did I miss anything?
Thanks,
Eitan


-----Original Message-----

From: dev [mailto:dev-bounces at openvswitch.org] On Behalf Of Sorin Vinturis

Sent: Monday, 16 March, 2015 20:08

To: dev at openvswitch.org

Subject: [ovs-dev] [PATCH] datapath-windows: Updated WFP system provider handling



If the Base Filtering Engine (BFE) is not started, the WFP system provider failed to be added because no session to the engine could be acquired.



The solution for this was to registered a BFE notification callback that is called whenever the BFE's state changes. Only if the BFE's state is running the WFP system provider is added.



Signed-off-by: Sorin Vinturis <svinturis at cloudbasesolutions.com>

Reported-by: Sorin Vinturis <svinturis at cloudbasesolutions.com>

Reported-at: https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_openvswitch_ovs-2Dissues_issues_65&d=AwIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=CWsgHUxi6ExLXY798tmo3LJ4e3geGYp56lkcH-5cLCY&m=MVriWGIsZGTQ5f_haLS0X5H8R3YdfikbqnWKRpKksKU&s=1iWqFul95i3o_mD41jKjZNdLnK-df_QWRzSY1614RTw&e= 

---

 datapath-windows/ovsext/Datapath.c     | 20 ++-----

 datapath-windows/ovsext/TunnelFilter.c | 99 ++++++++++++++++++++++++++++++++--

 datapath-windows/ovsext/TunnelIntf.h   |  8 +--

 3 files changed, 100 insertions(+), 27 deletions(-)



diff --git a/datapath-windows/ovsext/Datapath.c b/datapath-windows/ovsext/Datapath.c

index 8eb13f1..c6fe89e 100644

--- a/datapath-windows/ovsext/Datapath.c

+++ b/datapath-windows/ovsext/Datapath.c

@@ -353,35 +353,19 @@ PNDIS_SPIN_LOCK gOvsCtrlLock;  VOID

 OvsInit()

 {

-    HANDLE handle = NULL;

-

     gOvsCtrlLock = &ovsCtrlLockObj;

     NdisAllocateSpinLock(gOvsCtrlLock);

     OvsInitEventQueue();

-

-    OvsTunnelEngineOpen(&handle);

-    if (handle) {

-        OvsTunnelAddSystemProvider(handle);

-    }

-    OvsTunnelEngineClose(&handle);

 }

 

 VOID

 OvsCleanup()

 {

-    HANDLE handle = NULL;

-

     OvsCleanupEventQueue();

     if (gOvsCtrlLock) {

         NdisFreeSpinLock(gOvsCtrlLock);

         gOvsCtrlLock = NULL;

     }

-

-    OvsTunnelEngineOpen(&handle);

-    if (handle) {

-        OvsTunnelRemoveSystemProvider(handle);

-    }

-    OvsTunnelEngineClose(&handle);

 }

 

 VOID

@@ -448,6 +432,8 @@ OvsCreateDeviceObject(NDIS_HANDLE ovsExtDriverHandle)

         if (ovsExt) {

             ovsExt->numberOpenInstance = 0;

         }

+    } else {

+        OvsRegisterSystemProvider((PVOID)gOvsDeviceObject);

     }

 

     OVS_LOG_TRACE("DeviceObject: %p", gOvsDeviceObject); @@ -471,6 +457,8 @@ OvsDeleteDeviceObject()

         NdisDeregisterDeviceEx(gOvsDeviceHandle);

         gOvsDeviceHandle = NULL;

         gOvsDeviceObject = NULL;

+

+        OvsUnregisterSystemProvider();

     }

 }

 

diff --git a/datapath-windows/ovsext/TunnelFilter.c b/datapath-windows/ovsext/TunnelFilter.c

index e0adc37..4b879c0 100644

--- a/datapath-windows/ovsext/TunnelFilter.c

+++ b/datapath-windows/ovsext/TunnelFilter.c

@@ -111,6 +111,7 @@ DEFINE_GUID(

 PDEVICE_OBJECT gDeviceObject;

 

 HANDLE gEngineHandle = NULL;

+HANDLE gBfeSubscriptionHandle = NULL;

 UINT32 gCalloutIdV4;

 

 

@@ -173,17 +174,20 @@ OvsTunnelAddSystemProvider(HANDLE handle)

         provider.displayData.name = OVS_TUNNEL_PROVIDER_NAME;

         provider.displayData.description = OVS_TUNNEL_PROVIDER_DESC;

         /*

-        * Since we always want the provider to be present, it's easiest to add

-        * it as persistent object during driver load.

-        */

+         * Since we always want the provider to be present, it's easiest to add

+         * it as persistent object during driver load.

+         */

         provider.flags = FWPM_PROVIDER_FLAG_PERSISTENT;

 

         status = FwpmProviderAdd(handle,

                                  &provider,

                                  NULL);

         if (!NT_SUCCESS(status)) {

-            OVS_LOG_ERROR("Fail to add WFP provider, status: %x.", status);

-            break;

+            if (STATUS_FWP_ALREADY_EXISTS != status) {

+                OVS_LOG_ERROR("Failed to add WFP provider, status: %x.",

+                              status);

+                break;

+            }

         }

 

         status = FwpmTransactionCommit(handle); @@ -541,3 +545,88 @@ Exit:

 

     return status;

 }

+

+VOID NTAPI

+OvsBfeStateChangeCallback(PVOID context,

+                          FWPM_SERVICE_STATE bfeState) {

+    HANDLE handle = NULL;

+

+    DBG_UNREFERENCED_PARAMETER(context);

+

+    if (FWPM_SERVICE_RUNNING == bfeState) {

+        OvsTunnelEngineOpen(&handle);

+        if (handle) {

+            OvsTunnelAddSystemProvider(handle);

+        }

+        OvsTunnelEngineClose(&handle);

+    }

+}

+

+NTSTATUS

+OvsSubscribeBfeStateChanges(PVOID deviceObject) {

+    NTSTATUS status = STATUS_SUCCESS;

+

+    if (!gBfeSubscriptionHandle) {

+        status = FwpmBfeStateSubscribeChanges(deviceObject,

+                                              OvsBfeStateChangeCallback,

+                                              NULL,

+                                              &gBfeSubscriptionHandle);

+        if (!NT_SUCCESS(status)) {

+            OVS_LOG_ERROR(

+                "Failed to open subscribe BFE state change callback, status: %x.",

+                status);

+        }

+    }

+

+    return status;

+}

+

+VOID

+OvsUnsubscribeBfeStateChanges()

+{

+    NTSTATUS status = STATUS_SUCCESS;

+

+    if (gBfeSubscriptionHandle) {

+        status = FwpmBfeStateUnsubscribeChanges(gBfeSubscriptionHandle);

+        if (!NT_SUCCESS(status)) {

+            OVS_LOG_ERROR(

+                "Failed to open unsubscribe BFE state change callback, status: %x.",

+                status);

+        }

+        gBfeSubscriptionHandle = NULL;

+    }

+}

+

+VOID OvsRegisterSystemProvider(PVOID deviceObject) {

+    NTSTATUS status = STATUS_SUCCESS;

+    HANDLE handle = NULL;

+

+    status = OvsSubscribeBfeStateChanges(deviceObject);

+    if (NT_SUCCESS(status)) {

+        if (FWPM_SERVICE_RUNNING == FwpmBfeStateGet()) {

+            OvsTunnelEngineOpen(&handle);

+            if (handle) {

+                OvsTunnelAddSystemProvider(handle);

+            }

+            OvsTunnelEngineClose(&handle);

+

+            OvsUnsubscribeBfeStateChanges();

+        }

+    }

+}

+

+VOID OvsUnregisterSystemProvider()

+{

+    HANDLE handle = NULL;

+

+    OvsTunnelEngineOpen(&handle);

+    if (handle) {

+        OvsTunnelRemoveSystemProvider(handle);

+    }

+    OvsTunnelEngineClose(&handle);

+

+    OvsUnsubscribeBfeStateChanges();

+}

diff --git a/datapath-windows/ovsext/TunnelIntf.h b/datapath-windows/ovsext/TunnelIntf.h

index b2bba30..728a53f 100644

--- a/datapath-windows/ovsext/TunnelIntf.h

+++ b/datapath-windows/ovsext/TunnelIntf.h

@@ -22,12 +22,8 @@ NTSTATUS OvsTunnelFilterInitialize(PDRIVER_OBJECT driverObject);

 

 VOID OvsTunnelFilterUninitialize(PDRIVER_OBJECT driverObject);

 

-NTSTATUS OvsTunnelEngineOpen(HANDLE *handle);

+VOID OvsRegisterSystemProvider(PVOID deviceObject);

 

-VOID OvsTunnelEngineClose(HANDLE *handle);

-

-VOID OvsTunnelAddSystemProvider(HANDLE handle);

-

-VOID OvsTunnelRemoveSystemProvider(HANDLE handle);

+VOID OvsUnregisterSystemProvider();

 

 #endif /* __TUNNEL_INTF_H_ */

--

1.9.0.msysgit.0

_______________________________________________

dev mailing list

dev at openvswitch.org

https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailman_listinfo_dev&d=AwIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=CWsgHUxi6ExLXY798tmo3LJ4e3geGYp56lkcH-5cLCY&m=MVriWGIsZGTQ5f_haLS0X5H8R3YdfikbqnWKRpKksKU&s=IRTZMDQzH2bWNFdd7KZkHDqBBXjSOUx5lc0Z5tcIwag&e= 



More information about the dev mailing list