From patchwork Fri Jun 7 17:28:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason J. Herne" X-Patchwork-Id: 249774 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3C9AB2C0077 for ; Sat, 8 Jun 2013 03:32:50 +1000 (EST) Received: from localhost ([::1]:54178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ul0Wu-0004ti-9f for incoming@patchwork.ozlabs.org; Fri, 07 Jun 2013 13:32:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ul0T2-0007hb-7G for qemu-devel@nongnu.org; Fri, 07 Jun 2013 13:28:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ul0Sz-0008A6-Ju for qemu-devel@nongnu.org; Fri, 07 Jun 2013 13:28:48 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:58991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ul0Sz-0008A2-GG for qemu-devel@nongnu.org; Fri, 07 Jun 2013 13:28:45 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 7 Jun 2013 13:28:45 -0400 Received: from d01dlp01.pok.ibm.com (9.56.250.166) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 7 Jun 2013 13:28:43 -0400 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 3468038C806C for ; Fri, 7 Jun 2013 13:28:12 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r57HSCFW319240 for ; Fri, 7 Jun 2013 13:28:12 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r57HSACb018482 for ; Fri, 7 Jun 2013 14:28:11 -0300 Received: from jason-ThinkPad-W500.endicott.ibm.com (jason-thinkpad-w500.endicott.ibm.com [9.60.75.211] (may be forged)) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r57HS7Jh018232; Fri, 7 Jun 2013 14:28:09 -0300 From: "Jason J. Herne" To: agraf@suse.de, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, imammedo@redhat.com, qemu-devel@nongnu.org, ehabkost@redhat.com Date: Fri, 7 Jun 2013 13:28:05 -0400 Message-Id: <1370626087-840-7-git-send-email-jjherne@us.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1370626087-840-1-git-send-email-jjherne@us.ibm.com> References: <1370626087-840-1-git-send-email-jjherne@us.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13060717-5806-0000-0000-00002197CC15 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.182.137 Cc: "Jason J. Herne" Subject: [Qemu-devel] [PATCH 6/8] [PATCH RFC v2] s390-qemu: cpu hotplug - Storage key Global Access X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Jason J. Herne" In preparation for treating cpus as devices we refactor the code such that cpu initialization no longer relies on cpu 0 to obtain a pointer to the storage key data. This patch introduces global access to that data. 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 | 3 +++ 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index eb774d9..70bd858 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 = get_system_memory(); MemoryRegion *ram = g_new(MemoryRegion, 1); int shift = 0; - uint8_t *storage_keys; int ret; VirtualCssBus *css_bus; @@ -94,10 +93,10 @@ static void ccw_init(QEMUMachineInitArgs *args) memory_region_add_subregion(sysmem, 0, ram); /* allocate storage keys */ - storage_keys = g_malloc0(my_ram_size / TARGET_PAGE_SIZE); + s390_set_storage_keys_p(g_malloc0(my_ram_size / TARGET_PAGE_SIZE)); /* init CPUs */ - s390_init_cpus(args->cpu_model, storage_keys); + s390_init_cpus(args->cpu_model); 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 ef4f1ae..4af2d86 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -136,6 +136,18 @@ static void s390_virtio_register_hcalls(void) s390_virtio_hcall_set_status); } +static uint8_t *storage_keys; + +uint8_t *s390_get_storage_keys_p(void) +{ + return storage_keys; +} + +void s390_set_storage_keys_p(uint8_t *keys_p) +{ + storage_keys = keys_p; +} + /* * 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 @@ -189,7 +201,7 @@ void s390_init_ipl_dev(const char *kernel_filename, qdev_init_nofail(dev); } -void s390_init_cpus(const char *cpu_model, uint8_t *storage_keys) +void s390_init_cpus(const char *cpu_model) { int i; @@ -209,7 +221,7 @@ void s390_init_cpus(const char *cpu_model, uint8_t *storage_keys) ipi_states[i] = cpu; cs->halted = 1; cpu->env.exception_index = EXCP_HLT; - cpu->env.storage_keys = storage_keys; + cpu->env.storage_keys = s390_get_storage_keys_p(); } } @@ -244,7 +256,6 @@ static void s390_init(QEMUMachineInitArgs *args) MemoryRegion *sysmem = get_system_memory(); MemoryRegion *ram = g_new(MemoryRegion, 1); int shift = 0; - uint8_t *storage_keys; void *virtio_region; hwaddr virtio_region_len; hwaddr virtio_region_start; @@ -283,10 +294,10 @@ static void s390_init(QEMUMachineInitArgs *args) virtio_region_len); /* allocate storage keys */ - storage_keys = g_malloc0(my_ram_size / TARGET_PAGE_SIZE); + s390_set_storage_keys_p(g_malloc0(my_ram_size / TARGET_PAGE_SIZE)); /* init CPUs */ - s390_init_cpus(args->cpu_model, storage_keys); + s390_init_cpus(args->cpu_model); /* 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); -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 029d0c5..a4b87bf 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -393,6 +393,9 @@ uint16_t s390_cpu_get_free_state_idx(void); void s390_add_running_cpu(S390CPU *cpu); unsigned s390_del_running_cpu(S390CPU *cpu); +uint8_t *s390_get_storage_keys_p(void); +void s390_set_storage_keys_p(uint8_t *keys_p); + /* service interrupts are floating therefore we must not pass an cpustate */ void s390_sclp_extint(uint32_t parm);