{"id":815005,"url":"http://patchwork.ozlabs.org/api/patches/815005/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918160012.4317-7-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-7-david@redhat.com>","list_archive_url":null,"date":"2017-09-18T15:59:51","name":"[v1,06/27] s390x/tcg: injection of emergency signals and extarnal calls","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"683f1f2e431eabe6fad7adbc72d77746e78ad777","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-7-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/815005/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815005/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=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=david@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\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 3xwrXT1CH3z9s78\n\tfor ;\n\tTue, 19 Sep 2017 02:08:41 +1000 (AEST)","from localhost ([::1]:37610 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtyb9-0004cl-4v\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 12:08:39 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37386)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtyTu-0006wT-Tw\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:15 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtyTo-0007p4-M5\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:11 -0400","from mx1.redhat.com ([209.132.183.28]:56844)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtyTo-0007oO-E0\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:04 -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 52813C0050BF;\n\tMon, 18 Sep 2017 16:01:03 +0000 (UTC)","from t460s.redhat.com (unknown [10.36.118.72])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id A08715D6A9;\n\tMon, 18 Sep 2017 16:01:00 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 52813C0050BF","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 17:59:51 +0200","Message-Id":"<20170918160012.4317-7-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.32]);\n\tMon, 18 Sep 2017 16:01:03 +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 06/27] s390x/tcg: injection of emergency\n\tsignals and extarnal calls","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":"Preparation for new TCG SIGP code. Especially also prepare for\nindicating that another external call is already pending.\n\nSigned-off-by: David Hildenbrand \n---\n target/s390x/cpu.h | 8 +++++++-\n target/s390x/excp_helper.c | 14 ++++++++++++++\n target/s390x/internal.h | 2 ++\n target/s390x/interrupt.c | 26 ++++++++++++++++++++++++++\n 4 files changed, 49 insertions(+), 1 deletion(-)","diff":"diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex d4e2aa2f24..857af21d06 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -132,6 +132,8 @@ struct CPUS390XState {\n MchkQueue mchk_queue[MAX_MCHK_QUEUE];\n \n int pending_int;\n+ uint16_t external_call_addr;\n+ DECLARE_BITMAP(emergency_signals, S390_MAX_CPUS);\n int ext_index;\n int io_index[8];\n int mchk_index;\n@@ -405,9 +407,13 @@ static inline void cpu_get_tb_cpu_state(CPUS390XState* env, target_ulong *pc,\n #define INTERRUPT_EXT_FLOATING (1 << 2)\n #define INTERRUPT_EXT_CPU_TIMER (1 << 3)\n #define INTERRUPT_EXT_CLOCK_COMPARATOR (1 << 4)\n+#define INTERRUPT_EXTERNAL_CALL (1 << 5)\n+#define INTERRUPT_EMERGENCY_SIGNAL (1 << 6)\n #define INTERRUPT_EXT (INTERRUPT_EXT_FLOATING | \\\n INTERRUPT_EXT_CPU_TIMER | \\\n- INTERRUPT_EXT_CLOCK_COMPARATOR)\n+ INTERRUPT_EXT_CLOCK_COMPARATOR | \\\n+ INTERRUPT_EXTERNAL_CALL | \\\n+ INTERRUPT_EMERGENCY_SIGNAL)\n \n /* Program Status Word. */\n #define S390_PSWM_REGNUM 0\ndiff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c\nindex 46d015f260..ff257ba72e 100644\n--- a/target/s390x/excp_helper.c\n+++ b/target/s390x/excp_helper.c\n@@ -231,6 +231,7 @@ static void do_ext_interrupt(CPUS390XState *env)\n {\n S390CPU *cpu = s390_env_get_cpu(env);\n uint64_t mask, addr;\n+ uint16_t cpu_addr;\n LowCore *lowcore;\n ExtQueue *q;\n \n@@ -248,6 +249,19 @@ static void do_ext_interrupt(CPUS390XState *env)\n lowcore->ext_int_code = cpu_to_be16(EXT_CPU_TIMER);\n lowcore->cpu_addr = 0;\n env->pending_int &= ~INTERRUPT_EXT_CPU_TIMER;\n+ } else if (env->pending_int & INTERRUPT_EMERGENCY_SIGNAL) {\n+ lowcore->ext_int_code = cpu_to_be16(EXT_EMERGENCY);\n+ cpu_addr = find_first_bit(env->emergency_signals, S390_MAX_CPUS);\n+ g_assert(cpu_addr < S390_MAX_CPUS);\n+ lowcore->cpu_addr = cpu_to_be16(cpu_addr);\n+ clear_bit(cpu_addr, env->emergency_signals);\n+ if (bitmap_empty(env->emergency_signals, max_cpus)) {\n+ env->pending_int &= ~INTERRUPT_EMERGENCY_SIGNAL;\n+ }\n+ } else if (env->pending_int & INTERRUPT_EXTERNAL_CALL) {\n+ lowcore->ext_int_code = cpu_to_be16(EXT_EXTERNAL_CALL);\n+ lowcore->cpu_addr = cpu_to_be16(env->external_call_addr);\n+ env->pending_int &= ~INTERRUPT_EXTERNAL_CALL;\n } else if (env->pending_int | INTERRUPT_EXT_FLOATING) {\n g_assert(env->ext_index >= 0);\n /*\ndiff --git a/target/s390x/internal.h b/target/s390x/internal.h\nindex ae4b27a574..15743ec40f 100644\n--- a/target/s390x/internal.h\n+++ b/target/s390x/internal.h\n@@ -350,6 +350,8 @@ void cpu_inject_ext(S390CPU *cpu, uint32_t code, uint32_t param,\n uint64_t param64);\n void cpu_inject_clock_comparator(S390CPU *cpu);\n void cpu_inject_cpu_timer(S390CPU *cpu);\n+void cpu_inject_emergency_signal(S390CPU *cpu, uint16_t src_cpu_addr);\n+int cpu_inject_external_call(S390CPU *cpu, uint16_t src_cpu_addr);\n \n \n /* ioinst.c */\ndiff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c\nindex 4ba33c49cb..462316be8e 100644\n--- a/target/s390x/interrupt.c\n+++ b/target/s390x/interrupt.c\n@@ -91,6 +91,32 @@ void cpu_inject_cpu_timer(S390CPU *cpu)\n cpu_interrupt(CPU(cpu), CPU_INTERRUPT_HARD);\n }\n \n+void cpu_inject_emergency_signal(S390CPU *cpu, uint16_t src_cpu_addr)\n+{\n+ CPUS390XState *env = &cpu->env;\n+\n+ g_assert(src_cpu_addr < S390_MAX_CPUS);\n+ set_bit(src_cpu_addr, env->emergency_signals);\n+\n+ env->pending_int |= INTERRUPT_EMERGENCY_SIGNAL;\n+ cpu_interrupt(CPU(cpu), CPU_INTERRUPT_HARD);\n+}\n+\n+int cpu_inject_external_call(S390CPU *cpu, uint16_t src_cpu_addr)\n+{\n+ CPUS390XState *env = &cpu->env;\n+\n+ g_assert(src_cpu_addr < S390_MAX_CPUS);\n+ if (env->pending_int & INTERRUPT_EXTERNAL_CALL) {\n+ return -EBUSY;\n+ }\n+ env->external_call_addr = src_cpu_addr;\n+\n+ env->pending_int |= INTERRUPT_EXTERNAL_CALL;\n+ cpu_interrupt(CPU(cpu), CPU_INTERRUPT_HARD);\n+ return 0;\n+}\n+\n static void cpu_inject_io(S390CPU *cpu, uint16_t subchannel_id,\n uint16_t subchannel_number,\n uint32_t io_int_parm, uint32_t io_int_word)\n","prefixes":["v1","06/27"]}