From nobody Mon Jun 15 18:00:18 2026 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Acked-by: Balbir Singh --- a/kernel/taskstats.c +++ b/kernel/taskstats.c @@ -210,13 +210,39 @@ static int fill_stats_for_pid(pid_t pid, struct tasks= tats *stats) return 0; } =20 +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 =3D now_ns - tsk->start_time; + /* Convert to micro seconds */ + do_div(delta, NSEC_PER_USEC); + stats->ac_etime +=3D delta; + + task_cputime(tsk, &utime, &stime); + stats->ac_utime +=3D div_u64(utime, NSEC_PER_USEC); + stats->ac_stime +=3D div_u64(stime, NSEC_PER_USEC); + + stats->nvcsw +=3D tsk->nvcsw; + stats->nivcsw +=3D tsk->nivcsw; +} + static int fill_stats_for_tgid(pid_t tgid, struct taskstats *stats) { struct task_struct *tsk, *first; unsigned long flags; int rc =3D -ESRCH; - u64 delta, utime, stime; - u64 start_time; + u64 now_ns; =20 /* * Add additional stats from live tasks except zombie thread group @@ -233,30 +259,12 @@ static int fill_stats_for_tgid(pid_t tgid, struct tas= kstats *stats) else memset(stats, 0, sizeof(*stats)); =20 - start_time =3D ktime_get_ns(); + now_ns =3D 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 =3D start_time - tsk->start_time; - /* Convert to micro seconds */ - do_div(delta, NSEC_PER_USEC); - stats->ac_etime +=3D delta; =20 - task_cputime(tsk, &utime, &stime); - stats->ac_utime +=3D div_u64(utime, NSEC_PER_USEC); - stats->ac_stime +=3D div_u64(stime, NSEC_PER_USEC); - - stats->nvcsw +=3D tsk->nvcsw; - stats->nivcsw +=3D tsk->nivcsw; + tgid_stats_add_task(stats, tsk, now_ns); } =20 unlock_task_sighand(first, &flags); @@ -275,18 +283,14 @@ static int fill_stats_for_tgid(pid_t tgid, struct tas= kstats *stats) static void fill_tgid_exit(struct task_struct *tsk) { unsigned long flags; + u64 now_ns; =20 spin_lock_irqsave(&tsk->sighand->siglock, flags); if (!tsk->signal->stats) goto ret; =20 - /* - * 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 =3D ktime_get_ns(); + tgid_stats_add_task(tsk->signal->stats, tsk, now_ns); ret: spin_unlock_irqrestore(&tsk->sighand->siglock, flags); return; --=20 2.43.0 From nobody Mon Jun 15 18:00:18 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.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 149D82F5A06 for ; Sun, 12 Apr 2026 19:18:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776021539; cv=none; b=dZr9D0YjTNjZcWc/irBBZubfpoXaNouhGG55Z95CX06Iibo5gcVZy8zhRM1ziMVPckZ6zcszIQVhRD8Fm7lO5p7u22zOmUizUVYzu2r7j5cmsfIe+7t9mYY1Lo3CIUuzfJWtVd26P9+TZmPAFFo0TijCUEXiUhhEy4HjrlRebBk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776021539; c=relaxed/simple; bh=OHWVu00Ke4NChWsi4z5ifDbSDALwCO+sUrjctS0qsZM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CuPrQlc6lWMwoqQSa0UmwLm03Sd8Xhmf6+qZHq8wxtF0sY7VXlYhALLdoCiP2vYODHi2SkGByoJpnp7/4d0IyUdbL118Faq+73orJkt1iCfpJOLlEQMXDtqQlzK0uSC0FJTexgjEWoN732ukWVSPnADbcQ4ifGOPhnG+2OxJMpg= 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=Itd6NuzQ; arc=none smtp.client-ip=209.85.214.172 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="Itd6NuzQ" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2ad9f316d68so15942125ad.2 for ; Sun, 12 Apr 2026 12:18:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776021537; x=1776626337; 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=RLzsPPyntHB/U8P+3nsRuByTF+sw7wP/OrMrII1AdgE=; b=Itd6NuzQqwwLnkoAoySVsl4Qa9udFAs0yXgVt44i5b87M3dLIGWBgbELclGRd6FEER ieYF2tWPS47wcrkPAiL1nL01Wp8W3Sao5KAu9uGDR4yjDJLswckKQOEy3pZGDjXT7/yF X0nsAG08/BLaIk94DGkhqO1CBmT80MchF448te6mT9MBXyof3p0axqiSF80M2hBmLGYW H0dohYd6nnes7QfCVyWwcQU5AfMWqwKhzt+95Dq7mAj++Emci9YBTEP1duVoVBP+yXn+ TwS2LK3vjFM1ScnFJi8rMfm3gwKNjAGcvNUpH1SNHHPRLu4gMNb63xLuSOeE1BRWgYSv YBKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776021537; x=1776626337; 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=RLzsPPyntHB/U8P+3nsRuByTF+sw7wP/OrMrII1AdgE=; b=JSzMHrlBekkNom1bXuTlPiASSq/WHIwxNCC/zO4tZgjsS7plhsHY+3HAleOv3TfPNe 7qAvW0wmflOdYPvoLAM3zSntgiPlmbphc27M6u6NNnDhPio7B6nafKKyekroT46o160/ Ha6KpnEhR/3zKzlH6vWhcodCqhyDsRk2VxWg+FrkVCkoePtQ18934JloFfm+e7RvRdkh fOyxmHEeJxaYt7I2kqgApVGoOmVxdIhioB05iTpkBmacTecaeeMJX9pxId83sCulBuh3 aoXRBlDToOI6swLTVDhwMkkp2BqySf89d6PBlTF7f3eZKFey0Twiudd/9ySZMrkQYp0l +LCg== X-Gm-Message-State: AOJu0Yzm19GZoMTh8aWp5JYI3SBApUPolR7Gp4tbFtv53EUC+WHNDA+S W+nNCb2ERm3bMdVl/v2H0mWYXWUdLPD0aBxHcVNnuMuprDjuLyYEjyJYcqhqDw== X-Gm-Gg: AeBDievQ4Y5E2ZpzbfF0zqBI29sih1WNu402bqbDPhbqkU0XzClKxvw8PESFbojQGut NddQ/HJQoxS9mptF9um4OWNoE7S+cfExba+RP2yLOcztM6q0NsXkIGoLMS0670/76wEl8DKvIFg vJ39QUZwcjF9A3+4aGx+DGBo95zL7KciSZjCEinz1PvKPmgFhfFWPcEhtkPGZ0tI9l48M5yMfhg es2YyTG2617Rmw6UgO+1jnllamSkzQoaEdvh3oM+QoVxYtqqKmtyvNWWcUaVupwEYynyJKBZ/F/ w410+1f1MsFJH2QhDLqc24jzK/b2pKo9x5K5NfFGnh+W4kaKsnwxJ+Q3agsy3NfNR/hBQdXpcCI ubkPJvkrqqmVwEJEVCEm8No3RFoNL741dXGYoYM6BVgD6c4tVXJ3p2BqEyTM4+srlisMOFexnhN fUHYGls9i8JZNciMXOzInHbe1ax6qNr7Pf X-Received: by 2002:a17:902:b686:b0:2b2:490c:410e with SMTP id d9443c01a7336-2b2d591c0fdmr87899155ad.7.1776021537379; Sun, 12 Apr 2026 12:18:57 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Apr 2026 12:18:56 -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 Subject: [PATCH v2 2/2] selftests/acct: add taskstats TGID retention test Date: Mon, 13 Apr 2026 03:18:34 +0800 Message-ID: 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: quoted-printable Content-Type: text/plain; charset="utf-8" Add a kselftest for the taskstats TGID aggregation fix. The test creates a worker thread, snapshots TGID taskstats while the worker is still alive, lets the worker exit, and then verifies that the TGID CPU total does not regress after the thread has been reaped. The pass/fail check intentionally keys off ac_utime + ac_stime only, which is the primary user-visible regression fixed by the taskstats change and is less sensitive to scheduling noise than context-switch counters. Signed-off-by: Yiyang Chen diff --git a/tools/testing/selftests/acct/.gitignore b/tools/testing/selfte= sts/acct/.gitignore index 7e78aac19038..9e9c61c5bfd6 100644 Acked-by: Balbir Singh --- a/tools/testing/selftests/acct/.gitignore +++ b/tools/testing/selftests/acct/.gitignore @@ -1,3 +1,4 @@ acct_syscall +taskstats_fill_stats_tgid config -process_log \ No newline at end of file +process_log diff --git a/tools/testing/selftests/acct/Makefile b/tools/testing/selftest= s/acct/Makefile index 7e025099cf65..083cab5ddb72 100644 --- a/tools/testing/selftests/acct/Makefile +++ b/tools/testing/selftests/acct/Makefile @@ -1,5 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 TEST_GEN_PROGS :=3D acct_syscall +TEST_GEN_PROGS +=3D taskstats_fill_stats_tgid + CFLAGS +=3D -Wall +LDLIBS +=3D -lpthread =20 -include ../lib.mk \ No newline at end of file +include ../lib.mk diff --git a/tools/testing/selftests/acct/taskstats_fill_stats_tgid.c b/too= ls/testing/selftests/acct/taskstats_fill_stats_tgid.c new file mode 100644 index 000000000000..d6cab4ae26f2 --- /dev/null +++ b/tools/testing/selftests/acct/taskstats_fill_stats_tgid.c @@ -0,0 +1,375 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "kselftest.h" + +#ifndef NLA_ALIGN +#define NLA_ALIGNTO 4 +#define NLA_ALIGN(len) (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1)) +#define NLA_HDRLEN ((int)NLA_ALIGN(sizeof(struct nlattr))) +#endif + +#define BUSY_NS (200ULL * 1000 * 1000) + +struct worker_ctx { + pthread_mutex_t lock; + pthread_cond_t cond; + bool ready; + bool release; +}; + +static unsigned long busy_sink; + +static void *taskstats_nla_data(const struct nlattr *na) +{ + return (void *)((char *)na + NLA_HDRLEN); +} + +static bool taskstats_nla_ok(const struct nlattr *na, int remaining) +{ + return remaining >=3D (int)sizeof(*na) && + na->nla_len >=3D sizeof(*na) && + na->nla_len <=3D remaining; +} + +static struct nlattr *taskstats_nla_next(const struct nlattr *na, int *rem= aining) +{ + int aligned_len =3D NLA_ALIGN(na->nla_len); + + *remaining -=3D aligned_len; + return (struct nlattr *)((char *)na + aligned_len); +} + +static uint64_t timespec_diff_ns(const struct timespec *start, + const struct timespec *end) +{ + return (uint64_t)(end->tv_sec - start->tv_sec) * 1000000000ULL + + (uint64_t)(end->tv_nsec - start->tv_nsec); +} + +static void burn_cpu_for_ns(uint64_t runtime_ns) +{ + struct timespec start, now; + unsigned long acc =3D 0; + + if (clock_gettime(CLOCK_MONOTONIC, &start)) { + perror("clock_gettime"); + exit(EXIT_FAILURE); + } + + do { + for (int i =3D 0; i < 100000; i++) + acc +=3D i; + if (clock_gettime(CLOCK_MONOTONIC, &now)) { + perror("clock_gettime"); + exit(EXIT_FAILURE); + } + } while (timespec_diff_ns(&start, &now) < runtime_ns); + + busy_sink =3D acc; +} + +static int netlink_open(void) +{ + struct sockaddr_nl addr =3D { + .nl_family =3D AF_NETLINK, + .nl_pid =3D getpid(), + }; + int fd; + + fd =3D socket(AF_NETLINK, SOCK_RAW, NETLINK_GENERIC); + if (fd < 0) + return -errno; + + if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + int err =3D -errno; + + close(fd); + return err; + } + + return fd; +} + +static int send_request(int fd, void *buf, size_t len) +{ + struct sockaddr_nl addr =3D { + .nl_family =3D AF_NETLINK, + }; + + if (sendto(fd, buf, len, 0, (struct sockaddr *)&addr, sizeof(addr)) < 0) + return -errno; + + return 0; +} + +static int get_family_id(int fd, const char *name) +{ + struct { + struct nlmsghdr nlh; + struct genlmsghdr genl; + char buf[256]; + } req =3D { 0 }; + char resp[8192]; + struct nlmsghdr *nlh; + struct genlmsghdr *genl; + struct nlattr *na; + int len; + int rem; + int ret; + + req.nlh.nlmsg_len =3D NLMSG_LENGTH(GENL_HDRLEN); + req.nlh.nlmsg_type =3D GENL_ID_CTRL; + req.nlh.nlmsg_flags =3D NLM_F_REQUEST; + req.nlh.nlmsg_seq =3D 1; + req.nlh.nlmsg_pid =3D getpid(); + + req.genl.cmd =3D CTRL_CMD_GETFAMILY; + req.genl.version =3D 1; + + na =3D (struct nlattr *)((char *)&req + NLMSG_ALIGN(req.nlh.nlmsg_len)); + na->nla_type =3D CTRL_ATTR_FAMILY_NAME; + na->nla_len =3D NLA_HDRLEN + strlen(name) + 1; + memcpy(taskstats_nla_data(na), name, strlen(name) + 1); + req.nlh.nlmsg_len =3D NLMSG_ALIGN(req.nlh.nlmsg_len) + NLA_ALIGN(na->nla_= len); + + ret =3D send_request(fd, &req, req.nlh.nlmsg_len); + if (ret) + return ret; + + len =3D recv(fd, resp, sizeof(resp), 0); + if (len < 0) + return -errno; + + for (nlh =3D (struct nlmsghdr *)resp; NLMSG_OK(nlh, len); + nlh =3D NLMSG_NEXT(nlh, len)) { + if (nlh->nlmsg_type =3D=3D NLMSG_ERROR) { + struct nlmsgerr *err =3D NLMSG_DATA(nlh); + + return err->error ? err->error : -ENOENT; + } + + genl =3D (struct genlmsghdr *)NLMSG_DATA(nlh); + rem =3D nlh->nlmsg_len - NLMSG_HDRLEN - GENL_HDRLEN; + na =3D (struct nlattr *)((char *)genl + GENL_HDRLEN); + while (taskstats_nla_ok(na, rem)) { + if (na->nla_type =3D=3D CTRL_ATTR_FAMILY_ID) + return *(uint16_t *)taskstats_nla_data(na); + na =3D taskstats_nla_next(na, &rem); + } + } + + return -ENOENT; +} + +static int get_taskstats(int fd, int family_id, uint16_t attr_type, uint32= _t id, + struct taskstats *stats) +{ + struct { + struct nlmsghdr nlh; + struct genlmsghdr genl; + char buf[256]; + } req =3D { 0 }; + char resp[16384]; + struct nlmsghdr *nlh; + struct genlmsghdr *genl; + struct nlattr *na; + struct nlattr *nested; + int len; + int rem; + int nrem; + int ret; + + memset(stats, 0, sizeof(*stats)); + + req.nlh.nlmsg_len =3D NLMSG_LENGTH(GENL_HDRLEN); + req.nlh.nlmsg_type =3D family_id; + req.nlh.nlmsg_flags =3D NLM_F_REQUEST; + req.nlh.nlmsg_seq =3D 2; + req.nlh.nlmsg_pid =3D getpid(); + + req.genl.cmd =3D TASKSTATS_CMD_GET; + req.genl.version =3D 1; + + na =3D (struct nlattr *)((char *)&req + NLMSG_ALIGN(req.nlh.nlmsg_len)); + na->nla_type =3D attr_type; + na->nla_len =3D NLA_HDRLEN + sizeof(id); + memcpy(taskstats_nla_data(na), &id, sizeof(id)); + req.nlh.nlmsg_len =3D NLMSG_ALIGN(req.nlh.nlmsg_len) + NLA_ALIGN(na->nla_= len); + + ret =3D send_request(fd, &req, req.nlh.nlmsg_len); + if (ret) + return ret; + + len =3D recv(fd, resp, sizeof(resp), 0); + if (len < 0) + return -errno; + + for (nlh =3D (struct nlmsghdr *)resp; NLMSG_OK(nlh, len); + nlh =3D NLMSG_NEXT(nlh, len)) { + if (nlh->nlmsg_type =3D=3D NLMSG_ERROR) { + struct nlmsgerr *err =3D NLMSG_DATA(nlh); + + return err->error ? err->error : -ENOENT; + } + + genl =3D (struct genlmsghdr *)NLMSG_DATA(nlh); + rem =3D nlh->nlmsg_len - NLMSG_HDRLEN - GENL_HDRLEN; + na =3D (struct nlattr *)((char *)genl + GENL_HDRLEN); + while (taskstats_nla_ok(na, rem)) { + if (na->nla_type =3D=3D TASKSTATS_TYPE_AGGR_PID || + na->nla_type =3D=3D TASKSTATS_TYPE_AGGR_TGID) { + nested =3D (struct nlattr *)taskstats_nla_data(na); + nrem =3D na->nla_len - NLA_HDRLEN; + while (taskstats_nla_ok(nested, nrem)) { + if (nested->nla_type =3D=3D TASKSTATS_TYPE_STATS) { + memcpy(stats, taskstats_nla_data(nested), + sizeof(*stats)); + return 0; + } + nested =3D taskstats_nla_next(nested, &nrem); + } + } + na =3D taskstats_nla_next(na, &rem); + } + } + + return -ENOENT; +} + +static uint64_t cpu_total(const struct taskstats *stats) +{ + return (uint64_t)stats->ac_utime + (uint64_t)stats->ac_stime; +} + +static void print_stats(const char *label, const struct taskstats *stats) +{ + ksft_print_msg("%s: cpu_total=3D%llu nvcsw=3D%llu nivcsw=3D%llu\n", + label, (unsigned long long)cpu_total(stats), + (unsigned long long)stats->nvcsw, + (unsigned long long)stats->nivcsw); +} + +static void *worker_thread(void *arg) +{ + struct worker_ctx *ctx =3D arg; + + burn_cpu_for_ns(BUSY_NS); + + pthread_mutex_lock(&ctx->lock); + ctx->ready =3D true; + pthread_cond_broadcast(&ctx->cond); + while (!ctx->release) + pthread_cond_wait(&ctx->cond, &ctx->lock); + pthread_mutex_unlock(&ctx->lock); + + return NULL; +} + +int main(void) +{ + struct worker_ctx ctx =3D { + .lock =3D PTHREAD_MUTEX_INITIALIZER, + .cond =3D PTHREAD_COND_INITIALIZER, + }; + struct taskstats before, after; + pthread_t thread; + pid_t tgid =3D getpid(); + int family_id; + int fd; + int ret; + + ksft_print_header(); + ksft_set_plan(1); + + if (geteuid()) + ksft_exit_skip("taskstats_fill_stats_tgid needs root\n"); + + fd =3D netlink_open(); + if (fd < 0) + ksft_exit_skip("failed to open generic netlink socket: %s\n", + strerror(-fd)); + + family_id =3D get_family_id(fd, TASKSTATS_GENL_NAME); + if (family_id < 0) + ksft_exit_skip("taskstats generic netlink family unavailable: %s\n", + strerror(-family_id)); + + /* Create worker thread that burns 200ms of CPU */ + if (pthread_create(&thread, NULL, worker_thread, &ctx) !=3D 0) + ksft_exit_fail_msg("pthread_create failed: %s\n", strerror(errno)); + + /* Wait for worker to finish generating activity */ + pthread_mutex_lock(&ctx.lock); + while (!ctx.ready) + pthread_cond_wait(&ctx.cond, &ctx.lock); + pthread_mutex_unlock(&ctx.lock); + + /* + * Snapshot A: TGID stats while worker is alive and sleeping. + * Contains main thread + worker contributions. + */ + ret =3D get_taskstats(fd, family_id, TASKSTATS_CMD_ATTR_TGID, tgid, &befo= re); + if (ret) + ksft_exit_fail_msg("TGID query before exit failed: %s\n", + strerror(-ret)); + + /* Release worker so it can exit, then join (deterministic wait). + * + * Kernel exit path ordering guarantees: + * do_exit() + * taskstats_exit() -> fill_tgid_exit() (accumulates worker into sig= nal->stats) + * exit_notify() (releases the thread) + * do_task_dead() -> __schedule() (wakes joiner) + * + * So pthread_join() returns only after fill_tgid_exit() has completed. + */ + pthread_mutex_lock(&ctx.lock); + ctx.release =3D true; + pthread_cond_broadcast(&ctx.cond); + pthread_mutex_unlock(&ctx.lock); + + pthread_join(thread, NULL); + + /* + * Snapshot B: TGID stats after worker has exited. + * fill_stats_for_tgid() does: + * memcpy(signal->stats) <- includes fill_tgid_exit accumulation + * + scan live threads <- only main thread now + */ + ret =3D get_taskstats(fd, family_id, TASKSTATS_CMD_ATTR_TGID, tgid, &afte= r); + if (ret) + ksft_exit_fail_msg("TGID query after exit failed: %s\n", + strerror(-ret)); + + print_stats("TGID before worker exit", &before); + print_stats("TGID after worker exit", &after); + + /* + * The worker burned 200ms of CPU before the first snapshot. + * If the kernel correctly retained its contribution via + * fill_tgid_exit(), then the TGID CPU total after exit must be at + * least as large as the TGID CPU total before exit. + */ + ksft_test_result(cpu_total(&after) >=3D cpu_total(&before), + "TGID CPU stats should not regress after thread exit\n"); + + close(fd); + ksft_finished(); + return ksft_get_fail_cnt() ? KSFT_FAIL : KSFT_PASS; +} --=20 2.43.0