On Fri, 10 Jan 2020 08:48:24 -0500
Janosch Frank <frankja@xxxxxxxxxxxxx> wrote:
> The code seems to be quite old and uses lots of unneeded spaces for
> alignment, which doesn't really help with readability.
>
> Let's:
> * Get rid of the extra spaces
> * Remove the ULs as they are not needed on 0s
> * Define constants for the CR 0 and 14 initial values
> * Use the sizeof of the gcr array to memset it to 0
>
> Signed-off-by: Janosch Frank <frankja@xxxxxxxxxxxxx>
> ---
>
> Something like this?
+1, like.
> Did I forget something?
>
> ---
> arch/s390/include/asm/kvm_host.h | 5 +++++
> arch/s390/kvm/kvm-s390.c | 18 +++++++-----------
> 2 files changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
> index 02f4c21c57f6..37747db884bd 100644
> --- a/arch/s390/include/asm/kvm_host.h
> +++ b/arch/s390/include/asm/kvm_host.h
> @@ -122,6 +122,11 @@ struct mcck_volatile_info {
> __u32 reserved;
> };
>
> +#define CR0_INITIAL (CR0_UNUSED_56 | CR0_INTERRUPT_KEY_SUBMASK | \
> + CR0_MEASUREMENT_ALERT_SUBMASK)
> +#define CR14_INITIAL (CR14_UNUSED_32 | CR14_UNUSED_33 | \
> + CR14_EXTERNAL_DAMAGE_SUBMASK)
Maybe CR<n>_INITIAL_MASK?
> +
> #define CPUSTAT_STOPPED 0x80000000
> #define CPUSTAT_WAIT 0x10000000
> #define CPUSTAT_ECALL_PEND 0x08000000
> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
> index d9e6bf3d54f0..c163311e7f3d 100644
> --- a/arch/s390/kvm/kvm-s390.c
> +++ b/arch/s390/kvm/kvm-s390.c
> @@ -2847,19 +2847,15 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
> static void kvm_s390_vcpu_initial_reset(struct kvm_vcpu *vcpu)
> {
> /* this equals initial cpu reset in pop, but we don't switch to ESA */
> - vcpu->arch.sie_block->gpsw.mask = 0UL;
> - vcpu->arch.sie_block->gpsw.addr = 0UL;
> + vcpu->arch.sie_block->gpsw.mask = 0;
> + vcpu->arch.sie_block->gpsw.addr = 0;
> kvm_s390_set_prefix(vcpu, 0);
> kvm_s390_set_cpu_timer(vcpu, 0);
> - vcpu->arch.sie_block->ckc = 0UL;
> - vcpu->arch.sie_block->todpr = 0;
> - memset(vcpu->arch.sie_block->gcr, 0, 16 * sizeof(__u64));
> - vcpu->arch.sie_block->gcr[0] = CR0_UNUSED_56 |
> - CR0_INTERRUPT_KEY_SUBMASK |
> - CR0_MEASUREMENT_ALERT_SUBMASK;
> - vcpu->arch.sie_block->gcr[14] = CR14_UNUSED_32 |
> - CR14_UNUSED_33 |
> - CR14_EXTERNAL_DAMAGE_SUBMASK;
> + vcpu->arch.sie_block->ckc = 0;
> + vcpu->arch.sie_block->todpr = 0;
> + memset(vcpu->arch.sie_block->gcr, 0, sizeof(vcpu->arch.sie_block->gcr));
> + vcpu->arch.sie_block->gcr[0] = CR0_INITIAL;
> + vcpu->arch.sie_block->gcr[14] = CR14_INITIAL;
> /* make sure the new fpc will be lazily loaded */
> save_fpu_regs();
> current->thread.fpu.fpc = 0;
Reviewed-by: Cornelia Huck <cohuck@xxxxxxxxxx>
