{"id":815020,"url":"http://patchwork.ozlabs.org/api/patches/815020/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918160012.4317-26-david@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170918160012.4317-26-david@redhat.com>","list_archive_url":null,"date":"2017-09-18T16:00:10","name":"[v1,25/27] s390x/tcg: switch to new SIGP handling code","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0a285258f2595ed55616cb9441ee57636322e32a","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/?format=json","name":"David Hildenbrand","email":"david@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918160012.4317-26-david@redhat.com/mbox/","series":[{"id":3672,"url":"http://patchwork.ozlabs.org/api/series/3672/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3672","date":"2017-09-18T15:59:45","name":"s390x: SMP for TCG (+ cleanups)","version":1,"mbox":"http://patchwork.ozlabs.org/series/3672/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815020/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815020/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=208.118.235.17; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=david@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [208.118.235.17])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xwrnc5Mcsz9s78\n\tfor ;\n\tTue, 19 Sep 2017 02:20:04 +1000 (AEST)","from localhost ([::1]:37662 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtymA-0006Ve-Mj\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 12:20:02 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:38069)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtyUz-0007wo-JZ\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:02:22 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtyUr-0008Li-OS\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:02:17 -0400","from mx1.redhat.com ([209.132.183.28]:47404)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtyUr-0008LP-Fk\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:02:09 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 726F43E2B6;\n\tMon, 18 Sep 2017 16:02:08 +0000 (UTC)","from t460s.redhat.com (unknown [10.36.118.72])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 053745D6A8;\n\tMon, 18 Sep 2017 16:02:05 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 726F43E2B6","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 18:00:10 +0200","Message-Id":"<20170918160012.4317-26-david@redhat.com>","In-Reply-To":"<20170918160012.4317-1-david@redhat.com>","References":"<20170918160012.4317-1-david@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tMon, 18 Sep 2017 16:02:08 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v1 25/27] s390x/tcg: switch to new SIGP\n\thandling code","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Matthew Rosato , thuth@redhat.com,\n\tdavid@redhat.com, cohuck@redhat.com, Richard Henderson\n\t, Alexander Graf ,\n\tborntraeger@de.ibm.com, \tIgor Mammedov ,\n\t=?utf-8?q?Alex_Benn=C3=A9e?= ,\n\tAurelien Jarno ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This effectively enables experimental SMP support. Floating interrupts are\nstill a mess, so allow it but print a big warning. There also seems\nto be a problem with CPU hotplug (after the main loop started).\n\nSigned-off-by: David Hildenbrand \n---\n hw/s390x/s390-virtio-ccw.c | 4 +---\n target/s390x/helper.h | 2 +-\n target/s390x/misc_helper.c | 42 ++++++------------------------------------\n target/s390x/translate.c | 5 +++--\n 4 files changed, 11 insertions(+), 42 deletions(-)","diff":"diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex 49c1ab29ed..732feb9cff 100644\n--- a/hw/s390x/s390-virtio-ccw.c\n+++ b/hw/s390x/s390-virtio-ccw.c\n@@ -65,9 +65,7 @@ static void s390_init_cpus(MachineState *machine)\n machine->cpu_model = s390_default_cpu_model_name();\n }\n if (tcg_enabled() && max_cpus > 1) {\n- error_report(\"Number of SMP CPUs requested (%d) exceeds max CPUs \"\n- \"supported by TCG (1) on s390x\", max_cpus);\n- exit(1);\n+ error_report(\"WARNING: SMP support on s390x is experimental!\");\n }\n \n /* initialize possible_cpus */\ndiff --git a/target/s390x/helper.h b/target/s390x/helper.h\nindex 4b0290774e..a0e4bfb850 100644\n--- a/target/s390x/helper.h\n+++ b/target/s390x/helper.h\n@@ -138,7 +138,7 @@ DEF_HELPER_FLAGS_3(sske, TCG_CALL_NO_RWG, void, env, i64, i64)\n DEF_HELPER_FLAGS_2(rrbe, TCG_CALL_NO_RWG, i32, env, i64)\n DEF_HELPER_4(mvcs, i32, env, i64, i64, i64)\n DEF_HELPER_4(mvcp, i32, env, i64, i64, i64)\n-DEF_HELPER_4(sigp, i32, env, i64, i32, i64)\n+DEF_HELPER_4(sigp, i32, env, i64, i32, i32)\n DEF_HELPER_FLAGS_2(sacf, TCG_CALL_NO_WG, void, env, i64)\n DEF_HELPER_FLAGS_4(idte, TCG_CALL_NO_RWG, void, env, i64, i64, i32)\n DEF_HELPER_FLAGS_4(ipte, TCG_CALL_NO_RWG, void, env, i64, i64, i32)\ndiff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c\nindex 293fc8428a..1e4d3c8526 100644\n--- a/target/s390x/misc_helper.c\n+++ b/target/s390x/misc_helper.c\n@@ -319,44 +319,14 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0,\n }\n \n uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1,\n- uint64_t cpu_addr)\n+ uint32_t r3)\n {\n- int cc = SIGP_CC_ORDER_CODE_ACCEPTED;\n+ int cc;\n \n- HELPER_LOG(\"%s: %016\" PRIx64 \" %08x %016\" PRIx64 \"\\n\",\n- __func__, order_code, r1, cpu_addr);\n-\n- /* Remember: Use \"R1 or R1 + 1, whichever is the odd-numbered register\"\n- as parameter (input). Status (output) is always R1. */\n-\n- switch (order_code & SIGP_ORDER_MASK) {\n- case SIGP_SET_ARCH:\n- /* switch arch */\n- break;\n- case SIGP_SENSE:\n- /* enumerate CPU status */\n- if (cpu_addr) {\n- /* XXX implement when SMP comes */\n- return 3;\n- }\n- env->regs[r1] &= 0xffffffff00000000ULL;\n- cc = 1;\n- break;\n-#if !defined(CONFIG_USER_ONLY)\n- case SIGP_RESTART:\n- qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);\n- cpu_loop_exit(CPU(s390_env_get_cpu(env)));\n- break;\n- case SIGP_STOP:\n- qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);\n- cpu_loop_exit(CPU(s390_env_get_cpu(env)));\n- break;\n-#endif\n- default:\n- /* unknown sigp */\n- fprintf(stderr, \"XXX unknown sigp: 0x%\" PRIx64 \"\\n\", order_code);\n- cc = SIGP_CC_NOT_OPERATIONAL;\n- }\n+ /* TODO: needed to inject interrupts - push further down */\n+ qemu_mutex_lock_iothread();\n+ cc = handle_sigp(env, order_code & SIGP_ORDER_MASK, r1, r3);\n+ qemu_mutex_unlock_iothread();\n \n return cc;\n }\ndiff --git a/target/s390x/translate.c b/target/s390x/translate.c\nindex 5abd34fb34..abf2feb7aa 100644\n--- a/target/s390x/translate.c\n+++ b/target/s390x/translate.c\n@@ -3658,11 +3658,12 @@ static ExitStatus op_servc(DisasContext *s, DisasOps *o)\n static ExitStatus op_sigp(DisasContext *s, DisasOps *o)\n {\n TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));\n+ TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3));\n check_privileged(s);\n- potential_page_fault(s);\n- gen_helper_sigp(cc_op, cpu_env, o->in2, r1, o->in1);\n+ gen_helper_sigp(cc_op, cpu_env, o->in2, r1, r3);\n set_cc_static(s);\n tcg_temp_free_i32(r1);\n+ tcg_temp_free_i32(r3);\n return NO_EXIT;\n }\n #endif\n","prefixes":["v1","25/27"]}