Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
Date:   Mon, 27 Nov 2023 13:07:54 -0500
From:   Steven Rostedt <rostedt@goodmis.org>
To:     tiozhang <tiozhang@didiglobal.com>
Cc:     <bigeasy@linutronix.de>, <tglx@linutronix.de>, <mingo@redhat.com>,
        <peterz@infradead.org>, <juri.lelli@redhat.com>,
        <vincent.guittot@linaro.org>, <linux-kernel@vger.kernel.org>,
        <dietmar.eggemann@arm.com>, <bsegall@google.com>,
        <mgorman@suse.de>, <bristot@redhat.com>, <vschneid@redhat.com>,
        <zyhtheonly@gmail.com>, <zyhtheonly@yeah.net>
Subject: Re: [PATCH] sched/cputime: exclude ktimer threads in
 irqtime_account_irq
Message-ID: <20231127130754.3affb908@gandalf.local.home>
In-Reply-To: <20231124063450.GA18089@didi-ThinkCentre-M930t-N000>
References: <20231124063450.GA18089@didi-ThinkCentre-M930t-N000>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Fri, 24 Nov 2023 14:34:50 +0800
tiozhang <tiozhang@didiglobal.com> wrote:

> diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
> index af7952f12e6c..0fac0109d151 100644
> --- a/kernel/sched/cputime.c
> +++ b/kernel/sched/cputime.c
> @@ -73,7 +73,12 @@ void irqtime_account_irq(struct task_struct *curr, unsigned int offset)
>  	 */
>  	if (pc & HARDIRQ_MASK)
>  		irqtime_account_delta(irqtime, delta, CPUTIME_IRQ);
> +#ifdef CONFIG_PREEMPT_RT
> +	else if ((pc & SOFTIRQ_OFFSET) && curr != this_cpu_ksoftirqd()
> +		&& curr != this_cpu_ktimers())
> +#else
>  	else if ((pc & SOFTIRQ_OFFSET) && curr != this_cpu_ksoftirqd())
> +#endif
>  		irqtime_account_delta(irqtime, delta, CPUTIME_SOFTIRQ);
>  }

If the above is necessary, it would look nicer as:

  	else if (((pc & SOFTIRQ_OFFSET) && curr != this_cpu_ksoftirqd() &&
		  (!IS_ENABLED(CONFIG_PREEMPT_RT) || curr != this_cpu_ktimers()))

-- Steve