Changeset 34109 in vbox for trunk

Timestamp:

Nov 16, 2010 12:02:12 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67812

Message:

NetFlt/win: comments & assertions

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/win

Files:

• VBoxNetFltCommon-win.h (modified) (1 diff)
• VBoxNetFltPt-win.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltCommon-win.h

@@ -333 +333 @@
     VBOXADAPTSTATE                 enmState;
 #ifndef VBOXNETADP
-    /** true if we should indicate the receive complete used by the ProtocolReceeive mechanism */
+    /** true if we should indicate the receive complete used by the ProtocolReceive mechanism.
+     * We need to indicate it only with the ProtocolReceive + NdisMEthIndicateReceive path.
+     * There is no guarantee in the docs that the ProtocolReceive & ProtocolReceiveComplete
+     * for one transfer are called on one same CPU, however this is how the latest passthru
+     * sample handles this
+     * Note: we're using KeGetCurrentProcessorNumber, which is not entirely correct in case
+     * we're running on 64bit win7+, which can handle > 64 CPUs, however since KeGetCurrentProcessorNumber
+     * always returns the number < than the number of CPUs in the first group, we're guaranteed to have CPU index < 64
+     * @todo: use KeGetCurrentProcessorNumberEx for Win7+ 64 and dynamically extended array */
     bool                        abIndicateRcvComplete[64];
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltPt-win.c

@@ -1800 +1800 @@
 
             {
+                /* Note: we're using KeGetCurrentProcessorNumber, which is not entirely correct in case
+                * we're running on 64bit win7+, which can handle > 64 CPUs, however since KeGetCurrentProcessorNumber
+                * always returns the number < than the number of CPUs in the first group, we're guaranteed to have CPU index < 64
+                * @todo: use KeGetCurrentProcessorNumberEx for Win7+ 64 and dynamically extended array */
                 ULONG Proc = KeGetCurrentProcessorNumber();
+                Assert(Proc < RT_ELEMENTS(pAdapt->abIndicateRcvComplete));
                 pAdapt->abIndicateRcvComplete[Proc] = TRUE;
                 switch (pAdapt->Medium)
@@ -1864 +1869 @@
     bool bNetFltActive;
     bool fAdaptActive = vboxNetFltWinReferenceAdaptNetFlt(pNetFlt, pAdapt, &bNetFltActive);
+    /* Note: we're using KeGetCurrentProcessorNumber, which is not entirely correct in case
+    * we're running on 64bit win7+, which can handle > 64 CPUs, however since KeGetCurrentProcessorNumber
+    * always returns the number < than the number of CPUs in the first group, we're guaranteed to have CPU index < 64
+    * @todo: use KeGetCurrentProcessorNumberEx for Win7+ 64 and dynamically extended array */
     ULONG Proc = KeGetCurrentProcessorNumber();
+    Assert(Proc < RT_ELEMENTS(pAdapt->abIndicateRcvComplete));
 
     vboxNetFltWinPtFlushReceiveQueue(pAdapt, false);