From nobody Mon Feb 9 21:12:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495086801052211.59607956916238; Wed, 17 May 2017 22:53:21 -0700 (PDT) Received: from localhost ([::1]:51898 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBEND-00051s-EY for importer@patchew.org; Thu, 18 May 2017 01:53:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBEFj-00084O-BZ for qemu-devel@nongnu.org; Thu, 18 May 2017 01:45:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBEFi-0003Rs-8K for qemu-devel@nongnu.org; Thu, 18 May 2017 01:45:35 -0400 Received: from ozlabs.org ([103.22.144.67]:48995) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dBEFh-0003R7-TC; Thu, 18 May 2017 01:45:34 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3wT0X63bMVz9s75; Thu, 18 May 2017 15:45:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1495086326; bh=+3QDY/LX4HeSAvnPsyreOK7RKjmPHKesKMTQlr/jp3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MDW59B3JWl5zo/ZWXq2XTl+aKi7hwAX/dfXthUwMO04Z784Kr7pr2+bxPmSQPnAYy 9b/GKfhKb8Q+aHkCspodDmm5hBVH+lAzqyzpUvTwe/P/cI9Y8XhYNfyfY+QTaDR35M b3zvP9n/6/cRyXqrKFIqFqHXbjR8kzh1ivkH6TSo= From: David Gibson To: abologna@redhat.com, thuth@redhat.com, lvivier@redhat.com Date: Thu, 18 May 2017 15:45:22 +1000 Message-Id: <20170518054522.13141-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170518054522.13141-1-david@gibson.dropbear.id.au> References: <20170518054522.13141-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PATCH 3/3] pseries: Improve tracing of CPU compatibility negotiation 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-devel@nongnu.org, David Gibson , qemu-ppc@nongnu.org, mdroth@linux.vnet.ibm.com, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This makes some improvements to the debug tracepoints around the negotiation of CPU compatibility mode during CAS. The traces are reorganized to emphasise what the inputs and outputs of the process are, then distinguish the internal state of the two possible negotiation paths (current and pre-2.8 machine type compatibility). Signed-off-by: David Gibson Reviewed-by: Greg Kurz Reviewed-by: Laurent Vivier --- hw/ppc/spapr_hcall.c | 14 ++++++++------ hw/ppc/trace-events | 6 ++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index a790da7..cea5d99 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1109,7 +1109,6 @@ static uint32_t cas_check_pvr_pre_2_9(PowerPCCPU *cpu= , target_ulong *addr, break; /* Terminator record */ } =20 - trace_spapr_cas_pvr_try(pvr); if (!max_lvl && ((cpu->env.spr[SPR_PVR] & pvr_mask) =3D=3D (pvr & pvr_mask))) { cpu_match =3D true; @@ -1120,10 +1119,10 @@ static uint32_t cas_check_pvr_pre_2_9(PowerPCCPU *c= pu, target_ulong *addr, } else if (!cpu_match) { cas_handle_compat_cpu(pcc, pvr, max_lvl, &compat_lvl, &compat_= pvr); } + trace_cas_check_pvr_pre_2_9(pvr, pvr_mask, cpu_match, + compat_lvl, compat_pvr); } =20 - trace_spapr_cas_pvr(cpu->compat_pvr, cpu_match, compat_pvr); - return compat_pvr; } =20 @@ -1158,6 +1157,7 @@ static uint32_t cas_check_pvr(PowerPCCPU *cpu, target= _ulong *addr, best_compat =3D pvr; } } + trace_cas_check_pvr(pvr, pvr_mask, explicit_match, best_compat); } =20 if ((best_compat =3D=3D 0) && (!explicit_match || max_compat)) { @@ -1168,9 +1168,6 @@ static uint32_t cas_check_pvr(PowerPCCPU *cpu, target= _ulong *addr, return 0; } =20 - /* Parsing finished */ - trace_spapr_cas_pvr(cpu->compat_pvr, explicit_match, best_compat); - return best_compat; } =20 @@ -1188,6 +1185,9 @@ static target_ulong h_client_architecture_support(Pow= erPCCPU *cpu, bool guest_radix; Error *local_err =3D NULL; =20 + trace_cas_check_pvr_start(cpu->compat_pvr, cpu->max_compat, + cpu->env.spr[SPR_PVR]); + if (smc->pre_2_9_cas_pvr) { cas_pvr =3D cas_check_pvr_pre_2_9(cpu, &addr, &local_err); } else { @@ -1198,6 +1198,8 @@ static target_ulong h_client_architecture_support(Pow= erPCCPU *cpu, return H_HARDWARE; } =20 + trace_cas_check_pvr_complete(cpu->compat_pvr, cas_pvr); + /* Update CPUs */ if (cpu->compat_pvr !=3D cas_pvr) { ppc_set_compat_all(cas_pvr, &local_err); diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events index 43d265f..5329740 100644 --- a/hw/ppc/trace-events +++ b/hw/ppc/trace-events @@ -14,8 +14,10 @@ spapr_cas_failed(unsigned long n) "DT diff buffer is too= small: %ld bytes" spapr_cas_continue(unsigned long n) "Copy changes to the guest: %ld bytes" =20 # hw/ppc/spapr_hcall.c -spapr_cas_pvr_try(uint32_t pvr) "%x" -spapr_cas_pvr(uint32_t cur_pvr, bool explicit_match, uint32_t new_pvr) "cu= rrent=3D%x, explicit_match=3D%u, new=3D%x" +cas_check_pvr_pre_2_9(uint32_t pvr, uint32_t mask, bool match, unsigned lv= l, uint32_t compat_pvr) "0x%08x/0x%08x match=3D%d lvl=3D%d compat_pvr=3D0x%= x" +cas_check_pvr(uint32_t pvr, uint32_t pvr_mask, bool explicit_match, uint32= _t best_compat) "0x%08x/0x%08x explicit_match=3D%d best_compat=3D0x%08x" +cas_check_pvr_start(uint32_t compat_pvr, uint32_t max_compat, uint32_t phy= s_pvr) "Initial compat PVR 0x%08x, max compat 0x%08x (real PVR 0x%08x)" +cas_check_pvr_complete(uint32_t old_pvr, uint32_t new_pvr) "Compatibility = PVR was 0x%08x, now 0x%08x" =20 # hw/ppc/spapr_iommu.c spapr_iommu_put(uint64_t liobn, uint64_t ioba, uint64_t tce, uint64_t ret)= "liobn=3D%"PRIx64" ioba=3D0x%"PRIx64" tce=3D0x%"PRIx64" ret=3D%"PRId64 --=20 2.9.4