Message ID | 20180525113708.29856-6-david@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, 25 May 2018 13:37:06 +0200 David Hildenbrand <david@redhat.com> wrote: > This allows a guest to change its TOD. We already take care of updating > all CKC timers from within S390TODClass. > > Use MO_ALIGN to load the operand manually - this will properly trigger a > SPECIFICATION exception. > > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > target/s390x/helper.h | 1 + > target/s390x/insn-data.def | 3 +-- > target/s390x/misc_helper.c | 19 +++++++++++++++++++ > target/s390x/translate.c | 9 +++++++++ > 4 files changed, 30 insertions(+), 2 deletions(-) > > diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c > index 2ef9de1cca..2f5cd6d22a 100644 > --- a/target/s390x/misc_helper.c > +++ b/target/s390x/misc_helper.c > @@ -191,6 +191,25 @@ void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque) > helper_sckc(env, env->ckc); > } > > +/* Set Clock */ > +uint32_t HELPER(sck)(CPUS390XState *env, uint64_t tod_low) > +{ > + S390TODState *td = s390_get_tod(); > + S390TODClass *tdc = S390_TOD_GET_CLASS(td); Would it make sense to cache the class as well? > + S390TOD tod = { > + .high = 0, > + .low = tod_low, > + }; > + Error *err = NULL; > + > + qemu_mutex_lock_iothread(); > + tdc->set(td, &tod, &err); > + qemu_mutex_unlock_iothread(); > + g_assert(!err); > + > + return 0; > +} > +
On 04.06.2018 14:05, Cornelia Huck wrote: > On Fri, 25 May 2018 13:37:06 +0200 > David Hildenbrand <david@redhat.com> wrote: > >> This allows a guest to change its TOD. We already take care of updating >> all CKC timers from within S390TODClass. >> >> Use MO_ALIGN to load the operand manually - this will properly trigger a >> SPECIFICATION exception. >> >> Signed-off-by: David Hildenbrand <david@redhat.com> >> --- >> target/s390x/helper.h | 1 + >> target/s390x/insn-data.def | 3 +-- >> target/s390x/misc_helper.c | 19 +++++++++++++++++++ >> target/s390x/translate.c | 9 +++++++++ >> 4 files changed, 30 insertions(+), 2 deletions(-) >> > >> diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c >> index 2ef9de1cca..2f5cd6d22a 100644 >> --- a/target/s390x/misc_helper.c >> +++ b/target/s390x/misc_helper.c >> @@ -191,6 +191,25 @@ void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque) >> helper_sckc(env, env->ckc); >> } >> >> +/* Set Clock */ >> +uint32_t HELPER(sck)(CPUS390XState *env, uint64_t tod_low) >> +{ >> + S390TODState *td = s390_get_tod(); >> + S390TODClass *tdc = S390_TOD_GET_CLASS(td); > > Would it make sense to cache the class as well? Probably, but I don't think this is as critical as the flic (as this code is TCG only and the class conversion should be fairly fast compared to a device lookup). > >> + S390TOD tod = { >> + .high = 0, >> + .low = tod_low, >> + }; >> + Error *err = NULL; >> + >> + qemu_mutex_lock_iothread(); >> + tdc->set(td, &tod, &err); >> + qemu_mutex_unlock_iothread(); >> + g_assert(!err); >> + >> + return 0; >> +} >> + >
On Thu, 7 Jun 2018 12:48:21 +0200 David Hildenbrand <david@redhat.com> wrote: > On 04.06.2018 14:05, Cornelia Huck wrote: > > On Fri, 25 May 2018 13:37:06 +0200 > > David Hildenbrand <david@redhat.com> wrote: > > > >> This allows a guest to change its TOD. We already take care of updating > >> all CKC timers from within S390TODClass. > >> > >> Use MO_ALIGN to load the operand manually - this will properly trigger a > >> SPECIFICATION exception. > >> > >> Signed-off-by: David Hildenbrand <david@redhat.com> > >> --- > >> target/s390x/helper.h | 1 + > >> target/s390x/insn-data.def | 3 +-- > >> target/s390x/misc_helper.c | 19 +++++++++++++++++++ > >> target/s390x/translate.c | 9 +++++++++ > >> 4 files changed, 30 insertions(+), 2 deletions(-) > >> > > > >> diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c > >> index 2ef9de1cca..2f5cd6d22a 100644 > >> --- a/target/s390x/misc_helper.c > >> +++ b/target/s390x/misc_helper.c > >> @@ -191,6 +191,25 @@ void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque) > >> helper_sckc(env, env->ckc); > >> } > >> > >> +/* Set Clock */ > >> +uint32_t HELPER(sck)(CPUS390XState *env, uint64_t tod_low) > >> +{ > >> + S390TODState *td = s390_get_tod(); > >> + S390TODClass *tdc = S390_TOD_GET_CLASS(td); > > > > Would it make sense to cache the class as well? > > Probably, but I don't think this is as critical as the flic (as this > code is TCG only and the class conversion should be fairly fast compared > to a device lookup). Yes, it probably does not matter that much. Do as you like :)
diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 59cba86a27..97c60ca7bc 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -127,6 +127,7 @@ 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) DEF_HELPER_FLAGS_1(stckc, TCG_CALL_NO_RWG, i64, env) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 157619403d..5c6f33ed9c 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -997,8 +997,7 @@ /* SET ADDRESS SPACE CONTROL FAST */ C(0xb279, SACF, S, Z, 0, a2, 0, 0, sacf, 0) /* SET CLOCK */ - /* ??? Not implemented - is it necessary? */ - C(0xb204, SCK, S, Z, 0, 0, 0, 0, 0, 0) + C(0xb204, SCK, S, Z, la2, 0, 0, 0, sck, 0) /* SET CLOCK COMPARATOR */ C(0xb206, SCKC, S, Z, 0, m2_64a, 0, 0, sckc, 0) /* SET CLOCK PROGRAMMABLE FIELD */ diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 2ef9de1cca..2f5cd6d22a 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -191,6 +191,25 @@ void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque) helper_sckc(env, env->ckc); } +/* Set Clock */ +uint32_t HELPER(sck)(CPUS390XState *env, uint64_t tod_low) +{ + S390TODState *td = s390_get_tod(); + S390TODClass *tdc = S390_TOD_GET_CLASS(td); + S390TOD tod = { + .high = 0, + .low = tod_low, + }; + Error *err = NULL; + + qemu_mutex_lock_iothread(); + tdc->set(td, &tod, &err); + qemu_mutex_unlock_iothread(); + g_assert(!err); + + return 0; +} + /* Set Tod Programmable Field */ void HELPER(sckpf)(CPUS390XState *env, uint64_t r0) { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 82309faa11..c6ed9507de 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4016,6 +4016,15 @@ static DisasJumpType op_stcke(DisasContext *s, DisasOps *o) return DISAS_NEXT; } +static DisasJumpType op_sck(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + tcg_gen_qemu_ld_i64(o->in1, o->addr1, get_mem_index(s), MO_TEQ | MO_ALIGN); + gen_helper_sck(cc_op, cpu_env, o->in1); + set_cc_static(s); + return DISAS_NEXT; +} + static DisasJumpType op_sckc(DisasContext *s, DisasOps *o) { check_privileged(s);
This allows a guest to change its TOD. We already take care of updating all CKC timers from within S390TODClass. Use MO_ALIGN to load the operand manually - this will properly trigger a SPECIFICATION exception. Signed-off-by: David Hildenbrand <david@redhat.com> --- target/s390x/helper.h | 1 + target/s390x/insn-data.def | 3 +-- target/s390x/misc_helper.c | 19 +++++++++++++++++++ target/s390x/translate.c | 9 +++++++++ 4 files changed, 30 insertions(+), 2 deletions(-)