From: Cornelia Huck <cohuck@redhat.com>
To: Janosch Frank <frankja@linux.ibm.com>
Cc: kvm@vger.kernel.org, thuth@redhat.com, borntraeger@de.ibm.com,
linux-s390@vger.kernel.org, david@redhat.com
Subject: Re: [PATCH] KVM: s390: Cleanup initial cpu reset
Date: Fri, 10 Jan 2020 15:01:58 +0100 [thread overview]
Message-ID: <20200110150158.36ded698.cohuck@redhat.com> (raw)
In-Reply-To: <20200110134824.37963-1-frankja@linux.ibm.com>
On Fri, 10 Jan 2020 08:48:24 -0500
Janosch Frank <frankja@linux.ibm.com> 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@linux.ibm.com>
> ---
>
> 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@redhat.com>
next prev parent reply other threads:[~2020-01-10 14:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 11:45 [PATCH v7] KVM: s390: Add new reset vcpu API Janosch Frank
2020-01-10 12:11 ` Thomas Huth
2020-01-10 12:24 ` Janosch Frank
2020-01-10 13:47 ` Christian Borntraeger
2020-01-10 12:50 ` David Hildenbrand
2020-01-10 13:48 ` [PATCH] KVM: s390: Cleanup initial cpu reset Janosch Frank
2020-01-10 14:01 ` Cornelia Huck [this message]
2020-01-10 14:37 ` David Hildenbrand
2020-01-27 8:05 ` [PATCH v7] KVM: s390: Add new reset vcpu API Christian Borntraeger
2020-01-27 9:52 ` Janosch Frank
2020-01-29 20:03 [PATCH v8 0/4] " Janosch Frank
2020-01-30 9:10 ` [PATCH] KVM: s390: Cleanup initial cpu reset Janosch Frank
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200110150158.36ded698.cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).