[ros-diffs] [vmikayelyan] 72386: usb: hub: Add sychronization for FDO's child list access. As FDO's child list is getting changed not from PnP dispatcher but from DeviceStatusChangeThread(), we need to sychron...

Author: vmikayelyan
Date: Fri Aug 19 16:36:43 2016
New Revision: 72386

URL: http://svn.reactos.org/svn/reactos?rev=72386&view=rev
Log:
usb: hub: Add sychronization for FDO's child list access.

As FDO's child list is getting changed not from PnP dispatcher but
from DeviceStatusChangeThread(), we need to sychronize access for it.

Modified:
    branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c
    branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c
    branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c
    branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h

Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu…
==============================================================================
--- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c	[iso-8859-1] (original)
+++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c	[iso-8859-1] Fri Aug 19 16:36:43 2016
@@ -1094,6 +1094,7 @@
     PDEVICE_OBJECT ChildDeviceObject = NULL;
     ULONG Index = 0;
 
+    KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock);
     for (Index = 0; Index < USB_MAXCHILDREN; Index++)
     {
         if (HubDeviceExtension->ChildDeviceObject[Index])
@@ -1114,14 +1115,16 @@
     if (!ChildDeviceObject)
     {
         DPRINT1("Removal request for non-existant device!\n");
+        KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock);
         return STATUS_UNSUCCESSFUL;
     }
 
     DPRINT("Removing device on port %d (Child index: %d)\n", PortId, Index);
 
     /* Remove the device from the table */
-    // is lock needed?
     HubDeviceExtension->ChildDeviceObject[Index] = NULL;
+
+    KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock);
 
     /* Invalidate device relations for the root hub */
     IoInvalidateDeviceRelations(HubDeviceExtension->RootHubPhysicalDeviceObject,
BusRelations);
@@ -1153,26 +1156,6 @@
     HubInterface = &HubDeviceExtension->HubInterface;
     RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject;
     HubInterfaceBusContext = HubDeviceExtension->UsbDInterface.BusContext;
-    //
-    // Find an empty slot in the child device array
-    //
-    for (ChildDeviceCount = 0; ChildDeviceCount < USB_MAXCHILDREN;
ChildDeviceCount++)
-    {
-        if (HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] == NULL)
-        {
-        DPRINT("Found unused entry at %d\n", ChildDeviceCount);
-            break;
-        }
-    }
-
-    //
-    // Check if the limit has been reached for maximum usb devices
-    //
-    if (ChildDeviceCount == USB_MAXCHILDREN)
-    {
-        DPRINT1("USBHUB: Too many child devices!\n");
-        return STATUS_UNSUCCESSFUL;
-    }
 
     while (TRUE)
     {
@@ -1341,8 +1324,35 @@
 
     UsbChildExtension->IsRemovePending = FALSE;
 
+    KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock);
+
+    //
+    // Find an empty slot in the child device array
+    //
+    for (ChildDeviceCount = 0; ChildDeviceCount < USB_MAXCHILDREN;
ChildDeviceCount++)
+    {
+        if (HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] == NULL)
+        {
+            DPRINT("Found unused entry at %d\n", ChildDeviceCount);
+            break;
+        }
+    }
+
+    //
+    // Check if the limit has been reached for maximum usb devices
+    //
+    if (ChildDeviceCount == USB_MAXCHILDREN)
+    {
+        DPRINT1("USBHUB: Too many child devices!\n");
+        Status = STATUS_UNSUCCESSFUL;
+        KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock);
+       
UsbChildExtension->DeviceInterface.InterfaceDereference(UsbChildExtension->DeviceInterface.BusContext);
+        goto Cleanup;
+    }
+
     HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] = NewChildDeviceObject;
     HubDeviceExtension->InstanceCount++;
+    KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock);
 
     IoInvalidateDeviceRelations(RootHubDeviceObject, BusRelations);
     return STATUS_SUCCESS;
@@ -1398,6 +1408,8 @@
 
     HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
 
+    KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock);
+
     //
     // Count the number of children
     //
@@ -1418,6 +1430,7 @@
         {
             // We have nothing to add
             *pDeviceRelations = RelationsFromTop;
+            KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock);
             return STATUS_SUCCESS;
         }
     }
@@ -1432,6 +1445,7 @@
 
     if (!DeviceRelations)
     {
+        KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock);
         if (!RelationsFromTop)
             return STATUS_INSUFFICIENT_RESOURCES;
         else
@@ -1460,6 +1474,8 @@
             DeviceRelations->Objects[Children++] =
HubDeviceExtension->ChildDeviceObject[i];
         }
     }
+
+    KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock);
 
     // We should do this, because replaced this with our's one
     if (RelationsFromTop)
@@ -2198,6 +2214,7 @@
             // sanity checks
             ASSERT(NodeConnectionInfo);
 
+            KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock);
             for(Index = 0; Index < USB_MAXCHILDREN; Index++)
             {
                 if (HubDeviceExtension->ChildDeviceObject[Index] == NULL)
@@ -2224,6 +2241,7 @@
                 }
                 break;
             }
+            KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock);
             // done
             Irp->IoStatus.Information = sizeof(USB_NODE_INFORMATION);
             Status = STATUS_SUCCESS;
@@ -2244,6 +2262,7 @@
             // sanity checks
             ASSERT(NodeKey);
 
+            KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock);
             for(Index = 0; Index < USB_MAXCHILDREN; Index++)
             {
                 if (HubDeviceExtension->ChildDeviceObject[Index] == NULL)
@@ -2283,6 +2302,7 @@
                 NodeKey->ActualLength = Length +
sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME);
                 break;
             }
+            KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock);
         }
     }
     else if (IoStack->Parameters.DeviceIoControl.IoControlCode ==
IOCTL_USB_GET_NODE_CONNECTION_NAME)

Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu…
==============================================================================
--- branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c	[iso-8859-1] (original)
+++ branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c	[iso-8859-1] Fri Aug 19 16:36:43 2016
@@ -153,14 +153,18 @@
 
     HubDeviceExtension =
(PHUB_DEVICE_EXTENSION)ChildDeviceExtension->ParentDeviceObject->DeviceExtension;
 
+    KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock);
     for(Index = 0; Index < USB_MAXCHILDREN; Index++)
     {
         if (HubDeviceExtension->ChildDeviceObject[Index] == DeviceObject)
         {
+            KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock);
+
             /* PDO exists */
             return TRUE;
         }
     }
+    KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock);
 
     /* invalid pdo */
     return FALSE;

Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu…
==============================================================================
--- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c	[iso-8859-1] (original)
+++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c	[iso-8859-1] Fri Aug 19 16:36:43
2016
@@ -92,6 +92,9 @@
     HubDeviceExtension->Common.IsFDO = TRUE;
     DeviceObject->Flags |= DO_POWER_PAGABLE;
 
+    // initialize mutex
+    KeInitializeGuardedMutex(&HubDeviceExtension->HubMutexLock);
+
     //
     // initialize reset complete event
     //

Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu…
==============================================================================
--- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h	[iso-8859-1] (original)
+++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h	[iso-8859-1] Fri Aug 19 16:36:43
2016
@@ -72,6 +72,8 @@
     PDEVICE_OBJECT ChildDeviceObject[USB_MAXCHILDREN];
     PDEVICE_OBJECT RootHubPhysicalDeviceObject;
     PDEVICE_OBJECT RootHubFunctionalDeviceObject;
+
+    KGUARDED_MUTEX HubMutexLock;
 
     ULONG NumberOfHubs;
     KEVENT ResetComplete;