From: Jerry Snitselaar <jsnitsel@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-integrity@vger.kernel.org, intel-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org,
Thomas Gleixner <tglx@linutronix.de>,
Jani Nikula <jani.nikula@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Jarkko Sakkinen <jarkko@kernel.org>,
Jason Gunthorpe <jgg@ziepe.ca>, Peter Huewe <peterhuewe@gmx.de>,
James Bottomley <James.Bottomley@HansenPartnership.com>,
Matthew Garrett <mjg59@google.com>,
Hans de Goede <hdegoede@redhat.com>
Subject: [PATCH v3 2/4] drm/i915/pmu: Use kstat_irqs to get interrupt count
Date: Fri, 4 Dec 2020 18:43:38 -0700 [thread overview]
Message-ID: <20201205014340.148235-3-jsnitsel@redhat.com> (raw)
In-Reply-To: <20201205014340.148235-1-jsnitsel@redhat.com>
Now that kstat_irqs is exported, get rid of count_interrupts in
i915_pmu.c
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Cc: Jarkko Sakkinen <jarkko@kernel.org>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Peter Huewe <peterhuewe@gmx.de>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Matthew Garrett <mjg59@google.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
---
drivers/gpu/drm/i915/i915_pmu.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index 69c0fa20eba1..a3e63f03da8c 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -423,22 +423,6 @@ static enum hrtimer_restart i915_sample(struct hrtimer *hrtimer)
return HRTIMER_RESTART;
}
-static u64 count_interrupts(struct drm_i915_private *i915)
-{
- /* open-coded kstat_irqs() */
- struct irq_desc *desc = irq_to_desc(i915->drm.pdev->irq);
- u64 sum = 0;
- int cpu;
-
- if (!desc || !desc->kstat_irqs)
- return 0;
-
- for_each_possible_cpu(cpu)
- sum += *per_cpu_ptr(desc->kstat_irqs, cpu);
-
- return sum;
-}
-
static void i915_pmu_event_destroy(struct perf_event *event)
{
struct drm_i915_private *i915 =
@@ -581,7 +565,7 @@ static u64 __i915_pmu_event_read(struct perf_event *event)
USEC_PER_SEC /* to MHz */);
break;
case I915_PMU_INTERRUPTS:
- val = count_interrupts(i915);
+ val = kstat_irqs(i915->drm.pdev->irq);
break;
case I915_PMU_RC6_RESIDENCY:
val = get_rc6(&i915->gt);
--
2.27.0
next prev parent reply other threads:[~2020-12-05 1:45 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-05 1:43 [PATCH v3 0/4] tpm_tis: Detect interrupt storms Jerry Snitselaar
2020-12-05 1:43 ` [PATCH v3 1/4] irq: export kstat_irqs Jerry Snitselaar
2020-12-05 10:39 ` Jarkko Sakkinen
2020-12-06 16:40 ` Thomas Gleixner
2020-12-06 17:40 ` James Bottomley
2020-12-06 19:29 ` Thomas Gleixner
2020-12-06 17:54 ` Thomas Gleixner
2020-12-06 21:46 ` Jerry Snitselaar
2020-12-05 1:43 ` Jerry Snitselaar [this message]
2020-12-06 16:38 ` [PATCH v3 2/4] drm/i915/pmu: Use kstat_irqs to get interrupt count Thomas Gleixner
2020-12-06 21:33 ` Thomas Gleixner
2020-12-08 9:54 ` Jarkko Sakkinen
2020-12-06 21:47 ` Jerry Snitselaar
2020-12-06 23:38 ` Thomas Gleixner
2020-12-10 7:53 ` [Intel-gfx] " Joonas Lahtinen
2020-12-10 10:45 ` Tvrtko Ursulin
2020-12-10 16:35 ` Thomas Gleixner
2020-12-10 17:09 ` Tvrtko Ursulin
2020-12-10 17:44 ` Thomas Gleixner
2020-12-10 17:51 ` Tvrtko Ursulin
2020-12-05 1:43 ` [PATCH v3 3/4] tpm_tis: Disable interrupts if interrupt storm detected Jerry Snitselaar
2020-12-06 19:26 ` Thomas Gleixner
2020-12-07 19:28 ` Jason Gunthorpe
2020-12-07 19:58 ` James Bottomley
2020-12-08 17:43 ` Jarkko Sakkinen
2020-12-08 17:42 ` Jarkko Sakkinen
2020-12-05 1:43 ` [PATCH v3 4/4] tpm_tis: Disable Interrupts on the ThinkPad L490 Jerry Snitselaar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201205014340.148235-3-jsnitsel@redhat.com \
--to=jsnitsel@redhat.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hdegoede@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=jarkko@kernel.org \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mjg59@google.com \
--cc=peterhuewe@gmx.de \
--cc=rodrigo.vivi@intel.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).