Add some queue counters

worproject · Dec 29, 2023 · 8cad2ad · 8cad2ad
1 parent 18bcadc
commit 8cad2ad
Show file tree

Hide file tree

Showing 8 changed files with 134 additions and 31 deletions.
diff --git a/drivers/net/dwc_eqos/device.cpp b/drivers/net/dwc_eqos/device.cpp
@@ -80,6 +80,10 @@ struct DeviceContext
     UINT32 dpcTx; // Updated only in DPC.
     UINT32 dpcAbnormalStatus; // Updated only in DPC.
     UINT32 dpcFatalBusError; // Updated only in DPC.
+    UINT32 rxOwnDescriptors; // Updated only during RxQueueAdvance.
+    UINT32 rxDoneFragments; // Updated only during RxQueueAdvance.
+    UINT32 txOwnDescriptors; // Updated only during TxQueueAdvance.
+    UINT32 txDoneFragments; // Updated only during TxQueueAdvance.
 };
 WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(DeviceContext, DeviceGetContext)
 
@@ -416,7 +420,7 @@ AdapterCreateTxQueue(
     auto const context = DeviceGetContext(AdapterGetContext(adapter)->device);
     NT_ASSERT(context->txQueue == nullptr);
     return TxQueueCreate(
-        adapter,
+        context,
         queueInit,
         context->dma,
         &context->regs->Dma_Ch[0],
@@ -433,7 +437,7 @@ AdapterCreateRxQueue(
     auto const context = DeviceGetContext(AdapterGetContext(adapter)->device);
     NT_ASSERT(context->rxQueue == nullptr);
     return RxQueueCreate(
-        adapter,
+        context,
         queueInit,
         context->dma,
         &context->regs->Dma_Ch[0]);
@@ -993,13 +997,13 @@ DeviceReleaseHardware(
     return STATUS_SUCCESS;
 }
 
+_IRQL_requires_max_(PASSIVE_LEVEL)
 void
 DeviceSetNotificationRxQueue(
-    _In_ NETADAPTER adapter,
+    _Inout_ DeviceContext* context,
     _In_opt_ NETPACKETQUEUE rxQueue)
 {
     // PASSIVE_LEVEL, nonpaged (resume path, raises IRQL)
-    auto const context = DeviceGetContext(AdapterGetContext(adapter)->device);
 
     WdfSpinLockAcquire(context->queueLock); // PASSIVE_LEVEL --> DISPATCH_LEVEL
     context->rxQueue = rxQueue;
@@ -1015,13 +1019,13 @@ DeviceSetNotificationRxQueue(
     }
 }
 
+_IRQL_requires_max_(PASSIVE_LEVEL)
 void
 DeviceSetNotificationTxQueue(
-    _In_ NETADAPTER adapter,
+    _Inout_ DeviceContext* context,
     _In_opt_ NETPACKETQUEUE txQueue)
 {
     // PASSIVE_LEVEL, nonpaged (resume path, raises IRQL)
-    auto const context = DeviceGetContext(AdapterGetContext(adapter)->device);
 
     WdfSpinLockAcquire(context->queueLock); // PASSIVE_LEVEL --> DISPATCH_LEVEL
     context->txQueue = txQueue;
@@ -1038,6 +1042,30 @@ DeviceSetNotificationTxQueue(
 
 }
 
+_IRQL_requires_max_(DISPATCH_LEVEL)
+void
+DeviceAddStatisticsRxQueue(
+    _Inout_ DeviceContext* context,
+    UINT32 ownDescriptors,
+    UINT32 doneFragments)
+{
+    // DISPATCH_LEVEL
+    context->rxOwnDescriptors += ownDescriptors;
+    context->rxDoneFragments += doneFragments;
+}
+
+_IRQL_requires_max_(DISPATCH_LEVEL)
+void
+DeviceAddStatisticsTxQueue(
+    _Inout_ DeviceContext* context,
+    UINT32 ownDescriptors,
+    UINT32 doneFragments)
+{
+    // DISPATCH_LEVEL
+    context->txOwnDescriptors += ownDescriptors;
+    context->txDoneFragments += doneFragments;
+}
+
 __declspec(code_seg("PAGE"))
 static void
 DeviceCleanup(WDFOBJECT Object)
@@ -1235,6 +1263,10 @@ PerfDataInit(
     data->DpcTx = context->dpcTx;
     data->DpcAbnormalStatus = context->dpcAbnormalStatus;
     data->DpcFatalBusError = context->dpcFatalBusError;
+    data->RxOwnDescriptors = context->rxOwnDescriptors;
+    data->RxDoneFragments = context->rxDoneFragments;
+    data->TxOwnDescriptors = context->txOwnDescriptors;
+    data->TxDoneFragments = context->txDoneFragments;
 }
 
 // Implements the performance counter callback for a given DataType.
@@ -1291,6 +1323,7 @@ PerfCallback(
     return STATUS_SUCCESS;
 }
 
+_IRQL_requires_max_(PASSIVE_LEVEL)
 __declspec(code_seg("INIT"))
 void
 DevicePerfRegister(_In_ WDFDRIVER driver)
@@ -1340,6 +1373,7 @@ DevicePerfRegister(_In_ WDFDRIVER driver)
     TraceEntryExitWithStatus(DevicePerfRegister, LEVEL_INFO, status);
 }
 
+_IRQL_requires_max_(PASSIVE_LEVEL)
 __declspec(code_seg("PAGE"))
 void
 DevicePerfUnregister()

diff --git a/drivers/net/dwc_eqos/device.h b/drivers/net/dwc_eqos/device.h
@@ -3,30 +3,52 @@ Device behavior. Includes adapter and interrupt since they are 1:1 with the devi
 */
 #pragma once
 
+struct DeviceContext;
+
 // Referenced in driver.cpp DriverEntry.
 // Called by WDF.
 __declspec(code_seg("PAGE"))
 EVT_WDF_DRIVER_DEVICE_ADD
 DeviceAdd;
 
 // Called by driver.cpp DriverEntry.
+_IRQL_requires_max_(PASSIVE_LEVEL)
 __declspec(code_seg("INIT"))
 void
 DevicePerfRegister(_In_ WDFDRIVER driver);
 
 // Called by driver.cpp DriverUnload.
+_IRQL_requires_max_(PASSIVE_LEVEL)
 __declspec(code_seg("PAGE"))
 void
 DevicePerfUnregister();
 
 // Called by rxqueue.cpp RxQueueSetNotificationEnabled.
+_IRQL_requires_max_(PASSIVE_LEVEL)
 void
 DeviceSetNotificationRxQueue(
-    _In_ NETADAPTER adapter,
+    _Inout_ DeviceContext* context,
     _In_opt_ NETPACKETQUEUE rxQueue);
 
 // Called by txqueue.cpp TxQueueSetNotificationEnabled.
+_IRQL_requires_max_(PASSIVE_LEVEL)
 void
 DeviceSetNotificationTxQueue(
-    _In_ NETADAPTER adapter,
+    _Inout_ DeviceContext* context,
     _In_opt_ NETPACKETQUEUE txQueue);
+
+// Called by rxqueue.cpp RxQueueAdvance.
+_IRQL_requires_max_(DISPATCH_LEVEL)
+void
+DeviceAddStatisticsRxQueue(
+    _Inout_ DeviceContext* context,
+    UINT32 ownDescriptors,
+    UINT32 doneFragments);
+
+// Called by txqueue.cpp TxQueueAdvance.
+_IRQL_requires_max_(DISPATCH_LEVEL)
+void
+DeviceAddStatisticsTxQueue(
+    _Inout_ DeviceContext* context,
+    UINT32 ownDescriptors,
+    UINT32 doneFragments);
diff --git a/drivers/net/dwc_eqos/dwc_eqos_perf.man b/drivers/net/dwc_eqos/dwc_eqos_perf.man
@@ -434,6 +434,42 @@
             type="perf_counter_rawcount"
             uri="uri:opensource/dwc_eqos/perf/debug/DpcFatalBusError"
             />
+          <counter
+            detailLevel="standard"
+            field="RxOwnDescriptors"
+            id="7"
+            name="RxOwnDescriptors"
+            nameID="274"
+            type="perf_counter_rawcount"
+            uri="uri:opensource/dwc_eqos/perf/debug/RxOwnDescriptors"
+            />
+          <counter
+            detailLevel="standard"
+            field="RxDoneFragments"
+            id="8"
+            name="RxDoneFragments"
+            nameID="276"
+            type="perf_counter_rawcount"
+            uri="uri:opensource/dwc_eqos/perf/debug/RxDoneFragments"
+            />
+          <counter
+            detailLevel="standard"
+            field="TxOwnDescriptors"
+            id="9"
+            name="TxOwnDescriptors"
+            nameID="278"
+            type="perf_counter_rawcount"
+            uri="uri:opensource/dwc_eqos/perf/debug/TxOwnDescriptors"
+            />
+          <counter
+            detailLevel="standard"
+            field="TxDoneFragments"
+            id="10"
+            name="TxDoneFragments"
+            nameID="280"
+            type="perf_counter_rawcount"
+            uri="uri:opensource/dwc_eqos/perf/debug/TxDoneFragments"
+            />
         </counterSet>
 
       </provider>

diff --git a/drivers/net/dwc_eqos/dwc_eqos_perf_data.h b/drivers/net/dwc_eqos/dwc_eqos_perf_data.h
@@ -28,6 +28,10 @@ struct PERF_DEBUG_DATA
     UINT32 DpcTx;
     UINT32 DpcAbnormalStatus;
     UINT32 DpcFatalBusError;
+    UINT32 RxOwnDescriptors;
+    UINT32 RxDoneFragments;
+    UINT32 TxOwnDescriptors;
+    UINT32 TxDoneFragments;
 };
 
 // Each value corresponds directly to a register in the device.

diff --git a/drivers/net/dwc_eqos/rxqueue.cpp b/drivers/net/dwc_eqos/rxqueue.cpp
@@ -11,7 +11,7 @@ struct RxQueueContext
 {
     ChannelRegisters* channelRegs;
 
-    NETADAPTER adapter;
+    DeviceContext* deviceContext;
     NET_RING* packetRing;
     NET_RING* fragmentRing;
     WDFCOMMONBUFFER descBuffer;
@@ -88,7 +88,7 @@ RxQueueAdvance(_In_ NETPACKETQUEUE queue)
     auto const fragEnd = context->fragmentRing->EndIndex;
     auto const descMask = context->descCount - 1u;
     UINT32 descIndex, pktIndex, fragIndex;
-    UINT32 donePkts = 0, queuedPkts = 0;
+    UINT32 ownDescriptors = 0, doneFrags = 0, queuedFrags = 0;
 
     /*
     Fragment indexes:
@@ -127,6 +127,7 @@ RxQueueAdvance(_In_ NETPACKETQUEUE queue)
             TraceWrite("RxQueueAdvance-own", LEVEL_WARNING,
                 TraceLoggingUInt32(descIndex, "descIndex"),
                 TraceLoggingHexInt32(reinterpret_cast<UINT32 const*>(&descWrite)[3], "RDES3"));
+            ownDescriptors = 1;
             break;
         }
 
@@ -170,7 +171,7 @@ RxQueueAdvance(_In_ NETPACKETQUEUE queue)
 
         pktIndex = NetRingIncrementIndex(context->packetRing, pktIndex);
         fragIndex = NetRingIncrementIndex(context->fragmentRing, fragIndex);
-        donePkts += 1;
+        doneFrags += 1;
     }
 
     context->descBegin = descIndex;
@@ -207,7 +208,7 @@ RxQueueAdvance(_In_ NETPACKETQUEUE queue)
             context->descVirtual[descIndex].Read = descRead;
 
             fragIndex = NetRingIncrementIndex(context->fragmentRing, fragIndex);
-            queuedPkts += 1;
+            queuedFrags += 1;
         }
 
         // In some error cases, the device may stall until we write to the tail pointer
@@ -232,9 +233,12 @@ RxQueueAdvance(_In_ NETPACKETQUEUE queue)
         context->fragmentRing->BeginIndex = fragEnd;
     }
 
+    DeviceAddStatisticsRxQueue(context->deviceContext, ownDescriptors, doneFrags);
+
     TraceEntryExit(RxQueueAdvance, LEVEL_VERBOSE,
-        TraceLoggingUInt32(donePkts),
-        TraceLoggingUInt32(queuedPkts));
+        TraceLoggingUInt32(ownDescriptors),
+        TraceLoggingUInt32(doneFrags),
+        TraceLoggingUInt32(queuedFrags));
 }
 
 static EVT_PACKET_QUEUE_SET_NOTIFICATION_ENABLED RxQueueSetNotificationEnabled;
@@ -245,7 +249,7 @@ RxQueueSetNotificationEnabled(
 {
     // PASSIVE_LEVEL, nonpaged (resume path)
     auto const context = RxQueueGetContext(queue);
-    DeviceSetNotificationRxQueue(context->adapter, notificationEnabled ? queue : nullptr);
+    DeviceSetNotificationRxQueue(context->deviceContext, notificationEnabled ? queue : nullptr);
     TraceEntryExit(RxQueueSetNotificationEnabled, LEVEL_VERBOSE,
         TraceLoggingBoolean(notificationEnabled, "enabled"));
 }
@@ -278,7 +282,7 @@ RxQueueStop(_In_ NETPACKETQUEUE queue)
     PAGED_CODE();
     auto const context = RxQueueGetContext(queue);
 
-    DeviceSetNotificationRxQueue(context->adapter, nullptr);
+    DeviceSetNotificationRxQueue(context->deviceContext, nullptr);
 
     TraceEntryExit(RxQueueStop, LEVEL_INFO);
 }
@@ -300,7 +304,7 @@ RxQueueCleanup(_In_ WDFOBJECT queue)
 
 _Use_decl_annotations_ NTSTATUS
 RxQueueCreate(
-    NETADAPTER adapter,
+    DeviceContext* deviceContext,
     NETRXQUEUE_INIT* queueInit,
     WDFDMAENABLER dma,
     ChannelRegisters* channelRegs)
@@ -338,7 +342,7 @@ RxQueueCreate(
         auto const context = RxQueueGetContext(queue);
         context->channelRegs = channelRegs;
 
-        context->adapter = adapter;
+        context->deviceContext = deviceContext;
         context->packetRing = NetRingCollectionGetPacketRing(rings);
         context->fragmentRing = NetRingCollectionGetFragmentRing(rings);
         context->descCount = QueueDescriptorCount(context->fragmentRing->NumberOfElements);

diff --git a/drivers/net/dwc_eqos/rxqueue.h b/drivers/net/dwc_eqos/rxqueue.h
@@ -3,6 +3,7 @@ Receive queue behavior. Similar to the transmit queue.
 */
 #pragma once
 
+struct DeviceContext;
 struct ChannelRegisters;
 auto constexpr RxBufferSize = 2048u;
 
@@ -11,7 +12,7 @@ _IRQL_requires_same_
 _IRQL_requires_(PASSIVE_LEVEL)
 NTSTATUS
 RxQueueCreate(
-    _In_ NETADAPTER adapter,
+    _Inout_ DeviceContext* deviceContext,
     _Inout_ NETRXQUEUE_INIT* queueInit,
     _In_ WDFDMAENABLER dma,
     _Inout_ ChannelRegisters* channelRegs);