From patchwork Mon Nov 18 23:22:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umesh Nerlige Ramappa X-Patchwork-Id: 13879190 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 A1A25D60CFC for ; Mon, 18 Nov 2024 23:22:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9928810E298; Mon, 18 Nov 2024 23:22:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="EyRF0XsE"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id B6CB010E57B for ; Mon, 18 Nov 2024 23:22:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731972149; x=1763508149; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=qLQMAcoRpWiH/i63GGMSNTqZ6H5rMqbvJ4Vfy+ZqAXM=; b=EyRF0XsERqkLmiYlCr5f7uUIF+XQqYFUN0IEOVAuD6cGjUbfOosXcBI5 yfc85gbDU9QdYCyTeUU7fzGMrV2F8po22CITSQzQ76oz7YE4VO5iEeQVj WXfEuV3yK5PjuCkR8pbMber6yHRuAPCWWy+47/P58D6H4+UpMYHllrmVy bDjzDQBSFPyFQ8pYCa5ZdgEYQCY3p0OFjqvgLSyQZetD2/R1gNdzGFErq BZKiD+iRIiiUqOq9Wn7Hnzg/B9iRcCMehD00vSGBF6Elwvv3TiKwYbIFT y08HG6xHOiqbu0Dda1GqCfFGUbY/EiiMWfGWfE8ogiUXOcPI5vpV8iVdw g==; X-CSE-ConnectionGUID: Xj6Np0GzSSKqdS1IP7/MEw== X-CSE-MsgGUID: R8KAdZoLTuq4c1j+5omJVA== X-IronPort-AV: E=McAfee;i="6700,10204,11260"; a="42466978" X-IronPort-AV: E=Sophos;i="6.12,165,1728975600"; d="scan'208";a="42466978" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2024 15:22:29 -0800 X-CSE-ConnectionGUID: rGAPC99KRcWuOdU4VT6leA== X-CSE-MsgGUID: h2YTOCYaSZODYE7BoVRA5A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,165,1728975600"; d="scan'208";a="89777991" Received: from dut7231atsm.jf.intel.com ([10.75.202.213]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2024 15:22:28 -0800 From: Umesh Nerlige Ramappa To: intel-gfx@lists.freedesktop.org, john.c.harrison@intel.com Subject: [PATCH 1/3] i915/guc: Reset engine utilization buffer before registration Date: Mon, 18 Nov 2024 15:22:21 -0800 Message-Id: <20241118232223.53639-2-umesh.nerlige.ramappa@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241118232223.53639-1-umesh.nerlige.ramappa@intel.com> References: <20241118232223.53639-1-umesh.nerlige.ramappa@intel.com> MIME-Version: 1.0 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On GT reset, we store total busyness counts for all engines and re-register the utilization buffer with GuC. At that time we should reset the buffer, so that we don't get spurious busyness counts on subsequent queries. To repro this issue, run igt@perf_pmu@busy-hang followed by igt@perf_pmu@most-busy-idle-check-all for a couple iterations. Fixes: 77cdd054dd2c ("drm/i915/pmu: Connect engine busyness stats from GuC to pmu") Signed-off-by: Umesh Nerlige Ramappa Reviewed-by: John Harrison --- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index 353a9167c9a4..c71aedcbce43 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -1243,6 +1243,21 @@ static void __get_engine_usage_record(struct intel_engine_cs *engine, } while (++i < 6); } +static void __set_engine_usage_record(struct intel_engine_cs *engine, + u32 last_in, u32 id, u32 total) +{ + struct iosys_map rec_map = intel_guc_engine_usage_record_map(engine); + +#define record_write(map_, field_, val_) \ + iosys_map_wr_field(map_, 0, struct guc_engine_usage_record, field_, val_) + + record_write(&rec_map, last_switch_in_stamp, last_in); + record_write(&rec_map, current_context_index, id); + record_write(&rec_map, total_runtime, total); + +#undef record_write +} + static void guc_update_engine_gt_clks(struct intel_engine_cs *engine) { struct intel_engine_guc_stats *stats = &engine->stats.guc; @@ -1543,6 +1558,9 @@ static void guc_timestamp_ping(struct work_struct *wrk) static int guc_action_enable_usage_stats(struct intel_guc *guc) { + struct intel_gt *gt = guc_to_gt(guc); + struct intel_engine_cs *engine; + enum intel_engine_id id; u32 offset = intel_guc_engine_usage_offset(guc); u32 action[] = { INTEL_GUC_ACTION_SET_ENG_UTIL_BUFF, @@ -1550,6 +1568,9 @@ static int guc_action_enable_usage_stats(struct intel_guc *guc) 0, }; + for_each_engine(engine, gt, id) + __set_engine_usage_record(engine, 0, 0xffffffff, 0); + return intel_guc_send(guc, action, ARRAY_SIZE(action)); } From patchwork Mon Nov 18 23:22:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umesh Nerlige Ramappa X-Patchwork-Id: 13879189 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 D9DAAD60CFD for ; Mon, 18 Nov 2024 23:22:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 80AAB10E295; Mon, 18 Nov 2024 23:22:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="mhHhXh2q"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id C4A9510E57D for ; Mon, 18 Nov 2024 23:22:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731972149; x=1763508149; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=FkLHl5frL8EuMufMQN+ev5+QRnNTSCOgFp+cYD81yuc=; b=mhHhXh2qdQdXPdZOdTgHFZDz/8lMQvLMgWL4rQB3yTDblvJ+IecoI5Y2 vSfuzMBIzl9i4Lh747ozP+P2VnSaT6oEpNVQxHZQO+CwY3usp6XbLSbHn rR8k2f13Ru0MbkE0h5AxlJEIAFTLbIFTbp4+/l2ZDsVV4yzZkbR+J2f05 nhWetBnDbqUIDaFfsVphBxU8JqnFxaSVCKfM/WiZQ0aRvq/N2Qtcu26ZZ YtPEDT6XiTl0/8FXVTDzxVGyx2XmzI6cvR7C0VHS8xcgzoDAWDhZC1F+B wgTS+Sac7xIJQOkkc1KzgA5e0D5MEqTyRLvgdrkC9kcv26ERDjeLgl1Xv A==; X-CSE-ConnectionGUID: g3XR0OQbSNCC5RnuWmw/jg== X-CSE-MsgGUID: +lrHyTpBRE+e3+12oWzAAg== X-IronPort-AV: E=McAfee;i="6700,10204,11260"; a="42466979" X-IronPort-AV: E=Sophos;i="6.12,165,1728975600"; d="scan'208";a="42466979" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2024 15:22:29 -0800 X-CSE-ConnectionGUID: p0pVg140TgefeYhnj4acew== X-CSE-MsgGUID: K79ZvKRhSF27rpRONYfDtw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,165,1728975600"; d="scan'208";a="89777994" Received: from dut7231atsm.jf.intel.com ([10.75.202.213]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2024 15:22:28 -0800 From: Umesh Nerlige Ramappa To: intel-gfx@lists.freedesktop.org, john.c.harrison@intel.com Subject: [PATCH 2/3] i915/guc: Ensure busyness counter increases monotonically Date: Mon, 18 Nov 2024 15:22:22 -0800 Message-Id: <20241118232223.53639-3-umesh.nerlige.ramappa@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241118232223.53639-1-umesh.nerlige.ramappa@intel.com> References: <20241118232223.53639-1-umesh.nerlige.ramappa@intel.com> MIME-Version: 1.0 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Active busyness of an engine is calculated using gt timestamp and the context switch in time. While capturing the gt timestamp, it's possible that the context switches out. This race could result in an active busyness value that is greater than the actual context runtime value by a small amount. This leads to a negative delta and throws off busyness calculations for the user. If a subsequent count is smaller than the previous one, just return the previous one, since we expect the busyness to catch up. Fixes: 77cdd054dd2c ("drm/i915/pmu: Connect engine busyness stats from GuC to pmu") Signed-off-by: Umesh Nerlige Ramappa Reviewed-by: John Harrison --- drivers/gpu/drm/i915/gt/intel_engine_types.h | 5 +++++ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h index ba55c059063d..fe1f85e5dda3 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h @@ -343,6 +343,11 @@ struct intel_engine_guc_stats { * @start_gt_clk: GT clock time of last idle to active transition. */ u64 start_gt_clk; + + /** + * @total: The last value of total returned + */ + u64 total; }; union intel_engine_tlb_inv_reg { diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index c71aedcbce43..56be9f385270 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -1378,9 +1378,12 @@ static ktime_t guc_engine_busyness(struct intel_engine_cs *engine, ktime_t *now) total += intel_gt_clock_interval_to_ns(gt, clk); } + if (total > stats->total) + stats->total = total; + spin_unlock_irqrestore(&guc->timestamp.lock, flags); - return ns_to_ktime(total); + return ns_to_ktime(stats->total); } static void guc_enable_busyness_worker(struct intel_guc *guc) From patchwork Mon Nov 18 23:22:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umesh Nerlige Ramappa X-Patchwork-Id: 13879188 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 E2018D60CFA for ; Mon, 18 Nov 2024 23:22:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 08D1610E570; Mon, 18 Nov 2024 23:22:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="OTNomc1z"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id F0D3510E573 for ; Mon, 18 Nov 2024 23:22:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731972149; x=1763508149; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=lNrTZ7Y5syDNHhUS+26FG8TUWZ4sX+4CQGR6/leJmEE=; b=OTNomc1zZVHd9eeSOTCKdqLOU+1U7Myx7i8VEMEfDaFvsQCNJjMcBzPy /6/MspD6Da2HtQxvWMa5q0KXwh4VN//X18BZNnDp7X5opfi47IToYPEEN YmEHTBVRGGWwzDMFo5fBPoef3wUOk9/gwZzIjvCa5Vl74lJ6baO6let4R 5ZlP/abnD2dJnp9qnQOMZVLNDtz/8lDyhuiGlZwGI9WQnc9+caJ6jfqUd uGPaGFcjnTWYb2WoU+lwAjoziPCvzqLxK/jNK/u7wq++UEYRsFkS2AiB7 xvpf4lvIkCGUn5f2z00/AEA+l/zFYVgbOp0o9Xz3c2ebFMRIR0EDq6PnS g==; X-CSE-ConnectionGUID: 0tI/UYsuSVSedMb2J1EaMA== X-CSE-MsgGUID: l9vrTzc5QJKwyv+hpXfJAQ== X-IronPort-AV: E=McAfee;i="6700,10204,11260"; a="42466980" X-IronPort-AV: E=Sophos;i="6.12,165,1728975600"; d="scan'208";a="42466980" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2024 15:22:29 -0800 X-CSE-ConnectionGUID: 8o2sk5SMQk+4xUhqByW5Og== X-CSE-MsgGUID: 3A06Zd0QQhSTc40GDQNIxw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,165,1728975600"; d="scan'208";a="89777997" Received: from dut7231atsm.jf.intel.com ([10.75.202.213]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2024 15:22:28 -0800 From: Umesh Nerlige Ramappa To: intel-gfx@lists.freedesktop.org, john.c.harrison@intel.com Subject: [PATCH 3/3] i915/guc: Accumulate active runtime on gt reset Date: Mon, 18 Nov 2024 15:22:23 -0800 Message-Id: <20241118232223.53639-4-umesh.nerlige.ramappa@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241118232223.53639-1-umesh.nerlige.ramappa@intel.com> References: <20241118232223.53639-1-umesh.nerlige.ramappa@intel.com> MIME-Version: 1.0 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On gt reset, if a context is running, then accumulate it's active time into the busyness counter since there will be no chance for the context to switch out and update it's run time. Fixes: 77cdd054dd2c ("drm/i915/pmu: Connect engine busyness stats from GuC to pmu") Signed-off-by: Umesh Nerlige Ramappa --- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index 56be9f385270..0c204b7f3b2b 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -1449,8 +1449,21 @@ static void __reset_guc_busyness_stats(struct intel_guc *guc) guc_update_pm_timestamp(guc, &unused); for_each_engine(engine, gt, id) { + struct intel_engine_guc_stats *stats = &engine->stats.guc; + guc_update_engine_gt_clks(engine); - engine->stats.guc.prev_total = 0; + + if (stats->running) { + u64 clk = guc->timestamp.gt_stamp - stats->start_gt_clk; + + /* + * If resetting a running context, accumulate the active + * time as well since there will be no context switch. + */ + stats->total_gt_clks += clk; + } + stats->prev_total = 0; + stats->running = 0; } spin_unlock_irqrestore(&guc->timestamp.lock, flags);