Re: [Qemu-devel] [PATCH v3 20/23] target/arm: Put all PAC keys into a structure

[Philippe Mathieu-Daudé]

On 3/15/19 4:26 AM, Richard Henderson wrote:
> This allows us to use a single syscall to initialize them all.
> 
> Signed-off-by: Richard Henderson <address@hidden>
> ---
>  target/arm/cpu.h              | 12 +++++++-----
>  linux-user/aarch64/cpu_loop.c |  6 +-----
>  linux-user/syscall.c          | 10 +++++-----
>  target/arm/helper.c           | 20 ++++++++++----------
>  target/arm/pauth_helper.c     | 18 +++++++++---------
>  5 files changed, 32 insertions(+), 34 deletions(-)
> 
> diff --git a/target/arm/cpu.h b/target/arm/cpu.h
> index 5f23c62132..ae2381e222 100644
> --- a/target/arm/cpu.h
> +++ b/target/arm/cpu.h
> @@ -628,11 +628,13 @@ typedef struct CPUARMState {
>      } iwmmxt;
>  
>  #ifdef TARGET_AARCH64
> -    ARMPACKey apia_key;
> -    ARMPACKey apib_key;
> -    ARMPACKey apda_key;
> -    ARMPACKey apdb_key;
> -    ARMPACKey apga_key;
> +    struct {
> +        ARMPACKey apia;
> +        ARMPACKey apib;
> +        ARMPACKey apda;
> +        ARMPACKey apdb;
> +        ARMPACKey apga;
> +    } keys;

Yay!

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

>  #endif
>  
>  #if defined(CONFIG_USER_ONLY)
> diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c
> index cedad39ca0..2f2f63e3e8 100644
> --- a/linux-user/aarch64/cpu_loop.c
> +++ b/linux-user/aarch64/cpu_loop.c
> @@ -175,11 +175,7 @@ void target_cpu_copy_regs(CPUArchState *env, struct 
> target_pt_regs *regs)
>  #endif
>  
>      if (cpu_isar_feature(aa64_pauth, cpu)) {
> -        qemu_guest_getrandom_nofail(&env->apia_key, sizeof(ARMPACKey));
> -        qemu_guest_getrandom_nofail(&env->apib_key, sizeof(ARMPACKey));
> -        qemu_guest_getrandom_nofail(&env->apda_key, sizeof(ARMPACKey));
> -        qemu_guest_getrandom_nofail(&env->apdb_key, sizeof(ARMPACKey));
> -        qemu_guest_getrandom_nofail(&env->apga_key, sizeof(ARMPACKey));
> +        qemu_guest_getrandom_nofail(&env->keys, sizeof(env->keys));
>      }
>  
>      ts->stack_base = info->start_stack;
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index c2168db1c8..ebbda9e470 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -9741,23 +9741,23 @@ static abi_long do_syscall1(void *cpu_env, int num, 
> abi_long arg1,
>                          return -TARGET_EINVAL;
>                      }
>                      if (arg2 & TARGET_PR_PAC_APIAKEY) {
> -                        ret |= qemu_guest_getrandom(&env->apia_key,
> +                        ret |= qemu_guest_getrandom(&env->keys.apia,
>                                                      sizeof(ARMPACKey), &err);
>                      }
>                      if (arg2 & TARGET_PR_PAC_APIBKEY) {
> -                        ret |= qemu_guest_getrandom(&env->apib_key,
> +                        ret |= qemu_guest_getrandom(&env->keys.apib,
>                                                      sizeof(ARMPACKey), &err);
>                      }
>                      if (arg2 & TARGET_PR_PAC_APDAKEY) {
> -                        ret |= qemu_guest_getrandom(&env->apda_key,
> +                        ret |= qemu_guest_getrandom(&env->keys.apda,
>                                                      sizeof(ARMPACKey), &err);
>                      }
>                      if (arg2 & TARGET_PR_PAC_APDBKEY) {
> -                        ret |= qemu_guest_getrandom(&env->apdb_key,
> +                        ret |= qemu_guest_getrandom(&env->keys.apdb,
>                                                      sizeof(ARMPACKey), &err);
>                      }
>                      if (arg2 & TARGET_PR_PAC_APGAKEY) {
> -                        ret |= qemu_guest_getrandom(&env->apga_key,
> +                        ret |= qemu_guest_getrandom(&env->keys.apga,
>                                                      sizeof(ARMPACKey), &err);
>                      }
>                      if (ret != 0) {
> diff --git a/target/arm/helper.c b/target/arm/helper.c
> index 2607d39ad1..7b5d63f894 100644
> --- a/target/arm/helper.c
> +++ b/target/arm/helper.c
> @@ -5678,43 +5678,43 @@ static const ARMCPRegInfo pauth_reginfo[] = {
>      { .name = "APDAKEYLO_EL1", .state = ARM_CP_STATE_AA64,
>        .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 2, .opc2 = 0,
>        .access = PL1_RW, .accessfn = access_pauth,
> -      .fieldoffset = offsetof(CPUARMState, apda_key.lo) },
> +      .fieldoffset = offsetof(CPUARMState, keys.apda.lo) },
>      { .name = "APDAKEYHI_EL1", .state = ARM_CP_STATE_AA64,
>        .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 2, .opc2 = 1,
>        .access = PL1_RW, .accessfn = access_pauth,
> -      .fieldoffset = offsetof(CPUARMState, apda_key.hi) },
> +      .fieldoffset = offsetof(CPUARMState, keys.apda.hi) },
>      { .name = "APDBKEYLO_EL1", .state = ARM_CP_STATE_AA64,
>        .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 2, .opc2 = 2,
>        .access = PL1_RW, .accessfn = access_pauth,
> -      .fieldoffset = offsetof(CPUARMState, apdb_key.lo) },
> +      .fieldoffset = offsetof(CPUARMState, keys.apdb.lo) },
>      { .name = "APDBKEYHI_EL1", .state = ARM_CP_STATE_AA64,
>        .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 2, .opc2 = 3,
>        .access = PL1_RW, .accessfn = access_pauth,
> -      .fieldoffset = offsetof(CPUARMState, apdb_key.hi) },
> +      .fieldoffset = offsetof(CPUARMState, keys.apdb.hi) },
>      { .name = "APGAKEYLO_EL1", .state = ARM_CP_STATE_AA64,
>        .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 3, .opc2 = 0,
>        .access = PL1_RW, .accessfn = access_pauth,
> -      .fieldoffset = offsetof(CPUARMState, apga_key.lo) },
> +      .fieldoffset = offsetof(CPUARMState, keys.apga.lo) },
>      { .name = "APGAKEYHI_EL1", .state = ARM_CP_STATE_AA64,
>        .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 3, .opc2 = 1,
>        .access = PL1_RW, .accessfn = access_pauth,
> -      .fieldoffset = offsetof(CPUARMState, apga_key.hi) },
> +      .fieldoffset = offsetof(CPUARMState, keys.apga.hi) },
>      { .name = "APIAKEYLO_EL1", .state = ARM_CP_STATE_AA64,
>        .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 1, .opc2 = 0,
>        .access = PL1_RW, .accessfn = access_pauth,
> -      .fieldoffset = offsetof(CPUARMState, apia_key.lo) },
> +      .fieldoffset = offsetof(CPUARMState, keys.apia.lo) },
>      { .name = "APIAKEYHI_EL1", .state = ARM_CP_STATE_AA64,
>        .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 1, .opc2 = 1,
>        .access = PL1_RW, .accessfn = access_pauth,
> -      .fieldoffset = offsetof(CPUARMState, apia_key.hi) },
> +      .fieldoffset = offsetof(CPUARMState, keys.apia.hi) },
>      { .name = "APIBKEYLO_EL1", .state = ARM_CP_STATE_AA64,
>        .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 1, .opc2 = 2,
>        .access = PL1_RW, .accessfn = access_pauth,
> -      .fieldoffset = offsetof(CPUARMState, apib_key.lo) },
> +      .fieldoffset = offsetof(CPUARMState, keys.apib.lo) },
>      { .name = "APIBKEYHI_EL1", .state = ARM_CP_STATE_AA64,
>        .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 1, .opc2 = 3,
>        .access = PL1_RW, .accessfn = access_pauth,
> -      .fieldoffset = offsetof(CPUARMState, apib_key.hi) },
> +      .fieldoffset = offsetof(CPUARMState, keys.apib.hi) },
>      REGINFO_SENTINEL
>  };
>  #endif
> diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c
> index d750f96edf..7f30ae7395 100644
> --- a/target/arm/pauth_helper.c
> +++ b/target/arm/pauth_helper.c
> @@ -403,7 +403,7 @@ uint64_t HELPER(pacia)(CPUARMState *env, uint64_t x, 
> uint64_t y)
>          return x;
>      }
>      pauth_check_trap(env, el, GETPC());
> -    return pauth_addpac(env, x, y, &env->apia_key, false);
> +    return pauth_addpac(env, x, y, &env->keys.apia, false);
>  }
>  
>  uint64_t HELPER(pacib)(CPUARMState *env, uint64_t x, uint64_t y)
> @@ -413,7 +413,7 @@ uint64_t HELPER(pacib)(CPUARMState *env, uint64_t x, 
> uint64_t y)
>          return x;
>      }
>      pauth_check_trap(env, el, GETPC());
> -    return pauth_addpac(env, x, y, &env->apib_key, false);
> +    return pauth_addpac(env, x, y, &env->keys.apib, false);
>  }
>  
>  uint64_t HELPER(pacda)(CPUARMState *env, uint64_t x, uint64_t y)
> @@ -423,7 +423,7 @@ uint64_t HELPER(pacda)(CPUARMState *env, uint64_t x, 
> uint64_t y)
>          return x;
>      }
>      pauth_check_trap(env, el, GETPC());
> -    return pauth_addpac(env, x, y, &env->apda_key, true);
> +    return pauth_addpac(env, x, y, &env->keys.apda, true);
>  }
>  
>  uint64_t HELPER(pacdb)(CPUARMState *env, uint64_t x, uint64_t y)
> @@ -433,7 +433,7 @@ uint64_t HELPER(pacdb)(CPUARMState *env, uint64_t x, 
> uint64_t y)
>          return x;
>      }
>      pauth_check_trap(env, el, GETPC());
> -    return pauth_addpac(env, x, y, &env->apdb_key, true);
> +    return pauth_addpac(env, x, y, &env->keys.apdb, true);
>  }
>  
>  uint64_t HELPER(pacga)(CPUARMState *env, uint64_t x, uint64_t y)
> @@ -441,7 +441,7 @@ uint64_t HELPER(pacga)(CPUARMState *env, uint64_t x, 
> uint64_t y)
>      uint64_t pac;
>  
>      pauth_check_trap(env, arm_current_el(env), GETPC());
> -    pac = pauth_computepac(x, y, env->apga_key);
> +    pac = pauth_computepac(x, y, env->keys.apga);
>  
>      return pac & 0xffffffff00000000ull;
>  }
> @@ -453,7 +453,7 @@ uint64_t HELPER(autia)(CPUARMState *env, uint64_t x, 
> uint64_t y)
>          return x;
>      }
>      pauth_check_trap(env, el, GETPC());
> -    return pauth_auth(env, x, y, &env->apia_key, false, 0);
> +    return pauth_auth(env, x, y, &env->keys.apia, false, 0);
>  }
>  
>  uint64_t HELPER(autib)(CPUARMState *env, uint64_t x, uint64_t y)
> @@ -463,7 +463,7 @@ uint64_t HELPER(autib)(CPUARMState *env, uint64_t x, 
> uint64_t y)
>          return x;
>      }
>      pauth_check_trap(env, el, GETPC());
> -    return pauth_auth(env, x, y, &env->apib_key, false, 1);
> +    return pauth_auth(env, x, y, &env->keys.apib, false, 1);
>  }
>  
>  uint64_t HELPER(autda)(CPUARMState *env, uint64_t x, uint64_t y)
> @@ -473,7 +473,7 @@ uint64_t HELPER(autda)(CPUARMState *env, uint64_t x, 
> uint64_t y)
>          return x;
>      }
>      pauth_check_trap(env, el, GETPC());
> -    return pauth_auth(env, x, y, &env->apda_key, true, 0);
> +    return pauth_auth(env, x, y, &env->keys.apda, true, 0);
>  }
>  
>  uint64_t HELPER(autdb)(CPUARMState *env, uint64_t x, uint64_t y)
> @@ -483,7 +483,7 @@ uint64_t HELPER(autdb)(CPUARMState *env, uint64_t x, 
> uint64_t y)
>          return x;
>      }
>      pauth_check_trap(env, el, GETPC());
> -    return pauth_auth(env, x, y, &env->apdb_key, true, 1);
> +    return pauth_auth(env, x, y, &env->keys.apdb, true, 1);
>  }
>  
>  uint64_t HELPER(xpaci)(CPUARMState *env, uint64_t a)
>