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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 CB170C48BD5 for ; Tue, 25 Jun 2019 16:31:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 952E9208E3 for ; Tue, 25 Jun 2019 16:31:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="kgDcnI5L" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 952E9208E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33894 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfoLZ-0005Yy-Hr for qemu-devel@archiver.kernel.org; Tue, 25 Jun 2019 12:31:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47314) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfoJT-0004D5-FP for qemu-devel@nongnu.org; Tue, 25 Jun 2019 12:28:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfoJR-0002xF-Lu for qemu-devel@nongnu.org; Tue, 25 Jun 2019 12:28:55 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:38339) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hfoJP-0002tn-7V for qemu-devel@nongnu.org; Tue, 25 Jun 2019 12:28:53 -0400 Received: by mail-wr1-x443.google.com with SMTP id d18so18624986wrs.5 for ; Tue, 25 Jun 2019 09:28:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=lcxkU/3VoZPId5+vzxvq49ODSFmInmo0EPK5Ej/zB8s=; b=kgDcnI5LcFBnKsi0tNLeiTkECES8eej68kvDLIE668H1D9lR6fJIyHHtizKtLz8EDl xBsLHMKmgKHTNCj5i2f5f7aVrTrFfgSOfDo67Y8xnWnJCwjomBxx0SMl9HaEv2ZzBz52 HqopNVPXbp1O84jXDQH6ZzXICO/XILRL05M18z1ojeG5cwQxm9H52wbsTNOGiqtIsz1j EPx0GMcTrio1Dd2d5vAy1rxeaE0/GonNHGr7xgpCwOpPRflbFoe2xGaaHJCV7K1VRisa aneWpU20s8xprWIS8O4dq7PXvxlJSYoz8SjVgMuJUQdWRb0ai8NDLSfm7dyS0kPVroaN ZtXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=lcxkU/3VoZPId5+vzxvq49ODSFmInmo0EPK5Ej/zB8s=; b=Aobf7ms2DEyDHBlTdTldSYi0W4gCvKuBJ07sx3ThDsKrL1yx56Q2cG4+zCXD2wNhK1 6Rld/V8YAXZB8mUDh3Kk/JEgX3i1RBqUom4hLvCrdfJHJATgxD/O6ZzB8kSnO5xlGYez D0Rms20jKrc21vCiqOraStAaVpCjdgFcd74jyaUZcgl9eDjgWavNdLpWBV+0TNjhs+pG yyF5fya6ZBZ9bzJBtAgBfMcns63lyy1tjnN0KNMLIlJ4aw2RlJUia6iqpydkOEe+Xwt0 CRX9srCLRIPUkgzywLnavkYgD5zbGfc4NleTw3j29j/Hn90mltipZKqlWIZVAB63bDmJ 3tkg== X-Gm-Message-State: APjAAAVRyy36CPcHQ/s6AJUm0wGaPzLVP3/DhFYFzOuevKxjCsUV1rDP ztvuqSX7r0l9/4a9ib9tHQP00Q== X-Google-Smtp-Source: APXvYqwoL/S7gQR6MaC8wxziA8UOt/Js4/yQ2pHWxpVoYaCWFlmlFLIACZ2lVEQcwP6ovqASio8utg== X-Received: by 2002:adf:f1d1:: with SMTP id z17mr8039394wro.190.1561480128357; Tue, 25 Jun 2019 09:28:48 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h21sm3211323wmb.47.2019.06.25.09.28.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 25 Jun 2019 09:28:47 -0700 (PDT) Received: from zen (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 54FE71FF87; Tue, 25 Jun 2019 17:28:47 +0100 (BST) References: <20190624055442.2973-1-vandersonmr2@gmail.com> <20190624055442.2973-2-vandersonmr2@gmail.com> <87mui710qx.fsf@zen.linaroharston> User-agent: mu4e 1.3.2; emacs 26.1 From: Alex =?utf-8?Q?Benn=C3=A9e?= To: qemu-devel@nongnu.org In-reply-to: <87mui710qx.fsf@zen.linaroharston> Date: Tue, 25 Jun 2019 17:28:47 +0100 Message-ID: <87d0j11veo.fsf@zen.linaroharston> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: Re: [Qemu-devel] [PATCH v2 1/4] add and link a statistic struct to TBs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , vandersonmr , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Alex Benn=C3=A9e writes: > vandersonmr writes: > >> We want to store statistics for each TB even after flushes. >> We do not want to modify or grow the TB struct. >> So we create a new struct to contain this statistics and >> link it to each TB while they are created. >> >> Signed-off-by: Vanderson M. do Rosario >> --- >> accel/tcg/translate-all.c | 40 +++++++++++++++++++++++++++++++++++++++ >> include/exec/exec-all.h | 21 ++++++++++++++++++++ >> include/exec/tb-context.h | 1 + >> include/qemu/log.h | 1 + >> 4 files changed, 63 insertions(+) >> >> diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c >> index 5d1e08b169..f7e99f90e0 100644 >> --- a/accel/tcg/translate-all.c >> +++ b/accel/tcg/translate-all.c >> @@ -1118,6 +1118,18 @@ static inline void code_gen_alloc(size_t tb_size) >> } >> } >> >> +static gint statistics_cmp(gconstpointer p1, gconstpointer p2) >> +{ >> + const TBStatistics *a =3D (TBStatistics *) p1; >> + const TBStatistics *b =3D (TBStatistics *) p2; >> + >> + return (a->pc =3D=3D b->pc && >> + a->cs_base =3D=3D b->cs_base && >> + a->flags =3D=3D b->flags && >> + a->page_addr[0] =3D=3D b->page_addr[0] && >> + a->page_addr[1] =3D=3D b->page_addr[1]) ? 0 : 1; >> +} >> + > > There are a bunch of white space errors that need fixing up as you > probably already know from patchew ;-) > >> static bool tb_cmp(const void *ap, const void *bp) >> { >> const TranslationBlock *a =3D ap; >> @@ -1586,6 +1598,29 @@ static inline void tb_page_add(PageDesc *p, Trans= lationBlock *tb, >> #endif >> } >> >> +static void tb_insert_statistics_structure(TranslationBlock *tb) { >> + TBStatistics *new_stats =3D g_new0(TBStatistics, 1); >> + new_stats->pc =3D tb->pc; >> + new_stats->cs_base =3D tb->cs_base; >> + new_stats->flags =3D tb->flags; >> + new_stats->page_addr[0] =3D tb->page_addr[0]; >> + new_stats->page_addr[1] =3D tb->page_addr[1]; >> + >> + GList *lookup_result =3D g_list_find_custom(tb_ctx.tb_statistics, new_= stats, statistics_cmp); >> + >> + if (lookup_result) { >> + /* If there is already a TBStatistic for this TB from a previous flush >> + * then just make the new TB point to the older TBStatistic >> + */ >> + free(new_stats); >> + tb->tb_stats =3D lookup_result->data; >> + } else { >> + /* If not, then points to the new tb_statistics and add it to the has= h */ >> + tb->tb_stats =3D new_stats; >> + tb_ctx.tb_statistics =3D g_list_prepend(tb_ctx.tb_statistics, >> new_stats); > > This is going to race as nothing prevents two threads attempting to > insert records at the same time. > >> + } >> +} >> + >> /* add a new TB and link it to the physical page tables. phys_page2 is >> * (-1) to indicate that only one page contains the TB. >> * >> @@ -1636,6 +1671,11 @@ tb_link_page(TranslationBlock *tb, tb_page_addr_t= phys_pc, >> void *existing_tb =3D NULL; >> uint32_t h; >> >> + if (qemu_loglevel_mask(CPU_LOG_HOT_TBS)) { >> + /* create and link to its TB a structure to store statistics */ >> + tb_insert_statistics_structure(tb); >> + } >> + >> /* add in the hash table */ >> h =3D tb_hash_func(phys_pc, tb->pc, tb->flags, tb->cflags & CF_= HASH_MASK, >> tb->trace_vcpu_dstate); > > Perhaps we could just have a second qht array which allows for > "unlocked" insertion of record. You could take advantage of the fact the > hash would be the same: > > h =3D tb_hash_func(phys_pc, tb->pc, tb->flags, tb->cflags & CF_HA= SH_MASK, > tb->trace_vcpu_dstate); > qht_insert(&tb_ctx.htable, tb, h, &existing_tb); > > /* remove TB from the page(s) if we couldn't insert it */ > if (unlikely(existing_tb)) { > ... > tb =3D existing_tb; > } else if (qemu_loglevel_mask(CPU_LOG_HOT_TBS)) { > TBStatistics *new_stats =3D g_new0(TBStatistics, 1); > bool ok; > new_stats->pc =3D tb->pc; > new_stats->cs_base =3D tb->cs_base; > new_stats->flags =3D tb->flags; > new_stats->page_addr[0] =3D tb->page_addr[0]; > new_stats->page_addr[1] =3D tb->page_addr[1]; > ok =3D qht_insert(&tb_ctx.tb_stats, new_stats, h, NULL); > /* > * This should never fail as we succeeded in inserting the > * TB itself which means we haven't seen this combination yet. > */ > g_assert(ok); > } > > It would also avoid the clunkiness of having to allocate and then > freeing an unused structure. Actually thinking on this we still have to handle it. We may have tb_flushed away a translation and just be regenerating the same block. As TBStatistics should transcend tb_flush events we need to re-use it's structure. It would be worth counting the regens as well so we can see blocks that keep getting re-translated after each flush. > >> diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h >> index 16034ee651..359100ef3b 100644 >> --- a/include/exec/exec-all.h >> +++ b/include/exec/exec-all.h >> @@ -324,6 +324,24 @@ static inline void tlb_flush_by_mmuidx_all_cpus_syn= ced(CPUState *cpu, >> #define CODE_GEN_AVG_BLOCK_SIZE 150 >> #endif >> >> +typedef struct TBStatistics TBStatistics; >> + >> +/* >> + * This struct stores statistics such as execution count of the Transla= tionBlocks. >> + * Each TB has its own TBStatistics. TBStatistics is suppose to live ev= en after >> + * flushes. >> + */ >> +struct TBStatistics { >> + target_ulong pc; >> + target_ulong cs_base; >> + uint32_t flags; >> + tb_page_addr_t page_addr[2]; >> + >> + // total number of times that the related TB have being executed > > No c++ style comments > >> + uint32_t exec_count; >> + uint32_t exec_count_overflows; >> +}; >> + >> /* >> * Translation Cache-related fields of a TB. >> * This struct exists just for convenience; we keep track of TB's in a = binary >> @@ -403,6 +421,9 @@ struct TranslationBlock { >> uintptr_t jmp_list_head; >> uintptr_t jmp_list_next[2]; >> uintptr_t jmp_dest[2]; >> + >> + // Pointer to a struct where statistics from the TB is stored > > No c++ style comments > >> + TBStatistics *tb_stats; >> }; >> >> extern bool parallel_cpus; >> diff --git a/include/exec/tb-context.h b/include/exec/tb-context.h >> index feb585e0a7..a78ce92e60 100644 >> --- a/include/exec/tb-context.h >> +++ b/include/exec/tb-context.h >> @@ -35,6 +35,7 @@ struct TBContext { >> >> /* statistics */ >> unsigned tb_flush_count; >> + GList *tb_statistics; >> }; >> >> extern TBContext tb_ctx; >> diff --git a/include/qemu/log.h b/include/qemu/log.h >> index b097a6cae1..2fca65dd01 100644 >> --- a/include/qemu/log.h >> +++ b/include/qemu/log.h >> @@ -45,6 +45,7 @@ static inline bool qemu_log_separate(void) >> /* LOG_TRACE (1 << 15) is defined in log-for-trace.h */ >> #define CPU_LOG_TB_OP_IND (1 << 16) >> #define CPU_LOG_TB_FPU (1 << 17) >> +#define CPU_LOG_HOT_TBS (1 << 18) >> >> /* Lock output for a series of related logs. Since this is not needed >> * for a single qemu_log / qemu_log_mask / qemu_log_mask_and_addr, we -- Alex Benn=C3=A9e