From patchwork Mon Jan 16 12:49:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Leach X-Patchwork-Id: 13103213 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D074EC46467 for ; Mon, 16 Jan 2023 13:38:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UV/blRITJ+ueP5XAeK/Kc6e0UJSTadKEos/ziOfwY1E=; b=u3eNRgU1sOl69w bSmFiMDWeB8DjYo6hAJBDVoYGHZJwicKOrweOZKri+oGJbjFbnWfuHzn3ScLSKgq8Sl+rtHdPqcUs pz6cmECQLzyzgB9UOMb1yvusfq9E0wMcVJ1xt5fn/eqQOElQjZksMimFGizq3siboBoZSlDc64u0R y9QBvUXfps3i41iLitAOv/Zdjogff+c7vhJZirTgbpvfRvPQ4Dxi2OCfSGWNebtBdPyOLe6kvtNBZ iCSdGMKvPvzXJI8SIV4VBSqcw1FLNvigwLXfnV0hN1ug9RerZmDCO2XJ+i7vtZM20GWVqDtxPN9xM pd6q+lARIrY3/Y+2fOjg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHPfY-00AUQ2-TC; Mon, 16 Jan 2023 13:37:02 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHPIp-00AKJt-NZ for linux-arm-kernel@bombadil.infradead.org; Mon, 16 Jan 2023 13:13:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=References:In-Reply-To:Message-Id:Date :Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=7MmfeWQlT78drM8G0hOv804O+RJ2l1J7iO54NF0OyN8=; b=pgcFDhKclKeNxbBEsK8nEF/fvp wymhBVhvkwgGx+SojYlqjgMDATvrFe+tNmSIe8t6A8pmsHLJ5Lc8aMZEYz2BIzlVGfvt0BvgymkLs QZL/qceTDcvTkAJdEgRnsa6rVPP+4KHftHwMIWIgNgNdApZNAuwFptrUgHm07vFbsLObUf9OAT+gH 2CIZ56E/53M/OEpb1inSyxAuE6qnAOloeV3iay+AOO4Ow3eOHdPvZU32Cds+2lnRoEdJIAJ2Ghlfk Yt98E/+ViKWdsXHpCE+LJG35/4B6M7CtQOk1niWq+y4Hu/QUmfTXFBwlwQHSeQCVuBlVKV/Q/idtp j85p6gAA==; Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pHOvo-005ayJ-3C for linux-arm-kernel@lists.infradead.org; Mon, 16 Jan 2023 12:49:53 +0000 Received: by mail-wm1-x32d.google.com with SMTP id bi26-20020a05600c3d9a00b003d3404a89faso3757158wmb.1 for ; Mon, 16 Jan 2023 04:49:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=7MmfeWQlT78drM8G0hOv804O+RJ2l1J7iO54NF0OyN8=; b=OG+yCtYVzaQodpp5T6SUkXT2vd5myZOrMNCUDO5yrofj+CGODUYrK/8xI2hIp2nRbd E3Qq3SKmVuG+EOosLDSbpA0nq0UX9H+BQsRsKPwcD7qNj/VYgANq7lQk+30QVWq7kGEq JTc6kL0nLQB0xTQi45E2H9rghaTildWKHE1gafYtESWuVhpRLSqSabilgprKvnVYnh9M WAIMERBv3Q7oLhafwPGM0UrRIwi4oiV/h9A2kQqA1OKRxfUgKMgdYJ5VoWF9+TIc0+pv LDx/4nUnQapRddV0hle2h4RW7Xt6fJQQWHWhkhqoVD4Dg/CYyayBTgzG16XkrIQwMe9D WO+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7MmfeWQlT78drM8G0hOv804O+RJ2l1J7iO54NF0OyN8=; b=41w5TMUvQM5z0SQA02dU21MILPwMn7eISpoCcM1ioCPlcbu/l4nPft71YDScuMDXeV HYO9lVquhkn88AtO3Wr2IkRwDl/ErUVLTARCR445nS2AC0V1krbwf5JwBNK0hINadkWk mRd529XemZg2I8htd9nC2nEIG7yJPYNaHO5iNwws9rR00aBRpaGvna2+sx2pFgccDX4m +itNnl36fegLRavb9hw3mj9fUCXQhJ2iRIVhj+QUaSgnh6vgy4rznQV4EgT0hTKJ7UfP mGuhgsXOzpucMLaZNqW+Gm9lQz7c34qtkmBhI/auO4IPd+zdRvBQkTB7ir/rmLFsJHDA aE0g== X-Gm-Message-State: AFqh2kqAEq5DFZp+RcuQId2kuF3JlqLwBF1kfBQlLcvGuR+2EcnMlmaP bXxgvzQyLLuWNGaAaFFy8rrE5g== X-Google-Smtp-Source: AMrXdXsUtzGA3B42oEx1FBsS5xtHjmaXQ/esRd6b013xNmvEMEa51m+oASURT2mCnf/3KE+2CMsiMw== X-Received: by 2002:a05:600c:35d6:b0:3da:17f5:57b9 with SMTP id r22-20020a05600c35d600b003da17f557b9mr13228767wmq.5.1673873390001; Mon, 16 Jan 2023 04:49:50 -0800 (PST) Received: from linaro.org ([2a00:23c5:6809:2201:6c91:710d:9433:e868]) by smtp.gmail.com with ESMTPSA id fl12-20020a05600c0b8c00b003dab40f9eafsm6896832wmb.35.2023.01.16.04.49.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 04:49:49 -0800 (PST) From: Mike Leach To: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: mathieu.poirier@linaro.org, suzuki.poulose@arm.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, linux-perf-users@vger.kernel.org, leo.yan@linaro.org, quic_jinlmao@quicinc.com, Mike Leach Subject: [PATCH v7 14/15] coresight: trace-id: Add debug & test macros to Trace ID allocation Date: Mon, 16 Jan 2023 12:49:27 +0000 Message-Id: <20230116124928.5440-15-mike.leach@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230116124928.5440-1-mike.leach@linaro.org> References: <20230116124928.5440-1-mike.leach@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230116_124945_458643_3467640A X-CRM114-Status: GOOD ( 11.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Adds in a number of pr_debug macros to allow the debugging and test of the trace ID allocation system. Signed-off-by: Mike Leach --- .../hwtracing/coresight/coresight-trace-id.c | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/drivers/hwtracing/coresight/coresight-trace-id.c b/drivers/hwtracing/coresight/coresight-trace-id.c index 9b85c376cb12..367bbfb4c213 100644 --- a/drivers/hwtracing/coresight/coresight-trace-id.c +++ b/drivers/hwtracing/coresight/coresight-trace-id.c @@ -24,6 +24,27 @@ static atomic_t perf_cs_etm_session_active = ATOMIC_INIT(0); /* lock to protect id_map and cpu data */ static DEFINE_SPINLOCK(id_map_lock); +/* #define TRACE_ID_DEBUG 1 */ +#if defined(TRACE_ID_DEBUG) || defined(CONFIG_COMPILE_TEST) + +static void coresight_trace_id_dump_table(struct coresight_trace_id_map *id_map, + const char *func_name) +{ + pr_debug("%s id_map::\n", func_name); + pr_debug("Used = %*pb\n", CORESIGHT_TRACE_IDS_MAX, id_map->used_ids); + pr_debug("Pend = %*pb\n", CORESIGHT_TRACE_IDS_MAX, id_map->pend_rel_ids); +} +#define DUMP_ID_MAP(map) coresight_trace_id_dump_table(map, __func__) +#define DUMP_ID_CPU(cpu, id) pr_debug("%s called; cpu=%d, id=%d\n", __func__, cpu, id) +#define DUMP_ID(id) pr_debug("%s called; id=%d\n", __func__, id) +#define PERF_SESSION(n) pr_debug("%s perf count %d\n", __func__, n) +#else +#define DUMP_ID_MAP(map) +#define DUMP_ID(id) +#define DUMP_ID_CPU(cpu, id) +#define PERF_SESSION(n) +#endif + /* unlocked read of current trace ID value for given CPU */ static int _coresight_trace_id_read_cpu_id(int cpu) { @@ -127,6 +148,7 @@ static void coresight_trace_id_release_all_pending(void) cpumask_clear_cpu(cpu, &cpu_id_release_pending); } spin_unlock_irqrestore(&id_map_lock, flags); + DUMP_ID_MAP(id_map); } static int coresight_trace_id_map_get_cpu_id(int cpu, struct coresight_trace_id_map *id_map) @@ -168,6 +190,8 @@ static int coresight_trace_id_map_get_cpu_id(int cpu, struct coresight_trace_id_ get_cpu_id_out_unlock: spin_unlock_irqrestore(&id_map_lock, flags); + DUMP_ID_CPU(cpu, id); + DUMP_ID_MAP(id_map); return id; } @@ -194,6 +218,8 @@ static void coresight_trace_id_map_put_cpu_id(int cpu, struct coresight_trace_id } spin_unlock_irqrestore(&id_map_lock, flags); + DUMP_ID_CPU(cpu, id); + DUMP_ID_MAP(id_map); } static int coresight_trace_id_map_get_system_id(struct coresight_trace_id_map *id_map) @@ -206,6 +232,8 @@ static int coresight_trace_id_map_get_system_id(struct coresight_trace_id_map *i id = coresight_trace_id_alloc_new_id(id_map, 0, true); spin_unlock_irqrestore(&id_map_lock, flags); + DUMP_ID(id); + DUMP_ID_MAP(id_map); return id; } @@ -216,6 +244,9 @@ static void coresight_trace_id_map_put_system_id(struct coresight_trace_id_map * spin_lock_irqsave(&id_map_lock, flags); coresight_trace_id_free(id, id_map); spin_unlock_irqrestore(&id_map_lock, flags); + + DUMP_ID(id); + DUMP_ID_MAP(id_map); } /* API functions */ @@ -253,6 +284,7 @@ EXPORT_SYMBOL_GPL(coresight_trace_id_put_system_id); void coresight_trace_id_perf_start(void) { atomic_inc(&perf_cs_etm_session_active); + PERF_SESSION(atomic_read(&perf_cs_etm_session_active)); } EXPORT_SYMBOL_GPL(coresight_trace_id_perf_start); @@ -260,6 +292,7 @@ void coresight_trace_id_perf_stop(void) { if (!atomic_dec_return(&perf_cs_etm_session_active)) coresight_trace_id_release_all_pending(); + PERF_SESSION(atomic_read(&perf_cs_etm_session_active)); } EXPORT_SYMBOL_GPL(coresight_trace_id_perf_stop);