From: Greg Bellows <greg.bellows@linaro.org> To: "Alex Bennée" <alex.bennee@linaro.org> Cc: Peter Maydell <peter.maydell@linaro.org>, kvm@vger.kernel.org, marc.zyngier@arm.com, QEMU Developers <qemu-devel@nongnu.org>, Christoffer Dall <christoffer.dall@linaro.org>, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v2 1/6] target-arm: kvm: save/restore mp state Date: Wed, 11 Mar 2015 08:42:02 -0500 [thread overview] Message-ID: <CAOgzsHU4JXZbbQ=Bf3eY0YnjOQxMATLMnyR1jD=4eUzUExMqQA@mail.gmail.com> (raw) In-Reply-To: <1425479753-18349-2-git-send-email-alex.bennee@linaro.org> [-- Attachment #1: Type: text/plain, Size: 3171 bytes --] On Wed, Mar 4, 2015 at 8:35 AM, Alex Bennée <alex.bennee@linaro.org> wrote: > This adds the saving and restore of the current Multi-Processing state > of the machine. While the KVM_GET/SET_MP_STATE API exposes a number of > potential states for x86 we only use two for ARM. Either the process is > running or not. We then save this state into the cpu_powered TCG state > to avoid changing the serialisation format. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > > --- > v2 > - make mpstate field runtime dependant (kvm_enabled()) > - drop initial KVM_CAP_MP_STATE requirement > - re-use cpu_powered instead of new field > > diff --git a/target-arm/machine.c b/target-arm/machine.c > index 9446e5a..185f9a2 100644 > --- a/target-arm/machine.c > +++ b/target-arm/machine.c > @@ -161,6 +161,7 @@ static const VMStateInfo vmstate_cpsr = { > .put = put_cpsr, > }; > > + > remove extraneous space > static void cpu_pre_save(void *opaque) > { > ARMCPU *cpu = opaque; > @@ -170,6 +171,20 @@ static void cpu_pre_save(void *opaque) > /* This should never fail */ > abort(); > } > +#if defined CONFIG_KVM > The convention for ifdefing KVMatures appears to be more around the feature rather than KVM_CONFIG. For instance loo fek at kvm_check_extension in kvm-all.c. I may be missing something but if you follow this convention this should be #ifdef KVM_CAP_MP_STATE > + if (kvm_check_extension(CPU(cpu)->kvm_state, KVM_CAP_MP_STATE)) { > + struct kvm_mp_state mp_state; > + int ret = kvm_vcpu_ioctl(CPU(cpu), KVM_GET_MP_STATE, > &mp_state); > + if (ret) { > + fprintf(stderr, "%s: failed to get MP_STATE %d/%s\n", > + __func__, ret, strerror(ret)); > + abort(); > + } > + cpu->powered_off = > + (mp_state.mp_state == KVM_MP_STATE_RUNNABLE) > + ? false : true; > + } > +#endif > } else { > if (!write_cpustate_to_list(cpu)) { > /* This should never fail. */ > @@ -222,6 +237,20 @@ static int cpu_post_load(void *opaque, int version_id) > * we're using it. > */ > write_list_to_cpustate(cpu); > +#if defined CONFIG_KVM > + if (kvm_check_extension(CPU(cpu)->kvm_state, KVM_CAP_MP_STATE)) { > + struct kvm_mp_state mp_state = { > + .mp_state = > + cpu->powered_off ? KVM_MP_STATE_HALTED : > KVM_MP_STATE_RUNNABLE > + }; > + int ret = kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MP_STATE, > &mp_state); > + if (ret) { > + fprintf(stderr, "%s: failed to set MP_STATE %d/%s\n", > + __func__, ret, strerror(ret)); > + return -1; > + } > + } > +#endif > } else { > if (!write_list_to_cpustate(cpu)) { > return -1; > -- > 2.3.1 > > > Besides these the above nits... Reviewed-by: Greg Bellows <greg.bellows@linaro.org> [-- Attachment #2: Type: text/html, Size: 5212 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Greg Bellows <greg.bellows@linaro.org> To: "Alex Bennée" <alex.bennee@linaro.org> Cc: Peter Maydell <peter.maydell@linaro.org>, kvm@vger.kernel.org, marc.zyngier@arm.com, QEMU Developers <qemu-devel@nongnu.org>, Christoffer Dall <christoffer.dall@linaro.org>, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: Re: [Qemu-devel] [PATCH v2 1/6] target-arm: kvm: save/restore mp state Date: Wed, 11 Mar 2015 08:42:02 -0500 [thread overview] Message-ID: <CAOgzsHU4JXZbbQ=Bf3eY0YnjOQxMATLMnyR1jD=4eUzUExMqQA@mail.gmail.com> (raw) In-Reply-To: <1425479753-18349-2-git-send-email-alex.bennee@linaro.org> [-- Attachment #1: Type: text/plain, Size: 3171 bytes --] On Wed, Mar 4, 2015 at 8:35 AM, Alex Bennée <alex.bennee@linaro.org> wrote: > This adds the saving and restore of the current Multi-Processing state > of the machine. While the KVM_GET/SET_MP_STATE API exposes a number of > potential states for x86 we only use two for ARM. Either the process is > running or not. We then save this state into the cpu_powered TCG state > to avoid changing the serialisation format. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > > --- > v2 > - make mpstate field runtime dependant (kvm_enabled()) > - drop initial KVM_CAP_MP_STATE requirement > - re-use cpu_powered instead of new field > > diff --git a/target-arm/machine.c b/target-arm/machine.c > index 9446e5a..185f9a2 100644 > --- a/target-arm/machine.c > +++ b/target-arm/machine.c > @@ -161,6 +161,7 @@ static const VMStateInfo vmstate_cpsr = { > .put = put_cpsr, > }; > > + > remove extraneous space > static void cpu_pre_save(void *opaque) > { > ARMCPU *cpu = opaque; > @@ -170,6 +171,20 @@ static void cpu_pre_save(void *opaque) > /* This should never fail */ > abort(); > } > +#if defined CONFIG_KVM > The convention for ifdefing KVMatures appears to be more around the feature rather than KVM_CONFIG. For instance loo fek at kvm_check_extension in kvm-all.c. I may be missing something but if you follow this convention this should be #ifdef KVM_CAP_MP_STATE > + if (kvm_check_extension(CPU(cpu)->kvm_state, KVM_CAP_MP_STATE)) { > + struct kvm_mp_state mp_state; > + int ret = kvm_vcpu_ioctl(CPU(cpu), KVM_GET_MP_STATE, > &mp_state); > + if (ret) { > + fprintf(stderr, "%s: failed to get MP_STATE %d/%s\n", > + __func__, ret, strerror(ret)); > + abort(); > + } > + cpu->powered_off = > + (mp_state.mp_state == KVM_MP_STATE_RUNNABLE) > + ? false : true; > + } > +#endif > } else { > if (!write_cpustate_to_list(cpu)) { > /* This should never fail. */ > @@ -222,6 +237,20 @@ static int cpu_post_load(void *opaque, int version_id) > * we're using it. > */ > write_list_to_cpustate(cpu); > +#if defined CONFIG_KVM > + if (kvm_check_extension(CPU(cpu)->kvm_state, KVM_CAP_MP_STATE)) { > + struct kvm_mp_state mp_state = { > + .mp_state = > + cpu->powered_off ? KVM_MP_STATE_HALTED : > KVM_MP_STATE_RUNNABLE > + }; > + int ret = kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MP_STATE, > &mp_state); > + if (ret) { > + fprintf(stderr, "%s: failed to set MP_STATE %d/%s\n", > + __func__, ret, strerror(ret)); > + return -1; > + } > + } > +#endif > } else { > if (!write_list_to_cpustate(cpu)) { > return -1; > -- > 2.3.1 > > > Besides these the above nits... Reviewed-by: Greg Bellows <greg.bellows@linaro.org> [-- Attachment #2: Type: text/html, Size: 5212 bytes --]
next prev parent reply other threads:[~2015-03-11 13:42 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-04 14:35 [PATCH v2 0/6] QEMU ARM64 Migration Fixes Alex Bennée 2015-03-04 14:35 ` Alex Bennée 2015-03-04 14:35 ` [Qemu-devel] " Alex Bennée 2015-03-04 14:35 ` [PATCH v2 1/6] target-arm: kvm: save/restore mp state Alex Bennée 2015-03-04 14:35 ` Alex Bennée 2015-03-04 14:35 ` [Qemu-devel] " Alex Bennée 2015-03-11 13:42 ` Greg Bellows [this message] 2015-03-11 13:42 ` Greg Bellows 2015-03-12 15:43 ` Peter Maydell 2015-03-12 15:43 ` Peter Maydell 2015-03-12 15:43 ` [Qemu-devel] " Peter Maydell 2015-03-13 10:40 ` Alex Bennée 2015-03-13 10:40 ` Alex Bennée 2015-03-13 10:40 ` [Qemu-devel] " Alex Bennée 2015-03-04 14:35 ` [PATCH v2 2/6] hw/intc: arm_gic_kvm.c restore config first Alex Bennée 2015-03-04 14:35 ` Alex Bennée 2015-03-04 14:35 ` [Qemu-devel] " Alex Bennée 2015-03-11 13:59 ` Greg Bellows 2015-03-11 13:59 ` Greg Bellows 2015-03-11 13:59 ` Greg Bellows 2015-03-04 14:35 ` [PATCH v2 3/6] hw/char: pl011 don't keep setting the IRQ if nothing changed Alex Bennée 2015-03-04 14:35 ` Alex Bennée 2015-03-04 14:35 ` [Qemu-devel] " Alex Bennée 2015-03-11 14:44 ` Greg Bellows 2015-03-11 14:44 ` Greg Bellows 2015-03-11 14:44 ` Greg Bellows 2015-03-12 15:51 ` Peter Maydell 2015-03-12 15:51 ` Peter Maydell 2015-03-12 15:51 ` [Qemu-devel] " Peter Maydell 2015-03-12 20:27 ` Peter Maydell 2015-03-12 20:27 ` Peter Maydell 2015-03-12 20:27 ` [Qemu-devel] " Peter Maydell 2015-03-13 10:38 ` Alex Bennée 2015-03-13 10:38 ` Alex Bennée 2015-03-13 10:38 ` Alex Bennée 2015-03-13 10:38 ` [Qemu-devel] " Alex Bennée 2015-03-04 14:35 ` [PATCH v2 4/6] target-arm: kvm64 sync FP register state Alex Bennée 2015-03-04 14:35 ` Alex Bennée 2015-03-04 14:35 ` [Qemu-devel] " Alex Bennée 2015-03-11 15:17 ` Greg Bellows 2015-03-11 15:17 ` Greg Bellows 2015-03-11 15:17 ` Greg Bellows 2015-03-04 14:35 ` [PATCH v2 5/6] target-arm: kvm64 fix save/restore of SPSR regs Alex Bennée 2015-03-04 14:35 ` Alex Bennée 2015-03-04 14:35 ` [Qemu-devel] " Alex Bennée 2015-03-09 13:26 ` Christoffer Dall 2015-03-09 13:26 ` Christoffer Dall 2015-03-09 13:26 ` [Qemu-devel] " Christoffer Dall 2015-03-11 19:41 ` Greg Bellows 2015-03-11 19:41 ` Greg Bellows 2015-03-11 19:41 ` Greg Bellows 2015-03-04 14:35 ` [PATCH v2 6/6] target-arm: cpu.h document why env->spsr exists Alex Bennée 2015-03-04 14:35 ` Alex Bennée 2015-03-04 14:35 ` [Qemu-devel] " Alex Bennée 2015-03-04 14:46 ` Peter Maydell 2015-03-04 14:46 ` Peter Maydell 2015-03-04 14:46 ` [Qemu-devel] " Peter Maydell 2015-03-04 16:27 ` Alex Bennée 2015-03-04 16:27 ` Alex Bennée 2015-03-04 16:27 ` Alex Bennée 2015-03-04 16:27 ` [Qemu-devel] " Alex Bennée
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='CAOgzsHU4JXZbbQ=Bf3eY0YnjOQxMATLMnyR1jD=4eUzUExMqQA@mail.gmail.com' \ --to=greg.bellows@linaro.org \ --cc=alex.bennee@linaro.org \ --cc=christoffer.dall@linaro.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=peter.maydell@linaro.org \ --cc=qemu-devel@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.