From mboxrd@z Thu Jan 1 00:00:00 1970 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 B4896C02191 for ; Wed, 22 Jan 2025 06:24:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A4B3910E673; Wed, 22 Jan 2025 06:24:14 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="MnJlfcEN"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1127E10E148 for ; Wed, 22 Jan 2025 06:24:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1737527053; x=1769063053; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6nBis5hDK8emyZJlnksqrmdUFgEf8w3W/ae5Tt+wyp4=; b=MnJlfcENUR97noEnBHI5ZhD8/wC+KB3KzaxulmEEdib7Swq0G5iVoBjo YI8JbAoqGu+4ZD41gk1vBbJy2Z2fuZ/zhNXHPRx1T+S+KzWVSoHfJDXr+ Y1V7pA1xMLDsMZn5fyWWMGoDzkM1PYVWWigckwTPI+CykbvyiBD2nUwSX Ecv7xwiTrfrNlx7IU9t4X34GvwfG/8l4vnfWxtScn9n1iWlI1DWaG8HAO xEupdWme7SfMwE37F+qFg9Rmpl6e8xeSm9sxHBI5NHF6kr66zWqQW2WQW YbzDD6xnZJN4Puyu8CruWdr2OHJFarHsH6BnlL+DGBkkc5jMH0/tVnMy5 Q==; X-CSE-ConnectionGUID: TFiz+cJYTHasaW80SOpJYw== X-CSE-MsgGUID: nANrZeLKQ6K4mSIaZW5CTw== X-IronPort-AV: E=McAfee;i="6700,10204,11322"; a="41643299" X-IronPort-AV: E=Sophos;i="6.13,224,1732608000"; d="scan'208";a="41643299" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jan 2025 22:24:12 -0800 X-CSE-ConnectionGUID: J1r8tzPuQwyzYASWuf08GA== X-CSE-MsgGUID: WKbxcoYcQEqnjW9C3DvJMA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="112015664" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.196]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jan 2025 22:24:12 -0800 From: Lucas De Marchi To: Cc: Rodrigo Vivi , Vinay Belgaumkar , Riana Tauro , Peter Zijlstra , linux-perf-users@vger.kernel.org, Lucas De Marchi Subject: [PATCH v14 4/7] drm/xe/pmu: Extract xe_pmu_event_update() Date: Tue, 21 Jan 2025 22:23:38 -0800 Message-ID: <20250122062341.1100173-5-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.48.0 In-Reply-To: <20250122062341.1100173-1-lucas.demarchi@intel.com> References: <20250122062341.1100173-1-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Like other pmu drivers, keep the update separate from the read so it can be called from other methods (like stop()) without side effects. Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/xe/xe_pmu.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_pmu.c b/drivers/gpu/drm/xe/xe_pmu.c index bd2d709453257..5a93634f17a2b 100644 --- a/drivers/gpu/drm/xe/xe_pmu.c +++ b/drivers/gpu/drm/xe/xe_pmu.c @@ -125,18 +125,11 @@ static u64 __xe_pmu_event_read(struct perf_event *event) return val; } -static void xe_pmu_event_read(struct perf_event *event) +static void xe_pmu_event_update(struct perf_event *event) { - struct xe_device *xe = container_of(event->pmu, typeof(*xe), pmu.base); struct hw_perf_event *hwc = &event->hw; - struct xe_pmu *pmu = &xe->pmu; u64 prev, new; - if (!pmu->registered) { - event->hw.state = PERF_HES_STOPPED; - return; - } - prev = local64_read(&hwc->prev_count); do { new = __xe_pmu_event_read(event); @@ -145,6 +138,19 @@ static void xe_pmu_event_read(struct perf_event *event) local64_add(new - prev, &event->count); } +static void xe_pmu_event_read(struct perf_event *event) +{ + struct xe_device *xe = container_of(event->pmu, typeof(*xe), pmu.base); + struct xe_pmu *pmu = &xe->pmu; + + if (!pmu->registered) { + event->hw.state = PERF_HES_STOPPED; + return; + } + + xe_pmu_event_update(event); +} + static void xe_pmu_enable(struct perf_event *event) { /* @@ -174,7 +180,7 @@ static void xe_pmu_event_stop(struct perf_event *event, int flags) if (pmu->registered) if (flags & PERF_EF_UPDATE) - xe_pmu_event_read(event); + xe_pmu_event_update(event); event->hw.state = PERF_HES_STOPPED; } -- 2.48.0