From patchwork Fri Nov 30 19:22:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 152585 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4027996ljp; Fri, 30 Nov 2018 11:22:48 -0800 (PST) X-Google-Smtp-Source: AFSGD/UoWVGNIxWH12XTi2ueGqjs5VHPQDddd56UhBn9suFpK3PKj5307Cd2/twVp35PXcFOxeNN X-Received: by 2002:a25:49c5:: with SMTP id w188-v6mr6642028yba.223.1543605768336; Fri, 30 Nov 2018 11:22:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543605768; cv=none; d=google.com; s=arc-20160816; b=zAvP7K8mXTxc26tSqn9r12Ugaw6D+YSg9DHvBDS1lTQmcMtSPIk/WRSqGHuk9XUzfY VTwtMIgdAuAQaeAgdcT+3G85gJSYPcVfj+NWuuocZxGT/9OBdu5/OYCx0+ZXANWelzVC z/hgwt19wDgO0aExmnRXZXh1O61PvbE7+3mymZpDO3QQ3hG05uG3rdTX+YRr5EBEfyTx 2i/r+jSLN/SNb+ek1qQXoO8GvlVIcMkfULdIE9HmbKxL4mNy3lFI802N+0DXl2jFMy/9 J7cP/QnUU9EhJz9gcAu+w01t1pwbu2uxTkgUgJDTTNlGB1uROokq4IKyWEP73T3kNrkN YM3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=R+TOh2SCAt4Wj8baLh1lAxUHnibuqXT/AbW1eZj9AD8=; b=07dHf/H8mx/wUmZE6OHBMtuoIqeiuwHt4uuaK+tr9x7b4BpwiK1z3H9D5rxT+xQr6S UPR6nvp6BI3CiO1LeAn3qE6o7//VUghPr4Dtgro42XJXhJKa7pgpHF/icrliVy6Ozz3f gSmwxD4Np3mYhQPrWkFSWF7vpIgCO1kIaEscnhpveERErtWVYLqQHYEjs0gq583Xrppm vnShgeJFae4y3oQ2EMqMfJAS7LxPjnKHPCrkC/L2QxhTyONlH/pANeRp/A33Wv6SWwKT vA3tj4u+2kPe8VbcmwccAIiTir6JR+GPOZbmef7LaQ4OifIx/cCgIui51B5zrOozV6VM wkWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UevK2mwi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l6si3770857ywd.209.2018.11.30.11.22.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 30 Nov 2018 11:22:48 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UevK2mwi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34336 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSoND-0007lm-PJ for patch@linaro.org; Fri, 30 Nov 2018 14:22:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40367) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSoMt-0007j0-AT for qemu-devel@nongnu.org; Fri, 30 Nov 2018 14:22:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSoMo-00083y-SN for qemu-devel@nongnu.org; Fri, 30 Nov 2018 14:22:27 -0500 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:37728) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gSoMo-00083L-Mf for qemu-devel@nongnu.org; Fri, 30 Nov 2018 14:22:22 -0500 Received: by mail-pg1-x531.google.com with SMTP id 80so2907734pge.4 for ; Fri, 30 Nov 2018 11:22:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R+TOh2SCAt4Wj8baLh1lAxUHnibuqXT/AbW1eZj9AD8=; b=UevK2mwiA64+e3W9IDC0xTL6T5saHi03y9yhGzIhFKZGswGLUakVK0bzZMSqmReSWn JRafrp+KUMslIKNpmmO2cLwfBtfV1KJIQAajr4dBK1/B3etiOeuLkAYWTapKP6TH3+4l qZht7Dmfv9q1JBPCCXz1DshZyUuuf05P61Mas= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=R+TOh2SCAt4Wj8baLh1lAxUHnibuqXT/AbW1eZj9AD8=; b=Ii5CKIOlEZmilMt5zxsjWOaJZGbrXAVLPiB1JPY9pDiz+dCgaRR8DRUcHtP4nwZsN6 VzYDTp5a8O2+F7xyhJaaIKmbNTp9hyx8tHGhoInLeeWgdwPVLS/zqXeVbgwhaGuRsXAC NSoPghpcgUEvTTHvFws3HSloZ5T14FAOvL6pvY2/nyC6NFg2VL8WdtZ8WQhKi0IQd/wY u/2eMidLi/uBFJFwruh1pmCzVriLlsX2Q76NEQt8RblUOqvHN0/j98XxaqhqTaIkvEQD +F9HVmMrsz11nyV6gWDZaQKxjbLoLmawjF3W17SHwOMKFIz88Jbf1G5lMjRpiJNEkgmy Y7QA== X-Gm-Message-State: AA+aEWaFBxaD+08Mj5mkl3a4RuwfklUiZTLjaBIch88eb8pzHYzPOUWG AtHEiO4Fh83nMwO9FZEQTxgteEiKORU= X-Received: by 2002:a62:c613:: with SMTP id m19mr6901681pfg.207.1543605741320; Fri, 30 Nov 2018 11:22:21 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-170-180.tukw.qwest.net. [97.113.170.180]) by smtp.gmail.com with ESMTPSA id b185sm12941494pga.85.2018.11.30.11.22.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Nov 2018 11:22:20 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 30 Nov 2018 11:22:16 -0800 Message-Id: <20181130192216.26987-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181130192216.26987-1-richard.henderson@linaro.org> References: <20181130192216.26987-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::531 Subject: [Qemu-devel] [PATCH for-4.0 2/2] target/s390x: Implement STCK et al for CONFIG_USER_ONLY 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: qemu-s390x@nongnu.org, cohuck@redhat.com, david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is a non-privileged instruction that was only implemented for system mode. However, the stck instruction is used by glibc, so this was causing SIGILL for programs run under debian stretch. Signed-off-by: Richard Henderson --- target/s390x/helper.h | 2 +- target/s390x/misc_helper.c | 13 ++++++++++++- target/s390x/translate.c | 2 ++ target/s390x/insn-data.def | 11 ++++++----- 4 files changed, 21 insertions(+), 7 deletions(-) -- 2.17.2 diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 018e9dd414..6260b50496 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -121,13 +121,13 @@ DEF_HELPER_4(cu41, i32, env, i32, i32, i32) DEF_HELPER_4(cu42, i32, env, i32, i32, i32) DEF_HELPER_5(msa, i32, env, i32, i32, i32, i32) DEF_HELPER_FLAGS_1(stpt, TCG_CALL_NO_RWG, i64, env) +DEF_HELPER_FLAGS_1(stck, TCG_CALL_NO_RWG_SE, i64, env) #ifndef CONFIG_USER_ONLY DEF_HELPER_3(servc, i32, env, i64, i64) DEF_HELPER_4(diag, void, env, i32, i32, i32) DEF_HELPER_3(load_psw, noreturn, env, i64, i64) DEF_HELPER_FLAGS_2(spx, TCG_CALL_NO_RWG, void, env, i64) -DEF_HELPER_FLAGS_1(stck, TCG_CALL_NO_RWG_SE, i64, env) DEF_HELPER_FLAGS_2(sck, TCG_CALL_NO_RWG, i32, env, i64) DEF_HELPER_FLAGS_2(sckc, TCG_CALL_NO_RWG, void, env, i64) DEF_HELPER_FLAGS_2(sckpf, TCG_CALL_NO_RWG, void, env, i64) diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 3f91579570..c2940afecb 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -76,8 +76,19 @@ uint64_t HELPER(stpt)(CPUS390XState *env) #endif } -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_USER_ONLY +/* Store Clock */ +uint64_t HELPER(stck)(CPUS390XState *env) +{ + struct timespec ts; + uint64_t ms; + clock_gettime(CLOCK_REALTIME, &ts); + ms = (ts.tv_nsec / 1000) + (ts.tv_sec * 100000ull); + + return TOD_UNIX_EPOCH + ms; +} +#else /* SCLP service call */ uint32_t HELPER(servc)(CPUS390XState *env, uint64_t r1, uint64_t r2) { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index b5bd56b7ee..8bb9c0529a 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4010,6 +4010,7 @@ static DisasJumpType op_stap(DisasContext *s, DisasOps *o) tcg_gen_ld32u_i64(o->out, cpu_env, offsetof(CPUS390XState, core_id)); return DISAS_NEXT; } +#endif static DisasJumpType op_stck(DisasContext *s, DisasOps *o) { @@ -4046,6 +4047,7 @@ static DisasJumpType op_stcke(DisasContext *s, DisasOps *o) return DISAS_NEXT; } +#ifndef CONFIG_USER_ONLY static DisasJumpType op_sck(DisasContext *s, DisasOps *o) { tcg_gen_qemu_ld_i64(o->in1, o->addr1, get_mem_index(s), MO_TEQ | MO_ALIGN); diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 54e39df831..922227bada 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -837,6 +837,12 @@ C(0xe33e, STRV, RXY_a, Z, la2, r1_32u, new, m1_32, rev32, 0) C(0xe32f, STRVG, RXY_a, Z, la2, r1_o, new, m1_64, rev64, 0) +/* STORE CLOCK */ + C(0xb205, STCK, S, Z, la2, 0, new, m1_64, stck, 0) + C(0xb27c, STCKF, S, SCF, la2, 0, new, m1_64, stck, 0) +/* STORE CLOCK EXTENDED */ + C(0xb278, STCKE, S, Z, 0, a2, 0, 0, stcke, 0) + /* STORE FACILITY LIST EXTENDED */ C(0xb2b0, STFLE, S, SFLE, 0, a2, 0, 0, stfle, 0) /* STORE FPC */ @@ -1020,11 +1026,6 @@ F(0x8000, SSM, S, Z, 0, m2_8u, 0, 0, ssm, 0, IF_PRIV) /* SIGNAL PROCESSOR */ F(0xae00, SIGP, RS_a, Z, 0, a2, 0, 0, sigp, 0, IF_PRIV) -/* STORE CLOCK */ - C(0xb205, STCK, S, Z, la2, 0, new, m1_64, stck, 0) - C(0xb27c, STCKF, S, SCF, la2, 0, new, m1_64, stck, 0) -/* STORE CLOCK EXTENDED */ - C(0xb278, STCKE, S, Z, 0, a2, 0, 0, stcke, 0) /* STORE CLOCK COMPARATOR */ F(0xb207, STCKC, S, Z, la2, 0, new, m1_64a, stckc, 0, IF_PRIV) /* STORE CONTROL */