From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86D741487E9 for ; Wed, 14 Jan 2026 15:43:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768405408; cv=none; b=QchutCuLq7rITZLPxgWLEjhbILoY556xuD0D0wN2vfYxFjoj8yUX1xt9VGALnQxiifLu60NQpnHWFy/9e3fswCNn9SL2zTlwx5VMzU/8DejcQXasLxK9nV98RAQaixD8trHWocwIM+WuufT7WCVXyhL8WccmreMVVU8dF/cMl7s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768405408; c=relaxed/simple; bh=oU33vatFeWfheycSDWW0VdfvnfqapcK/5QGNOA/kj3w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T9ESg0xNyDqUZnUbOP8wXujvOC1tZKSzH+diHZaqMOLTVh4aLknqNGtyY+sYHf3tU6lCq1wk0woYWn3OjTlMKX1r6ZnKQibbmfoIBJg4+l2uHquRAmhTTmL+dFO1SSEHQHq0iknwJkpzgwPCjzdBoPC/h4LXk55ofpXyN7YC5eM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org; spf=pass smtp.mailfrom=cmpxchg.org; dkim=pass (2048-bit key) header.d=cmpxchg.org header.i=@cmpxchg.org header.b=Vg+o+iJU; arc=none smtp.client-ip=209.85.222.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cmpxchg.org header.i=@cmpxchg.org header.b="Vg+o+iJU" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-8c15e8b2f1aso897570085a.0 for ; Wed, 14 Jan 2026 07:43:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg.org; s=google; t=1768405405; x=1769010205; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wxwAHkRU73ZJ5m1M4naILd3dlOWFXCxHTH34PQsvNbw=; b=Vg+o+iJU+7WViaKQaamLgE8q8I3lViWPBLxIjeNoU6nrhkoz7ixyfxa+Zeduuw+eO6 raDrZay0bKndYIpB1k5Iui+OGAX/O0Cg5OKM9ufR9lGraoDgRJUxjVxy5UnIFG/G+Dgy qAV2d7YTa4xvCOE7h1XTKn8gcHKdk9JpeOh/RufyxfTAbL3ABRDCFEXzTG+/jzORg8Yv n8kzTwlNkAThnQ3jgEf7ilu9kVlXPFeC+YdtTybrLuJ25IPwwD21WqisIAfqlkFUpSnz 8A7s1/jQGgijn2+rlPhXNNaSLjnfxUHG1H7uScKX3w5vqq2QjMsC5OI7PpQIaLI7qQji t6cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768405405; x=1769010205; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wxwAHkRU73ZJ5m1M4naILd3dlOWFXCxHTH34PQsvNbw=; b=TmGiXF+OhvSOsxaP0fwAnbkK5S14RsbpLNI0S7loPTwUH0kUrWk/x/Lg/crS8bNjbu 73FoaHqfd6G0jdLigE3sLxyRNO/mA0XO1setG7A3NxLKlE+9TQFWP/6uFZH0e3qjqtWo rUNSucanBM4726vMdr2Jbm6j+2cj718dgqLJopDaAcdyj/MGXsawgemURwM7KC0Cgu6z 6PKn0xdtchdO2oJNWhPIAukn0B1THTTzN0OraXNu6owCa41U4L+1d62I0qIDHx6RJPlb zDRNj2rv+mGY580LwpIU+kW7+4MRgU2inv3Xvqo35OTwZ+rqe1VhEkNEwe+lmU/hfUZi qLSA== X-Forwarded-Encrypted: i=1; AJvYcCU1kjEcmsBm6EO/ZHaaUgyWJ3nzCBVUFujOhfbhzaFQ76CUlrqQuMwPvWofypHNZW77lCY/gUbx3aQVLX0=@vger.kernel.org X-Gm-Message-State: AOJu0YzIkmX5jMx3Nqaic3HNfy39IvY5MAgg01H7R6Ee/0lvzQ2aGfc7 R8jckx+V41oa+AdIQdOwyPJLQeyZH1eqIeYLSyY1fm49+wTVGPseE6A/UHfUofvFvnY= X-Gm-Gg: AY/fxX58xcktrL/7D3fWPRY+/ZEUH1/5ZcWBHzH1iwDb9FUqnjNHKM+WY21kmw/PIIt 7ptIbMfowhz8SbPPtkZuLifrnwYR9oC6JXRRQFFuMHwd8CI2kAW3xn3gsB+oyZ2z1kxD9+xbq1O 3uCO/TtaPHyXXHT4uq5dhT42Ge87LxzvFMuYLvqsLqTlbiYRO2+c18dAuF2pLNk5NkLCnZavcMQ qQnzZPA1SEmF02X0Mi+y0G9YhFjSk7I9WNv3ViAnIATWUbzhCAtzwaWpdDYsTymOC8j2Fvhb0X7 xbNhoSaoGlvYmAf5FEmnMkeqekJZt1WNEKbTZ++Yo6GNSbt/2EaAEgiuCq63cn1rUUwK+fqoxdn xJw6eyESQoVlUcH2uKOzDuJZqCMjLhAzK4CdIRDsTiSVGNTOtt7prx7fWacxqqmWNEdlLG2wPtc gavo8l46wLug== X-Received: by 2002:a05:620a:178a:b0:8b2:63ed:dd10 with SMTP id af79cd13be357-8c531817444mr276145485a.78.1768405405071; Wed, 14 Jan 2026 07:43:25 -0800 (PST) Received: from localhost ([2603:7000:c01:2716:365a:60ff:fe62:ff29]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8c530a6c1a1sm183576585a.2.2026.01.14.07.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jan 2026 07:43:24 -0800 (PST) From: Johannes Weiner To: Peter Zijlstra , Suren Baghdasaryan , Ingo Molnar Cc: Chengming Zhou , Dietmar Eggemann , John Stultz , linux-kernel@vger.kernel.org Subject: [PATCH resend 2/2] sched: psi: use rq_clock() during task state changes Date: Wed, 14 Jan 2026 10:43:17 -0500 Message-ID: <20260114154317.1815429-2-hannes@cmpxchg.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260114154317.1815429-1-hannes@cmpxchg.org> References: <20260114154317.1815429-1-hannes@cmpxchg.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In the hottest psi paths, the scheduler already caches the cpu_clock() call for the event in rq->clock. Now that the clocks between state changes and pressure aggregation don't need to be synchronized inside the seqcount section anymore, use the cheaper rq_clock(). Add update_rq_clock() calls to the few places where psi is entered without the rq already locked. schbench -n 0 (no think ops): Before: average rps: 204408.50 After: average rps: 204755.90 2.67% -0.54% [kernel.kallsyms] [k] sched_clock_noinstr Reviewed-by: Chengming Zhou Signed-off-by: Johannes Weiner --- kernel/sched/core.c | 3 ++- kernel/sched/psi.c | 12 +++++++----- kernel/sched/stats.h | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 60afadb6eede..27d880a3af28 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5517,11 +5517,12 @@ void sched_tick(void) sched_clock_tick(); rq_lock(rq, &rf); + update_rq_clock(rq); + donor = rq->donor; psi_account_irqtime(rq, donor, NULL); - update_rq_clock(rq); hw_pressure = arch_scale_hw_pressure(cpu_of(rq)); update_hw_load_avg(rq_clock_task(rq), rq, hw_pressure); diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index 4b7bf8eb46c2..4a0a83f1d1dc 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -932,7 +932,7 @@ void psi_task_change(struct task_struct *task, int clear, int set) return; cpu = task_cpu(task); - now = cpu_clock(cpu); + now = rq_clock(cpu_rq(cpu)); psi_flags_change(task, clear, set); @@ -947,7 +947,7 @@ void psi_task_switch(struct task_struct *prev, struct task_struct *next, { struct psi_group *common = NULL; int cpu = task_cpu(prev); - u64 now = cpu_clock(cpu); + u64 now = rq_clock(cpu_rq(cpu)); psi_write_begin(cpu); @@ -1026,9 +1026,8 @@ void psi_account_irqtime(struct rq *rq, struct task_struct *curr, struct task_st { int cpu = task_cpu(curr); struct psi_group_cpu *groupc; + u64 irq, now; s64 delta; - u64 irq; - u64 now; if (static_branch_likely(&psi_disabled) || !irqtime_enabled()) return; @@ -1046,7 +1045,7 @@ void psi_account_irqtime(struct rq *rq, struct task_struct *curr, struct task_st return; rq->psi_irq_time = irq; - now = cpu_clock(cpu); + now = rq_clock(rq); psi_write_begin(cpu); for_each_group(group, task_psi_group(curr)) { @@ -1089,6 +1088,7 @@ void psi_memstall_enter(unsigned long *flags) * race with CPU migration. */ rq = this_rq_lock_irq(&rf); + update_rq_clock(rq); current->in_memstall = 1; psi_task_change(current, 0, TSK_MEMSTALL | TSK_MEMSTALL_RUNNING); @@ -1119,6 +1119,7 @@ void psi_memstall_leave(unsigned long *flags) * race with CPU migration. */ rq = this_rq_lock_irq(&rf); + update_rq_clock(rq); current->in_memstall = 0; psi_task_change(current, TSK_MEMSTALL | TSK_MEMSTALL_RUNNING, 0); @@ -1187,6 +1188,7 @@ void cgroup_move_task(struct task_struct *task, struct css_set *to) } rq = task_rq_lock(task, &rf); + update_rq_clock(rq); /* * We may race with schedule() dropping the rq lock between diff --git a/kernel/sched/stats.h b/kernel/sched/stats.h index c903f1a42891..cb67a81e92b6 100644 --- a/kernel/sched/stats.h +++ b/kernel/sched/stats.h @@ -210,6 +210,7 @@ static inline void psi_ttwu_dequeue(struct task_struct *p) struct rq *rq; rq = __task_rq_lock(p, &rf); + update_rq_clock(rq); psi_task_change(p, p->psi_flags, 0); __task_rq_unlock(rq, p, &rf); } -- 2.52.0