Skip to contentSkip to conversation

x86/svm: Correct vm_event API for descriptor accesses

PATCH Superseded Andrew Cooper 6 participants 7 messages Nov 28, 2019 – Nov 29, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/svm: Correct vm_event API for descriptor accesses

c/s d0a699a389f1 "x86/monitor: add support for descriptor access events" introduced logic looking for what appeared to be exitinfo (not that this exists in SVM - exitinfo1 or 2 do), but actually passed the exit IDT vectoring information. There is never any IDT vectoring involved in these intercepts so the value passed is always zero.

In fact, SVM doesn't provide any information, even in exitinfo1 and 2. Note the error in the public API and state that this field is always 0, and drop the SVM logic in hvm_monitor_descriptor_access().

In the SVM vmexit handler itself, optimise the switch statement by observing that there is a linear transformation between the SVM exit_reason and VM_EVENT_DESC_* values. (Bloat-o-meter reports 6028 => 5877 for a saving of 151 bytes).

---
CC: Jan Beulich <[email protected]>
CC: Wei Liu <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Razvan Cojocaru <[email protected]>
CC: Tamas K Lengyel <[email protected]>
CC: Alexandru Isaila <[email protected]>
CC: Petre Pircalabu <[email protected]>
CC: Adrian Pop <[email protected]>

Adrian: Do you recall what information you were attempting to forward from the VMCB? I can't locate anything which would plausibly be interesting.

This is part of a longer cleanup series I gathered in the wake of the task switch issues, but it is pulled out ahead due to its interaction with the public interface.

---
 xen/arch/x86/hvm/monitor.c    |  4 ----
 xen/arch/x86/hvm/svm/svm.c    | 37 +++++++++++++++++--------------------
 xen/include/public/vm_event.h |  4 ++--
 3 files changed, 19 insertions(+), 26 deletions(-)
xen/arch/x86/hvm/monitor.c +0 -4
index 7fb1e2c04e..1f23fe25e8 100644
@@ -113,10 +113,6 @@ void hvm_monitor_descriptor_access(uint64_t exit_info,
         req.u.desc_access.arch.vmx.instr_info = exit_info;
         req.u.desc_access.arch.vmx.exit_qualification = vmx_exit_qualification;
     }
-    else
-    {
-        req.u.desc_access.arch.svm.exitinfo = exit_info;
-    }
 
     monitor_traps(current, true, &req);
 }
xen/arch/x86/hvm/svm/svm.c +17 -20
index 0fb1908c18..776cf11459 100644
@@ -2980,29 +2980,26 @@ void svm_vmexit_handler(struct cpu_user_regs *regs)
         svm_vmexit_do_pause(regs);
         break;
 
-    case VMEXIT_IDTR_READ:
-    case VMEXIT_IDTR_WRITE:
-        hvm_descriptor_access_intercept(vmcb->exitintinfo.bytes, 0,
-            VM_EVENT_DESC_IDTR, exit_reason == VMEXIT_IDTR_WRITE);
-        break;
-
-    case VMEXIT_GDTR_READ:
-    case VMEXIT_GDTR_WRITE:
-        hvm_descriptor_access_intercept(vmcb->exitintinfo.bytes, 0,
-            VM_EVENT_DESC_GDTR, exit_reason == VMEXIT_GDTR_WRITE);
-        break;
+    case VMEXIT_IDTR_READ ... VMEXIT_TR_WRITE:
+    {
+        /*
+         * Consecutive block of 8 exit codes (sadly not aligned).  Top bit
+         * indicates write (vs read), bottom 2 bits map linearly to
+         * VM_EVENT_DESC_* values.
+         */
+#define E2D(e)      ((((e)         - VMEXIT_IDTR_READ) & 3) + 1)
+        bool write = ((exit_reason - VMEXIT_IDTR_READ) & 4);
+        unsigned int desc = E2D(exit_reason);
 
-    case VMEXIT_LDTR_READ:
-    case VMEXIT_LDTR_WRITE:
-        hvm_descriptor_access_intercept(vmcb->exitintinfo.bytes, 0,
-            VM_EVENT_DESC_LDTR, exit_reason == VMEXIT_LDTR_WRITE);
-        break;
+        BUILD_BUG_ON(E2D(VMEXIT_IDTR_READ) != VM_EVENT_DESC_IDTR);
+        BUILD_BUG_ON(E2D(VMEXIT_GDTR_READ) != VM_EVENT_DESC_GDTR);
+        BUILD_BUG_ON(E2D(VMEXIT_LDTR_READ) != VM_EVENT_DESC_LDTR);
+        BUILD_BUG_ON(E2D(VMEXIT_TR_READ)   != VM_EVENT_DESC_TR);
+#undef E2D
 
-    case VMEXIT_TR_READ:
-    case VMEXIT_TR_WRITE:
-        hvm_descriptor_access_intercept(vmcb->exitintinfo.bytes, 0,
-            VM_EVENT_DESC_TR, exit_reason == VMEXIT_TR_WRITE);
+        hvm_descriptor_access_intercept(0, 0, desc, write);
         break;
+    }
 
     default:
     unexpected_exit_type:
xen/include/public/vm_event.h +2 -2
index 959083d8c4..d1b5c95f72 100644
@@ -302,8 +302,8 @@ struct vm_event_desc_access {
             uint64_t exit_qualification; /* VMX: VMCS Exit Qualification */
         } vmx;
         struct {
-            uint64_t exitinfo;           /* SVM: VMCB EXITINFO */
-            uint64_t _pad2;
+            uint64_t exitinfo;           /* SVM: Always 0.  This field made */
+            uint64_t _pad2;              /* its way into the API by error.  */
         } svm;
     } arch;
     uint8_t descriptor;                  /* VM_EVENT_DESC_* */
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#1 lore raw
Quoted 110 lines · Andrew Cooper

c/s d0a699a389f1 "x86/monitor: add support for descriptor access events" introduced logic looking for what appeared to be exitinfo (not that this exists in SVM - exitinfo1 or 2 do), but actually passed the exit IDT vectoring information. There is never any IDT vectoring involved in these intercepts so the value passed is always zero.

In fact, SVM doesn't provide any information, even in exitinfo1 and 2. Note the error in the public API and state that this field is always 0, and drop the SVM logic in hvm_monitor_descriptor_access().

In the SVM vmexit handler itself, optimise the switch statement by observing that there is a linear transformation between the SVM exit_reason and VM_EVENT_DESC_* values. (Bloat-o-meter reports 6028 => 5877 for a saving of 151 bytes).

---
CC: Jan Beulich <[email protected]>
CC: Wei Liu <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Razvan Cojocaru <[email protected]>
CC: Tamas K Lengyel <[email protected]>
CC: Alexandru Isaila <[email protected]>
CC: Petre Pircalabu <[email protected]>
CC: Adrian Pop <[email protected]>

Adrian: Do you recall what information you were attempting to forward from the VMCB? I can't locate anything which would plausibly be interesting.

This is part of a longer cleanup series I gathered in the wake of the task switch issues, but it is pulled out ahead due to its interaction with the public interface.

---
 xen/arch/x86/hvm/monitor.c    |  4 ----
 xen/arch/x86/hvm/svm/svm.c    | 37 +++++++++++++++++--------------------
 xen/include/public/vm_event.h |  4 ++--
 3 files changed, 19 insertions(+), 26 deletions(-)
xen/arch/x86/hvm/monitor.c +0 -4
index 7fb1e2c04e..1f23fe25e8 100644
@@ -113,10 +113,6 @@ void hvm_monitor_descriptor_access(uint64_t exit_info,
         req.u.desc_access.arch.vmx.instr_info = exit_info;
         req.u.desc_access.arch.vmx.exit_qualification = vmx_exit_qualification;
     }
-    else
-    {
-        req.u.desc_access.arch.svm.exitinfo = exit_info;
-    }
 
     monitor_traps(current, true, &req);
 }
xen/arch/x86/hvm/svm/svm.c +17 -20
index 0fb1908c18..776cf11459 100644
@@ -2980,29 +2980,26 @@ void svm_vmexit_handler(struct cpu_user_regs *regs)
         svm_vmexit_do_pause(regs);
         break;
 
-    case VMEXIT_IDTR_READ:
-    case VMEXIT_IDTR_WRITE:
-        hvm_descriptor_access_intercept(vmcb->exitintinfo.bytes, 0,
-            VM_EVENT_DESC_IDTR, exit_reason == VMEXIT_IDTR_WRITE);
-        break;
-
-    case VMEXIT_GDTR_READ:
-    case VMEXIT_GDTR_WRITE:
-        hvm_descriptor_access_intercept(vmcb->exitintinfo.bytes, 0,
-            VM_EVENT_DESC_GDTR, exit_reason == VMEXIT_GDTR_WRITE);
-        break;
+    case VMEXIT_IDTR_READ ... VMEXIT_TR_WRITE:
+    {
+        /*
+         * Consecutive block of 8 exit codes (sadly not aligned).  Top bit
+         * indicates write (vs read), bottom 2 bits map linearly to
+         * VM_EVENT_DESC_* values.
+         */
+#define E2D(e)      ((((e)         - VMEXIT_IDTR_READ) & 3) + 1)
+        bool write = ((exit_reason - VMEXIT_IDTR_READ) & 4);
+        unsigned int desc = E2D(exit_reason);
 
-    case VMEXIT_LDTR_READ:
-    case VMEXIT_LDTR_WRITE:
-        hvm_descriptor_access_intercept(vmcb->exitintinfo.bytes, 0,
-            VM_EVENT_DESC_LDTR, exit_reason == VMEXIT_LDTR_WRITE);
-        break;
+        BUILD_BUG_ON(E2D(VMEXIT_IDTR_READ) != VM_EVENT_DESC_IDTR);
+        BUILD_BUG_ON(E2D(VMEXIT_GDTR_READ) != VM_EVENT_DESC_GDTR);
+        BUILD_BUG_ON(E2D(VMEXIT_LDTR_READ) != VM_EVENT_DESC_LDTR);
+        BUILD_BUG_ON(E2D(VMEXIT_TR_READ)   != VM_EVENT_DESC_TR);
+#undef E2D
 
-    case VMEXIT_TR_READ:
-    case VMEXIT_TR_WRITE:
-        hvm_descriptor_access_intercept(vmcb->exitintinfo.bytes, 0,
-            VM_EVENT_DESC_TR, exit_reason == VMEXIT_TR_WRITE);
+        hvm_descriptor_access_intercept(0, 0, desc, write);
         break;
+    }
 
     default:
     unexpected_exit_type:
xen/include/public/vm_event.h +0 -0
index 959083d8c4..d1b5c95f72 100644

xen/include/public/vm_event.h struct vm_event_desc_access { · line 305

Quoted 6 lines
xen/include/public/vm_event.h +1 -2
@@ -302,8 +302,8 @@ struct vm_event_desc_access {
             uint64_t exit_qualification; /* VMX: VMCS Exit Qualification */
         } vmx;
         struct {
-            uint64_t exitinfo;           /* SVM: VMCB EXITINFO */
-            uint64_t _pad2;
+            uint64_t exitinfo;           /* SVM: Always 0.  This field made */

There really is no point in retaining a useless field. Just remove it and bump the event interface version. That's what it's for.

xen/include/public/vm_event.h struct vm_event_desc_access { · line 306

Quoted 1 line
xen/include/public/vm_event.h +1 -0
+            uint64_t _pad2;              /* its way into the API by error.  */

Also not sure what this field is for, we just want to pad things to be 64-bit aligned. So having a 64-bit pad field makes no sense, please also just remove it.

Thanks,
Tamas

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

Acked-by on v1 1/1
#2 lore raw
In reply to Andrew Cooper
Quoted 26 lines · Andrew Cooper

c/s d0a699a389f1 "x86/monitor: add support for descriptor access events" introduced logic looking for what appeared to be exitinfo (not that this exists in SVM - exitinfo1 or 2 do), but actually passed the exit IDT vectoring information. There is never any IDT vectoring involved in these intercepts so the value passed is always zero.

In fact, SVM doesn't provide any information, even in exitinfo1 and 2. Note the error in the public API and state that this field is always 0, and drop the SVM logic in hvm_monitor_descriptor_access().

In the SVM vmexit handler itself, optimise the switch statement by observing that there is a linear transformation between the SVM exit_reason and VM_EVENT_DESC_* values. (Bloat-o-meter reports 6028 => 5877 for a saving of 151 bytes).

---
CC: Jan Beulich <[email protected]>
CC: Wei Liu <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Razvan Cojocaru <[email protected]>
CC: Tamas K Lengyel <[email protected]>
CC: Alexandru Isaila <[email protected]>
CC: Petre Pircalabu <[email protected]>
CC: Adrian Pop <[email protected]>

Quoted 2 lines

Adrian: Do you recall what information you were attempting to forward from the VMCB? I can't locate anything which would plausibly be interesting.

I think it's safe to go the route you're going (you shouldn't break anything).

(with or without addressing Tamas' comments).

Thanks,
Razvan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

Reviewed-by on v1 1/1
#3 lore raw
In reply to Andrew Cooper
Quoted 10 lines · Andrew Cooper

c/s d0a699a389f1 "x86/monitor: add support for descriptor access events" introduced logic looking for what appeared to be exitinfo (not that this exists in SVM - exitinfo1 or 2 do), but actually passed the exit IDT vectoring information. There is never any IDT vectoring involved in these intercepts so the value passed is always zero.

In fact, SVM doesn't provide any information, even in exitinfo1 and 2. Note the error in the public API and state that this field is always 0, and drop the SVM logic in hvm_monitor_descriptor_access().

Quoted 6 lines

In the SVM vmexit handler itself, optimise the switch statement by observing that there is a linear transformation between the SVM exit_reason and VM_EVENT_DESC_* values. (Bloat-o-meter reports 6028 => 5877 for a saving of 151 bytes).

I agree with Tamas, good thing to have that field removed.
_______________________________________________
Xen-devel mailing list [email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

Acked-by on v1 1/1
#4 lore raw
In reply to Andrew Cooper

Hello,

Quoted 26 lines · Andrew Cooper

c/s d0a699a389f1 "x86/monitor: add support for descriptor access events" introduced logic looking for what appeared to be exitinfo (not that this exists in SVM - exitinfo1 or 2 do), but actually passed the exit IDT vectoring information. There is never any IDT vectoring involved in these intercepts so the value passed is always zero.

In fact, SVM doesn't provide any information, even in exitinfo1 and 2. Note the error in the public API and state that this field is always 0, and drop the SVM logic in hvm_monitor_descriptor_access().

In the SVM vmexit handler itself, optimise the switch statement by observing that there is a linear transformation between the SVM exit_reason and VM_EVENT_DESC_* values. (Bloat-o-meter reports 6028 => 5877 for a saving of 151 bytes).

---
CC: Jan Beulich <[email protected]>
CC: Wei Liu <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Razvan Cojocaru <[email protected]>
CC: Tamas K Lengyel <[email protected]>
CC: Alexandru Isaila <[email protected]>
CC: Petre Pircalabu <[email protected]>
CC: Adrian Pop <[email protected]>

Quoted 2 lines

Adrian: Do you recall what information you were attempting to forward from the VMCB? I can't locate anything which would plausibly be interesting.

The SVM part was most likely meant to mirror the logic from VMX. But, as I recall, monitoring hadn't been implemented with SVM so this couldn't really be used on AMD. Unfortunately I'm not sure what information was supposed to be forwarded.

The cleanup looks good to me.

Quoted 3 lines

This is part of a longer cleanup series I gathered in the wake of the task switch issues, but it is pulled out ahead due to its interaction with the public interface.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

Acked-by on v1 1/1
#5 lore raw
In reply to Andrew Cooper
Quoted 10 lines · Andrew Cooper

c/s d0a699a389f1 "x86/monitor: add support for descriptor access events" introduced logic looking for what appeared to be exitinfo (not that this exists in SVM - exitinfo1 or 2 do), but actually passed the exit IDT vectoring information. There is never any IDT vectoring involved in these intercepts so the value passed is always zero.

In fact, SVM doesn't provide any information, even in exitinfo1 and 2. Note the error in the public API and state that this field is always 0, and drop the SVM logic in hvm_monitor_descriptor_access().

Quoted 6 lines

In the SVM vmexit handler itself, optimise the switch statement by observing that there is a linear transformation between the SVM exit_reason and VM_EVENT_DESC_* values. (Bloat-o-meter reports 6028 => 5877 for a saving of 151 bytes).

SVM part of the change

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#6 lore raw

PATCH v2 1/1 x86/svm: Correct vm_event API for descriptor accesses

In reply to Andrew Cooper

c/s d0a699a389f1 "x86/monitor: add support for descriptor access events" introduced logic looking for what appeared to be exitinfo (not that this exists in SVM - exitinfo1 or 2 do), but actually passed the exit IDT vectoring information. There is never any IDT vectoring involved in these intercepts so the value passed is always zero.

In fact, SVM doesn't provide any information, even in exitinfo1 and 2. Drop the svm struct entirely, and bump the interface version.

In the SVM vmexit handler itself, optimise the switch statement by observing that there is a linear transformation between the SVM exit_reason and VM_EVENT_DESC_* values. (Bloat-o-meter reports 6028 => 5877 for a saving of 151 bytes).

---
CC: Jan Beulich <[email protected]>
CC: Wei Liu <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Razvan Cojocaru <[email protected]>
CC: Tamas K Lengyel <[email protected]>
CC: Alexandru Isaila <[email protected]>
CC: Petre Pircalabu <[email protected]>
CC: Adrian Pop <[email protected]>

v2:
* Drop the svm struct and bump the interface version.

---
 xen/arch/x86/hvm/monitor.c    |  4 ----
 xen/arch/x86/hvm/svm/svm.c    | 37 +++++++++++++++++--------------------
 xen/include/public/vm_event.h |  6 +-----
 3 files changed, 18 insertions(+), 29 deletions(-)
xen/arch/x86/hvm/monitor.c +0 -4
index 7fb1e2c04e..1f23fe25e8 100644
@@ -113,10 +113,6 @@ void hvm_monitor_descriptor_access(uint64_t exit_info,
         req.u.desc_access.arch.vmx.instr_info = exit_info;
         req.u.desc_access.arch.vmx.exit_qualification = vmx_exit_qualification;
     }
-    else
-    {
-        req.u.desc_access.arch.svm.exitinfo = exit_info;
-    }
 
     monitor_traps(current, true, &req);
 }
xen/arch/x86/hvm/svm/svm.c +17 -20
index 0fb1908c18..776cf11459 100644
@@ -2980,29 +2980,26 @@ void svm_vmexit_handler(struct cpu_user_regs *regs)
         svm_vmexit_do_pause(regs);
         break;
 
-    case VMEXIT_IDTR_READ:
-    case VMEXIT_IDTR_WRITE:
-        hvm_descriptor_access_intercept(vmcb->exitintinfo.bytes, 0,
-            VM_EVENT_DESC_IDTR, exit_reason == VMEXIT_IDTR_WRITE);
-        break;
-
-    case VMEXIT_GDTR_READ:
-    case VMEXIT_GDTR_WRITE:
-        hvm_descriptor_access_intercept(vmcb->exitintinfo.bytes, 0,
-            VM_EVENT_DESC_GDTR, exit_reason == VMEXIT_GDTR_WRITE);
-        break;
+    case VMEXIT_IDTR_READ ... VMEXIT_TR_WRITE:
+    {
+        /*
+         * Consecutive block of 8 exit codes (sadly not aligned).  Top bit
+         * indicates write (vs read), bottom 2 bits map linearly to
+         * VM_EVENT_DESC_* values.
+         */
+#define E2D(e)      ((((e)         - VMEXIT_IDTR_READ) & 3) + 1)
+        bool write = ((exit_reason - VMEXIT_IDTR_READ) & 4);
+        unsigned int desc = E2D(exit_reason);
 
-    case VMEXIT_LDTR_READ:
-    case VMEXIT_LDTR_WRITE:
-        hvm_descriptor_access_intercept(vmcb->exitintinfo.bytes, 0,
-            VM_EVENT_DESC_LDTR, exit_reason == VMEXIT_LDTR_WRITE);
-        break;
+        BUILD_BUG_ON(E2D(VMEXIT_IDTR_READ) != VM_EVENT_DESC_IDTR);
+        BUILD_BUG_ON(E2D(VMEXIT_GDTR_READ) != VM_EVENT_DESC_GDTR);
+        BUILD_BUG_ON(E2D(VMEXIT_LDTR_READ) != VM_EVENT_DESC_LDTR);
+        BUILD_BUG_ON(E2D(VMEXIT_TR_READ)   != VM_EVENT_DESC_TR);
+#undef E2D
 
-    case VMEXIT_TR_READ:
-    case VMEXIT_TR_WRITE:
-        hvm_descriptor_access_intercept(vmcb->exitintinfo.bytes, 0,
-            VM_EVENT_DESC_TR, exit_reason == VMEXIT_TR_WRITE);
+        hvm_descriptor_access_intercept(0, 0, desc, write);
         break;
+    }
 
     default:
     unexpected_exit_type:
xen/include/public/vm_event.h +1 -5
index 959083d8c4..aa54c86325 100644
@@ -29,7 +29,7 @@
 
 #include "xen.h"
 
-#define VM_EVENT_INTERFACE_VERSION 0x00000005
+#define VM_EVENT_INTERFACE_VERSION 0x00000006
 
 #if defined(__XEN__) || defined(__XEN_TOOLS__)
 
@@ -301,10 +301,6 @@ struct vm_event_desc_access {
             uint32_t _pad1;
             uint64_t exit_qualification; /* VMX: VMCS Exit Qualification */
         } vmx;
-        struct {
-            uint64_t exitinfo;           /* SVM: VMCB EXITINFO */
-            uint64_t _pad2;
-        } svm;
     } arch;
     uint8_t descriptor;                  /* VM_EVENT_DESC_* */
     uint8_t is_write;
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel