Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/815554/?format=api
{ "id": 815554, "url": "http://patchwork.ozlabs.org/api/patches/815554/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919142654.16369-4-david@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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": "<20170919142654.16369-4-david@redhat.com>", "list_archive_url": null, "date": "2017-09-19T14:26:54", "name": "[v2,3/3] s390x/tcg: add basic MSA features", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "d0492e76ce603727f3d82dcd2c61025c490e4dbd", "submitter": { "id": 70402, "url": "http://patchwork.ozlabs.org/api/people/70402/?format=api", "name": "David Hildenbrand", "email": "david@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919142654.16369-4-david@redhat.com/mbox/", "series": [ { "id": 3894, "url": "http://patchwork.ozlabs.org/api/series/3894/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3894", "date": "2017-09-19T14:26:52", "name": "Implement basic MSA functions", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/3894/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/815554/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/815554/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=<UNKNOWN>)", "ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx09.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 3xxQJf4fFnz9s7h\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 20 Sep 2017 00:30:26 +1000 (AEST)", "from localhost ([::1]:43239 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1duJXc-0008AV-Mr\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 10:30:24 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:52898)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <david@redhat.com>) id 1duJUS-0005u3-D8\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 10:27:10 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <david@redhat.com>) id 1duJUQ-0004W8-RN\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 10:27:08 -0400", "from mx1.redhat.com ([209.132.183.28]:37538)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <david@redhat.com>) id 1duJUQ-0004UJ-Iu\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 10:27:06 -0400", "from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 A89554A6EA;\n\tTue, 19 Sep 2017 14:27:05 +0000 (UTC)", "from t460s.redhat.com (unknown [10.36.118.31])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id BE5A75C541;\n\tTue, 19 Sep 2017 14:27:03 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com A89554A6EA", "From": "David Hildenbrand <david@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Tue, 19 Sep 2017 16:26:54 +0200", "Message-Id": "<20170919142654.16369-4-david@redhat.com>", "In-Reply-To": "<20170919142654.16369-1-david@redhat.com>", "References": "<20170919142654.16369-1-david@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.16", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tTue, 19 Sep 2017 14:27:05 +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 v2 3/3] s390x/tcg: add basic MSA features", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "thuth@redhat.com, david@redhat.com, cohuck@redhat.com,\n\tRichard Henderson <richard.henderson@linaro.org>,\n\tAlexander Graf <agraf@suse.de>, Aurelien Jarno <aurelien@aurel32.net>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "The STFLE bits for the MSA (extension) facilities simply indicate that\nthe respective instructions can be executed. The QUERY subfunction can then\nbe used to identify which features exactly are available.\n\nAvailability of subfunctions can also vary on real hardware. For now, we\nsimply implement a CPU model without any available subfunctions except\nQUERY (which is always around).\n\nAs all MSA functions behave quite similarly, we can use one translation\nhandler for now. Prepare the code for implementation of actual subfunctions.\n\nAt least MSA is helpful for now, as older Linux kernels require this\nfacility when compiled for a z9 model. Allow to enable the facilities\nfor the qemu cpu model.\n\nSigned-off-by: David Hildenbrand <david@redhat.com>\n---\n target/s390x/Makefile.objs | 2 +-\n target/s390x/cpu_models.c | 4 +++\n target/s390x/crypto_helper.c | 65 ++++++++++++++++++++++++++++++++++++++++++++\n target/s390x/helper.h | 1 +\n target/s390x/insn-data.def | 13 +++++++++\n target/s390x/translate.c | 56 ++++++++++++++++++++++++++++++++++++++\n 6 files changed, 140 insertions(+), 1 deletion(-)\n create mode 100644 target/s390x/crypto_helper.c", "diff": "diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs\nindex 9615256d81..c88ac81e84 100644\n--- a/target/s390x/Makefile.objs\n+++ b/target/s390x/Makefile.objs\n@@ -1,6 +1,6 @@\n obj-y += cpu.o cpu_models.o cpu_features.o gdbstub.o interrupt.o helper.o\n obj-$(CONFIG_TCG) += translate.o cc_helper.o excp_helper.o fpu_helper.o\n-obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o\n+obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o crypto_helper.o\n obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o diag.o\n obj-$(CONFIG_KVM) += kvm.o\n obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o\ndiff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\nindex 5169379db5..1051a16ece 100644\n--- a/target/s390x/cpu_models.c\n+++ b/target/s390x/cpu_models.c\n@@ -825,6 +825,7 @@ static void add_qemu_cpu_model_features(S390FeatBitmap fbm)\n S390_FEAT_STFLE,\n S390_FEAT_EXTENDED_IMMEDIATE,\n S390_FEAT_EXTENDED_TRANSLATION_2,\n+ S390_FEAT_MSA,\n S390_FEAT_EXTENDED_TRANSLATION_3,\n S390_FEAT_LONG_DISPLACEMENT,\n S390_FEAT_LONG_DISPLACEMENT_FAST,\n@@ -841,6 +842,9 @@ static void add_qemu_cpu_model_features(S390FeatBitmap fbm)\n S390_FEAT_STFLE_49,\n S390_FEAT_LOCAL_TLB_CLEARING,\n S390_FEAT_STFLE_53,\n+ S390_FEAT_MSA_EXT_5,\n+ S390_FEAT_MSA_EXT_3,\n+ S390_FEAT_MSA_EXT_4,\n };\n int i;\n \ndiff --git a/target/s390x/crypto_helper.c b/target/s390x/crypto_helper.c\nnew file mode 100644\nindex 0000000000..5b210b4080\n--- /dev/null\n+++ b/target/s390x/crypto_helper.c\n@@ -0,0 +1,65 @@\n+/*\n+ * s390x crypto helpers\n+ *\n+ * Copyright (c) 2017 Red Hat Inc\n+ *\n+ * Authors:\n+ * David Hildenbrand <david@redhat.com>\n+ *\n+ * This work is licensed under the terms of the GNU GPL, version 2 or later.\n+ * See the COPYING file in the top-level directory.\n+ */\n+\n+#include \"qemu/osdep.h\"\n+#include \"qemu/main-loop.h\"\n+#include \"internal.h\"\n+#include \"exec/helper-proto.h\"\n+#include \"exec/exec-all.h\"\n+#include \"exec/cpu_ldst.h\"\n+\n+uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3,\n+ uint32_t type)\n+{\n+ const uintptr_t ra = GETPC();\n+ const uint8_t mod = env->regs[0] & 0x80ULL;\n+ const uint8_t fc = env->regs[0] & 0x7fULL;\n+ CPUState *cs = CPU(s390_env_get_cpu(env));\n+ uint8_t subfunc[16] = { 0 };\n+ uint64_t param_addr;\n+ int i;\n+\n+ switch (type) {\n+ case S390_FEAT_TYPE_KMAC:\n+ case S390_FEAT_TYPE_KIMD:\n+ case S390_FEAT_TYPE_KLMD:\n+ case S390_FEAT_TYPE_PCKMO:\n+ case S390_FEAT_TYPE_PCC:\n+ if (mod) {\n+ cpu_restore_state(cs, ra);\n+ program_interrupt(env, PGM_SPECIFICATION, 4);\n+ return 0;\n+ }\n+ break;\n+ }\n+\n+ s390_get_feat_block(type, subfunc);\n+ if (fc >= 128 || !test_be_bit(fc, subfunc)) {\n+ cpu_restore_state(cs, ra);\n+ program_interrupt(env, PGM_SPECIFICATION, 4);\n+ return 0;\n+ }\n+\n+ switch (fc) {\n+ case 0: /* query subfunction */\n+ for (i = 0; i < 16; i++) {\n+ param_addr = wrap_address(env, env->regs[1] + i);\n+ cpu_stb_data_ra(env, param_addr, subfunc[i], ra);\n+ }\n+ break;\n+ default:\n+ /* we don't implement any other subfunction yet */\n+ g_assert_not_reached();\n+ }\n+\n+ return 0;\n+}\ndiff --git a/target/s390x/helper.h b/target/s390x/helper.h\nindex 4b0290774e..75ba04fc15 100644\n--- a/target/s390x/helper.h\n+++ b/target/s390x/helper.h\n@@ -115,6 +115,7 @@ DEF_HELPER_4(cu21, i32, env, i32, i32, i32)\n DEF_HELPER_4(cu24, i32, env, i32, i32, i32)\n DEF_HELPER_4(cu41, i32, env, i32, i32, i32)\n DEF_HELPER_4(cu42, i32, env, i32, i32, i32)\n+DEF_HELPER_5(msa, i32, env, i32, i32, i32, i32)\n \n #ifndef CONFIG_USER_ONLY\n DEF_HELPER_3(servc, i32, env, i64, i64)\ndiff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def\nindex 84233a456d..d09f2ed538 100644\n--- a/target/s390x/insn-data.def\n+++ b/target/s390x/insn-data.def\n@@ -941,6 +941,19 @@\n /* UNPACK UNICODE */\n C(0xe200, UNPKU, SS_a, E2, la1, a2, 0, 0, unpku, 0)\n \n+/* MSA Instructions */\n+ D(0xb91e, KMAC, RRE, MSA, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KMAC)\n+ D(0xb928, PCKMO, RRE, MSA3, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_PCKMO)\n+ D(0xb92a, KMF, RRE, MSA4, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KMF)\n+ D(0xb92b, KMO, RRE, MSA4, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KMO)\n+ D(0xb92c, PCC, RRE, MSA4, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_PCC)\n+ D(0xb92d, KMCTR, RRF_b, MSA4, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KMCTR)\n+ D(0xb92e, KM, RRE, MSA, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KM)\n+ D(0xb92f, KMC, RRE, MSA, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KMC)\n+ D(0xb93c, PPNO, RRE, MSA5, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_PPNO)\n+ D(0xb93e, KIMD, RRE, MSA, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KIMD)\n+ D(0xb93f, KLMD, RRE, MSA, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KLMD)\n+\n #ifndef CONFIG_USER_ONLY\n /* COMPARE AND SWAP AND PURGE */\n D(0xb250, CSP, RRE, Z, r1_32u, ra2, r1_P, 0, csp, 0, MO_TEUL)\ndiff --git a/target/s390x/translate.c b/target/s390x/translate.c\nindex 59fde44d55..78ffd8ff24 100644\n--- a/target/s390x/translate.c\n+++ b/target/s390x/translate.c\n@@ -2422,6 +2422,58 @@ static ExitStatus op_iske(DisasContext *s, DisasOps *o)\n }\n #endif\n \n+static ExitStatus op_msa(DisasContext *s, DisasOps *o)\n+{\n+ int r1 = have_field(s->fields, r1) ? get_field(s->fields, r1) : 0;\n+ int r2 = have_field(s->fields, r2) ? get_field(s->fields, r2) : 0;\n+ int r3 = have_field(s->fields, r3) ? get_field(s->fields, r3) : 0;\n+ TCGv_i32 t_r1, t_r2, t_r3, type;\n+\n+ switch (s->insn->data) {\n+ case S390_FEAT_TYPE_KMCTR:\n+ if (r3 & 1 || !r3) {\n+ gen_program_exception(s, PGM_SPECIFICATION);\n+ return EXIT_NORETURN;\n+ }\n+ /* FALL THROUGH */\n+ case S390_FEAT_TYPE_PPNO:\n+ case S390_FEAT_TYPE_KMF:\n+ case S390_FEAT_TYPE_KMC:\n+ case S390_FEAT_TYPE_KMO:\n+ case S390_FEAT_TYPE_KM:\n+ if (r1 & 1 || !r1) {\n+ gen_program_exception(s, PGM_SPECIFICATION);\n+ return EXIT_NORETURN;\n+ }\n+ /* FALL THROUGH */\n+ case S390_FEAT_TYPE_KMAC:\n+ case S390_FEAT_TYPE_KIMD:\n+ case S390_FEAT_TYPE_KLMD:\n+ if (r2 & 1 || !r2) {\n+ gen_program_exception(s, PGM_SPECIFICATION);\n+ return EXIT_NORETURN;\n+ }\n+ /* FALL THROUGH */\n+ case S390_FEAT_TYPE_PCKMO:\n+ case S390_FEAT_TYPE_PCC:\n+ break;\n+ default:\n+ g_assert_not_reached();\n+ };\n+\n+ t_r1 = tcg_const_i32(r1);\n+ t_r2 = tcg_const_i32(r2);\n+ t_r3 = tcg_const_i32(r3);\n+ type = tcg_const_i32(s->insn->data);\n+ gen_helper_msa(cc_op, cpu_env, t_r1, t_r2, t_r3, type);\n+ set_cc_static(s);\n+ tcg_temp_free_i32(t_r1);\n+ tcg_temp_free_i32(t_r2);\n+ tcg_temp_free_i32(t_r3);\n+ tcg_temp_free_i32(type);\n+ return NO_EXIT;\n+}\n+\n static ExitStatus op_keb(DisasContext *s, DisasOps *o)\n {\n gen_helper_keb(cc_op, cpu_env, o->in1, o->in2);\n@@ -5505,6 +5557,10 @@ enum DisasInsnEnum {\n #define FAC_PPA S390_FEAT_STFLE_49 /* processor-assist */\n #define FAC_LZRB S390_FEAT_STFLE_53 /* load-and-zero-rightmost-byte */\n #define FAC_ETF3 S390_FEAT_EXTENDED_TRANSLATION_3\n+#define FAC_MSA S390_FEAT_MSA /* message-security-assist facility */\n+#define FAC_MSA3 S390_FEAT_MSA_EXT_3 /* msa-extension-3 facility */\n+#define FAC_MSA4 S390_FEAT_MSA_EXT_4 /* msa-extension-4 facility */\n+#define FAC_MSA5 S390_FEAT_MSA_EXT_5 /* msa-extension-5 facility */\n \n static const DisasInsn insn_info[] = {\n #include \"insn-data.def\"\n", "prefixes": [ "v2", "3/3" ] }