From: Cornelia Huck <cohuck@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: Laurent Vivier <lvivier@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
David Hildenbrand <david@redhat.com>,
Daniel Henrique Barboza <danielhb413@gmail.com>,
QEMU Developers <qemu-devel@nongnu.org>,
Greg Kurz <groug@kaod.org>, qemu-ppc <qemu-ppc@nongnu.org>,
Thiago Jung Bauermann <bauerman@linux.ibm.com>,
David Gibson <david@gibson.dropbear.id.au>
Subject: Re: [PULL 00/30] ppc-for-5.2 queue 20200904
Date: Tue, 8 Sep 2020 08:11:23 +0200 [thread overview]
Message-ID: <20200908081123.048f7534.cohuck@redhat.com> (raw)
In-Reply-To: <0bca4e6e-f4ba-2108-ecaf-c3daaadbdb26@redhat.com>
On Mon, 7 Sep 2020 21:46:28 +0200
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> On 9/7/20 7:26 PM, Laurent Vivier wrote:
> > On 07/09/2020 18:29, Laurent Vivier wrote:
> >> I think we should not enter in cpu_loop() with halted set to 1.
> >>
> >> Before the patch of this series, s390_cpu_reset() is called twice, and
> >> on the second call, halted is already 0.
> >>
> >> With start_powered_off set to true in initfn, on the first reset
> >> "halted" is 0 and on the second it is 1 (because it has been copied from
> >> start_powered_off) and so cpu_loop() starts with halted set to 1 and fails.
> >
> > What is happening:
> >
> > [without start_powered_off]
> >
> > 1- halted is set to 1 in s390x_cpu_initfn()
> > 2- halted is set to 0 in s390x_cpu_reset() by parent_reset()
> > (cpu_common_reset()
> > 3- cpu_loop() is always entered with halted set to 0
> >
> > [with start_powered_off]
> >
> > 1- halted is set to start_powered_off (1) in s390x_cpu_reset() by
> > parent_reset() (cpu_common_reset()
> > 2- cpu_loop() is always entered with halted set to 1
> >
> > So in the first case, cpu_loop() is always started with halted set to 0
> > and in the second case with halted set to 1.
> >
> > And I think, with linux-user, it should never be started with halted set
> > to 1.
linux-user always confuses me a bit, but this seems right.
> >
> > We can't add a "#ifdef CONFIG_USER_ONLY" in hw/core/cpu.c to set halted
> > to 0 because it is in the common files, but we can do:
> >
> > diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
> > index 73d7d6007e8e..749cd548f0f3 100644
> > --- a/target/s390x/cpu.c
> > +++ b/target/s390x/cpu.c
> > @@ -291,9 +291,9 @@ static void s390_cpu_initfn(Object *obj)
> > S390CPU *cpu = S390_CPU(obj);
> >
> > cpu_set_cpustate_pointers(cpu);
> > - cs->start_powered_off = true;
> > cs->exception_index = EXCP_HLT;
> > #if !defined(CONFIG_USER_ONLY)
> > + cs->start_powered_off = true;
> > object_property_add(obj, "crash-information", "GuestPanicInformation",
> > s390_cpu_get_crash_info_qom, NULL, NULL, NULL);
> > cpu->env.tod_timer =
>
> This looks like the correct fix indeed :)
> (Maybe worth adding a comment around).
Agreed on both counts.
> Thanks for investigating!
And here as well :)
next prev parent reply other threads:[~2020-09-08 6:12 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-04 3:46 [PULL 00/30] ppc-for-5.2 queue 20200904 David Gibson
2020-09-04 3:46 ` [PULL 01/30] adb: Correct class size on TYPE_ADB_DEVICE David Gibson
2020-09-04 3:46 ` [PULL 02/30] ppc/pnv: Fix TypeInfo of PnvLpcController abstract class David Gibson
2020-09-04 3:46 ` [PULL 03/30] spapr: Remove unnecessary DRC type-checker macros David Gibson
2020-09-04 3:46 ` [PULL 04/30] spapr/xive: Add a 'hv-prio' property to represent the KVM escalation priority David Gibson
2020-09-04 3:46 ` [PULL 05/30] ppc/pnv: Add a HIOMAP erase command David Gibson
2020-09-04 3:46 ` [PULL 06/30] spapr_vscsi: do not allow device hotplug David Gibson
2020-09-04 3:46 ` [PULL 07/30] spapr/xive: Use the xics flag to check for XIVE-only IRQ backends David Gibson
2020-09-04 3:46 ` [PULL 08/30] spapr/xive: Modify kvm_cpu_is_enabled() interface David Gibson
2020-09-04 3:46 ` [PULL 09/30] spapr/xive: Use kvmppc_xive_source_reset() in post_load David Gibson
2020-09-04 3:46 ` [PULL 10/30] spapr/xive: Allocate IPIs independently from the other sources David Gibson
2020-09-04 3:47 ` [PULL 11/30] spapr/xive: Allocate vCPU IPIs from the vCPU contexts David Gibson
2020-09-04 3:47 ` [PULL 12/30] ppc/spapr_nvdimm: use g_autofree in spapr_nvdimm_validate_opts() David Gibson
2020-09-04 3:47 ` [PULL 13/30] spapr, spapr_nvdimm: fold NVDIMM validation in the same place David Gibson
2020-09-04 3:47 ` [PULL 14/30] ppc/spapr_nvdimm: do not enable support with 'nvdimm=off' David Gibson
2020-09-04 3:47 ` [PULL 15/30] target/arm: Move start-powered-off property to generic CPUState David Gibson
2020-09-04 3:47 ` [PULL 16/30] target/arm: Move setting of CPU halted state to generic code David Gibson
2020-09-04 3:47 ` [PULL 17/30] ppc/spapr: Use start-powered-off CPUState property David Gibson
2020-09-04 3:47 ` [PULL 18/30] ppc/e500: " David Gibson
2020-09-04 3:47 ` [PULL 19/30] mips/cps: " David Gibson
2020-09-04 3:47 ` [PULL 20/30] sparc/sun4m: Don't set cs->halted = 0 in main_cpu_reset() David Gibson
2020-09-04 3:47 ` [PULL 21/30] sparc/sun4m: Use start-powered-off CPUState property David Gibson
2020-09-04 3:47 ` [PULL 22/30] target/s390x: " David Gibson
2020-09-04 3:47 ` [PULL 23/30] hw/ppc/ppc4xx_pci: Use ARRAY_SIZE() instead of magic value David Gibson
2020-09-04 3:47 ` [PULL 24/30] hw/ppc/ppc4xx_pci: Replace pointless warning by assert() David Gibson
2020-09-04 3:47 ` [PULL 25/30] ppc: introducing spapr_numa.c NUMA code helper David Gibson
2020-09-04 3:47 ` [PULL 26/30] ppc/spapr_nvdimm: turn spapr_dt_nvdimm() static David Gibson
2020-09-04 3:47 ` [PULL 27/30] spapr: introduce SpaprMachineState::numa_assoc_array David Gibson
2020-09-04 3:47 ` [PULL 28/30] spapr, spapr_numa: handle vcpu ibm,associativity David Gibson
2020-09-04 3:47 ` [PULL 29/30] spapr, spapr_numa: move lookup-arrays handling to spapr_numa.c David Gibson
2020-09-04 3:47 ` [PULL 30/30] spapr_numa: move NVLink2 associativity " David Gibson
2020-09-06 15:20 ` [PULL 00/30] ppc-for-5.2 queue 20200904 Peter Maydell
2020-09-07 2:38 ` David Gibson
2020-09-07 13:29 ` Laurent Vivier
2020-09-07 14:05 ` Philippe Mathieu-Daudé
2020-09-07 14:31 ` Laurent Vivier
2020-09-07 14:51 ` Cornelia Huck
2020-09-07 16:29 ` Laurent Vivier
2020-09-07 17:26 ` Laurent Vivier
2020-09-07 19:46 ` Philippe Mathieu-Daudé
2020-09-07 23:50 ` David Gibson
2020-09-08 6:11 ` Cornelia Huck [this message]
2020-09-08 15:12 ` Thiago Jung Bauermann
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=20200908081123.048f7534.cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=bauerman@linux.ibm.com \
--cc=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=groug@kaod.org \
--cc=lvivier@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@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).