From: Thomas Gleixner <tglx@linutronix.de>
To: Peter Zijlstra <peterz@infradead.org>
Cc: mingo@kernel.org, linux-kernel@vger.kernel.org,
Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH 3/3] perf: Fix mux_interval hrtimer wreckage
Date: Wed, 22 Apr 2015 17:12:04 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.11.1504221710370.13914@nanos> (raw)
In-Reply-To: <20150415095011.863052571@infradead.org>
On Wed, 15 Apr 2015, Peter Zijlstra wrote:
> -static void perf_cpu_hrtimer_restart(struct perf_cpu_context *cpuctx)
> +static int perf_mux_hrtimer_restart(struct perf_cpu_context *cpuctx)
> {
> - struct hrtimer *hr = &cpuctx->hrtimer;
> + struct hrtimer *timer = &cpuctx->hrtimer;
> struct pmu *pmu = cpuctx->ctx.pmu;
>
> /* not for SW PMU */
> if (pmu->task_ctx_nr == perf_sw_context)
> - return;
> + return 0;
>
> - if (hrtimer_active(hr))
> - return;
> + if (hrtimer_is_queued(timer))
> + return 0;
>
> - hrtimer_start(hr, cpuctx->hrtimer_interval, HRTIMER_MODE_REL_PINNED);
> + hrtimer_start(timer, cpuctx->hrtimer_interval, HRTIMER_MODE_REL_PINNED);
return 0;
> }
I fixed it up when applying it.
Thanks,
tglx
next prev parent reply other threads:[~2015-04-22 15:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-15 9:41 [PATCH 0/3] hrtimer (related) fixes Peter Zijlstra
2015-04-15 9:41 ` [PATCH 1/3] hrtimer: Fix race between hrtimer_start() and __run_hrtimer() Peter Zijlstra
2015-04-15 10:26 ` Thomas Gleixner
2015-04-15 11:31 ` Peter Zijlstra
2015-04-15 11:35 ` Thomas Gleixner
2015-04-15 11:43 ` Peter Zijlstra
2015-04-22 19:15 ` [tip:timers/core] hrtimer: Allow concurrent hrtimer_start() for self restarting timers tip-bot for Peter Zijlstra
2015-05-12 13:52 ` Sasha Levin
2015-05-13 13:43 ` Peter Zijlstra
2015-05-13 13:54 ` Ingo Molnar
2015-05-13 17:25 ` bsegall
2015-05-13 23:09 ` Sasha Levin
2015-05-14 10:23 ` Peter Zijlstra
2015-05-18 15:21 ` [tip:timers/core] sched,perf: Fix periodic timers tip-bot for Peter Zijlstra
2015-04-15 9:41 ` [PATCH 2/3] sched: Cleanup bandwidth timers Peter Zijlstra
2015-04-16 20:03 ` bsegall
2015-04-22 19:15 ` [tip:timers/core] " tip-bot for Peter Zijlstra
2015-04-15 9:41 ` [PATCH 3/3] perf: Fix mux_interval hrtimer wreckage Peter Zijlstra
2015-04-15 13:48 ` David Ahern
2015-04-15 14:20 ` Peter Zijlstra
2015-04-22 15:12 ` Thomas Gleixner [this message]
2015-04-22 19:15 ` [tip:timers/core] " tip-bot for Peter Zijlstra
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=alpine.DEB.2.11.1504221710370.13914@nanos \
--to=tglx@linutronix.de \
--cc=eranian@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
/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
all inboxes | Powered by JetHome®