29 Jun
2023
29 Jun
'23
4:27 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbf64c0cc49c3f1ab6514…
commit bbf64c0cc49c3f1ab651435c4ed8b6519ecbd84b
Author: Victor Perevertkin <victor.perevertkin(a)reactos.org>
AuthorDate: Mon Jun 26 01:47:40 2023 +0300
Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org>
CommitDate: Thu Jun 29 19:25:25 2023 +0300
[NTOS:PNP] Do not create an extra "PDO" device inside PnP root driver
The root device object is in fact a PDO and a FDO at the same time. Thus
there is no need in creating two device objects here, one is enough.
This commit also removes the explicit device extension for the root DO,
because the only reason it existed is to distinguish the root driver's
FDO from its PDOs. This can easily be done by comparing with
IopRootDeviceNode.
Also collect some unused garbage while we are here.
---
ntoskrnl/include/internal/io.h | 3 +
ntoskrnl/io/pnpmgr/pnpinit.c | 16 +---
ntoskrnl/io/pnpmgr/pnproot.c | 171 ++++++++---------------------------------
3 files changed, 37 insertions(+), 153 deletions(-)
diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h
index 13b0b6364ea..c4cb5c366cb 100644
--- a/ntoskrnl/include/internal/io.h
+++ b/ntoskrnl/include/internal/io.h
@@ -1075,6 +1075,9 @@ NTSTATUS
PnpRootRegisterDevice(
IN PDEVICE_OBJECT DeviceObject);
+VOID
+PnpRootInitializeDevExtension(VOID);
+
//
// Driver Routines
//
diff --git a/ntoskrnl/io/pnpmgr/pnpinit.c b/ntoskrnl/io/pnpmgr/pnpinit.c
index b1a5e24c8e5..7c7c1209fd2 100644
--- a/ntoskrnl/io/pnpmgr/pnpinit.c
+++ b/ntoskrnl/io/pnpmgr/pnpinit.c
@@ -14,12 +14,6 @@
/* GLOBALS ********************************************************************/
-typedef struct _IOPNP_DEVICE_EXTENSION
-{
- PWCHAR CompatibleIdList;
- ULONG CompatibleIdListSize;
-} IOPNP_DEVICE_EXTENSION, *PIOPNP_DEVICE_EXTENSION;
-
PUNICODE_STRING PiInitGroupOrderTable;
USHORT PiInitGroupOrderTableCount;
INTERFACE_TYPE PnpDefaultInterfaceType;
@@ -412,7 +406,7 @@ IopInitializePlugPlayServices(VOID)
/* Create the root PDO */
Status = IoCreateDevice(IopRootDriverObject,
- sizeof(IOPNP_DEVICE_EXTENSION),
+ 0,
NULL,
FILE_DEVICE_CONTROLLER,
0,
@@ -441,9 +435,7 @@ IopInitializePlugPlayServices(VOID)
KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
}
- /* Call the add device routine */
- IopRootDriverObject->DriverExtension->AddDevice(IopRootDriverObject,
-
IopRootDeviceNode->PhysicalDeviceObject);
+ PnpRootInitializeDevExtension();
PiSetDevNodeState(IopRootDeviceNode, DeviceNodeStarted);
@@ -457,7 +449,7 @@ IopInitializePlugPlayServices(VOID)
ExInitializeFastMutex(&PnpBusTypeGuidList->Lock);
/* Initialize PnP root relations (this is a syncronous operation) */
- PiQueueDeviceAction(IopRootDeviceNode->PhysicalDeviceObject,
PiActionEnumRootDevices, NULL, NULL);
+ PiQueueDeviceAction(Pdo, PiActionEnumRootDevices, NULL, NULL);
/* Launch the firmware mapper */
Status = IopUpdateRootKey();
@@ -467,7 +459,7 @@ IopInitializePlugPlayServices(VOID)
NtClose(KeyHandle);
/* Initialize PnP root relations (this is a syncronous operation) */
- PiQueueDeviceAction(IopRootDeviceNode->PhysicalDeviceObject,
PiActionEnumRootDevices, NULL, NULL);
+ PiQueueDeviceAction(Pdo, PiActionEnumRootDevices, NULL, NULL);
/* We made it */
return STATUS_SUCCESS;
diff --git a/ntoskrnl/io/pnpmgr/pnproot.c b/ntoskrnl/io/pnpmgr/pnproot.c
index 58d740b7d3b..4a9ae6607b5 100644
--- a/ntoskrnl/io/pnpmgr/pnproot.c
+++ b/ntoskrnl/io/pnpmgr/pnproot.c
@@ -38,26 +38,9 @@ typedef struct _PNPROOT_DEVICE
ULONG ResourceListSize;
} PNPROOT_DEVICE, *PPNPROOT_DEVICE;
-typedef enum
-{
- dsStopped,
- dsStarted,
- dsPaused,
- dsRemoved,
- dsSurpriseRemoved
-} PNPROOT_DEVICE_STATE;
-
-typedef struct _PNPROOT_COMMON_DEVICE_EXTENSION
-{
- // Wether this device extension is for an FDO or PDO
- BOOLEAN IsFDO;
-} PNPROOT_COMMON_DEVICE_EXTENSION, *PPNPROOT_COMMON_DEVICE_EXTENSION;
-
/* Physical Device Object device extension for a child device */
typedef struct _PNPROOT_PDO_DEVICE_EXTENSION
{
- // Common device data
- PNPROOT_COMMON_DEVICE_EXTENSION Common;
// Informations about the device
PPNPROOT_DEVICE DeviceInfo;
} PNPROOT_PDO_DEVICE_EXTENSION, *PPNPROOT_PDO_DEVICE_EXTENSION;
@@ -65,12 +48,6 @@ typedef struct _PNPROOT_PDO_DEVICE_EXTENSION
/* Physical Device Object device extension for the Root bus device object */
typedef struct _PNPROOT_FDO_DEVICE_EXTENSION
{
- // Common device data
- PNPROOT_COMMON_DEVICE_EXTENSION Common;
- // Lower device object
- PDEVICE_OBJECT Ldo;
- // Current state of the driver
- PNPROOT_DEVICE_STATE State;
// Namespace device list
LIST_ENTRY DeviceListHead;
// Number of (not removed) devices in device list
@@ -85,7 +62,7 @@ typedef struct _BUFFER
PULONG Length;
} BUFFER, *PBUFFER;
-static PDEVICE_OBJECT PnpRootDeviceObject = NULL;
+static PNPROOT_FDO_DEVICE_EXTENSION PnpRootDOExtension;
/* FUNCTIONS *****************************************************************/
@@ -130,7 +107,7 @@ NTSTATUS
PnpRootRegisterDevice(
IN PDEVICE_OBJECT DeviceObject)
{
- PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension =
PnpRootDeviceObject->DeviceExtension;
+ PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension = &PnpRootDOExtension;
PPNPROOT_DEVICE Device;
PDEVICE_NODE DeviceNode;
PWSTR InstancePath;
@@ -202,7 +179,7 @@ PnpRootCreateDevice(
RTL_QUERY_REGISTRY_TABLE QueryTable[2];
OBJECT_ATTRIBUTES ObjectAttributes;
- DeviceExtension = PnpRootDeviceObject->DeviceExtension;
+ DeviceExtension = &PnpRootDOExtension;
KeAcquireGuardedMutex(&DeviceExtension->DeviceListLock);
DPRINT("Creating a PnP root device for service '%wZ'\n",
ServiceName);
@@ -341,7 +318,7 @@ tryagain:
/* Initialize a device object */
Status = IoCreateDevice(
- DriverObject ? DriverObject : PnpRootDeviceObject->DriverObject,
+ DriverObject ? DriverObject :
IopRootDeviceNode->PhysicalDeviceObject->DriverObject,
sizeof(PNPROOT_PDO_DEVICE_EXTENSION),
NULL,
FILE_DEVICE_CONTROLLER,
@@ -357,7 +334,6 @@ tryagain:
PdoDeviceExtension =
(PPNPROOT_PDO_DEVICE_EXTENSION)Device->Pdo->DeviceExtension;
RtlZeroMemory(PdoDeviceExtension, sizeof(PNPROOT_PDO_DEVICE_EXTENSION));
- PdoDeviceExtension->Common.IsFDO = FALSE;
PdoDeviceExtension->DeviceInfo = Device;
Device->Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE;
@@ -679,7 +655,7 @@ EnumerateDevices(
DPRINT("EnumerateDevices(FDO %p)\n", DeviceObject);
- DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
+ DeviceExtension = &PnpRootDOExtension;
KeAcquireGuardedMutex(&DeviceExtension->DeviceListLock);
/* Should hold most key names, but we reallocate below if it's too small */
@@ -909,7 +885,7 @@ PnpRootQueryDeviceRelations(
return Status;
}
- DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
+ DeviceExtension = &PnpRootDOExtension;
Size = FIELD_OFFSET(DEVICE_RELATIONS, Objects) + sizeof(PDEVICE_OBJECT) *
DeviceExtension->DeviceListCount;
if (OtherRelations)
@@ -963,7 +939,6 @@ PnpRootQueryDeviceRelations(
PdoDeviceExtension =
(PPNPROOT_PDO_DEVICE_EXTENSION)Device->Pdo->DeviceExtension;
RtlZeroMemory(PdoDeviceExtension, sizeof(PNPROOT_PDO_DEVICE_EXTENSION));
- PdoDeviceExtension->Common.IsFDO = FALSE;
PdoDeviceExtension->DeviceInfo = Device;
Device->Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE;
@@ -1010,11 +985,9 @@ PnpRootFdoPnpControl(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
{
- PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension;
PIO_STACK_LOCATION IrpSp;
NTSTATUS Status;
- DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
Status = Irp->IoStatus.Status;
IrpSp = IoGetCurrentIrpStackLocation(Irp);
@@ -1025,29 +998,9 @@ PnpRootFdoPnpControl(
Status = PnpRootQueryDeviceRelations(DeviceObject, Irp);
break;
- case IRP_MN_START_DEVICE:
- DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n");
- if (!IoForwardIrpSynchronously(DeviceExtension->Ldo, Irp))
- Status = STATUS_UNSUCCESSFUL;
- else
- {
- Status = Irp->IoStatus.Status;
- if (NT_SUCCESS(Status))
- DeviceExtension->State = dsStarted;
- }
-
- Irp->IoStatus.Status = Status;
- IoCompleteRequest(Irp, IO_NO_INCREMENT);
- return Status;
-
- case IRP_MN_STOP_DEVICE:
- DPRINT("IRP_MJ_PNP / IRP_MN_STOP_DEVICE\n");
- /* Root device cannot be stopped */
- Irp->IoStatus.Status = Status = STATUS_INVALID_DEVICE_REQUEST;
- IoCompleteRequest(Irp, IO_NO_INCREMENT);
- return Status;
-
default:
+ // The root device object can receive only IRP_MN_QUERY_DEVICE_RELATIONS
+ ASSERT(FALSE);
DPRINT("IRP_MJ_PNP / Unknown minor function 0x%lx\n",
IrpSp->MinorFunction);
break;
}
@@ -1330,7 +1283,7 @@ PnpRootPdoPnpControl(
NTSTATUS Status;
DeviceExtension = DeviceObject->DeviceExtension;
- FdoDeviceExtension = PnpRootDeviceObject->DeviceExtension;
+ FdoDeviceExtension = &PnpRootDOExtension;
Status = Irp->IoStatus.Status;
IrpSp = IoGetCurrentIrpStackLocation(Irp);
@@ -1439,12 +1392,9 @@ PnpRootPnpControl(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
{
- PPNPROOT_COMMON_DEVICE_EXTENSION DeviceExtension;
NTSTATUS Status;
- DeviceExtension =
(PPNPROOT_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-
- if (DeviceExtension->IsFDO)
+ if (IopRootDeviceNode == IopGetDeviceNode(DeviceObject))
Status = PnpRootFdoPnpControl(DeviceObject, Irp);
else
Status = PnpRootPdoPnpControl(DeviceObject, Irp);
@@ -1465,100 +1415,39 @@ PnpRootPowerControl(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
{
- PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension;
- PIO_STACK_LOCATION IrpSp;
- NTSTATUS Status;
-
- DeviceExtension = DeviceObject->DeviceExtension;
- Status = Irp->IoStatus.Status;
- IrpSp = IoGetCurrentIrpStackLocation(Irp);
-
- /*
- * We must handle power IRPs based on whether it is a function driver
- * or not from the device extension, so it cannot be NULL.
- */
- ASSERT(DeviceExtension);
+ PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
+ NTSTATUS Status = Irp->IoStatus.Status;
- if (DeviceExtension->Common.IsFDO)
- {
- ASSERT(!DeviceExtension->Common.IsFDO);
- PoStartNextPowerIrp(Irp);
- IoCopyCurrentIrpStackLocationToNext(Irp);
- Status = PoCallDriver(DeviceExtension->Ldo, Irp);
- }
- else
+ switch (IrpSp->MinorFunction)
{
- switch (IrpSp->MinorFunction)
- {
- case IRP_MN_QUERY_POWER:
- case IRP_MN_SET_POWER:
- Status = STATUS_SUCCESS;
- break;
- }
- Irp->IoStatus.Status = Status;
- PoStartNextPowerIrp(Irp);
- IoCompleteRequest(Irp, IO_NO_INCREMENT);
+ case IRP_MN_QUERY_POWER:
+ case IRP_MN_SET_POWER:
+ Status = STATUS_SUCCESS;
+ break;
}
+ Irp->IoStatus.Status = Status;
+ PoStartNextPowerIrp(Irp);
+ IoCompleteRequest(Irp, IO_NO_INCREMENT);
return Status;
}
+VOID
+PnpRootInitializeDevExtension(VOID)
+{
+ PnpRootDOExtension.DeviceListCount = 0;
+ InitializeListHead(&PnpRootDOExtension.DeviceListHead);
+ KeInitializeGuardedMutex(&PnpRootDOExtension.DeviceListLock);
+}
+
NTSTATUS
NTAPI
PnpRootAddDevice(
IN PDRIVER_OBJECT DriverObject,
IN PDEVICE_OBJECT PhysicalDeviceObject)
{
- PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension;
- NTSTATUS Status;
-
- DPRINT("PnpRootAddDevice(DriverObject %p, Pdo %p)\n", DriverObject,
PhysicalDeviceObject);
-
- if (!PhysicalDeviceObject)
- {
- DPRINT("PhysicalDeviceObject 0x%p\n", PhysicalDeviceObject);
- Status = STATUS_INSUFFICIENT_RESOURCES;
- KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
- }
-
- Status = IoCreateDevice(
- DriverObject,
- sizeof(PNPROOT_FDO_DEVICE_EXTENSION),
- NULL,
- FILE_DEVICE_BUS_EXTENDER,
- FILE_DEVICE_SECURE_OPEN,
- TRUE,
- &PnpRootDeviceObject);
- if (!NT_SUCCESS(Status))
- {
- DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status);
- KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
- }
- DPRINT("Created FDO %p\n", PnpRootDeviceObject);
-
- DeviceExtension =
(PPNPROOT_FDO_DEVICE_EXTENSION)PnpRootDeviceObject->DeviceExtension;
- RtlZeroMemory(DeviceExtension, sizeof(PNPROOT_FDO_DEVICE_EXTENSION));
-
- DeviceExtension->Common.IsFDO = TRUE;
- DeviceExtension->State = dsStopped;
- InitializeListHead(&DeviceExtension->DeviceListHead);
- DeviceExtension->DeviceListCount = 0;
- KeInitializeGuardedMutex(&DeviceExtension->DeviceListLock);
-
- Status = IoAttachDeviceToDeviceStackSafe(
- PnpRootDeviceObject,
- PhysicalDeviceObject,
- &DeviceExtension->Ldo);
- if (!NT_SUCCESS(Status))
- {
- DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status
0x%08lx\n", Status);
- KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
- }
-
- PnpRootDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;
-
- DPRINT("Done AddDevice()\n");
-
+ // AddDevice must never be called for the root driver
+ ASSERT(FALSE);
return STATUS_SUCCESS;
}