From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F8F1C04A6B for ; Tue, 7 May 2019 01:29:04 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C024A20856 for ; Tue, 7 May 2019 01:29:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aGdEbR9g" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C024A20856 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:36422 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNoul-0006zU-5C for qemu-devel@archiver.kernel.org; Mon, 06 May 2019 21:29:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNotx-0006cI-GV for qemu-devel@nongnu.org; Mon, 06 May 2019 21:28:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNotw-0008UP-3L for qemu-devel@nongnu.org; Mon, 06 May 2019 21:28:13 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:39470) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hNotv-0008Tp-Hd; Mon, 06 May 2019 21:28:12 -0400 Received: by mail-pg1-x541.google.com with SMTP id w22so6062275pgi.6; Mon, 06 May 2019 18:28:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:subject:from:to:cc:date:in-reply-to:references :mime-version:content-transfer-encoding; bh=wPY13rpw/KFAFvadbflNp5wbhlzxSvI2tbCQNypnUsk=; b=aGdEbR9gXQ0EOZ2WhDfER0DPYo8iUIQWs8/R1CTumiS9tStoVwwqduiQcAGPtC3FGX Vxow1KvlGlxwpT4aY0lCIFJhiMfoulmEkYRahNb8C6fSVEaIHkNfn6kPBrtP5inzfnhw u4fXVuEPj8fML++L0nV2UQOkjziQsjzn2chIgjPP/zG4x9K27vbH0z1MC+SkcqqsFzrp 1NO90psWOALYBPG+Neo7F07Hgz6KPHoT2Yf/Y1Jw0f2ynYdbcq+i6ucNdzD62e7SSs95 1NqNiaddycD1KvUgTBk2Gg4/Ng7537f5LopNv/SnZgqbUX6MQhRNslFxXsyYlRDEiVfH T6kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:mime-version:content-transfer-encoding; bh=wPY13rpw/KFAFvadbflNp5wbhlzxSvI2tbCQNypnUsk=; b=R0ZIELLUzNGtZiZQZlPmnOznXvT8m7MTT4fc1O5jCc3LSBTKCJ/hlRB8siACE9CNch g0qAYMEkbXu8pUuoSI/Af5g0mWeD84COemU/TszNuEjL0pLN93UCK2GbVjA23l8rNe0g D1xQK6c9soAmSHeoLUEfD8JZOIQ3Q47jzDsa7zzsDghQsXlT7KxNE/qfRHycAgwYQ9V/ nLL2zrfXEVXsst+6Y68bxDKGOSwDxCboMsRV2Wv9NGZP6prx5+ssgNFOPinfmYxoYexg nf+O0uSA3y4yJGriacR9uMhEpRgyihfN5TqVRoiY6hkaxKHUtC1r6NbUJFQ23rCPZ4m6 vDvA== X-Gm-Message-State: APjAAAVJaUpFdE0ySfQVFYtDkzqX1OXOHTOv5fIcUy/09wv/yttDiHCa m9+sQJuefUy7nI7J5ViqDx0= X-Google-Smtp-Source: APXvYqxV3uuv4JUaHnd9JpKuYvNreUnJV40DJlRMljAkUkzdNIyCuoW77hAnKltNhSrIo3nYWo3Mjg== X-Received: by 2002:a63:8342:: with SMTP id h63mr36938376pge.251.1557192490390; Mon, 06 May 2019 18:28:10 -0700 (PDT) Received: from surajjs2.ozlabs.ibm.com ([122.99.82.10]) by smtp.googlemail.com with ESMTPSA id v6sm4602488pgk.77.2019.05.06.18.28.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2019 18:28:09 -0700 (PDT) Message-ID: <1557192484.6435.8.camel@gmail.com> From: Suraj Jitindar Singh To: David Gibson Date: Tue, 07 May 2019 11:28:04 +1000 In-Reply-To: <20190506061534.GH6790@umbus.fritz.box> References: <20190503055316.6441-1-sjitindarsingh@gmail.com> <20190503055316.6441-3-sjitindarsingh@gmail.com> <20190506061534.GH6790@umbus.fritz.box> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.24.6 (3.24.6-1.fc26) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 Subject: Re: [Qemu-devel] [QEMU-PPC] [PATCH 02/13] target/ppc: Work [S]PURR implementation and add HV support 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: groug@kaod.org, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, clg@kaod.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 2019-05-06 at 16:15 +1000, David Gibson wrote: > On Fri, May 03, 2019 at 03:53:05PM +1000, Suraj Jitindar Singh wrote: > > The Processor Utilisation of Resources Register (PURR) and Scaled > > Processor Utilisation of Resources Register (SPURR) provide an > > estimate > > of the resources used by the thread, present on POWER7 and later > > processors. > > > > Currently the [S]PURR registers simply count at the rate of the > > timebase. > > > > Preserve this behaviour but rework the implementation to store an > > offset > > like the timebase rather than doing the calculation manually. Also > > allow > > hypervisor write access to the register along with the currently > > available read access. > > > > Signed-off-by: Suraj Jitindar Singh > > Hm. How will this affect migration of the PURR and SPURR? So as it turns out, the PURR isn't acutually migrated. We rely on the fact that the QEMU_CLOCK_VIRTUAL is migrated and that the PURR can never change value. Since it just counts at the same rate as the time base we get away with it. For this to work we will need to add PURR, and VTB for the later patch which adds it to the migration stream. I suggest me just migrate by value meaning the internal representation can infact change in future without breaking migration. What this means is that this patch changing the internal representation if fine given migration is broken anyway. When I resend this series I'll add the purr and vtb to the migration stream. > > > --- > > /ppc/ppc.c | 17 +++++++---------- > > include/hw/ppc/ppc.h | 3 +-- > > target/ppc/cpu.h | 1 + > > target/ppc/helper.h | 1 + > > target/ppc/timebase_helper.c | 5 +++++ > > target/ppc/translate_init.inc.c | 23 +++++++++++++++-------- > > 6 files changed, 30 insertions(+), 20 deletions(-) > > > > diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c > > index a57ca64626..b567156f97 100644 > > --- a/hw/ppc/ppc.c > > +++ b/hw/ppc/ppc.c > > @@ -819,12 +819,9 @@ target_ulong cpu_ppc_load_hdecr (CPUPPCState > > *env) > > uint64_t cpu_ppc_load_purr (CPUPPCState *env) > > { > > ppc_tb_t *tb_env = env->tb_env; > > - uint64_t diff; > > > > - diff = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - tb_env- > > >purr_start; > > - > > - return tb_env->purr_load + > > - muldiv64(diff, tb_env->tb_freq, NANOSECONDS_PER_SECOND); > > + return cpu_ppc_get_tb(tb_env, > > qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL), > > + tb_env->purr_offset); > > } > > > > /* When decrementer expires, > > @@ -980,12 +977,12 @@ static void cpu_ppc_hdecr_cb(void *opaque) > > cpu_ppc_hdecr_excp(cpu); > > } > > > > -static void cpu_ppc_store_purr(PowerPCCPU *cpu, uint64_t value) > > +void cpu_ppc_store_purr(CPUPPCState *env, uint64_t value) > > { > > - ppc_tb_t *tb_env = cpu->env.tb_env; > > + ppc_tb_t *tb_env = env->tb_env; > > > > - tb_env->purr_load = value; > > - tb_env->purr_start = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); > > + cpu_ppc_store_tb(tb_env, > > qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL), > > + &tb_env->purr_offset, value); > > } > > > > static void cpu_ppc_set_tb_clk (void *opaque, uint32_t freq) > > @@ -1002,7 +999,7 @@ static void cpu_ppc_set_tb_clk (void *opaque, > > uint32_t freq) > > */ > > _cpu_ppc_store_decr(cpu, 0xFFFFFFFF, 0xFFFFFFFF, 32); > > _cpu_ppc_store_hdecr(cpu, 0xFFFFFFFF, 0xFFFFFFFF, 32); > > - cpu_ppc_store_purr(cpu, 0x0000000000000000ULL); > > + cpu_ppc_store_purr(env, 0x0000000000000000ULL); > > } > > > > static void timebase_save(PPCTimebase *tb) > > diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h > > index 205150e6b4..b09ffbf300 100644 > > --- a/include/hw/ppc/ppc.h > > +++ b/include/hw/ppc/ppc.h > > @@ -32,8 +32,7 @@ struct ppc_tb_t { > > /* Hypervisor decrementer management */ > > uint64_t hdecr_next; /* Tick for next hdecr interrupt */ > > QEMUTimer *hdecr_timer; > > - uint64_t purr_load; > > - uint64_t purr_start; > > + int64_t purr_offset; > > void *opaque; > > uint32_t flags; > > }; > > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > > index 70167bae22..19b3e1de0e 100644 > > --- a/target/ppc/cpu.h > > +++ b/target/ppc/cpu.h > > @@ -1335,6 +1335,7 @@ void cpu_ppc_store_decr (CPUPPCState *env, > > target_ulong value); > > target_ulong cpu_ppc_load_hdecr (CPUPPCState *env); > > void cpu_ppc_store_hdecr (CPUPPCState *env, target_ulong value); > > uint64_t cpu_ppc_load_purr (CPUPPCState *env); > > +void cpu_ppc_store_purr(CPUPPCState *env, uint64_t value); > > uint32_t cpu_ppc601_load_rtcl (CPUPPCState *env); > > uint32_t cpu_ppc601_load_rtcu (CPUPPCState *env); > > #if !defined(CONFIG_USER_ONLY) > > diff --git a/target/ppc/helper.h b/target/ppc/helper.h > > index 3701bcbf1b..336e7802fb 100644 > > --- a/target/ppc/helper.h > > +++ b/target/ppc/helper.h > > @@ -686,6 +686,7 @@ DEF_HELPER_FLAGS_1(load_601_rtcu, > > TCG_CALL_NO_RWG, tl, env) > > #if !defined(CONFIG_USER_ONLY) > > #if defined(TARGET_PPC64) > > DEF_HELPER_FLAGS_1(load_purr, TCG_CALL_NO_RWG, tl, env) > > +DEF_HELPER_FLAGS_2(store_purr, TCG_CALL_NO_RWG, void, env, tl) > > DEF_HELPER_2(store_ptcr, void, env, tl) > > #endif > > DEF_HELPER_2(store_sdr1, void, env, tl) > > diff --git a/target/ppc/timebase_helper.c > > b/target/ppc/timebase_helper.c > > index 8c3c2fe67c..2395295b77 100644 > > --- a/target/ppc/timebase_helper.c > > +++ b/target/ppc/timebase_helper.c > > @@ -55,6 +55,11 @@ target_ulong helper_load_purr(CPUPPCState *env) > > { > > return (target_ulong)cpu_ppc_load_purr(env); > > } > > + > > +void helper_store_purr(CPUPPCState *env, target_ulong val) > > +{ > > + cpu_ppc_store_purr(env, val); > > +} > > #endif > > > > target_ulong helper_load_601_rtcl(CPUPPCState *env) > > diff --git a/target/ppc/translate_init.inc.c > > b/target/ppc/translate_init.inc.c > > index e3f941800b..9cd33e79ef 100644 > > --- a/target/ppc/translate_init.inc.c > > +++ b/target/ppc/translate_init.inc.c > > @@ -285,6 +285,11 @@ static void spr_read_purr(DisasContext *ctx, > > int gprn, int sprn) > > gen_helper_load_purr(cpu_gpr[gprn], cpu_env); > > } > > > > +static void spr_write_purr(DisasContext *ctx, int sprn, int gprn) > > +{ > > + gen_helper_store_purr(cpu_env, cpu_gpr[gprn]); > > +} > > + > > /* HDECR */ > > static void spr_read_hdecr(DisasContext *ctx, int gprn, int sprn) > > { > > @@ -7972,14 +7977,16 @@ static void gen_spr_book3s_purr(CPUPPCState > > *env) > > { > > #if !defined(CONFIG_USER_ONLY) > > /* PURR & SPURR: Hack - treat these as aliases for the TB for > > now */ > > - spr_register_kvm(env, SPR_PURR, "PURR", > > - &spr_read_purr, SPR_NOACCESS, > > - &spr_read_purr, SPR_NOACCESS, > > - KVM_REG_PPC_PURR, 0x00000000); > > - spr_register_kvm(env, SPR_SPURR, "SPURR", > > - &spr_read_purr, SPR_NOACCESS, > > - &spr_read_purr, SPR_NOACCESS, > > - KVM_REG_PPC_SPURR, 0x00000000); > > + spr_register_kvm_hv(env, SPR_PURR, "PURR", > > + &spr_read_purr, SPR_NOACCESS, > > + &spr_read_purr, SPR_NOACCESS, > > + &spr_read_purr, &spr_write_purr, > > + KVM_REG_PPC_PURR, 0x00000000); > > + spr_register_kvm_hv(env, SPR_SPURR, "SPURR", > > + &spr_read_purr, SPR_NOACCESS, > > + &spr_read_purr, SPR_NOACCESS, > > + &spr_read_purr, &spr_write_purr, > > + KVM_REG_PPC_SPURR, 0x00000000); > > #endif > > } > > > >