From patchwork Tue Nov 1 16:31:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Leach X-Patchwork-Id: 13027284 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 2637FC4332F for ; Tue, 1 Nov 2022 17:29:52 +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=h7Aql3J4+GoLk/xr2yosrHS62kJmOR/eG6M1NvdQVPE=; b=pdceHFYJCTwDpP YeMWOmk7UdpZc3TG/1qPrVHTNE9F8uQpNbJqXDoO3v9B9pbQPLatvbJ2BVgayjlj9o70NZJphoiKL NTqytKrXwjqhSb3mqlUuBl3o35I/tGfA3XkL/SEsy3rIHqGUa+RzADZgPcF+9XiiXxJEcu1iOLHlP JXij3lOpUW6sYJ3jpxbLGaVkgtm4bagT4c7eNQmZBULw6tA+k1dbSsHdkyqk3eNlATOceciyUw85g vr1vtVeT/vmO4RtBrwRAy7Y1jt7gxHw0dYk1JskbNkQFprYAbozc/zBLVw61nIgz4sAmRwkOIQkOL 5pJeUDh2HUk/F3NptNQw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1opv43-006HBe-P2; Tue, 01 Nov 2022 17:28:39 +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 1opv41-006H9V-HS for linux-arm-kernel@bombadil.infradead.org; Tue, 01 Nov 2022 17:28:37 +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=0n8UTexiHKIiqpxO27R+y1dDLs4IJMQEzjh508MgLvo=; b=cTQVa2d2mcdjSbq93Yn2Wgjv7U Ks6gXftPcXIb1ICi4sdRdKPfdwvEld7T9IcIIan7nOcfU7BtjDGZvUSvy0/JJzyfmt8nSF52Kchip Rv7SZZUL4q353rF5TKTjMDGNBMAE9QR+j6vmC19JdY4pwbEwUY17LWc/ypz6auM4mg1VejZBhWlc0 6xjMI97mtbG5eBgQQxYNfzf6ea+oKCwnUycvt9GGd+Dum4+Bu5kClSE/yvMtKKJUVdmATtZB6dqnI HpatmK6wib+RjIBuF/RsQL8qALfrPwuLpBQ1bgRXBLXkOmeqrONZ8tod/wj4nbgOOU2S4hJ8UUwEY aJPoerdw==; Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1opuAt-008AOw-65 for linux-arm-kernel@lists.infradead.org; Tue, 01 Nov 2022 16:31:41 +0000 Received: by mail-wm1-x331.google.com with SMTP id c3-20020a1c3503000000b003bd21e3dd7aso13091933wma.1 for ; Tue, 01 Nov 2022 09:31:38 -0700 (PDT) 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=0n8UTexiHKIiqpxO27R+y1dDLs4IJMQEzjh508MgLvo=; b=yaj1GT32R5YeT6PCGvU+3mT8rNJSC2qLIIbQHgC/BYUsqpkbq1Q9VSRJ8UmoLUSoD2 Y4zYirTlhSw973T18+XGoErAjVFlm+URZAAw16Vp8ZJK0Hm07xZcDvp2co/a7923PPw4 ZDn4ALybUlW5O+TeiKNNHXg7HBckGDWJR0fsh1jEWwAHNWR9zz4ohgYkBRbVIRSe725T nh8joBpErWRxBScyuAGRawcbFq0EUHA3wvhoYjuoLsPKeaM6D4Ba42byW+et+dgTfprl zDV/SclwnF0gH3yiDUPcCSlwymVjcqSq9wZgWW0A3AT/QyUqQeeJOXw1IrCYaVbMWiYX 0Q5A== 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=0n8UTexiHKIiqpxO27R+y1dDLs4IJMQEzjh508MgLvo=; b=AsacvRaK7Iwl1RxEkUgqvek/Vgb05W3cmCEeyDDbk6nHiZtRAa39eVgSNj3kPBxz5E H3+Yl+Kuc5odlcmqmYtEZY63hmSrhXlpffl0KRjx6DJzda7Zpxy1jq8ov+/doNMnj4du KCYppblZUFv/21tH6Yt02Xz/lC3h1e9VpLaPcgcUq6aHR1x9G0lC1SssJ0/uf/MJmWbQ xFB1T485zOzEOZWQG0bm0Bx1FwJznkL3MHO43mfX9QTnhgfsCqyrH/zKe7mVBl7qo2eO vcv3WK7TEGCdWJ+BHg6jdTjGxMYDHQe/13aVwnr+XaUbV4BWexz30gIdkIkNXrDmDDTN OdXA== X-Gm-Message-State: ACrzQf3qWDqvi7V3jYnHzbKT/asJ/otZgZL5qUzjNxxN1g+eakz7LevS UmazSPeN3nbROE6RfYASJpcKrQ== X-Google-Smtp-Source: AMsMyM4Td2SohI4rtM2aYnAYL9xu3OhzOuaYsV6jOlUYEi0LO0g3cWi4idU+LyzhGQO2ByBb4fwQ0g== X-Received: by 2002:a7b:c341:0:b0:3c4:552d:2ea7 with SMTP id l1-20020a7bc341000000b003c4552d2ea7mr12813263wmj.82.1667320297696; Tue, 01 Nov 2022 09:31:37 -0700 (PDT) Received: from linaro.org ([2a00:23c5:6809:2201:e844:18b6:fc5:bbc9]) by smtp.gmail.com with ESMTPSA id bu15-20020a056000078f00b0022ac1be009esm8339844wrb.16.2022.11.01.09.31.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Nov 2022 09:31:36 -0700 (PDT) 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 v5 14/14] coresight: trace-id: Add debug & test macros to Trace ID allocation Date: Tue, 1 Nov 2022 16:31:03 +0000 Message-Id: <20221101163103.17921-15-mike.leach@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221101163103.17921-1-mike.leach@linaro.org> References: <20221101163103.17921-1-mike.leach@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221101_163139_301847_2077BF4D X-CRM114-Status: GOOD ( 11.64 ) 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 8e05a244c9d6..1588bad60715 100644 --- a/drivers/hwtracing/coresight/coresight-trace-id.c +++ b/drivers/hwtracing/coresight/coresight-trace-id.c @@ -64,6 +64,27 @@ static void coresight_trace_id_set_pend_rel(int id, struct coresight_trace_id_ma set_bit(id, id_map->pend_rel_ids); } +/* #define TRACE_ID_DEBUG 1 */ +#ifdef TRACE_ID_DEBUG + +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("Avial= %*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 + /* release all pending IDs for all current maps & clear CPU associations */ static void coresight_trace_id_release_all_pending(void) { @@ -81,6 +102,7 @@ static void coresight_trace_id_release_all_pending(void) clear_bit(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) @@ -120,6 +142,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; } @@ -146,6 +170,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) @@ -157,6 +183,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); spin_unlock_irqrestore(&id_map_lock, flags); + DUMP_ID(id); + DUMP_ID_MAP(id_map); return id; } @@ -167,6 +195,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 */ @@ -204,6 +235,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); @@ -211,6 +243,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);