From nobody Mon Apr 29 01:10:59 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549949898293149.7958312577033; Mon, 11 Feb 2019 21:38:18 -0800 (PST) Received: from localhost ([127.0.0.1]:33615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtQlt-0007Qg-8r for importer@patchew.org; Tue, 12 Feb 2019 00:38:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtQi1-00041D-Ri for qemu-devel@nongnu.org; Tue, 12 Feb 2019 00:34:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtQel-00076L-Bu for qemu-devel@nongnu.org; Tue, 12 Feb 2019 00:30:57 -0500 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:39457) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtQek-0006H5-PM for qemu-devel@nongnu.org; Tue, 12 Feb 2019 00:30:54 -0500 Received: by mail-pl1-x643.google.com with SMTP id 101so729882pld.6 for ; Mon, 11 Feb 2019 21:30:49 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id d16sm13625036pgj.21.2019.02.11.21.30.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 21:30:46 -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=vLEKYFvAuLQbA+pZwdtsS5qwQxZp0LswOsj4vjwjJCA=; b=UDRTThdwAqR6wleEAJo57z8hl0/TZ2b2dUpWHQ0IGCdJB4pQ/Pj9hwxBjkIPc4M+2J xIS5GXnFufSzKWyepQqQc6RDHWmrJ+d7U7VOtxXDSdA7fk3XF2VvqSO1SR1geZJk7odA ZdgbxuP3cqI7i2+0bAzXSLKEyCH2HCrKZfJ9LgLLlEPH6dvpUziUdzUVy743xrLFPbmF yQIwIBW7mQiqdxOuzc2OCMctRxMPHNqcetHEvrQLq7esfnTcrC5pj38Cyh7QtjVqWBA4 EKW6RAxXrv2Gesl9Ts52JzajbQi65W2Dl297rd/MoIMwgdB29UschuMgqjMwy8oCHZtg pIUw== 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=vLEKYFvAuLQbA+pZwdtsS5qwQxZp0LswOsj4vjwjJCA=; b=K2uN2O7J6KUA7q/KWtQlnT2LkLk02mxx9Jd/P1I9iZXXyUwUBGVY4K0E9ZSQO6k6MY yCWE9bnyc5fYswJD/wQoeBKeOj34pm28gkyodSchSR5BxDk+92hPSRRk9yD4CKIg3nzJ kgQcnSXAMJePMYFVpyZyCCGtnj8FguGgJ55hzM/7Nyl99D6C5+d1+NzvG/Ea6tUoDVJC bbGzbKXZaQ1F1kjyt/XtAHu+HoRDnlVhLEbl4Anz4O6P16oJPg1bdz4/cNH/67XW5nsH SeiRKNHd1M2m2c3IvxejEnRTBIdPTFDAOcGoSskWiSlI7aLazlQc0moI183QhLjqEND5 kUpw== X-Gm-Message-State: AHQUAubBK6Z+k66FCH712MElj0QJjnjbgnydiEzNzy6M+wM4dY0bq2ZY HtJRDOmrMzSTHcm58xUowB76I7oT7wk= X-Google-Smtp-Source: AHgI3IaGPS1z1ydw5qWUwaNRGXSNE7+F2qjbUNA62TT3uGsxWUCXgBz4R4I2dKZq9vYzN3sHY0UdWA== X-Received: by 2002:a17:902:704b:: with SMTP id h11mr2199733plt.157.1549949447703; Mon, 11 Feb 2019 21:30:47 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 11 Feb 2019 21:30:43 -0800 Message-Id: <20190212053044.29015-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190212053044.29015-1-richard.henderson@linaro.org> References: <20190212053044.29015-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::643 Subject: [Qemu-devel] [PATCH v3 1/2] target/s390x: Split out s390-tod.h 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We will need these from CONFIG_USER_ONLY as well, which cannot access include/hw/. Reviewed-by: Thomas Huth Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson --- include/hw/s390x/tod.h | 16 +--------------- target/s390x/s390-tod.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 target/s390x/s390-tod.h diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h index 47ef9de869..9c4a6000c3 100644 --- a/include/hw/s390x/tod.h +++ b/include/hw/s390x/tod.h @@ -12,6 +12,7 @@ #define HW_S390_TOD_H =20 #include "hw/qdev.h" +#include "s390-tod.h" =20 typedef struct S390TOD { uint8_t high; @@ -50,21 +51,6 @@ typedef struct S390TODClass { void (*set)(S390TODState *td, const S390TOD *tod, Error **errp); } S390TODClass; =20 -/* The value of the TOD clock for 1.1.1970. */ -#define TOD_UNIX_EPOCH 0x7d91048bca000000ULL - -/* Converts ns to s390's clock format */ -static inline uint64_t time2tod(uint64_t ns) -{ - return (ns << 9) / 125 + (((ns & 0xff80000000000000ull) / 125) << 9); -} - -/* Converts s390's clock format to ns */ -static inline uint64_t tod2time(uint64_t t) -{ - return ((t >> 9) * 125) + (((t & 0x1ff) * 125) >> 9); -} - void s390_init_tod(void); S390TODState *s390_get_todstate(void); =20 diff --git a/target/s390x/s390-tod.h b/target/s390x/s390-tod.h new file mode 100644 index 0000000000..8b74d6a6d8 --- /dev/null +++ b/target/s390x/s390-tod.h @@ -0,0 +1,29 @@ +/* + * TOD (Time Of Day) clock + * + * Copyright 2018 Red Hat, Inc. + * Author(s): David Hildenbrand + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#ifndef TARGET_S390_TOD_H +#define TARGET_S390_TOD_H + +/* The value of the TOD clock for 1.1.1970. */ +#define TOD_UNIX_EPOCH 0x7d91048bca000000ULL + +/* Converts ns to s390's clock format */ +static inline uint64_t time2tod(uint64_t ns) +{ + return (ns << 9) / 125 + (((ns & 0xff80000000000000ull) / 125) << 9); +} + +/* Converts s390's clock format to ns */ +static inline uint64_t tod2time(uint64_t t) +{ + return ((t >> 9) * 125) + (((t & 0x1ff) * 125) >> 9); +} + +#endif --=20 2.17.2 From nobody Mon Apr 29 01:10:59 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 154994976676055.17920391707878; Mon, 11 Feb 2019 21:36:06 -0800 (PST) Received: from localhost ([127.0.0.1]:33583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtQjk-0005dU-CB for importer@patchew.org; Tue, 12 Feb 2019 00:36:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtQhw-00041E-A9 for qemu-devel@nongnu.org; Tue, 12 Feb 2019 00:34:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtQel-00075f-9K for qemu-devel@nongnu.org; Tue, 12 Feb 2019 00:30:58 -0500 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:45361) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtQek-0006Tk-Cb for qemu-devel@nongnu.org; Tue, 12 Feb 2019 00:30:54 -0500 Received: by mail-pg1-x543.google.com with SMTP id y4so688884pgc.12 for ; Mon, 11 Feb 2019 21:30:50 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id d16sm13625036pgj.21.2019.02.11.21.30.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 21:30:48 -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=sYqOuPIKKMuM+JSYbUKLjF6TsNjMKw+rF+QLJqqZn8k=; b=A/2TyssiVT+rObwJqrRoANXRP0OsquSOWt/UBqmsKkFD+/zbtDg7LdvuW66ZauKr0Q re5kWGqSS0SDORqc7/kR2fcfX34U85Eu1vcv8aY1lGa8iwUYJ41HnDhbvqWDsIPWNFTh 3LYJSXyVhryzNd8SC4z/SL19h3YPnMysEAS72T+0IoUBlud6dEfzjFx5/oXvZtcS6YKn tQeNll5eQ7PaqanNgImwUdgGqkOSDm9tnS1BzGKEBe2n5yZRVhNtkayXc2Fbvcl6J8zE sgVKRW09Pd+nHr6szc+dr8CfBfUBruo8idiEMK+6rO/OvT/ZjRO9K5/eihG3/GaAYzO8 iBdg== 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=sYqOuPIKKMuM+JSYbUKLjF6TsNjMKw+rF+QLJqqZn8k=; b=oFKd3XOlxsEpza30khl7ecM1/hVkOaOoOS+k2gDpzHO0ahFQ+JWC5uP06hI+YGd+O1 r4mJcYuNt10SOmWJG84AcYYBiCz/wEAThpR/FsBXdNrNbOo7d7yIbUaPsyCZ5xiiKlQ9 ZagFOLytqw5tNGhRr+AhAoFO1m3BBfqc4VgwDT0fbPMg5j48qEKnI6axYODk2/a2PwmF EQee/bxV4rO/z9UhwnordhANW0bZaE4F+T9quSQY2p7GZjI5Gak2MREg8GHh69iGVr/F tqcEpVd0EiiB1JBoJ9wOx4OWdJHh7A66RCc69OOzr3Bzstlsh/KyWdAiAfsAlaKNcP0Q 9oPA== X-Gm-Message-State: AHQUAuZ0EMWgqppnPen6VmugHJQMsmOfeQCM4d5sUNU5KNjHzhlpSwZM 9mi92AkQDLla7F/Osg+yneDn1fNn/7U= X-Google-Smtp-Source: AHgI3Ib8AeEoa2Lyp325HLQfk25KgKC3VLqUXeoKfReCVZ+RxR87v2Oi5denhdNksehbMtauR1TJ5w== X-Received: by 2002:a63:d703:: with SMTP id d3mr2016484pgg.167.1549949448986; Mon, 11 Feb 2019 21:30:48 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 11 Feb 2019 21:30:44 -0800 Message-Id: <20190212053044.29015-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190212053044.29015-1-richard.henderson@linaro.org> References: <20190212053044.29015-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::543 Subject: [Qemu-devel] [PATCH v3 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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. Reviewed-by: Thomas Huth Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson --- target/s390x/helper.h | 2 +- target/s390x/misc_helper.c | 34 ++++++++++++++++++++++------------ target/s390x/translate.c | 2 ++ target/s390x/insn-data.def | 11 ++++++----- 4 files changed, 31 insertions(+), 18 deletions(-) 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) =20 #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 52262f62df..ee67c1fa0c 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -30,6 +30,7 @@ #include "exec/cpu_ldst.h" #include "qapi/error.h" #include "tcg_s390x.h" +#include "s390-tod.h" =20 #if !defined(CONFIG_USER_ONLY) #include "sysemu/cpus.h" @@ -76,8 +77,28 @@ uint64_t HELPER(stpt)(CPUS390XState *env) #endif } =20 -#ifndef CONFIG_USER_ONLY +/* Store Clock */ +uint64_t HELPER(stck)(CPUS390XState *env) +{ +#ifdef CONFIG_USER_ONLY + struct timespec ts; + uint64_t ns; =20 + clock_gettime(CLOCK_REALTIME, &ts); + ns =3D ts.tv_sec * NANOSECONDS_PER_SECOND + ts.tv_nsec; + + return TOD_UNIX_EPOCH + time2tod(ns); +#else + S390TODState *td =3D s390_get_todstate(); + S390TODClass *tdc =3D S390_TOD_GET_CLASS(td); + S390TOD tod; + + tdc->get(td, &tod, &error_abort); + return tod.low; +#endif +} + +#ifndef CONFIG_USER_ONLY /* SCLP service call */ uint32_t HELPER(servc)(CPUS390XState *env, uint64_t r1, uint64_t r2) { @@ -138,17 +159,6 @@ void HELPER(spx)(CPUS390XState *env, uint64_t a1) tlb_flush_page(cs, TARGET_PAGE_SIZE); } =20 -/* Store Clock */ -uint64_t HELPER(stck)(CPUS390XState *env) -{ - S390TODState *td =3D s390_get_todstate(); - S390TODClass *tdc =3D S390_TOD_GET_CLASS(td); - S390TOD tod; - - tdc->get(td, &tod, &error_abort); - return tod.low; -} - static void update_ckc_timer(CPUS390XState *env) { S390TODState *td =3D s390_get_todstate(); diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 639084af07..19072efec6 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4060,6 +4060,7 @@ static DisasJumpType op_stap(DisasContext *s, DisasOp= s *o) tcg_gen_ld32u_i64(o->out, cpu_env, offsetof(CPUS390XState, core_id)); return DISAS_NEXT; } +#endif =20 static DisasJumpType op_stck(DisasContext *s, DisasOps *o) { @@ -4096,6 +4097,7 @@ static DisasJumpType op_stcke(DisasContext *s, DisasO= ps *o) return DISAS_NEXT; } =20 +#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_AL= IGN); diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index dab805fd90..61582372ab 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) =20 +/* 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 */ --=20 2.17.2