From: Thomas Huth <thuth@redhat.com>
To: Janosch Frank <frankja@linux.ibm.com>, qemu-devel@nongnu.org
Cc: pmorel@linux.ibm.com, david@redhat.com, cohuck@redhat.com,
borntraeger@de.ibm.com, qemu-s390x@nongnu.org,
mihajlov@linux.ibm.com
Subject: Re: [PATCH v2 08/13] s390x: protvirt: Add new VCPU reset functions
Date: Wed, 4 Dec 2019 12:58:31 +0100 [thread overview]
Message-ID: <942e3aaa-e79a-ac02-4152-eb160e487865@redhat.com> (raw)
In-Reply-To: <20191129094809.26684-9-frankja@linux.ibm.com>
On 29/11/2019 10.48, Janosch Frank wrote:
> CPU resets for protected guests need to be done via Ultravisor
> calls. Hence we need a way to issue these calls for each reset.
>
> As we formerly had only one reset function and it was called for
> initial, as well as for the clear reset, we now need a new interface.
>
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> ---
[...]
> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
> index b802d02ff5..5b1ed3acb4 100644
> --- a/target/s390x/kvm.c
> +++ b/target/s390x/kvm.c
> @@ -154,6 +154,7 @@ static int cap_ri;
> static int cap_gs;
> static int cap_hpage_1m;
> static int cap_protvirt;
> +static int cap_vcpu_resets;
>
> static int active_cmma;
>
> @@ -346,6 +347,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
> cap_mem_op = kvm_check_extension(s, KVM_CAP_S390_MEM_OP);
> cap_s390_irq = kvm_check_extension(s, KVM_CAP_S390_INJECT_IRQ);
> cap_protvirt = kvm_check_extension(s, KVM_CAP_S390_PROTECTED);
> + cap_vcpu_resets = kvm_check_extension(s, KVM_CAP_S390_VCPU_RESETS);
>
> if (!kvm_check_extension(s, KVM_CAP_S390_GMAP)
> || !kvm_check_extension(s, KVM_CAP_S390_COW)) {
> @@ -407,20 +409,44 @@ int kvm_arch_destroy_vcpu(CPUState *cs)
> return 0;
> }
>
> -void kvm_s390_reset_vcpu(S390CPU *cpu)
> +static void kvm_s390_reset_vcpu(S390CPU *cpu, unsigned long type)
> {
> CPUState *cs = CPU(cpu);
>
> - /* The initial reset call is needed here to reset in-kernel
> - * vcpu data that we can't access directly from QEMU
> - * (i.e. with older kernels which don't support sync_regs/ONE_REG).
> - * Before this ioctl cpu_synchronize_state() is called in common kvm
> - * code (kvm-all) */
> + /*
> + * The reset call is needed here to reset in-kernel vcpu data that
> + * we can't access directly from QEMU (i.e. with older kernels
> + * which don't support sync_regs/ONE_REG). Before this ioctl
> + * cpu_synchronize_state() is called in common kvm code
> + * (kvm-all).
> + */
> + if (cap_vcpu_resets) {
> + if (kvm_vcpu_ioctl(cs, KVM_S390_VCPU_RESET, type)) {
> + error_report("CPU reset type %ld failed on CPU %i",
> + type, cs->cpu_index);
> + }
> + return;
> + }
> if (kvm_vcpu_ioctl(cs, KVM_S390_INITIAL_RESET, NULL)) {
> error_report("Initial CPU reset failed on CPU %i", cs->cpu_index);
> }
Don't you want to check for type != KVM_S390_VCPU_RESET_NORMAL before
doing the INITIAL_RESET here?
> }
>
> +void kvm_s390_reset_vcpu_initial(S390CPU *cpu)
> +{
> + kvm_s390_reset_vcpu(cpu, KVM_S390_VCPU_RESET_INITIAL);
> +}
> +
> +void kvm_s390_reset_vcpu_clear(S390CPU *cpu)
> +{
> + kvm_s390_reset_vcpu(cpu, KVM_S390_VCPU_RESET_CLEAR);
> +}
> +
> +void kvm_s390_reset_vcpu_normal(S390CPU *cpu)
> +{
> + kvm_s390_reset_vcpu(cpu, KVM_S390_VCPU_RESET_NORMAL);
> +}
... otherwise this might reset more things than expected?
Or do I miss something here?
Thomas
next prev parent reply other threads:[~2019-12-04 12:34 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-29 9:47 [PATCH v2 00/13] s390x: Protected Virtualization support Janosch Frank
2019-11-29 9:47 ` [PATCH v2 01/13] s390x: protvirt: Add diag308 subcodes 8 - 10 Janosch Frank
2019-11-29 10:09 ` David Hildenbrand
2019-11-29 11:18 ` Janosch Frank
2019-11-29 11:41 ` Cornelia Huck
2019-11-29 12:40 ` Thomas Huth
2019-11-29 14:08 ` Janosch Frank
2019-12-02 9:20 ` Cornelia Huck
2019-11-29 9:47 ` [PATCH v2 02/13] Header sync protvirt Janosch Frank
2019-11-29 9:47 ` [PATCH v2 03/13] s390x: protvirt: Support unpack facility Janosch Frank
2019-11-29 10:19 ` David Hildenbrand
2019-12-04 10:48 ` Thomas Huth
2019-12-04 11:32 ` Janosch Frank
2019-12-04 11:34 ` Thomas Huth
2019-12-04 11:46 ` Janosch Frank
2019-11-29 9:48 ` [PATCH v2 04/13] s390x: protvirt: Handle diag 308 subcodes 0,1,3,4 Janosch Frank
2019-11-29 10:23 ` David Hildenbrand
2019-11-29 9:48 ` [PATCH v2 05/13] s390x: protvirt: Add pv state to cpu env Janosch Frank
2019-11-29 10:30 ` David Hildenbrand
2019-11-29 11:22 ` Janosch Frank
2019-12-06 9:50 ` Janosch Frank
2019-12-06 9:56 ` David Hildenbrand
2019-11-29 9:48 ` [PATCH v2 06/13] s390x: protvirt: KVM intercept changes Janosch Frank
2019-11-29 10:34 ` David Hildenbrand
2019-12-05 17:15 ` Cornelia Huck
2019-12-05 17:34 ` Janosch Frank
2019-12-05 17:46 ` Cornelia Huck
2019-12-06 7:44 ` Janosch Frank
2019-12-06 8:29 ` Cornelia Huck
2019-12-06 8:45 ` Janosch Frank
2019-12-06 9:08 ` Cornelia Huck
2019-12-06 9:30 ` Janosch Frank
2019-11-29 9:48 ` [PATCH v2 07/13] s390x: protvirt: SCLP interpretation Janosch Frank
2019-11-29 10:43 ` David Hildenbrand
2019-11-29 11:15 ` Janosch Frank
2019-11-29 11:27 ` David Hildenbrand
2019-11-29 9:48 ` [PATCH v2 08/13] s390x: protvirt: Add new VCPU reset functions Janosch Frank
2019-11-29 10:47 ` David Hildenbrand
2019-11-29 11:21 ` Janosch Frank
2019-11-29 11:24 ` David Hildenbrand
2019-12-04 11:58 ` Thomas Huth [this message]
2019-12-04 12:44 ` Janosch Frank
2019-11-29 9:48 ` [PATCH v2 09/13] s390x: Exit on vcpu reset error Janosch Frank
2019-11-29 9:48 ` [PATCH v2 10/13] s390x: protvirt: Set guest IPL PSW Janosch Frank
2019-11-29 11:30 ` David Hildenbrand
2019-11-29 11:47 ` David Hildenbrand
2019-11-29 9:48 ` [PATCH v2 11/13] s390x: protvirt: Move diag 308 data over SIDAD Janosch Frank
2019-11-29 11:34 ` David Hildenbrand
2019-11-29 9:48 ` [PATCH v2 12/13] s390x: protvirt: Disable address checks for PV guest IO emulation Janosch Frank
2019-11-29 11:42 ` David Hildenbrand
2019-12-04 12:16 ` Thomas Huth
2019-12-05 17:44 ` Cornelia Huck
2019-11-29 9:48 ` [PATCH v2 13/13] s390x: protvirt: Handle SIGP store status correctly Janosch Frank
2019-11-29 11:04 ` Thomas Huth
2019-11-29 11:08 ` David Hildenbrand
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=942e3aaa-e79a-ac02-4152-eb160e487865@redhat.com \
--to=thuth@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=mihajlov@linux.ibm.com \
--cc=pmorel@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/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).