Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH] hrtimer: Use raw_cpu_ptr() in clock_was_set()
To:     Thomas Gleixner <tglx@linutronix.de>,
        Mike Galbraith <efault@gmx.de>, linux-kernel@vger.kernel.org,
        linux-tip-commits@vger.kernel.org
Cc:     Peter Zijlstra <peterz@infradead.org>, x86@kernel.org
From:   Marek Szyprowski <m.szyprowski@samsung.com>
Message-ID: <72282431-2d9e-048c-62c5-1fb62ebd8f5d@samsung.com>
Date:   Fri, 13 Aug 2021 08:42:35 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0)
        Gecko/20100101 Thunderbird/78.13.0
MIME-Version: 1.0
In-Reply-To: <875ywacsmb.ffs@tglx>
Content-Transfer-Encoding: 7bit
Content-Language: en-US
Content-Type: text/plain; charset="utf-8"
CMS-TYPE: 201P
References: <20210713135158.054424875@linutronix.de>
        <162861133759.395.7795246170325882103.tip-bot2@tip-bot2>
        <7dfb3b15af67400227e7fa9e1916c8add0374ba9.camel@gmx.de>
        <87a6lmiwi0.ffs@tglx>
        <CGME20210812203131eucas1p22c7a4049c7f78825e80d1624dbd78805@eucas1p2.samsung.com>
        <875ywacsmb.ffs@tglx>
Precedence: bulk

On 12.08.2021 22:31, Thomas Gleixner wrote:
> clock_was_set() can be invoked from preemptible context. Use raw_cpu_ptr()
> to check whether high resolution mode is active or not. It does not matter
> whether the task migrates after acquiring the pointer.
>
> Fixes: e71a4153b7c2 ("hrtimer: Force clock_was_set() handling for the HIGHRES=n, NOHZ=y case")
> Reported-by: Mike Galbraith <efault@gmx.de>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>

This fixes the following issue:

BUG: using smp_processor_id() in preemptible [00000000] code: hwclock/227

> ---
>   kernel/time/hrtimer.c |    5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> --- a/kernel/time/hrtimer.c
> +++ b/kernel/time/hrtimer.c
> @@ -944,10 +944,11 @@ static bool update_needs_ipi(struct hrti
>    */
>   void clock_was_set(unsigned int bases)
>   {
> +	struct hrtimer_cpu_base *cpu_base = raw_cpu_ptr(&hrtimer_bases);
>   	cpumask_var_t mask;
>   	int cpu;
>   
> -	if (!hrtimer_hres_active() && !tick_nohz_active)
> +	if (!__hrtimer_hres_active(cpu_base) && !tick_nohz_active)
>   		goto out_timerfd;
>   
>   	if (!zalloc_cpumask_var(&mask, GFP_KERNEL)) {
> @@ -958,9 +959,9 @@ void clock_was_set(unsigned int bases)
>   	/* Avoid interrupting CPUs if possible */
>   	cpus_read_lock();
>   	for_each_online_cpu(cpu) {
> -		struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
>   		unsigned long flags;
>   
> +		cpu_base = &per_cpu(hrtimer_bases, cpu);
>   		raw_spin_lock_irqsave(&cpu_base->lock, flags);
>   
>   		if (update_needs_ipi(cpu_base, bases))
>
Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland