{"id":815025,"url":"http://patchwork.ozlabs.org/api/patches/815025/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918160012.4317-28-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-28-david@redhat.com>","list_archive_url":null,"date":"2017-09-18T16:00:12","name":"[v1,27/27] s390x/tcg: refactor stfl(e) to use s390_get_feat_block()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5a113ba9d04848b9a118b122a96d1d4a6b8c9cc3","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-28-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/815025/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815025/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-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 [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 3xwrs00Gxmz9s78\n\tfor ;\n\tTue, 19 Sep 2017 02:23:00 +1000 (AEST)","from localhost ([::1]:37680 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtyp0-0000aN-2X\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 12:22:58 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:38082)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtyV0-0007y6-8o\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:02:24 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtyUx-0008Nj-LO\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:02:18 -0400","from mx1.redhat.com ([209.132.183.28]:8055)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtyUx-0008NR-DV\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:02:15 -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 637E7D7127;\n\tMon, 18 Sep 2017 16:02:14 +0000 (UTC)","from t460s.redhat.com (unknown [10.36.118.72])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 838A95D6A8;\n\tMon, 18 Sep 2017 16:02:11 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 637E7D7127","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 18:00:12 +0200","Message-Id":"<20170918160012.4317-28-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.38]);\n\tMon, 18 Sep 2017 16:02:14 +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 27/27] s390x/tcg: refactor stfl(e) to use\n\ts390_get_feat_block()","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":"Refactor it to use s390_get_feat_block(). Directly write into the mapped\nlowcore with stfl and make sure it is really only compiled if needed.\n\nWhile at it, add an alignment check for STFLE and avoid\npotential_page_fault() by properly restoring the CPU state.\n\nDue to s390_get_feat_block(), we will now also indicate the\n\"Configuration-z-architectural-mode\", which is with new SIGP code the\nright thing to do.\n\nSigned-off-by: David Hildenbrand \n---\n target/s390x/helper.h | 2 +-\n target/s390x/misc_helper.c | 72 ++++++++++++++++++++++------------------------\n target/s390x/translate.c | 1 -\n 3 files changed, 35 insertions(+), 40 deletions(-)","diff":"diff --git a/target/s390x/helper.h b/target/s390x/helper.h\nindex a0e4bfb850..a6d94d2d82 100644\n--- a/target/s390x/helper.h\n+++ b/target/s390x/helper.h\n@@ -104,7 +104,6 @@ DEF_HELPER_FLAGS_5(calc_cc, TCG_CALL_NO_RWG_SE, i32, env, i32, i64, i64, i64)\n DEF_HELPER_FLAGS_2(sfpc, TCG_CALL_NO_RWG, void, env, i64)\n DEF_HELPER_FLAGS_2(sfas, TCG_CALL_NO_WG, void, env, i64)\n DEF_HELPER_FLAGS_1(popcnt, TCG_CALL_NO_RWG_SE, i64, i64)\n-DEF_HELPER_FLAGS_1(stfl, TCG_CALL_NO_RWG, void, env)\n DEF_HELPER_2(stfle, i32, env, i64)\n DEF_HELPER_FLAGS_2(lpq, TCG_CALL_NO_WG, i64, env, i64)\n DEF_HELPER_FLAGS_4(stpq, TCG_CALL_NO_WG, void, env, i64, i64, i64)\n@@ -152,6 +151,7 @@ DEF_HELPER_FLAGS_3(sturg, TCG_CALL_NO_WG, void, env, i64, i64)\n DEF_HELPER_1(per_check_exception, void, env)\n DEF_HELPER_FLAGS_3(per_branch, TCG_CALL_NO_RWG, void, env, i64, i64)\n DEF_HELPER_FLAGS_2(per_ifetch, TCG_CALL_NO_RWG, void, env, i64)\n+DEF_HELPER_FLAGS_1(stfl, TCG_CALL_NO_RWG, void, env)\n \n DEF_HELPER_2(xsch, void, env, i64)\n DEF_HELPER_2(csch, void, env, i64)\ndiff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c\nindex 1e4d3c8526..4afd90b969 100644\n--- a/target/s390x/misc_helper.c\n+++ b/target/s390x/misc_helper.c\n@@ -475,61 +475,57 @@ void HELPER(per_ifetch)(CPUS390XState *env, uint64_t addr)\n }\n #endif\n \n-/* The maximum bit defined at the moment is 129. */\n-#define MAX_STFL_WORDS 3\n+static uint8_t stfl_bytes[2048];\n+static unsigned int used_stfl_bytes;\n \n-/* Canonicalize the current cpu's features into the 64-bit words required\n- by STFLE. Return the index-1 of the max word that is non-zero. */\n-static unsigned do_stfle(CPUS390XState *env, uint64_t words[MAX_STFL_WORDS])\n+static void prepare_stfl(void)\n {\n- S390CPU *cpu = s390_env_get_cpu(env);\n- const unsigned long *features = cpu->model->features;\n- unsigned max_bit = 0;\n- S390Feat feat;\n-\n- memset(words, 0, sizeof(uint64_t) * MAX_STFL_WORDS);\n+ static bool initialized;\n+ int i;\n \n- if (test_bit(S390_FEAT_ZARCH, features)) {\n- /* z/Architecture is always active if around */\n- words[0] = 1ull << (63 - 2);\n+ /* racy, but we don't care, the same values are always written */\n+ if (initialized) {\n+ return;\n }\n \n- for (feat = find_first_bit(features, S390_FEAT_MAX);\n- feat < S390_FEAT_MAX;\n- feat = find_next_bit(features, S390_FEAT_MAX, feat + 1)) {\n- const S390FeatDef *def = s390_feat_def(feat);\n- if (def->type == S390_FEAT_TYPE_STFL) {\n- unsigned bit = def->bit;\n- if (bit > max_bit) {\n- max_bit = bit;\n- }\n- assert(bit / 64 < MAX_STFL_WORDS);\n- words[bit / 64] |= 1ULL << (63 - bit % 64);\n+ s390_get_feat_block(S390_FEAT_TYPE_STFL, stfl_bytes);\n+ for (i = 0; i < sizeof(stfl_bytes); i++) {\n+ if (stfl_bytes[i]) {\n+ used_stfl_bytes = i + 1;\n }\n }\n-\n- return max_bit / 64;\n+ initialized = true;\n }\n \n+#ifndef CONFIG_USER_ONLY\n void HELPER(stfl)(CPUS390XState *env)\n {\n- uint64_t words[MAX_STFL_WORDS];\n+ LowCore *lowcore;\n \n- do_stfle(env, words);\n- cpu_stl_data(env, 200, words[0] >> 32);\n+ lowcore = cpu_map_lowcore(env);\n+ prepare_stfl();\n+ memcpy(&lowcore->stfl_fac_list, stfl_bytes, sizeof(lowcore->stfl_fac_list));\n+ cpu_unmap_lowcore(lowcore);\n }\n+#endif\n \n uint32_t HELPER(stfle)(CPUS390XState *env, uint64_t addr)\n {\n- uint64_t words[MAX_STFL_WORDS];\n- unsigned count_m1 = env->regs[0] & 0xff;\n- unsigned max_m1 = do_stfle(env, words);\n- unsigned i;\n+ const uintptr_t ra = GETPC();\n+ const int count_bytes = ((env->regs[0] & 0xff) + 1) * 8;\n+ const int max_bytes = ROUND_UP(used_stfl_bytes, 8);\n+ int i;\n+\n+ if (addr & 0x7) {\n+ cpu_restore_state(ENV_GET_CPU(env), ra);\n+ program_interrupt(env, PGM_SPECIFICATION, 4);\n+ }\n \n- for (i = 0; i <= count_m1; ++i) {\n- cpu_stq_data(env, addr + 8 * i, words[i]);\n+ prepare_stfl();\n+ for (i = 0; i < count_bytes; ++i) {\n+ cpu_stb_data_ra(env, addr + i, stfl_bytes[i], ra);\n }\n \n- env->regs[0] = deposit64(env->regs[0], 0, 8, max_m1);\n- return (count_m1 >= max_m1 ? 0 : 3);\n+ env->regs[0] = deposit64(env->regs[0], 0, 8, (max_bytes / 8) - 1);\n+ return count_bytes >= max_bytes ? 0 : 3;\n }\ndiff --git a/target/s390x/translate.c b/target/s390x/translate.c\nindex abf2feb7aa..0e05942fe9 100644\n--- a/target/s390x/translate.c\n+++ b/target/s390x/translate.c\n@@ -4082,7 +4082,6 @@ static ExitStatus op_sturg(DisasContext *s, DisasOps *o)\n \n static ExitStatus op_stfle(DisasContext *s, DisasOps *o)\n {\n- potential_page_fault(s);\n gen_helper_stfle(cc_op, cpu_env, o->in2);\n set_cc_static(s);\n return NO_EXIT;\n","prefixes":["v1","27/27"]}