From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTpGP-0004oa-Cb for qemu-devel@nongnu.org; Mon, 03 Dec 2018 09:31:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTpGM-00027Q-NM for qemu-devel@nongnu.org; Mon, 03 Dec 2018 09:31:57 -0500 References: <20181130192216.26987-1-richard.henderson@linaro.org> <20181130192216.26987-3-richard.henderson@linaro.org> <34711f80-1959-32e0-e4e9-d22e003a5636@redhat.com> <75253fd5-7c6a-5a8e-fc18-14534a50bd03@linaro.org> <6895cef5-646a-8e51-2493-75b7805d33b0@redhat.com> From: Thomas Huth Message-ID: <1409414d-d799-09db-aa45-00d4a51e0962@redhat.com> Date: Mon, 3 Dec 2018 15:31:48 +0100 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [qemu-s390x] [PATCH for-4.0 2/2] target/s390x: Implement STCK et al for CONFIG_USER_ONLY List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson , qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, cohuck@redhat.com, david@redhat.com On 2018-12-03 15:29, Richard Henderson wrote: > On 12/3/18 8:02 AM, Thomas Huth wrote: >> On 2018-12-03 14:27, Richard Henderson wrote: >>> On 12/3/18 12:19 AM, Thomas Huth wrote: >>>> On 2018-11-30 20:22, Richard Henderson wrote: >>>>> 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(-) >>>>> >>>>> 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; >>>> >>>> May I suggest "us" for microseconds? "ms" makes me thing of >>>> "milliseconds"... >>> >>> Oops, think-o. >>> >>>>> + clock_gettime(CLOCK_REALTIME, &ts); >>>>> + ms = (ts.tv_nsec / 1000) + (ts.tv_sec * 100000ull); >>>>> + >>>>> + return TOD_UNIX_EPOCH + ms; >>>>> +} >>>> >>>> Don't you need to shift the value around a little bit for getting the >>>> right format of the TOD clock? The microseconds are not starting with >>>> the lowest bit, the TOD clock has a higher resolution. See also the >>>> time2tod() macro in include/hw/s390x/tod.h ... >>> >>> That's for STCKE, which does use this routine and shift the result around. >> >> STCKE certainly has even more bits ... but still, according to the PoP: >> >> "The TOD clock nominally is incremented by adding a >> one in bit position 51 every microsecond." > > I don't see that language within the description of STCK. It's in chapter 4 instead, the sub-section about "Timing". Thomas