diff mbox

[v8,6/6] tools/xen-access: add test-case for ARM SMC

Message ID 1467743871-9644-6-git-send-email-tamas.lengyel@zentific.com (mailing list archive)
State New, archived
Headers show

Commit Message

Tamas Lengyel July 5, 2016, 6:37 p.m. UTC 
Signed-off-by: Tamas K Lengyel <tamas.lengyel@zentific.com>
Acked-by: Razvan Cojocaru <rcojocaru@bitdefender.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/tests/xen-access/xen-access.c | 45 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

Comments

Julien Grall July 7, 2016, 10:05 a.m. UTC | #1 
On 05/07/16 19:37, Tamas K Lengyel wrote:
> +#if defined(__arm__) || defined(__aarch64__)
> +            case VM_EVENT_REASON_PRIVILEGED_CALL:
> +                {
> +                    const struct vm_event_regs_arm *in_regs = &req.data.regs.arm;
> +                    struct vm_event_regs_arm *out_regs = &rsp.data.regs.arm;
> +                    bool is32bit = !!(in_regs->cpsr & PSR_MODE_BIT);
> +                    uint64_t pc;
> +
> +                    *out_regs = *in_regs;
> +
> +                    if ( is32bit ) {

The open-bracket should be on a separate line.

> +                        pc = in_regs->arch.arm32.pc;
> +                        out_regs->arch.arm32.pc += 4;

I suspect you will have to update the CSPR if the SMC instruction is 
part of an IT block (see advance_pc code in arch/arm/traps.c).

> +                    } else {

The open-bracket should be on a separate line.

> +                        pc = in_regs->arch.arm64.pc;
> +                        out_regs->arch.arm64.pc += 8;

SMC instruction length is 4 bytes not 8 (see encoding in C6.2.165 in DDI 
0487A.j).

> +                    }
> +
> +                    printf("Privileged call: pc=%016"PRIx64" (vcpu %d)\n",
> +                           pc, req.vcpu_id);
> +
> +                    rsp.flags |= VM_EVENT_FLAG_SET_REGISTERS;
> +                }
> +                break;
> +#endif
>               default:
>                   fprintf(stderr, "UNKNOWN REASON CODE %d\n", req.reason);
>               }
>

Regards,
Tamas Lengyel July 7, 2016, 3:54 p.m. UTC | #2 
On Thu, Jul 7, 2016 at 4:05 AM, Julien Grall <julien.grall@arm.com> wrote:
>
>
> On 05/07/16 19:37, Tamas K Lengyel wrote:
>>
>> +#if defined(__arm__) || defined(__aarch64__)
>> +            case VM_EVENT_REASON_PRIVILEGED_CALL:
>> +                {
>> +                    const struct vm_event_regs_arm *in_regs =
>> &req.data.regs.arm;
>> +                    struct vm_event_regs_arm *out_regs =
>> &rsp.data.regs.arm;
>> +                    bool is32bit = !!(in_regs->cpsr & PSR_MODE_BIT);
>> +                    uint64_t pc;
>> +
>> +                    *out_regs = *in_regs;
>> +
>> +                    if ( is32bit ) {
>
>
> The open-bracket should be on a separate line.
>
>> +                        pc = in_regs->arch.arm32.pc;
>> +                        out_regs->arch.arm32.pc += 4;
>
>
> I suspect you will have to update the CSPR if the SMC instruction is part of
> an IT block (see advance_pc code in arch/arm/traps.c).
>
>> +                    } else {
>
>
> The open-bracket should be on a separate line.
>
>> +                        pc = in_regs->arch.arm64.pc;
>> +                        out_regs->arch.arm64.pc += 8;
>
>
> SMC instruction length is 4 bytes not 8 (see encoding in C6.2.165 in DDI
> 0487A.j).
>
>> +                    }
>> +
>> +                    printf("Privileged call: pc=%016"PRIx64" (vcpu
>> %d)\n",
>> +                           pc, req.vcpu_id);
>> +
>> +                    rsp.flags |= VM_EVENT_FLAG_SET_REGISTERS;
>> +                }
>> +                break;
>> +#endif
>>               default:
>>                   fprintf(stderr, "UNKNOWN REASON CODE %d\n", req.reason);
>>               }
>>
>
> Regards,
>
> --
> Julien Grall

Good points, thanks!

Tamas
diff mbox

Patch

diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c
index 02655d5..a04dbff 100644
--- a/tools/tests/xen-access/xen-access.c
+++ b/tools/tests/xen-access/xen-access.c
@@ -338,6 +338,8 @@  void usage(char* progname)
     fprintf(stderr, "Usage: %s [-m] <domain_id> write|exec", progname);
 #if defined(__i386__) || defined(__x86_64__)
             fprintf(stderr, "|breakpoint|altp2m_write|altp2m_exec|debug");
+#elif defined(__arm__) || defined(__aarch64__)
+            fprintf(stderr, "|privcall");
 #endif
             fprintf(stderr,
             "\n"
@@ -426,6 +428,11 @@  int main(int argc, char *argv[])
     {
         debug = 1;
     }
+#elif defined(__arm__) || defined(__aarch64__)
+    else if ( !strcmp(argv[0], "privcall") )
+    {
+        privcall = 1;
+    }
 #endif
     else
     {
@@ -548,6 +555,16 @@  int main(int argc, char *argv[])
         }
     }
 
+    if ( privcall )
+    {
+        rc = xc_monitor_privileged_call(xch, domain_id, 1);
+        if ( rc < 0 )
+        {
+            ERROR("Error %d setting privileged call trapping with vm_event\n", rc);
+            goto exit;
+        }
+    }
+
     /* Wait for access */
     for (;;)
     {
@@ -560,7 +577,8 @@  int main(int argc, char *argv[])
                 rc = xc_monitor_software_breakpoint(xch, domain_id, 0);
             if ( debug )
                 rc = xc_monitor_debug_exceptions(xch, domain_id, 0, 0);
-
+            if ( privcall )
+                rc = xc_monitor_privileged_call(xch, domain_id, 0);
             if ( altp2m )
             {
                 rc = xc_altp2m_switch_to_view( xch, domain_id, 0 );
@@ -716,6 +734,31 @@  int main(int argc, char *argv[])
                 }
 
                 break;
+#if defined(__arm__) || defined(__aarch64__)
+            case VM_EVENT_REASON_PRIVILEGED_CALL:
+                {
+                    const struct vm_event_regs_arm *in_regs = &req.data.regs.arm;
+                    struct vm_event_regs_arm *out_regs = &rsp.data.regs.arm;
+                    bool is32bit = !!(in_regs->cpsr & PSR_MODE_BIT);
+                    uint64_t pc;
+
+                    *out_regs = *in_regs;
+
+                    if ( is32bit ) {
+                        pc = in_regs->arch.arm32.pc;
+                        out_regs->arch.arm32.pc += 4;
+                    } else {
+                        pc = in_regs->arch.arm64.pc;
+                        out_regs->arch.arm64.pc += 8;
+                    }
+
+                    printf("Privileged call: pc=%016"PRIx64" (vcpu %d)\n",
+                           pc, req.vcpu_id);
+
+                    rsp.flags |= VM_EVENT_FLAG_SET_REGISTERS;
+                }
+                break;
+#endif
             default:
                 fprintf(stderr, "UNKNOWN REASON CODE %d\n", req.reason);
             }