Changeset 26594 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Feb 17, 2010 1:48:11 AM (15 years ago)

Author:

vboxsync

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

57786

Message:

CPU hotplug: Reduce the amount of AML code interpreted by the guest and the number of context switches during hot-add events

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (6 diffs)
• vbox-cpuhotplug.dsl (modified) (3 diffs)
• vbox.dsl (modified) (1 diff)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -142 +142 @@
 enum
 {
+    CPU_EVENT_TYPE_ADD                  = 0x01, /**< Event type add */
+    CPU_EVENT_TYPE_REMOVE               = 0x03  /**< Event type remove */
+};
+
+enum
+{
     SYSTEM_INFO_INDEX_LOW_MEMORY_LENGTH = 0,
     SYSTEM_INFO_INDEX_USE_IOAPIC        = 1,
@@ -155 +161 @@
     SYSTEM_INFO_INDEX_CPU_LOCKED        = 11, /**< Contains a flag indicating whether the CPU is locked or not */
     SYSTEM_INFO_INDEX_CPU_LOCK_CHECK    = 12, /**< For which CPU the lock status should be checked */
+    SYSTEM_INFO_INDEX_CPU_EVENT_TYPE    = 13, /**< Type of the CPU hot-plug event */
+    SYSTEM_INFO_INDEX_CPU_EVENT         = 14, /**< The CPU id the event is for */
     SYSTEM_INFO_INDEX_END               = 15,
     SYSTEM_INFO_INDEX_INVALID           = 0x80,
@@ -242 +250 @@
     /** Mask of locked CPUs (used by the guest) */
     VMCPUSET            CpuSetLocked;
+    /** The CPU event type */
+    uint32_t            u32CpuEventType;
+    /** The CPU id affected */
+    uint32_t            u32CpuEvent;
     /** Flag whether CPU hot plugging is enabled */
     bool                fCpuHotPlug;
@@ -1491 +1503 @@
                 }
 
+                case SYSTEM_INFO_INDEX_CPU_EVENT_TYPE:
+                {
+                    *pu32 = s->u32CpuEventType;
+                    break;
+                }
+
+                case SYSTEM_INFO_INDEX_CPU_EVENT:
+                {
+                    *pu32 = s->u32CpuEvent;
+                    break;
+                }
+
                 /* Solaris 9 tries to read from this index */
                 case SYSTEM_INFO_INDEX_INVALID:
@@ -2187 +2211 @@
          */
         VMCPUSET_ADD(&s->CpuSetLocked, iLUN);
+        s->u32CpuEventType = CPU_EVENT_TYPE_ADD;
+        s->u32CpuEvent     = iLUN;
         /* Notify the guest */
         update_gpe0(s, s->gpe0_sts | 0x2, s->gpe0_en);
@@ -2356 +2382 @@
     VMCPUSET_EMPTY(&s->CpuSetLocked);
     s->idCpuLockCheck = UINT32_C(0xffffffff);
+    s->u32CpuEventType = 0;
+    s->u32CpuEvent     = UINT32_C(0xffffffff);
 
     /* The first CPU can't be attached/detached */

trunk/src/VBox/Devices/PC/vbox-cpuhotplug.dsl

@@ -22 +22 @@
     External(\_SB.CPUC)
     External(\_SB.CPUL)
+    External(\_SB.CPEV)
+    External(\_SB.CPET)
 
     // Method to check for the CPU status
@@ -131 +133 @@
     {
 
-#define CHECK_CPU(cpu, sck)    \
-    IF (CPCK(cpu))             \
-    {                          \
-        Notify (\_SB.sck, 0x1) \
-    }                          \
+#define CHECK_CPU(cpu, sck)          \
+    IF (LEqual(Local0, cpu))      \
+    {                                \
+        Notify (\_SB.sck, Local1) \
+    }                                \
 
         // GPE bit 1 handler
@@ -143 +145 @@
         Method (_L01, 0, NotSerialized)
         {
-            /*Store(\_SB.CPET, Local0)*/
-            /*Store(\_SB.CPEV, Local1)*/
+            Store(\_SB.CPEV, Local0)
+            Store(\_SB.CPET, Local1)
 
             CHECK_CPU(0x01, SCK1)

trunk/src/VBox/Devices/PC/vbox.dsl

@@ -146 +146 @@
             CPUL,  32,
             CPUC,  32,
+            CPET,  32,
+            CPEV,  32,
             Offset (0x80),
             ININ, 32,