From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHY1S-0007yS-Vr for qemu-devel@nongnu.org; Thu, 05 Sep 2013 07:46:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHY1I-0004LT-D3 for qemu-devel@nongnu.org; Thu, 05 Sep 2013 07:46:50 -0400 Received: from cantor2.suse.de ([195.135.220.15]:39353 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHY1I-0004LM-3T for qemu-devel@nongnu.org; Thu, 05 Sep 2013 07:46:40 -0400 Message-ID: <52286F1C.8080703@suse.de> Date: Thu, 05 Sep 2013 13:46:36 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1375366359-11553-1-git-send-email-jjherne@us.ibm.com> <1375366359-11553-5-git-send-email-jjherne@us.ibm.com> In-Reply-To: <1375366359-11553-5-git-send-email-jjherne@us.ibm.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 4/8] [PATCH RFC v3] s390-qemu: cpu hotplug - Storage key global access List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Jason J. Herne" Cc: ehabkost@redhat.com, qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, imammedo@redhat.com Am 01.08.2013 16:12, schrieb Jason J. Herne: > From: "Jason J. Herne" >=20 > Introduces global access to storage key data so we can set it for each = cpu in > the S390 cpu initialization routine. >=20 > Signed-off-by: Jason J. Herne > --- > hw/s390x/s390-virtio-ccw.c | 5 ++--- > hw/s390x/s390-virtio.c | 21 ++++++++++++++++----- > hw/s390x/s390-virtio.h | 2 +- > target-s390x/cpu.h | 4 ++++ > 4 files changed, 23 insertions(+), 9 deletions(-) >=20 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index aebbbf1..b469960 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -65,7 +65,6 @@ static void ccw_init(QEMUMachineInitArgs *args) > MemoryRegion *sysmem =3D get_system_memory(); > MemoryRegion *ram =3D g_new(MemoryRegion, 1); > int shift =3D 0; > - uint8_t *storage_keys; > int ret; > VirtualCssBus *css_bus; > =20 > @@ -94,10 +93,10 @@ static void ccw_init(QEMUMachineInitArgs *args) > memory_region_add_subregion(sysmem, 0, ram); > =20 > /* allocate storage keys */ > - storage_keys =3D g_malloc0(my_ram_size / TARGET_PAGE_SIZE); > + s390_alloc_storage_keys(my_ram_size); > =20 > /* init CPUs */ > - s390_init_cpus(args->cpu_model, storage_keys); > + s390_init_cpus(args->cpu_model); > =20 > if (kvm_enabled()) { > kvm_s390_enable_css_support(s390_cpu_addr2state(0)); > diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c > index 439d732..21e9124 100644 > --- a/hw/s390x/s390-virtio.c > +++ b/hw/s390x/s390-virtio.c > @@ -123,6 +123,18 @@ static void s390_virtio_register_hcalls(void) > s390_virtio_hcall_set_status); > } > =20 > +static uint8_t *storage_keys; > + > +uint8_t *s390_get_storage_keys(void) > +{ > + return storage_keys; > +} > + > +void s390_alloc_storage_keys(ram_addr_t ram_size) > +{ > + storage_keys =3D g_malloc0(ram_size / TARGET_PAGE_SIZE); > +} > + > /* > * The number of running CPUs. On s390 a shutdown is the state of all = CPUs > * being either stopped or disabled (for interrupts) waiting. We have = to > @@ -176,7 +188,7 @@ void s390_init_ipl_dev(const char *kernel_filename, > qdev_init_nofail(dev); > } > =20 > -void s390_init_cpus(const char *cpu_model, uint8_t *storage_keys) > +void s390_init_cpus(const char *cpu_model) > { > int i; > =20 > @@ -196,7 +208,7 @@ void s390_init_cpus(const char *cpu_model, uint8_t = *storage_keys) > ipi_states[i] =3D cpu; > cs->halted =3D 1; > cpu->env.exception_index =3D EXCP_HLT; > - cpu->env.storage_keys =3D storage_keys; > + cpu->env.storage_keys =3D s390_get_storage_keys(); Why not go this from the CPU initfn? Is there any ccw- vs. non-ccw difference? Thinking about -device s390-cpu here. I believe it's safe to assume that machine init and thus allocation has run before the CPU is instantiated - possibly assert that. Andreas > } > } > =20 > @@ -231,7 +243,6 @@ static void s390_init(QEMUMachineInitArgs *args) > MemoryRegion *sysmem =3D get_system_memory(); > MemoryRegion *ram =3D g_new(MemoryRegion, 1); > int shift =3D 0; > - uint8_t *storage_keys; > void *virtio_region; > hwaddr virtio_region_len; > hwaddr virtio_region_start; > @@ -270,10 +281,10 @@ static void s390_init(QEMUMachineInitArgs *args) > virtio_region_len); > =20 > /* allocate storage keys */ > - storage_keys =3D g_malloc0(my_ram_size / TARGET_PAGE_SIZE); > + s390_alloc_storage_keys(my_ram_size); > =20 > /* init CPUs */ > - s390_init_cpus(args->cpu_model, storage_keys); > + s390_init_cpus(args->cpu_model); > =20 > /* Create VirtIO network adapters */ > s390_create_virtio_net((BusState *)s390_bus, "virtio-net-s390"); > diff --git a/hw/s390x/s390-virtio.h b/hw/s390x/s390-virtio.h > index 5c405e7..c1cb042 100644 > --- a/hw/s390x/s390-virtio.h > +++ b/hw/s390x/s390-virtio.h > @@ -20,7 +20,7 @@ > typedef int (*s390_virtio_fn)(const uint64_t *args); > void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn); > =20 > -void s390_init_cpus(const char *cpu_model, uint8_t *storage_keys); > +void s390_init_cpus(const char *cpu_model); > void s390_init_ipl_dev(const char *kernel_filename, > const char *kernel_cmdline, > const char *initrd_filename, > diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h > index 65bef86..877eac7 100644 > --- a/target-s390x/cpu.h > +++ b/target-s390x/cpu.h > @@ -374,6 +374,10 @@ static inline void kvm_s390_interrupt_internal(S39= 0CPU *cpu, int type, > { > } > #endif > + > +uint8_t *s390_get_storage_keys(void); > +void s390_alloc_storage_keys(ram_addr_t ram_size); > + > S390CPU *s390_cpu_addr2state(uint16_t cpu_addr); > void s390_add_running_cpu(S390CPU *cpu); > unsigned s390_del_running_cpu(S390CPU *cpu); >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg