From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 04DBD3624D4 for ; Sun, 12 Apr 2026 19:18:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776021533; cv=none; b=bs4zhfX5izfvk4COivmzuFFAqgul2z+jXioBNCn5VEmqX36AQ29kvg989vZMQ8scq+Mn+U8OtcVcaWrFyM4VWg4h78/f6Jb7veMTjFfPKID2wSzSbMqWtpzJWrARwcQpYmgHy2Z/vvhwYtYCHl0Ci9rESXjzxrXBlmcQoROkttQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776021533; c=relaxed/simple; bh=D3Zx7q+jagPNX2zM/ItOrdAtZmXCdo7UO8rhYFHyMFo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p5SkgLS6V6XooUEE513PZZgGfEFyWRuve2KdsJK3fm+1O0JdUD0YcC/PhI93SwRbXY2nOxoN9CCBQpXQ3jtQUhY7hZryqjKRFAI/KmpljxnOjBp+kyq5FKYFjIxh9YPo3q5MLKBXmjFc4yQdTzRrTdqdI3D41lMXVgNZCKeO2/I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CQC+kjDZ; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CQC+kjDZ" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2b4583f0a1aso3002415ad.3 for ; Sun, 12 Apr 2026 12:18:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776021531; x=1776626331; 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=GcSoI/8gd+Lz5ms3qNFjtNkgBdfJJNG1XR3lhET5sGQ=; b=CQC+kjDZhd70jXeIeHedF6mZHVL/mOGtNGAEPwiKiHZBuS4yUQeS13+fOXcFRnEers TI9RwmpQh+xttNN7fyyXpl9EJUZiqDXw3rLqzILCPqrce7v+SI0psRj7eOMnL9CvstkZ lc50nrU1FpAO7oh3acX33VJ4uYF26GSbIsZPbmwyt/urWPL80JMOHuFIJ/bcUUAMmj2M 6DyTRnlg+D+m++M0ElvUAeGZoGDjrw7hoDj1kngw6uAIKdPQ1WOPPTvvFdVHJlDnNYEw 42pKLHZ7B61rSNDQ26VGwyYuHH9g/3l1sDu4bSFA5jAltPW3dUWrhO9Nn1/it0wmLu4c yjsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776021531; x=1776626331; 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=GcSoI/8gd+Lz5ms3qNFjtNkgBdfJJNG1XR3lhET5sGQ=; b=pJHzUJZCCADPhZCn0fIL69tSmpef8tFciVesUOlsR+r9cHojYSBIK0azIcmVxFMrx7 /xGqI2caFUnrQqFmlaKp9rM7fo6e39MBkyFLHysEhUfA0KZ4HB1j3OOnkcy3B6gWxdIh yVbIX2RUMG4fDzTkhYTmlL+JjrMR+hX95x5+jXLHciIyhHgVY8P3g5I6YepilD0t6dgf oxX631Q75e02BN1EELdOjDWjqAJz2Wq1WppMxRaPPpcHa0kVCDVBvzVJb24tb9lJOD7E mtQheFXZr3DF3+GHmLW9b2fBE3bjl2lyhYTRZcQ2qe96eKfk7dAohHiXlbaq/YeJ7RIk 3HGQ== X-Gm-Message-State: AOJu0Yz2qajfeCQQUKK+p1YcShmLW91KZ6v9L6vrUDzd5Dm2gUvZLKAy lUpCK7SNgSLMAv7q+AhG3sI+2Ev8cao58WOceDFjdfY7nrcVMYHsoFuF X-Gm-Gg: AeBDietQpD7CBwDVaoe1HmAnL6HbPndzCW7Qo5wKDlruaPO6zj8tRn9lVB6iOBXP0XM 05/OtuPX+pO+xi7Cr4HfbR6BioiDT1yT83FcqYa+krmb/Nw7RBqwLQtdcRGdsq8iLiUl19b+WMI WKkXik/jOQapz0+WKMFaTG13EfGOuhtVT4/fYaTx5toYzLw87wTvFeGB70bCEDMQH4QnCSmH39k hKJyN/U6mvQXT3JloAYAJR261dOicnzFJMw7PUUzKgGewlTkes+LPITz48DaJ9z+k0rb8vQgZat 06MLinNmT8nUv6b5EKElTRzD4pv5kKUUqEfIlPkptTSceU5FVTzkyklF9nocLOntyRNDdEA9Q4U R0F9iNQGDU5dy476YtyZwo4DXNpIyzmAUKRVFsE4ur7aoXbe7av7ciwr4CqXgzz2gTjQIrQnNuu oKc7O8u0iCiEq53Zj2K9leDA== X-Received: by 2002:a17:903:c11:b0:2b2:5099:2f3e with SMTP id d9443c01a7336-2b2d59416b7mr68154855ad.4.1776021531368; Sun, 12 Apr 2026 12:18:51 -0700 (PDT) Received: from ubuntu24.lan ([2602:ffe4:1:2113:9dfd:1ff:3726:3839]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b45cbf11b1sm13864075ad.17.2026.04.12.12.18.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Apr 2026 12:18:50 -0700 (PDT) From: Yiyang Chen To: Balbir Singh , Yang Yang , Wang Yaxin Cc: linux-kernel@vger.kernel.org, Oleg Nesterov , "Dr . Thomas Orgis" , Andrew Morton , Yiyang Chen , stable@vger.kernel.org Subject: [PATCH v2 1/2] taskstats: retain dead thread stats in TGID queries Date: Mon, 13 Apr 2026 03:18:33 +0800 Message-ID: <99c79e8529eb2c125ffd1eaa9f5d6b479fec227c.1776020234.git.cyyzero16@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit fill_stats_for_tgid() builds TGID stats from two sources: the cached aggregate in signal->stats and a scan of the live threads in the group. However, fill_tgid_exit() only accumulates delay accounting into signal->stats. This means that once a thread exits, TGID queries lose the fields that fill_stats_for_tgid() adds for live threads. This gap was introduced incrementally by two earlier changes that extended fill_stats_for_tgid() but did not make the corresponding update to fill_tgid_exit(): - commit 8c733420bdd5 ("taskstats: add e/u/stime for TGID command") added ac_etime, ac_utime, and ac_stime to the TGID query path. - commit b663a79c1915 ("taskstats: add context-switch counters") added nvcsw and nivcsw to the TGID query path. As a result, those fields were accounted for live threads in TGID queries, but were dropped from the cached TGID aggregate after thread exit. The final TGID exit notification emitted when group_dead is true also copies that cached aggregate, so it loses the same fields. Factor the per-task TGID accumulation into tgid_stats_add_task() and use it in both fill_stats_for_tgid() and fill_tgid_exit(). This keeps the cached aggregate used for dead threads aligned with the live-thread accumulation used by TGID queries. Fixes: 8c733420bdd5 ("taskstats: add e/u/stime for TGID command") Fixes: b663a79c1915 ("taskstats: add context-switch counters") Cc: stable@vger.kernel.org Signed-off-by: Yiyang Chen diff --git a/kernel/taskstats.c b/kernel/taskstats.c index 0cd680ccc7e5..a80be5d9f52b 100644 --- a/kernel/taskstats.c +++ b/kernel/taskstats.c @@ -210,13 +210,39 @@ static int fill_stats_for_pid(pid_t pid, struct taskstats *stats) return 0; } +static void tgid_stats_add_task(struct taskstats *stats, + struct task_struct *tsk, u64 now_ns) +{ + u64 delta, utime, stime; + + /* + * Each accounting subsystem calls its functions here to + * accumulate its per-task stats for tsk, into the per-tgid structure + * + * per-task-foo(tsk->signal->stats, tsk); + */ + delayacct_add_tsk(stats, tsk); + + /* calculate task elapsed time in nsec */ + delta = now_ns - tsk->start_time; + /* Convert to micro seconds */ + do_div(delta, NSEC_PER_USEC); + stats->ac_etime += delta; + + task_cputime(tsk, &utime, &stime); + stats->ac_utime += div_u64(utime, NSEC_PER_USEC); + stats->ac_stime += div_u64(stime, NSEC_PER_USEC); + + stats->nvcsw += tsk->nvcsw; + stats->nivcsw += tsk->nivcsw; +} + static int fill_stats_for_tgid(pid_t tgid, struct taskstats *stats) { struct task_struct *tsk, *first; unsigned long flags; int rc = -ESRCH; - u64 delta, utime, stime; - u64 start_time; + u64 now_ns; /* * Add additional stats from live tasks except zombie thread group @@ -233,30 +259,12 @@ static int fill_stats_for_tgid(pid_t tgid, struct taskstats *stats) else memset(stats, 0, sizeof(*stats)); - start_time = ktime_get_ns(); + now_ns = ktime_get_ns(); for_each_thread(first, tsk) { if (tsk->exit_state) continue; - /* - * Accounting subsystem can call its functions here to - * fill in relevant parts of struct taskstsats as follows - * - * per-task-foo(stats, tsk); - */ - delayacct_add_tsk(stats, tsk); - - /* calculate task elapsed time in nsec */ - delta = start_time - tsk->start_time; - /* Convert to micro seconds */ - do_div(delta, NSEC_PER_USEC); - stats->ac_etime += delta; - task_cputime(tsk, &utime, &stime); - stats->ac_utime += div_u64(utime, NSEC_PER_USEC); - stats->ac_stime += div_u64(stime, NSEC_PER_USEC); - - stats->nvcsw += tsk->nvcsw; - stats->nivcsw += tsk->nivcsw; + tgid_stats_add_task(stats, tsk, now_ns); } unlock_task_sighand(first, &flags); @@ -275,18 +283,14 @@ static int fill_stats_for_tgid(pid_t tgid, struct taskstats *stats) static void fill_tgid_exit(struct task_struct *tsk) { unsigned long flags; + u64 now_ns; spin_lock_irqsave(&tsk->sighand->siglock, flags); if (!tsk->signal->stats) goto ret; - /* - * Each accounting subsystem calls its functions here to - * accumalate its per-task stats for tsk, into the per-tgid structure - * - * per-task-foo(tsk->signal->stats, tsk); - */ - delayacct_add_tsk(tsk->signal->stats, tsk); + now_ns = ktime_get_ns(); + tgid_stats_add_task(tsk->signal->stats, tsk, now_ns); ret: spin_unlock_irqrestore(&tsk->sighand->siglock, flags); return; -- 2.43.0