From nobody Sat Feb 7 23:48:14 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 3BAA815624B for ; Sat, 17 Aug 2024 20:46:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723927610; cv=none; b=pZKTFAjMHJkvXIbfKhq7UDUUJRzEawBb3qNaBDmb5RJLnQGmtJLHtcU0q2U7YTVYmaxO7eKFGdAjeMks1Rkq3bvuYDKpipbHlhGzAJsjwhIxEQXUQ5F/Dw27+cXy/FpXuld+Y7aq5dppXSR7D3E4gffw3r4T2lEK11RbUGcvNxU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723927610; c=relaxed/simple; bh=K0xjumLwWN6l2imOx3JvlkgsS/HBAmMUKFbMV39pZxQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VYT2LZcYwftRsb6UlcaiIhodvM6cJAhajNXU44ukKecBR8/HtlYu3sZEBNR2ZYWr+Qd/5lrtCk5Qtokxcnngrf3B7c4qXSMtRfTfbmHxiAYbuQfM1ALRlGi47xDsdlkWv77ADqJgFYpU21FgKXJzNHefAiuFiaQ3ohnwrzOp0OI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=3Kmo1S2D; arc=none smtp.client-ip=209.85.210.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="3Kmo1S2D" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-70d0fc15efbso25730b3a.3 for ; Sat, 17 Aug 2024 13:46:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1723927605; x=1724532405; 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=JkqFfu8TNNTkeL8UJk+hasytcQg+Y2ER8tyNsGPxyto=; b=3Kmo1S2DRq7A33txQCq24nF/12JFZzMNAKKnz7nARySFYv0vSUzXMCgBs6Sq3WV31A +bUwtgQ7JN2OdFZA4ZupNWPucZiXV9P5SjUMrWg3YnNJcKAdMj/E2C+6eaKoeg5yqdv+ f1pGRHWHbmwy4s6cEGNzq+Z3zyofBqOapYr4CAPbB4FhdmFDWlKPuQhbgePnwdLIdAHP BiKrZ0kM66viWe+w3r37g9bjrecHIjSp3orNYM2lV03+X+xLR4pAzGCgjbEv9aZKVetq MLecrZX4fuI01HXZACT4YG41pVfjfep/GJjv5Mp9pxIs4OeiV4h+Y8gNS5HuuMlBh5b6 C2UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723927605; x=1724532405; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JkqFfu8TNNTkeL8UJk+hasytcQg+Y2ER8tyNsGPxyto=; b=aUq0NzYtFTnLaonGxdlg3PBkY2h7IpVu6wfmHeXZ1lUC71nqBdYkyxTzdrKRH/ODR7 E6D8sX4iCtZEM9+uEji297gNrsAkd9pTpBexQO9w1o5LoXnv0N3M31o8gnQNR6HegFO7 j20CaARW0MUGjGaDQd9u/fHWTLR9IGWYO3G8xYZGTQveP1yrwag+KoqN6g1S7eMU6VjE 0wFjeBoKasqgoq/9SQZi0xomc3O9g34jrEPUK8/qpCZKYs8wQ7A9v5gkmTViv9Ib962B k/KzwQK9wQZgRA2xTAZl8Hxqsq90JOJTxO1mQyzVHOy60lsjHtxnfrNUNRvPFbBXT/eT CPAw== X-Gm-Message-State: AOJu0YxQjPgVo9YsWxqgGVvg0N/CGCemtnYQ4Ytr+X/mOeh9sBcCrSMp xX7XFT1W4Hbav4GbHaqrH+Qvla264AsndLis64iWTVgG4Om6i9P6nQVAQJtBJY226QXJnsIsgzH h X-Google-Smtp-Source: AGHT+IEVx9zvTwiMTf8LUWcZri6euCeuaxNcG9dp1Cw7iLh1ROYQfLofEx+PG0jtzlyq5XsXpmP8GQ== X-Received: by 2002:a05:6a00:9446:b0:710:5d44:5fe6 with SMTP id d2e1a72fcca58-713c557a36amr4960595b3a.1.1723927605087; Sat, 17 Aug 2024 13:46:45 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7127ae07e41sm4411039b3a.65.2024.08.17.13.46.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Aug 2024 13:46:44 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: peterz@infradead.org, tglx@linutronix.de, Jens Axboe Subject: [PATCH 1/4] sched/core: add helpers for iowait handling Date: Sat, 17 Aug 2024 14:45:10 -0600 Message-ID: <20240817204639.132794-2-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240817204639.132794-1-axboe@kernel.dk> References: <20240817204639.132794-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adds helpers to inc/dec the runqueue iowait count, based on the task, and use those in the spots where the count is manipulated. Adds an rq_iowait() helper, to abstract out how the per-rq stats are read. No functional changes in this patch, just in preparation for switching the type of 'nr_iowait'. Signed-off-by: Jens Axboe --- kernel/sched/core.c | 23 +++++++++++++++++++---- kernel/sched/cputime.c | 3 +-- kernel/sched/sched.h | 2 ++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index ab50100363ca..9bf1b67818d0 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3541,6 +3541,21 @@ static inline bool rq_has_pinned_tasks(struct rq *rq) =20 #endif /* !CONFIG_SMP */ =20 +static void task_iowait_inc(struct task_struct *p) +{ + atomic_inc(&task_rq(p)->nr_iowait); +} + +static void task_iowait_dec(struct task_struct *p) +{ + atomic_dec(&task_rq(p)->nr_iowait); +} + +int rq_iowait(struct rq *rq) +{ + return atomic_read(&rq->nr_iowait); +} + static void ttwu_stat(struct task_struct *p, int cpu, int wake_flags) { @@ -3607,7 +3622,7 @@ ttwu_do_activate(struct rq *rq, struct task_struct *p= , int wake_flags, #endif if (p->in_iowait) { delayacct_blkio_end(p); - atomic_dec(&task_rq(p)->nr_iowait); + task_iowait_dec(p); } =20 activate_task(rq, p, en_flags); @@ -4184,7 +4199,7 @@ int try_to_wake_up(struct task_struct *p, unsigned in= t state, int wake_flags) if (task_cpu(p) !=3D cpu) { if (p->in_iowait) { delayacct_blkio_end(p); - atomic_dec(&task_rq(p)->nr_iowait); + task_iowait_dec(p); } =20 wake_flags |=3D WF_MIGRATED; @@ -5282,7 +5297,7 @@ unsigned long long nr_context_switches(void) =20 unsigned int nr_iowait_cpu(int cpu) { - return atomic_read(&cpu_rq(cpu)->nr_iowait); + return rq_iowait(cpu_rq(cpu)); } =20 /* @@ -6512,7 +6527,7 @@ static void __sched notrace __schedule(unsigned int s= ched_mode) deactivate_task(rq, prev, DEQUEUE_SLEEP | DEQUEUE_NOCLOCK); =20 if (prev->in_iowait) { - atomic_inc(&rq->nr_iowait); + task_iowait_inc(prev); delayacct_blkio_start(); } } diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 0bed0fa1acd9..b826267714de 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -222,9 +222,8 @@ void account_steal_time(u64 cputime) void account_idle_time(u64 cputime) { u64 *cpustat =3D kcpustat_this_cpu->cpustat; - struct rq *rq =3D this_rq(); =20 - if (atomic_read(&rq->nr_iowait) > 0) + if (rq_iowait(this_rq()) > 0) cpustat[CPUTIME_IOWAIT] +=3D cputime; else cpustat[CPUTIME_IDLE] +=3D cputime; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 1e1d1b467af2..b6b3b565bcb1 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3579,6 +3579,8 @@ static inline void init_sched_mm_cid(struct task_stru= ct *t) { } extern u64 avg_vruntime(struct cfs_rq *cfs_rq); extern int entity_eligible(struct cfs_rq *cfs_rq, struct sched_entity *se); =20 +int rq_iowait(struct rq *rq); + #ifdef CONFIG_RT_MUTEXES =20 static inline int __rt_effective_prio(struct task_struct *pi_task, int pri= o) --=20 2.43.0 From nobody Sat Feb 7 23:48:14 2026 Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) (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 EC7CD15623B for ; Sat, 17 Aug 2024 20:46:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723927610; cv=none; b=RkNin+PDIerCqVgv0aNKhSUl4oIUxtE/EPEjYdz/wC/34fDN1X13r+ddE3jcKo4BzW6ClGCAkOYSxPFfSK794UvXc5YR8k5dkMaTuMg4r07GFEMdcm0XNqC4XSYRZYOkdQqwvb5u7qQL97OsQZdVQhEa9ZpUrIe/f55Jbi/LeZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723927610; c=relaxed/simple; bh=7Vp7No9whTj/vA4D1O3CqTZTNcenrkvZwi9JHFy5Tm8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lva8ToINsf44yRFb/KUGgSLVH4iK8DTeyyxwbz9mBLkCMtCxSiTq2x31pLGxejSzx+1VPiQFt7Qz9KH+94iR422hA4V+mho3opgB6zRO+hJ5ZDO40MkZ97vNuZErjpDStVFRm5AJswFheaJtHZ1D0derIOoHPmG2phjlGaeBVAo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=kyjbiwa1; arc=none smtp.client-ip=209.85.210.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="kyjbiwa1" Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-70c7c5cb313so48589a34.1 for ; Sat, 17 Aug 2024 13:46:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1723927606; x=1724532406; 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=02y/Wd8d3ZrLXS7qBzEKtx51SdWa+9oNHCqY9s5SPZE=; b=kyjbiwa1Y0r0vy7Jqzp9b3DNujVInGrqgtIPLPYMs0lJSEf1Bum4in7Mwk7xYO4oA7 PTX6dOynrg+Nd4c9CvWHzjrxNtH8zU5CFxwVDATRXFC0X22W5xLUAkbAOYEsDeh+Jf8h O+0uFZNXmAc30iqRE31snyCj+Ut07YF0A3KTN5U+cJzELey2WGtmyFw3AfVvBx5a3aGo R6pOtLnML//iji/4p7dLWqdYYEGNbaHK9WCJ1mWyRB8Jh49CVCEfuXTUFZF4fwoMerKM TmIadzgCLvmlHf1uKyURjyiGIdDm99rvDztyNXd76FGfTaXX/dMGrRLDYwAwfNH4hhJe x7HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723927606; x=1724532406; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=02y/Wd8d3ZrLXS7qBzEKtx51SdWa+9oNHCqY9s5SPZE=; b=A5vGeVdhLOY9Yb4aDnsmppiFXtWQ5XKWUBPtrladSo/I1L1aql/cnXM7FXbqCopcGL 6iE9M2coSFX0tKtZXnX+8ZmXDIQuOWZBtOD/fn749n/nNDiZVjqMuDG2qNGxx31bLeuB Ve9H+kYolqGc2J4xn3EXikSNLL3Byy0pjKyb5N5v149vFirEbqGzGhnQfEed/ftsXFAZ dqCXNHRkJ3tyauKI7aEv/dyN1SF/aTqbz0JYUp9jYlzf6Z4ucTqg2qNBMEwCKOBnMEb8 8ebuCgTbCLNUOZDyTNNxosjPbB2SjaQEKdhX/csTM/LtI9BqG1BszsEcCc148ulVt95j mBIA== X-Gm-Message-State: AOJu0YymL8X4x3KHkf88Gtu2+zXElKuR+4uDzbXiVqPwJG8cGbYAfFjA XY9fohYFVMIluTLrJJV1lvFy/3n4vu3xmBfmVgOijOFP7iXF8r+hMbVS2ijwwb/Vhi08PvZlJF6 O X-Google-Smtp-Source: AGHT+IFqjfiTlMbyBgbOXSrDzwrVTU0Iq7cMM59EJVaPUwdJqLY9FKlS5uF3LRTNIbPXN3Rw+6xIRw== X-Received: by 2002:a05:6830:4486:b0:703:78ff:1e1 with SMTP id 46e09a7af769-70cac7d4d86mr3074352a34.0.1723927606580; Sat, 17 Aug 2024 13:46:46 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7127ae07e41sm4411039b3a.65.2024.08.17.13.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Aug 2024 13:46:45 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: peterz@infradead.org, tglx@linutronix.de, Jens Axboe Subject: [PATCH 2/4] sched/core: change rq->nr_iowait type to atomic_long_t on 64-bit Date: Sat, 17 Aug 2024 14:45:11 -0600 Message-ID: <20240817204639.132794-3-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240817204639.132794-1-axboe@kernel.dk> References: <20240817204639.132794-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In preparation for storing two separate iowait states in there, bump the size from a 32-bit to a 64-bit size, for 64-bit kernels. Note that on 32-bit, the number of tasks are limited to 0x8000, which fits just fine in even half of the existiing 32-bit atomic_t. For 64-bit, no such limit exists, hence play it safe and make it a 64-bit atomic. Signed-off-by: Jens Axboe --- kernel/sched/core.c | 14 +++++++++++++- kernel/sched/sched.h | 4 ++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 9bf1b67818d0..ddabf20cd9e0 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3543,17 +3543,29 @@ static inline bool rq_has_pinned_tasks(struct rq *r= q) =20 static void task_iowait_inc(struct task_struct *p) { +#ifdef CONFIG_64BIT + atomic_long_inc(&task_rq(p)->nr_iowait); +#else atomic_inc(&task_rq(p)->nr_iowait); +#endif } =20 static void task_iowait_dec(struct task_struct *p) { +#ifdef CONFIG_64BIT + atomic_long_dec(&task_rq(p)->nr_iowait); +#else atomic_dec(&task_rq(p)->nr_iowait); +#endif } =20 int rq_iowait(struct rq *rq) { +#ifdef CONFIG_64BIT + return atomic_long_read(&rq->nr_iowait); +#else return atomic_read(&rq->nr_iowait); +#endif } =20 static void @@ -8372,7 +8384,7 @@ void __init sched_init(void) #endif #endif /* CONFIG_SMP */ hrtick_rq_init(rq); - atomic_set(&rq->nr_iowait, 0); + atomic_long_set(&rq->nr_iowait, 0); fair_server_init(rq); =20 #ifdef CONFIG_SCHED_CORE diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index b6b3b565bcb1..6a90c2da1eb3 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1082,7 +1082,11 @@ struct rq { u64 clock_idle_copy; #endif =20 +#ifdef CONFIG_64BIT + atomic_long_t nr_iowait; +#else atomic_t nr_iowait; +#endif =20 #ifdef CONFIG_SCHED_DEBUG u64 last_seen_need_resched_ns; --=20 2.43.0 From nobody Sat Feb 7 23:48:14 2026 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 2C4C015624D for ; Sat, 17 Aug 2024 20:46:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723927610; cv=none; b=ddfAo4C14FaXE4MnwszSgOoZCbMd/ImQqwTMaAVlCIqwZ0RT23aqYb5yhFc1qZDZOiwHjd7I5F1gOMCpfzM0AkeksIZhBippXySCYeMVsUB/7hIfDOGWPML3tomS/lhsxXhvT2fAs2DIXs/vocQ0TMTVMR01BTWxEaQpfiCOWAw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723927610; c=relaxed/simple; bh=BmTe2CyYLeUX7cn6C5aHi1iNgZg8GBCBNyLdqX9hEhI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZS7M0ObWoNPHYuR+GX3nqcEdYKY6eBLf+zvErrMJkjdNtakqRdO+B8OpFejjlXGkAlRQ51rEZGqPFWKS1TdCrUnR2QCUxJTbZuz5e1bB7j5zOVGhjA7Jq+OtpHFVWQKLRSgeo4WvMi+csLKRIt63b8I634HOVBB4aiphcTm5uJk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=l+1pcYK2; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="l+1pcYK2" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2d3ed48c748so353997a91.3 for ; Sat, 17 Aug 2024 13:46:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1723927608; x=1724532408; 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=fqE65oF4WU06KhnFO6TGzqMahCVuqHBDZ2qPq59QCiU=; b=l+1pcYK21cr/Ey8IjhY72AqkH5mBgTQimwTXqEBGFQFqGFRgHPv3gNVtFBFjcY5m75 1F04tloCpCMrw518ZdB7fLg6dP0Kt2qw+eYNCfX/mc6wf+qJqtG+WtMTPxLeTuL4Spi6 l4Xt/TomASWa/BgmC6Mvoxhd4wbLkuJQ/f/GJ/9hU2Dm4ROsBnR9riC8qr8XS9CB5rjP cK6outfpMQmrqlPCLQ0lMfDNCWNeLSeaZskpwnHta9GaOjVD5nD0JW3+wRD0Kkahtco1 LhbBZ34nOMEdAAHblH3TtKlx31VVS8ZW4EsLsyfpEl52PjRixPgDY7BgdiWmssvdVkrC I5oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723927608; x=1724532408; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fqE65oF4WU06KhnFO6TGzqMahCVuqHBDZ2qPq59QCiU=; b=pGXdL+vDWuFlCa7Ir5rmYr4eIOv8mytqNOuxCQmANsvyEGNBHwfV5ocdHNGUnWUteC DZyHO3V4IVCDsdor9mzR+ZTxX9TYeCQbTkAcg1gKrV2j/rG5sGJZeoneV4SCXvRru8n/ ekXLjhREuxe7Nw2hC5WoMcOWWXp/8GHo4OdalzxyCQmW9U1TNIehRJ8CYMKuF2K9BJfF ySOwByiV0bmdx1BluKLjH6jIGX32CGr0Fl/SMPSRb+sJOUvOUUGU68LZ9AE7brALJvHq Wo04zFbd2jO79+SdZw+1Pn1GzHkRLq3MTc+rAMZlpODU46PXuLWMUotZkhDLwPKtGSUo wuew== X-Gm-Message-State: AOJu0Yyb5PH6VL1jK+aiAMsPaksoltuN7e0vWtjVtrTBUZsPY232drXQ 5BstPq3h/P0kbSOe5Ij9q3R3dRiiMTFG3tQnB3CDmEwonMUYP0aLdxWOZDdnCkyxmahP7LFt3AK W X-Google-Smtp-Source: AGHT+IGjVuqQzi5Vz0aVyh+txyYvwjdEKreZuWKgms7U6azB9teX3pOfS9dgfoxt8zyxLln1F1i1Ag== X-Received: by 2002:a05:6a21:6da3:b0:1c4:9567:18fe with SMTP id adf61e73a8af0-1c905052543mr4722461637.6.1723927608077; Sat, 17 Aug 2024 13:46:48 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7127ae07e41sm4411039b3a.65.2024.08.17.13.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Aug 2024 13:46:47 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: peterz@infradead.org, tglx@linutronix.de, Jens Axboe Subject: [PATCH 3/4] sched/core: have io_schedule_prepare() return a long Date: Sat, 17 Aug 2024 14:45:12 -0600 Message-ID: <20240817204639.132794-4-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240817204639.132794-1-axboe@kernel.dk> References: <20240817204639.132794-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In preparation for needing more state then 32-bit on 64-bit archs, switch it to a long instead. Signed-off-by: Jens Axboe --- block/blk-cgroup.c | 2 +- include/linux/sched.h | 4 ++-- kernel/locking/mutex.c | 4 ++-- kernel/locking/rtmutex_api.c | 4 ++-- kernel/sched/core.c | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 69e70964398c..f8e6220c66a7 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1884,7 +1884,7 @@ static void blkcg_maybe_throttle_blkg(struct blkcg_gq= *blkg, bool use_memdelay) u64 now =3D blk_time_get_ns(); u64 exp; u64 delay_nsec =3D 0; - int tok; + long tok; =20 while (blkg->parent) { int use_delay =3D atomic_read(&blkg->use_delay); diff --git a/include/linux/sched.h b/include/linux/sched.h index 2c1b4ee3234f..c1a65e19a3ac 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -319,8 +319,8 @@ asmlinkage void preempt_schedule_irq(void); extern void schedule_rtlock(void); #endif =20 -extern int __must_check io_schedule_prepare(void); -extern void io_schedule_finish(int token); +extern long __must_check io_schedule_prepare(void); +extern void io_schedule_finish(long token); extern long io_schedule_timeout(long timeout); extern void io_schedule(void); =20 diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index cbae8c0b89ab..4a86ea6c7f19 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c @@ -830,7 +830,7 @@ EXPORT_SYMBOL_GPL(mutex_lock_interruptible_nested); void __sched mutex_lock_io_nested(struct mutex *lock, unsigned int subclass) { - int token; + long token; =20 might_sleep(); =20 @@ -1026,7 +1026,7 @@ EXPORT_SYMBOL(mutex_lock_killable); */ void __sched mutex_lock_io(struct mutex *lock) { - int token; + long token; =20 token =3D io_schedule_prepare(); mutex_lock(lock); diff --git a/kernel/locking/rtmutex_api.c b/kernel/locking/rtmutex_api.c index a6974d044593..ddf7f7f3f0b5 100644 --- a/kernel/locking/rtmutex_api.c +++ b/kernel/locking/rtmutex_api.c @@ -547,7 +547,7 @@ EXPORT_SYMBOL_GPL(mutex_lock_killable_nested); =20 void __sched mutex_lock_io_nested(struct mutex *lock, unsigned int subclas= s) { - int token; + long token; =20 might_sleep(); =20 @@ -579,7 +579,7 @@ EXPORT_SYMBOL(mutex_lock_killable); =20 void __sched mutex_lock_io(struct mutex *lock) { - int token =3D io_schedule_prepare(); + long token =3D io_schedule_prepare(); =20 __mutex_lock_common(lock, TASK_UNINTERRUPTIBLE, 0, NULL, _RET_IP_); io_schedule_finish(token); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index ddabf20cd9e0..7cb7ca38fdfc 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -7427,16 +7427,16 @@ static inline void preempt_dynamic_init(void) { } =20 #endif /* CONFIG_PREEMPT_DYNAMIC */ =20 -int io_schedule_prepare(void) +long io_schedule_prepare(void) { - int old_iowait =3D current->in_iowait; + long old_iowait =3D current->in_iowait; =20 current->in_iowait =3D 1; blk_flush_plug(current->plug, true); return old_iowait; } =20 -void io_schedule_finish(int token) +void io_schedule_finish(long token) { current->in_iowait =3D token; } --=20 2.43.0 From nobody Sat Feb 7 23:48:14 2026 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 BCAA915666A for ; Sat, 17 Aug 2024 20:46:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723927613; cv=none; b=AV0BW3NdpBPZ1/J8Y7KMuNmMFDTPKdDy641tU/eyjf3N/fjj65PbAW208NAbZhBpjCZnZ5o86tHCFgJJ7HIe6FsdfIV4u1eASq20hx7Ksb7+fW6kFC1EhuYdL9EfLZDfeUgbebFOBpGP4Ad8gkGG58XwU1PF6IlKEqsX3O3a8hs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723927613; c=relaxed/simple; bh=SPg/XGdiwvOhL+oa1vx9Pvfril4dvc5VZdhtTr90MxM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lu/gqEeLdrgHER1BsqApfCX1DROtnXayo4WuVoIxLTyKrdEhfRfgeGDYDTKNf3+1QBIzBkRcgZD3a42OkGuTyqmOPHBEaKOzhlgPVDFehYUllgX+B9kipPkS+7vjn+1dV8GzVqjiRwOMsYNwFZ8A71zATu9hakmzl6zONTUYolc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=E02/qpjb; arc=none smtp.client-ip=209.85.210.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="E02/qpjb" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-70e9545d8b2so302667b3a.3 for ; Sat, 17 Aug 2024 13:46:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1723927609; x=1724532409; 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=PdJU0AKBI1klaEB//Q4NVt3BG+whZBi3IWelzEvwmBo=; b=E02/qpjbrnlVn3jpYt6tIroIYW2nTqBmzbxp3/c8qOPOhZak84E3MBsUOg+cx8lGs6 Me/KfFzY6GSdfhUGH1JyQ5NqiclGhK6elXXkv37oJsOBlZ+Y13W83mVNQ1SrvqZrasys zzjBwEqlJF9n1CEMUZcYNIcLDNCH0LruMfgdV/WWORb4w82y1rmoUfXrafMLUdjyxwAF mfKQueW6m5THhas+A+yjw0Far4awYN+Q2A3idAoarIU+yHQQuA8TQHozlzFvnCGlx+qG m6nPacBIlUpFtAYraiEGkeb/tL2Tj5zz8X+Ni3+gKjfp/gVDH5TJjW0FiBxX6Egg+8pE uOPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723927609; x=1724532409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PdJU0AKBI1klaEB//Q4NVt3BG+whZBi3IWelzEvwmBo=; b=gfkpgo9+t0Nbud+UHhWO72UKNs7T3M6qEMv40uiDCMJUUPiF3a95yhMGTx/4rPnmDA mKXEEPVHvpmM/nMVKbjUAcUznvnkcMF/N13el5CEDeux0v8L8tWZ5amE4MZ9A6mws+3J 2E0MpamfTA2Vc2YnvdA642/lEnZFAiKe1ULp8w0eujKOqFZcskP2ZEN/ZyzwUFS75hQn O6+vNjH4J/JnC3X1VHf2/Aq+q5ZIh+eUUYCN6+SjQRVNTwYxoxir4LIs1l9BasPlFo3k KyTpRR66v4SUx31m2/ZpdjRELsRNIC/jRl54trUS0zSLXyjZFwRK/SCUz3i6cckC7bel sfKw== X-Gm-Message-State: AOJu0Yw5b2N+9g3BXtJQoKel38iZQMdetAeTnrwQQuJxMnJxXEsfMSwP YR9fICTAWVD+EPHPUzSVz/P+fWs9t3OH3kWSmrQl5dc3/GL+X4oddaUV37r7zMOu1uzttzgMbrQ o X-Google-Smtp-Source: AGHT+IHCMlvikufxnp0CIT030Dri3L7MhVt1qa9DhShIkxkCbTdWVjDgAAvrxENvPAGV41e+iE3f5A== X-Received: by 2002:a05:6a00:2d17:b0:70d:1048:d4eb with SMTP id d2e1a72fcca58-713c5222e10mr5169301b3a.3.1723927609548; Sat, 17 Aug 2024 13:46:49 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7127ae07e41sm4411039b3a.65.2024.08.17.13.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Aug 2024 13:46:48 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: peterz@infradead.org, tglx@linutronix.de, Jens Axboe Subject: [PATCH 4/4] sched/core: split iowait state into two states Date: Sat, 17 Aug 2024 14:45:13 -0600 Message-ID: <20240817204639.132794-5-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240817204639.132794-1-axboe@kernel.dk> References: <20240817204639.132794-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" iowait is a bogus metric, but it's helpful in the sense that it allows short waits to not enter sleep states that have a higher exit latency than would've otherwise have been picked for iowait'ing tasks. However, it's harmless in that lots of applications and monitoring assumes that iowait is busy time, or otherwise use it as a health metric. Particularly for async IO it's entirely nonsensical. Split the iowait part into two parts - one that tracks whether the task needs boosting for short waits, and one that marks whether the task needs to be accounted as such. ->in_iowait_acct nests inside of ->in_iowait, both for efficiency reasons, but also so that the relationship between the two is clear. A waiter may set ->in_wait alone and not care about the accounting. Existing users of nr_iowait() for accounting purposes are switched to use nr_iowait_acct(), which leaves the governor using nr_iowait() as it only cares about iowaiters, not the accounting side. Utilize that there's enough space in rq->nr_iowait to store both values in there, shifting the accounting side by half the size of the type. Thank you to Thomas Gleixner for that [1] suggestion. [1] https://lore.kernel.org/lkml/87sf1b6o9w.ffs@tglx/ Signed-off-by: Jens Axboe --- arch/s390/appldata/appldata_base.c | 2 +- arch/s390/appldata/appldata_os.c | 2 +- fs/proc/stat.c | 2 +- include/linux/sched.h | 6 +++ include/linux/sched/stat.h | 5 ++- kernel/sched/core.c | 62 +++++++++++++++++++++++------- kernel/sched/sched.h | 1 + kernel/time/tick-sched.c | 6 +-- 8 files changed, 65 insertions(+), 21 deletions(-) diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/applda= ta_base.c index 91a30e017d65..5b21225405fd 100644 --- a/arch/s390/appldata/appldata_base.c +++ b/arch/s390/appldata/appldata_base.c @@ -423,4 +423,4 @@ EXPORT_SYMBOL_GPL(si_swapinfo); #endif EXPORT_SYMBOL_GPL(nr_threads); EXPORT_SYMBOL_GPL(nr_running); -EXPORT_SYMBOL_GPL(nr_iowait); +EXPORT_SYMBOL_GPL(nr_iowait_acct); diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata= _os.c index a363d30ce739..fa4b278aca6c 100644 --- a/arch/s390/appldata/appldata_os.c +++ b/arch/s390/appldata/appldata_os.c @@ -100,7 +100,7 @@ static void appldata_get_os_data(void *data) =20 os_data->nr_threads =3D nr_threads; os_data->nr_running =3D nr_running(); - os_data->nr_iowait =3D nr_iowait(); + os_data->nr_iowait =3D nr_iowait_acct(); os_data->avenrun[0] =3D avenrun[0] + (FIXED_1/200); os_data->avenrun[1] =3D avenrun[1] + (FIXED_1/200); os_data->avenrun[2] =3D avenrun[2] + (FIXED_1/200); diff --git a/fs/proc/stat.c b/fs/proc/stat.c index da60956b2915..149be7a884fb 100644 --- a/fs/proc/stat.c +++ b/fs/proc/stat.c @@ -180,7 +180,7 @@ static int show_stat(struct seq_file *p, void *v) (unsigned long long)boottime.tv_sec, total_forks, nr_running(), - nr_iowait()); + nr_iowait_acct()); =20 seq_put_decimal_ull(p, "softirq ", (unsigned long long)sum_softirq); =20 diff --git a/include/linux/sched.h b/include/linux/sched.h index c1a65e19a3ac..1b40847b0a80 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -953,7 +953,13 @@ struct task_struct { =20 /* Bit to tell TOMOYO we're in execve(): */ unsigned in_execve:1; + /* task is in iowait */ unsigned in_iowait:1; + /* + * task is in iowait and should be accounted as such. can only be set + * if ->in_iowait is also set. + */ + unsigned in_iowait_acct:1; #ifndef TIF_RESTORE_SIGMASK unsigned restore_sigmask:1; #endif diff --git a/include/linux/sched/stat.h b/include/linux/sched/stat.h index 0108a38bb64d..31e8a44b3d71 100644 --- a/include/linux/sched/stat.h +++ b/include/linux/sched/stat.h @@ -19,8 +19,9 @@ DECLARE_PER_CPU(unsigned long, process_counts); extern int nr_processes(void); extern unsigned int nr_running(void); extern bool single_task_running(void); -extern unsigned int nr_iowait(void); -extern unsigned int nr_iowait_cpu(int cpu); +unsigned int nr_iowait_acct(void); +unsigned int nr_iowait_acct_cpu(int cpu); +unsigned int nr_iowait_cpu(int cpu); =20 static inline int sched_info_on(void) { diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 7cb7ca38fdfc..94af01c6b85d 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3541,30 +3541,47 @@ static inline bool rq_has_pinned_tasks(struct rq *r= q) =20 #endif /* !CONFIG_SMP */ =20 +/* + * Store iowait and iowait_acct state in the same variable. The lower bits + * hold the iowait state, and the upper bits hold the iowait_acct state. + */ static void task_iowait_inc(struct task_struct *p) { #ifdef CONFIG_64BIT - atomic_long_inc(&task_rq(p)->nr_iowait); + long val =3D 1 + ((long) p->in_iowait_acct << 32); + atomic_long_add(val, &task_rq(p)->nr_iowait); #else - atomic_inc(&task_rq(p)->nr_iowait); + int val =3D 1 + ((int) p->in_iowait_acct << 16); + atomic_add(val, &task_rq(p)->nr_iowait); #endif } =20 static void task_iowait_dec(struct task_struct *p) { #ifdef CONFIG_64BIT - atomic_long_dec(&task_rq(p)->nr_iowait); + long val =3D 1 + ((long) p->in_iowait_acct << 32); + atomic_long_sub(val, &task_rq(p)->nr_iowait); #else - atomic_dec(&task_rq(p)->nr_iowait); + int val =3D 1 + ((int) p->in_iowait_acct << 16); + atomic_sub(val, &task_rq(p)->nr_iowait); #endif } =20 int rq_iowait(struct rq *rq) { #ifdef CONFIG_64BIT - return atomic_long_read(&rq->nr_iowait); + return atomic_long_read(&rq->nr_iowait) & ((1UL << 32) - 1); +#else + return atomic_read(&rq->nr_iowait) & ((1U << 16) - 1); +#endif +} + +int rq_iowait_acct(struct rq *rq) +{ +#ifdef CONFIG_64BIT + return atomic_long_read(&rq->nr_iowait) >> 32; #else - return atomic_read(&rq->nr_iowait); + return atomic_read(&rq->nr_iowait) >> 16; #endif } =20 @@ -5307,7 +5324,12 @@ unsigned long long nr_context_switches(void) * it does become runnable. */ =20 -unsigned int nr_iowait_cpu(int cpu) +unsigned int nr_iowait_acct_cpu(int cpu) +{ + return rq_iowait_acct(cpu_rq(cpu)); +} + +unsigned nr_iowait_cpu(int cpu) { return rq_iowait(cpu_rq(cpu)); } @@ -5342,12 +5364,12 @@ unsigned int nr_iowait_cpu(int cpu) * Task CPU affinities can make all that even more 'interesting'. */ =20 -unsigned int nr_iowait(void) +unsigned int nr_iowait_acct(void) { unsigned int i, sum =3D 0; =20 for_each_possible_cpu(i) - sum +=3D nr_iowait_cpu(i); + sum +=3D nr_iowait_acct_cpu(i); =20 return sum; } @@ -7427,18 +7449,32 @@ static inline void preempt_dynamic_init(void) { } =20 #endif /* CONFIG_PREEMPT_DYNAMIC */ =20 +/* + * Returns a token which is comprised of the two bits of iowait wait state= - + * one is whether we're making ourselves as in iowait for cpufreq reasons, + * and the other is if the task should be accounted as such. + */ long io_schedule_prepare(void) { - long old_iowait =3D current->in_iowait; - +#ifdef CONFIG_64BIT + long token =3D current->in_iowait + ((long) current->in_iowait_acct << 32= ); +#else + int token =3D current->in_iowait + (current->in_iowait_acct << 16); +#endif current->in_iowait =3D 1; + current->in_iowait_acct =3D 1; blk_flush_plug(current->plug, true); - return old_iowait; + return token; } =20 void io_schedule_finish(long token) { - current->in_iowait =3D token; + current->in_iowait =3D token & 0x01; +#ifdef CONFIG_64BIT + current->in_iowait_acct =3D token >> 32; +#else + current->in_iowait_acct =3D token >> 16; +#endif } =20 /* diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 6a90c2da1eb3..0f0eb2b26816 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3584,6 +3584,7 @@ extern u64 avg_vruntime(struct cfs_rq *cfs_rq); extern int entity_eligible(struct cfs_rq *cfs_rq, struct sched_entity *se); =20 int rq_iowait(struct rq *rq); +int rq_iowait_acct(struct rq *rq); =20 #ifdef CONFIG_RT_MUTEXES =20 diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 753a184c7090..17a82771c3df 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -732,7 +732,7 @@ static void tick_nohz_stop_idle(struct tick_sched *ts, = ktime_t now) delta =3D ktime_sub(now, ts->idle_entrytime); =20 write_seqcount_begin(&ts->idle_sleeptime_seq); - if (nr_iowait_cpu(smp_processor_id()) > 0) + if (nr_iowait_acct_cpu(smp_processor_id()) > 0) ts->iowait_sleeptime =3D ktime_add(ts->iowait_sleeptime, delta); else ts->idle_sleeptime =3D ktime_add(ts->idle_sleeptime, delta); @@ -805,7 +805,7 @@ u64 get_cpu_idle_time_us(int cpu, u64 *last_update_time) struct tick_sched *ts =3D &per_cpu(tick_cpu_sched, cpu); =20 return get_cpu_sleep_time_us(ts, &ts->idle_sleeptime, - !nr_iowait_cpu(cpu), last_update_time); + !nr_iowait_acct_cpu(cpu), last_update_time); } EXPORT_SYMBOL_GPL(get_cpu_idle_time_us); =20 @@ -831,7 +831,7 @@ u64 get_cpu_iowait_time_us(int cpu, u64 *last_update_ti= me) struct tick_sched *ts =3D &per_cpu(tick_cpu_sched, cpu); =20 return get_cpu_sleep_time_us(ts, &ts->iowait_sleeptime, - nr_iowait_cpu(cpu), last_update_time); + nr_iowait_acct_cpu(cpu), last_update_time); } EXPORT_SYMBOL_GPL(get_cpu_iowait_time_us); =20 --=20 2.43.0