From nobody Wed Nov 5 17:23:01 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496795614628339.9531987711513; Tue, 6 Jun 2017 17:33:34 -0700 (PDT) Received: from localhost ([::1]:40559 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOuh-00047a-CD for importer@patchew.org; Tue, 06 Jun 2017 20:33:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOsj-0002IS-3Z for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOsh-0001nN-Cu for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:29 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:34034) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOsh-0001nI-7T for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:27 -0400 Received: by mail-qt0-x242.google.com with SMTP id o21so22861118qtb.1 for ; Tue, 06 Jun 2017 17:31:27 -0700 (PDT) Received: from bigtime.twiddle.net.com (71-217-91-69.tukw.qwest.net. [71.217.91.69]) by smtp.gmail.com with ESMTPSA id m47sm29286qtc.36.2017.06.06.17.31.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=oHZ59cMTS51+z39wvru3ITyHo4oBlkcKYcs6QaFM+yc=; b=e2dKtqTgqhZCEU9vt8747HpdeVK8ABhxSKqtWio92JVT5tpYpzfT9Cn+Z+sG4wUyzI Sa7M68hFtANj+omZDl6bt36C1ZNms6MMNOgb7P1BgNtwDUoDp9gVayNrCe/eUAQP7jg6 aO40NOzeFDV8brxburBBYJLW795LIz1gpb6TOrmd38CugNrej07NHKpTIlS2g9uNKaVo OWkJZCNrMgPMo79TjPcT2/TZJ7qrSQsv1Ro5mg4EUDJczb4JNyLQv05BcWKoEJ7mYB3k z8bAaMnAx73R/Gch8SMfSbgK1xJSUelCIvTDBAQTQnKE5WhjzRVnfSCB6D6/UTir1c4z rk+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=oHZ59cMTS51+z39wvru3ITyHo4oBlkcKYcs6QaFM+yc=; b=TG37Y5fSsbjtrs/QfiGqOoW1JssClfZnH+Tv9Rg/hy7IrRg9FyaqYYBfRKHV1h47mR Hj7GuKfQEB3dq4HShi0y8L7UnGN7fiZjhdUBt7poKzhx41yL8WAX/AKwaV3RvIEfYpm6 KMwhQbsFdv99dT6aFsLeR1pUpYDihjIr8b7adVG4erA5B73Xy+16GwcKdSnxX4wbLC5r gNk33eo7zc9ByGCg513Feh588Zn3qVF7/J2VlIluNjdozvMKrpMVWuBYpFEXnefv2GUZ gPZGvTRAgDiJD5O4EXJlYPt8qLH5Y5t+b3RhULFsi4aiSmYNl/bFRyVozGEjYX2JefVT L8DQ== X-Gm-Message-State: AODbwcCGcVwaxNlvfakW3KMyaAofXHNz5HDmSNSua2l9UToi192fzjla 6fTCeMZYlhCOqdRr+8c= X-Received: by 10.200.48.245 with SMTP id w50mr16960103qta.54.1496795486395; Tue, 06 Jun 2017 17:31:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:10 -0700 Message-Id: <20170607003119.14778-2-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170607003119.14778-1-rth@twiddle.net> References: <20170607003119.14778-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PULL v2 01/70] target/s390x: Add support for the TEST BLOCK instruction X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth TEST BLOCK was likely once used to execute basic memory tests, but nowadays it's just a (slow) way to clear a page. Reviewed-by: Aurelien Jarno Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth Message-Id: <1495128400-23759-1-git-send-email-thuth@redhat.com> Signed-off-by: Richard Henderson --- target/s390x/cpu.h | 1 + target/s390x/helper.h | 1 + target/s390x/insn-data.def | 2 ++ target/s390x/mem_helper.c | 28 ++++++++++++++++++++++++++++ target/s390x/mmu_helper.c | 2 +- target/s390x/translate.c | 11 +++++++++++ 6 files changed, 44 insertions(+), 1 deletion(-) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index c74b419..f463113 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -1084,6 +1084,7 @@ struct sysib_322 { #define SIGP_ORDER_MASK 0x000000ff =20 void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr); +target_ulong mmu_real2abs(CPUS390XState *env, target_ulong raddr); int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t= asc, target_ulong *raddr, int *flags, bool exc); int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code); diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 0b70770..1fae191 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -102,6 +102,7 @@ DEF_HELPER_FLAGS_4(lctl, TCG_CALL_NO_WG, void, env, i32= , i64, i32) DEF_HELPER_FLAGS_4(lctlg, TCG_CALL_NO_WG, void, env, i32, i64, i32) DEF_HELPER_FLAGS_4(stctl, TCG_CALL_NO_WG, void, env, i32, i64, i32) DEF_HELPER_FLAGS_4(stctg, TCG_CALL_NO_WG, void, env, i32, i64, i32) +DEF_HELPER_FLAGS_2(testblock, TCG_CALL_NO_WG, i32, env, i64) DEF_HELPER_FLAGS_2(tprot, TCG_CALL_NO_RWG, i32, i64, i64) DEF_HELPER_FLAGS_2(iske, TCG_CALL_NO_RWG_SE, i64, env, i64) DEF_HELPER_FLAGS_3(sske, TCG_CALL_NO_RWG, void, env, i64, i64) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 55a7c52..cac0f51 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -918,6 +918,8 @@ /* STORE USING REAL ADDRESS */ C(0xb246, STURA, RRE, Z, r1_o, r2_o, 0, 0, stura, 0) C(0xb925, STURG, RRE, Z, r1_o, r2_o, 0, 0, sturg, 0) +/* TEST BLOCK */ + C(0xb22c, TB, RRE, Z, 0, r2_o, 0, 0, testblock, 0) /* TEST PROTECTION */ C(0xe501, TPROT, SSE, Z, la1, a2, 0, 0, tprot, 0) =20 diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index f6e5bce..0c6a0d9 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -20,6 +20,7 @@ =20 #include "qemu/osdep.h" #include "cpu.h" +#include "exec/address-spaces.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" #include "exec/cpu_ldst.h" @@ -973,6 +974,33 @@ void HELPER(stctl)(CPUS390XState *env, uint32_t r1, ui= nt64_t a2, uint32_t r3) } } =20 +uint32_t HELPER(testblock)(CPUS390XState *env, uint64_t real_addr) +{ + CPUState *cs =3D CPU(s390_env_get_cpu(env)); + uint64_t abs_addr; + int i; + + real_addr =3D fix_address(env, real_addr); + abs_addr =3D mmu_real2abs(env, real_addr) & TARGET_PAGE_MASK; + if (!address_space_access_valid(&address_space_memory, abs_addr, + TARGET_PAGE_SIZE, true)) { + program_interrupt(env, PGM_ADDRESSING, 4); + return 1; + } + + /* Check low-address protection */ + if ((env->cregs[0] & CR0_LOWPROT) && real_addr < 0x2000) { + program_interrupt(env, PGM_PROTECTION, 4); + return 1; + } + + for (i =3D 0; i < TARGET_PAGE_SIZE; i +=3D 8) { + stq_phys(cs->as, abs_addr + i, 0); + } + + return 0; +} + uint32_t HELPER(tprot)(uint64_t a1, uint64_t a2) { /* XXX implement */ diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index b11a027..31eb9ef 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -108,7 +108,7 @@ static void trigger_page_fault(CPUS390XState *env, targ= et_ulong vaddr, * Translate real address to absolute (=3D physical) * address by taking care of the prefix mapping. */ -static target_ulong mmu_real2abs(CPUS390XState *env, target_ulong raddr) +target_ulong mmu_real2abs(CPUS390XState *env, target_ulong raddr) { if (raddr < 0x2000) { return raddr + env->psa; /* Map the lowcore. */ diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 628fb86..837d90c 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4062,6 +4062,16 @@ static ExitStatus op_tcxb(DisasContext *s, DisasOps = *o) } =20 #ifndef CONFIG_USER_ONLY + +static ExitStatus op_testblock(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + potential_page_fault(s); + gen_helper_testblock(cc_op, cpu_env, o->in2); + set_cc_static(s); + return NO_EXIT; +} + static ExitStatus op_tprot(DisasContext *s, DisasOps *o) { potential_page_fault(s); @@ -4069,6 +4079,7 @@ static ExitStatus op_tprot(DisasContext *s, DisasOps = *o) set_cc_static(s); return NO_EXIT; } + #endif =20 static ExitStatus op_tr(DisasContext *s, DisasOps *o) --=20 2.9.4