From patchwork Mon Jan 22 07:08:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ze Gao X-Patchwork-Id: 189927 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2408483dyb; Sun, 21 Jan 2024 23:11:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IGtMh2Xsn5htUzlhdhLPaJZ0WTNVsw5WCRCcPjUf95tw+PWjjMtVH1asMwgnuqa23YjGOll X-Received: by 2002:ac8:7fd3:0:b0:42a:384a:78a6 with SMTP id b19-20020ac87fd3000000b0042a384a78a6mr3627263qtk.30.1705907486094; Sun, 21 Jan 2024 23:11:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705907486; cv=pass; d=google.com; s=arc-20160816; b=ubHzHW8x1+rPtZaEk1bg3kSp8b8va9733l+10/eXZ3dL9gXQs9k15lGmTN6SqcARS5 IjHTcoR8BNycHxQXeIpG8ihPyHPCF98VND1zulO0d67bMVG9Ki/eVoY6eGMhjm/2Cel0 hpmuceg2PE1SuUKvbOSn6TDF1mQBhz4RNb9vM6dWHCQB5VyBHoztLygvS0p7r7VgAxFh uIrUbvuXR2IRv0JSqRubPr67EVmi7gEcFKM2jwbeOk+AerWzSgkpHNfeYjPxjhbDsUd4 2T9y3RuTf8KQ6kdxlB9YeIjIqzznlsPeAr2iaex3LOtHxeBp/QEuE5stQlhHWKSecsgV fTxg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=8DlrDFe5Y9kinmI2EZideUfaxC8SBA39wYnKFZevMC4=; fh=BA7X0Fh+nH6aOBOR/HncHKQUGXeIUOSOgeWoVcIZnUI=; b=H4/H7iNWgu2fazhLOiV1sJHVo85SK0MoWHQxz3rarsR4FiorlWJ/s4Yu2IpWe9XU9d 4NSANTM7Z1yxnMM0I4bZLnLnMntffvJwX5a9isLCIGXwg8S+UjpTJnnQKrO+bU+mzQKj n5bKCpgGxh1at8XRj/pwhqa/3Me79Xf75aLzxpJkO+CFiciFuorI1O3uGKeYjTX38hAI YYWU7vGHrG3coHVOseH1Et9Ty3PEAXzWo7exyfTWMBrlRkDDm3erPjUxKU1x9dqZaPkq UXuQ9Qmzpn+Yt+OdDOqi/OzTGGRDxmpM/w/1vRH/Qfc3+yWF50Ug1L90iz9nFdTWlwbt jE4w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lgcQS3L8; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-32409-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-32409-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id w16-20020ac87e90000000b0042a458e045dsi198045qtj.106.2024.01.21.23.11.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 23:11:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-32409-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lgcQS3L8; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-32409-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-32409-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id DEFBD1C21089 for ; Mon, 22 Jan 2024 07:11:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6755E107AA; Mon, 22 Jan 2024 07:10:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lgcQS3L8" Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 77D24F9DE; Mon, 22 Jan 2024 07:10:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705907453; cv=none; b=IYYMZl8gATy+m+mNKDo6yfC1KllGXOrcfRqSLotK/+0nbYczQ7JRHABzrU44eEjhy259rjq87ZCwdOT9+NJvVoR3CzuEvWK58fxrwLjhtD6Wp61tm91cDv+YCD4HKhxmRS/gRUTfPMGQF39vVpn7bfDOS0UogA27nf7hKfGhjrM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705907453; c=relaxed/simple; bh=r/ehZCziQ5mB2O0dOK+KkcrR87VE1zkqb85/RQs0jgM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ol/8dagJKVahLmsCNIAodHuYrxLVlQABLrtz38nDEZYbnqg1Lki3h95esKJvY8xfWhfPqZ76Z3JpDgr5PSfimdUbR+vjrLvJ31ZHEEjGt02XsUOx0bRJFpYX4JELmirq3V9K595MRLhoy4ZzyD+4SvpDN3u5uCuXWFl16FVltqk= 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=lgcQS3L8; arc=none smtp.client-ip=209.85.214.173 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 Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1d7431e702dso2020245ad.1; Sun, 21 Jan 2024 23:10:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705907452; x=1706512252; 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=8DlrDFe5Y9kinmI2EZideUfaxC8SBA39wYnKFZevMC4=; b=lgcQS3L81zM0xRXaXrX65c/W8eirs6dyEc4VN538fGSe521DAx8YvzlpsyWw+QCRSL lWTT+rdpUDljT69B65gZ22kGj2qVGNtj3EWy70CFfaK+MpjCnpXhFHyxNc5T70fHpEDl vaIHKxHSyFMnbHVEdgp3KCBoowlu/AVatqvwYxbdYl/gEuYPE87EA8G0ih4eY7shapho qlCta2CEKJ6d8xASAjgqFHIJm6EjJ3uttR6ggj/Sf7VBDqgrgoRVcz/6yzAWZSoOtJi3 EQzcI5hDFVr2I5083j5D7F3NVg7TumGVjqiN8JeJHK+nz8lsmPkqAu/+QZBt7Onlb/qh fYRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705907452; x=1706512252; 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=8DlrDFe5Y9kinmI2EZideUfaxC8SBA39wYnKFZevMC4=; b=cRfuWpqmtwufLJxDL4BjZxVlQBB2vwgGWKa4veef2gGf7a+Yd+kGDkDecZ7qXrTxEN RQim/kfQKwSV3ls+O7CFLrlTJj9JFUnhrtc/pnL4t3lo3timAGNg5rIDxn8XbqaYplwt VtC62p3CqsGT0tSu0yxX80O0xWzM29/kiGxv7g+Xq8VYtCPye5l0U+I7hEz2ZqmdtlPW skj16iZV78ux8lXP8mRIENHVylGiqTzMgGpzlNQbM9pfZwCUvr5Er5z//pogA7XyNDv2 Il/1QgodGnGH2shLg9nO89nZb0ubFErRCaZNx1HhoJyU037jla/qdY+uNWnVcihdgiuK gg1A== X-Gm-Message-State: AOJu0Yy95PeYuoHzmkh67syige744ZVFiPRTOPCWHpfyK9qCVEtn7dcq I9b3PwTXgXkGmDMVXB6ZDyStAMwxDEQJa2ymJa7xWJFA0QgtG1zV X-Received: by 2002:a17:902:edc3:b0:1d6:f2c0:3e3c with SMTP id q3-20020a170902edc300b001d6f2c03e3cmr1357035plk.87.1705907451645; Sun, 21 Jan 2024 23:10:51 -0800 (PST) Received: from localhost.localdomain ([43.132.98.45]) by smtp.googlemail.com with ESMTPSA id t10-20020a170902d28a00b001d72b3b0ee6sm3463365plc.248.2024.01.21.23.10.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 23:10:51 -0800 (PST) From: Ze Gao X-Google-Original-From: Ze Gao To: Adrian Hunter , Alexander Shishkin , Arnaldo Carvalho de Melo , Ian Rogers , Ingo Molnar , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Steven Rostedt Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Ze Gao Subject: [PATCH v2 1/4] perf sched: Sync state char array with the kernel Date: Mon, 22 Jan 2024 02:08:56 -0500 Message-ID: <20240122070859.1394479-3-zegao@tencent.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240122070859.1394479-2-zegao@tencent.com> References: <20240122070859.1394479-2-zegao@tencent.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788773647769113254 X-GMAIL-MSGID: 1788773647769113254 Update state char array to match the latest kernel definitions and remove unused state mapping macros. Note this is the preparing patch for get rid of the way to parse process state from raw bitmask value. Instead we are going to parse it from the recorded tracepoint print format, and this change marks why we're doing it. Signed-off-by: Ze Gao --- tools/perf/builtin-sched.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index dd6065afbbaf..ced6fffe8110 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -92,23 +92,12 @@ struct sched_atom { struct task_desc *wakee; }; -#define TASK_STATE_TO_CHAR_STR "RSDTtZXxKWP" +#define TASK_STATE_TO_CHAR_STR "RSDTtXZPI" /* task state bitmask, copied from include/linux/sched.h */ #define TASK_RUNNING 0 #define TASK_INTERRUPTIBLE 1 #define TASK_UNINTERRUPTIBLE 2 -#define __TASK_STOPPED 4 -#define __TASK_TRACED 8 -/* in tsk->exit_state */ -#define EXIT_DEAD 16 -#define EXIT_ZOMBIE 32 -#define EXIT_TRACE (EXIT_ZOMBIE | EXIT_DEAD) -/* in tsk->state again */ -#define TASK_DEAD 64 -#define TASK_WAKEKILL 128 -#define TASK_WAKING 256 -#define TASK_PARKED 512 enum thread_state { THREAD_SLEEPING = 0, From patchwork Mon Jan 22 07:08:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ze Gao X-Patchwork-Id: 189929 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2409106dyb; Sun, 21 Jan 2024 23:13:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IH1FNoLprfhfWKmwyduWm7wyP9KQmRGtL7dBSz6PgsSA1CCKXDUho6jZQwLblCjIZR1ogHy X-Received: by 2002:a17:903:230d:b0:1d7:2311:8070 with SMTP id d13-20020a170903230d00b001d723118070mr1691054plh.37.1705907605451; Sun, 21 Jan 2024 23:13:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705907605; cv=pass; d=google.com; s=arc-20160816; b=Dq0lFo2IC6YUjRPuFBHleanwM4mQPae2y1OF+b7TE5dEbK7yazzYOd+K8TLd2DhBQU w5EXlPjAQSEBDrSfZj8j5cfSX2Tp+7rIV7bp4MeV1Ie5QUJ9sH2+wRKN/OeLVIlsL2ib 7Sk8NPuKLmlzC+j/kzgXtwV8ogQ6RSO4CD4kb79w1+eRr1lZs9w9LnYwX8lvAyKmJEqG vrcBwm63E76MLmtF0AM52mcZ1PWPnUZXiMjOqD2dr1r2p7g7zJdWuvMknpoNHGWKKjDr ZbuVRebCc99pZcothDEo+YtbHwe/YoaSzsZWZ8ZJ//ePDhuXeWH4vu0/FkqtfU/IZhp/ DQ8w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=JrVZPYX6+LJDxAqZZx92qIZWWOPVnm+/UvjikRe0maQ=; fh=BA7X0Fh+nH6aOBOR/HncHKQUGXeIUOSOgeWoVcIZnUI=; b=CXOvF9xXDa7k26SxABBoDOk23QTZMQ++C3MKZ1AZHbqCh4BsuTfNrdhvbWq9mG4Cu3 NW7DGSwSRPKmQZHASWhbZeZAjoJF2vL8tjcij/vEk670GqvDm/NCSPIxgx/ruclRo1+R vMFFGcpBlR+Kj+/ORnD0IHNirZGtBLjxQgP0Hy118iZ+01p+ZpxpeVrolPW8MD7Mz28C kj4lFv8jI2/nDuvw2VVTghdo9r7jBEYP/LxslCt5xPgDygVXoAfqWh9xKQsYdTObjSh5 24Yb7PXYbdASajJ7VXL0i6uPN2GSBxSApKoRja4RF0F18bexW2y6vLZqyHtPdk4KFG8+ PahQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bPRBTNEV; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-32411-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-32411-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id y15-20020a17090322cf00b001d749d39548si1970759plg.35.2024.01.21.23.13.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 23:13:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-32411-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bPRBTNEV; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-32411-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-32411-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 18B1C282554 for ; Mon, 22 Jan 2024 07:12:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0216A16426; Mon, 22 Jan 2024 07:11:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bPRBTNEV" Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.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 D45F9125CB; Mon, 22 Jan 2024 07:10:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705907460; cv=none; b=hhN7jErb2e7tDW8HalZ4h4BQ+BlDPTQWBs0WEXdZbk9Dr/xwGehE3W9WHXvjyS44ldZvwFu7BGxj6N3bTrGyoN8z1oKoBoCNGyVPyE4iq2kdSFjledMJWQBpCJY06Lvjm05dJPYxANiO5VQO0iHRSJsDbXNuwxMDLuN1ZFP80x4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705907460; c=relaxed/simple; bh=Xe+gzP34bayeyLhlz7fXRDak5wLIF+f816cQhwgr4dk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XGDlR6h+5l+MD67vMYavM0iYhCLwt04NULRbLe1/wN4gg+3IorZjsKdbzcsDPsdpESpOJo6Btv0zeUM1+q5x+DboKtXK5sddq/hp37vYtSTjEZcSlV8pEK+mr4A0/YQI8IkHsTHmVrnL24vhJYSl3hsK2YV7n3/vgNz036nwgRo= 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=bPRBTNEV; arc=none smtp.client-ip=209.85.214.177 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 Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1d7393de183so1112035ad.3; Sun, 21 Jan 2024 23:10:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705907458; x=1706512258; 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=JrVZPYX6+LJDxAqZZx92qIZWWOPVnm+/UvjikRe0maQ=; b=bPRBTNEVSX424Y58s7PqaSleOrsAHAWLt8+jxsscMtVSOg9ZJ6OvATqkFZ6HHQ3Ra8 cMX/9b54CXNTymedNsU2+VsqHhi22YOKY3Qku9mI2naJUN0+gL6fExDVoYCGfGr72/ji G5qUsUsspNy8MRbNkuB+cNw2CDvDZ8uZUymsKam6CDFbOR1CYFdR3IJU+PUhYvIaAajQ u4P8tIRYU5DdfVPWZ2BCPij0x3VMzEjJgRWcvz2Lf3/xP9cwuh3QA/odfKwCBxr4EEef eb3P4hhQ4QsC0UNfFtEHqZxhTQ6HcWUy/7UnMmGc3B6f0iDXxOSg/SabZcuRC95XYvpb Rehw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705907458; x=1706512258; 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=JrVZPYX6+LJDxAqZZx92qIZWWOPVnm+/UvjikRe0maQ=; b=WcncV90GX1o4U8TC1E62vJ0eob0MTkLr218tYoGnN+RuhD0n0Lz8gh0Q5Ku0HC6/0/ Q3+j4N2O1+BJHBgwWQzBY+TTmC1L/R3RwyOp4emhiZ2kqrk0zhV82Px2F5fH/lPSO4eo 7F50hXIxCIL1La2bUjzVa8x1XmCJuYqSEqTPdpvBs4RMAXLbNv1j1aSqxaPO9fVs1bH6 MxnPMlOB5XqDGVV2HgMQskOdcAe0o83mL+geugUYGm6y3qwoMv5BK/1vLW0391cpLWRG lGmvSpQa1uIp5NhdXMTojvh8F3jzM0sjf0rKZ1iqdHWQ+OKJN/NJQth+k11IoCAeI3d7 r3FA== X-Gm-Message-State: AOJu0YzB/rC2zVZTsIPbXeCyzo3floyuMIUtQONRscCUlDzv2+Y4M5UF pUamFZoYdjZtscW17r0cEBAjADQEt5lSfeP4rZO7gFLhtS/FlcaO X-Received: by 2002:a17:903:2805:b0:1d7:3061:e8fc with SMTP id kp5-20020a170903280500b001d73061e8fcmr847630plb.111.1705907458262; Sun, 21 Jan 2024 23:10:58 -0800 (PST) Received: from localhost.localdomain ([43.132.98.45]) by smtp.googlemail.com with ESMTPSA id t10-20020a170902d28a00b001d72b3b0ee6sm3463365plc.248.2024.01.21.23.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 23:10:58 -0800 (PST) From: Ze Gao X-Google-Original-From: Ze Gao To: Adrian Hunter , Alexander Shishkin , Arnaldo Carvalho de Melo , Ian Rogers , Ingo Molnar , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Steven Rostedt Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Ze Gao Subject: [PATCH v2 3/4] perf util: Add evsel__taskstate() to parse the task state info instead Date: Mon, 22 Jan 2024 02:08:58 -0500 Message-ID: <20240122070859.1394479-5-zegao@tencent.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240122070859.1394479-2-zegao@tencent.com> References: <20240122070859.1394479-2-zegao@tencent.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788773773161463931 X-GMAIL-MSGID: 1788773773161463931 Now that we have the __prinf_flags() parsing routines, we add a new helper evsel__taskstate() to extract the task state info from the recorded data. Signed-off-by: Ze Gao --- tools/perf/util/evsel.c | 36 +++++++++++++++++++++++++++++++++++- tools/perf/util/evsel.h | 1 + 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index e08294c51cd4..4d14f14f2506 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -2939,7 +2939,7 @@ search_op(struct tep_format_field *prev_state_field, struct tep_print_arg *arg) return sym; } -static __maybe_unused const char *get_states(struct tep_format_field *prev_state_field) +static const char *get_states(struct tep_format_field *prev_state_field) { struct tep_print_flag_sym *sym; struct tep_print_arg *arg; @@ -2963,6 +2963,40 @@ static __maybe_unused const char *get_states(struct tep_format_field *prev_state } return NULL; } + +char evsel__taskstate(struct evsel *evsel, struct perf_sample *sample, const char *name) +{ + static struct tep_format_field *prev_state_field; + static const char *states; + struct tep_format_field *field; + unsigned long long val; + unsigned int bit; + char state = '?'; /* '?' denotes unknown task state */ + + field = evsel__field(evsel, name); + + if (!field) + return state; + + if (!states || field != prev_state_field) { + states = get_states(field); + if (!states) + return state; + prev_state_field = field; + } + + /* + * Note since the kernel exposes TASK_REPORT_MAX to userspace + * to denote the 'preempted' state, we might as welll report + * 'R' for this case, which make senses to users as well. + * + * We can change this if we have a good reason in the future. + */ + val = evsel__intval(evsel, sample, name); + bit = val ? ffs(val) : 0; + state = (!bit || bit > strlen(states)) ? 'R' : states[bit-1]; + return state; +} #endif bool evsel__fallback(struct evsel *evsel, struct target *target, int err, diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index efbb6e848287..517cff431de2 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -339,6 +339,7 @@ struct perf_sample; void *evsel__rawptr(struct evsel *evsel, struct perf_sample *sample, const char *name); u64 evsel__intval(struct evsel *evsel, struct perf_sample *sample, const char *name); u64 evsel__intval_common(struct evsel *evsel, struct perf_sample *sample, const char *name); +char evsel__taskstate(struct evsel *evsel, struct perf_sample *sample, const char *name); static inline char *evsel__strval(struct evsel *evsel, struct perf_sample *sample, const char *name) { From patchwork Mon Jan 22 07:08:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ze Gao X-Patchwork-Id: 189928 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2408850dyb; Sun, 21 Jan 2024 23:12:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IEB76jD5NiKAUuU4WrGFbH5FshpRIRVr8apTiatiPvlaoorEeBQ+av49u8oT0ZjUtxEtlhR X-Received: by 2002:a05:6402:b21:b0:55a:34e1:4d13 with SMTP id bo1-20020a0564020b2100b0055a34e14d13mr1812045edb.17.1705907549681; Sun, 21 Jan 2024 23:12:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705907549; cv=pass; d=google.com; s=arc-20160816; b=PCo2oBsR4S2jbcuvpOKBbfJDM9Ot67xwciQlUgCFe5ngTQvEyq5pJLujXMVJoWbI2L qPYnGIpDRZ22ZW30bNJvpAsz7mM0tHAELpYqnVmVTZVIKDJJMXkkBpN1vgVG3PeEGK49 XCqCH03I4m/BxNXpvsQi3pzL3BNXunSdxTFoCapUw+7Si912h/v+COPZtsv07TTtG0WC Fyxm/GUHXtkYaquWeX4Pso2PWHQQwKOq4IRw8dDMAC/7bHTHUhp8the5WbQ35XXxjBeB QmmQcv1899Ptk/3C2DLziRHoWJfEFJrRHCcuzPQ0gAqjj91QMmml+MDOpKj576dUFpLz hNpg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=kZ5LQrtGOef2RhCQexh0DzGghwnp1zT6hJb7zIaDJYU=; fh=BA7X0Fh+nH6aOBOR/HncHKQUGXeIUOSOgeWoVcIZnUI=; b=JwjSZcPWteAxVN65cHHyEbBIfFm4KuWMetLNR8rvrByIo9SWCzRJUGSRO5/DHYMvUE Wwnq1K9yIvBHXfrmSanWhz7+s83lfoKLdAzDbX3MeRFCaaU/baYVd53pZWps2c1x6+N9 +CoDF72Q/+BlIA6HcyBIzxdTxaqCbN/RB3XVOpCq6h/BnLUSbemv9z+dEKVi0TGbWWYy 5GgUZfSaiLFW0Ekn9wQ8bBpFOzSebuTUsefDzEV3JY5YHJqPKbjAj323m6ubBMsxpVOf BhDRDlE53fI/IVxdcJOoei/hxAEB5FVnC6R+G+/Ejc/f1Z2QciN4Z1ya2i1G6cQ0EI5S D1NA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=j2v3DQfn; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-32412-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-32412-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id x16-20020a056402415000b005597ae20511si6924392eda.376.2024.01.21.23.12.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 23:12:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-32412-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=j2v3DQfn; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-32412-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-32412-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 7E12C1F21B85 for ; Mon, 22 Jan 2024 07:12:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C699617BC8; Mon, 22 Jan 2024 07:11:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="j2v3DQfn" Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 2A56D1549F; Mon, 22 Jan 2024 07:11:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705907463; cv=none; b=PurFz2/5y8f314VooCYT+Wbx2UAsQO4VJhdxQ9/PQVXrcHNu5dcDmgKEdlzu2Xc4EQK5EoI/ctA+plMNciCBILriQ0AhcY/L0t5/CSg7TWBUhR8mwZbV0+X1l1xsjcpnZkb4sIuHlvfekPdi4LhEIzaP95hOAZWaoUOKaYhDKkk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705907463; c=relaxed/simple; bh=GiCGWYYpI/zBmzmXTbTU7hU/gSeRqY9wIRiNhNMugk0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lHvQVQ14lbgALzqDWbGGrmhm3yzfD7a9k8PZhe+FXjnN7XPNcFBAhUnqMMklKcBEpYvkGyKnveMMwi83mDYT3VmxrN5UyEoTtw+RIAnyFFD63zVtMV4xZmFb8xq4Rgp4K7pudjc4p7RupmzYGTRh6VHxbdAssnQbOR9m6bjeYD8= 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=j2v3DQfn; arc=none smtp.client-ip=209.85.214.171 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 Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1d51ba18e1bso25148275ad.0; Sun, 21 Jan 2024 23:11:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705907461; x=1706512261; 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=kZ5LQrtGOef2RhCQexh0DzGghwnp1zT6hJb7zIaDJYU=; b=j2v3DQfn5mK8AoWP+TzKsd6QnToH0h7yJH88PMANbvIy+ZnxB1HnmiZHe/lK9FvS++ rxLMzyVNNb+bCDVjyAY4wiOCMnVZHM3efOSxeoWxCjkwAj4fUflqhH+0KbuDgsKHILWv cNv85NtKBoIc2ci74HqzB4trpAF39wBZPz+4n4e/yaxFfgvfQGUy7D7UkV3PTh92az6X qL1pJTlqs78SRV0SIqJVdGuvaV2s1VsWf/S8XfwXSor6kr3AnKVisXxXtLaMbILNgLSl wzoVAjCnBfR2WKFQJByvFsWA2jWsExnoFfSu2SeKqbaOQOhQIrlDogVVeks2SNvK4Tht FFwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705907461; x=1706512261; 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=kZ5LQrtGOef2RhCQexh0DzGghwnp1zT6hJb7zIaDJYU=; b=hLg5z8iXnZep8Gd4v4Pn1fG17Jrs6o1Fpl21Ol2z9+eaX/1q3PaPcZI74Zgc1kxuBX /A5f1R3mFgmeNUeuYL1SoFCsOUbOVc+1VAqYo+If+ge1G2RUK3W0kL1zTNnWajvbxs4Q pPZGtyfkRkEYRUJ07NLS68laXygt4Np64p1sV782iaaZVYZw7ugtf8duHFsker40kBHn ofXnOzescvy00Qvf5wh/3wHT6dqEdgl8niS0npmeIQYsAnNe4NjuJ25FEuLY+ZNFZYAg 2uC0a0otLjGidndpVXVT+YNmRhomyWXOnKjE2eqdEUBcIarfnM7x6gI6uIo4yl7ENwog Ow/g== X-Gm-Message-State: AOJu0YwEocY8rPhfsYqdMXWw9nI4xOmW2aeGaRbxnQs1+ckYACDlZ8g7 NmZy5J847kZmokIwrs6iOwM1DDani2xZTxnPTpxHrWO/C8LrsEyn X-Received: by 2002:a17:902:e852:b0:1d7:41b7:332b with SMTP id t18-20020a170902e85200b001d741b7332bmr3187637plg.14.1705907461571; Sun, 21 Jan 2024 23:11:01 -0800 (PST) Received: from localhost.localdomain ([43.132.98.45]) by smtp.googlemail.com with ESMTPSA id t10-20020a170902d28a00b001d72b3b0ee6sm3463365plc.248.2024.01.21.23.10.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 23:11:01 -0800 (PST) From: Ze Gao X-Google-Original-From: Ze Gao To: Adrian Hunter , Alexander Shishkin , Arnaldo Carvalho de Melo , Ian Rogers , Ingo Molnar , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Steven Rostedt Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Ze Gao Subject: [PATCH v2 4/4] perf sched: Commit to evsel__taskstate() to parse task state info Date: Mon, 22 Jan 2024 02:08:59 -0500 Message-ID: <20240122070859.1394479-6-zegao@tencent.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240122070859.1394479-2-zegao@tencent.com> References: <20240122070859.1394479-2-zegao@tencent.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788773714813025059 X-GMAIL-MSGID: 1788773714813025059 Now that we have evsel__taskstate() which no longer relies on the hardcoded task state string and has good backward compatibility, we have a good reason to use it. Note TASK_STATE_TO_CHAR_STR and task bitmasks are useless now so we remove them for good. And now we pass the state info back and forth in a symbolic char which explains itself well instead. Signed-off-by: Ze Gao --- tools/perf/builtin-sched.c | 46 +++++++++----------------------------- 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index ced6fffe8110..f1d62f6b6cab 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -92,13 +92,6 @@ struct sched_atom { struct task_desc *wakee; }; -#define TASK_STATE_TO_CHAR_STR "RSDTtXZPI" - -/* task state bitmask, copied from include/linux/sched.h */ -#define TASK_RUNNING 0 -#define TASK_INTERRUPTIBLE 1 -#define TASK_UNINTERRUPTIBLE 2 - enum thread_state { THREAD_SLEEPING = 0, THREAD_WAIT_CPU, @@ -255,7 +248,7 @@ struct thread_runtime { u64 total_preempt_time; u64 total_delay_time; - int last_state; + char last_state; char shortname[3]; bool comm_changed; @@ -425,7 +418,7 @@ static void add_sched_event_wakeup(struct perf_sched *sched, struct task_desc *t } static void add_sched_event_sleep(struct perf_sched *sched, struct task_desc *task, - u64 timestamp, u64 task_state __maybe_unused) + u64 timestamp, const char task_state __maybe_unused) { struct sched_atom *event = get_new_event(task, timestamp); @@ -849,7 +842,7 @@ static int replay_switch_event(struct perf_sched *sched, *next_comm = evsel__strval(evsel, sample, "next_comm"); const u32 prev_pid = evsel__intval(evsel, sample, "prev_pid"), next_pid = evsel__intval(evsel, sample, "next_pid"); - const u64 prev_state = evsel__intval(evsel, sample, "prev_state"); + const char prev_state = evsel__taskstate(evsel, sample, "prev_state"); struct task_desc *prev, __maybe_unused *next; u64 timestamp0, timestamp = sample->time; int cpu = sample->cpu; @@ -1039,13 +1032,6 @@ static int thread_atoms_insert(struct perf_sched *sched, struct thread *thread) return 0; } -static char sched_out_state(u64 prev_state) -{ - const char *str = TASK_STATE_TO_CHAR_STR; - - return str[prev_state]; -} - static int add_sched_out_event(struct work_atoms *atoms, char run_state, @@ -1121,7 +1107,7 @@ static int latency_switch_event(struct perf_sched *sched, { const u32 prev_pid = evsel__intval(evsel, sample, "prev_pid"), next_pid = evsel__intval(evsel, sample, "next_pid"); - const u64 prev_state = evsel__intval(evsel, sample, "prev_state"); + const char prev_state = evsel__taskstate(evsel, sample, "prev_state"); struct work_atoms *out_events, *in_events; struct thread *sched_out, *sched_in; u64 timestamp0, timestamp = sample->time; @@ -1157,7 +1143,7 @@ static int latency_switch_event(struct perf_sched *sched, goto out_put; } } - if (add_sched_out_event(out_events, sched_out_state(prev_state), timestamp)) + if (add_sched_out_event(out_events, prev_state, timestamp)) return -1; in_events = thread_atoms_search(&sched->atom_root, sched_in, &sched->cmp_pid); @@ -2022,24 +2008,12 @@ static void timehist_header(struct perf_sched *sched) printf("\n"); } -static char task_state_char(struct thread *thread, int state) -{ - static const char state_to_char[] = TASK_STATE_TO_CHAR_STR; - unsigned bit = state ? ffs(state) : 0; - - /* 'I' for idle */ - if (thread__tid(thread) == 0) - return 'I'; - - return bit < sizeof(state_to_char) - 1 ? state_to_char[bit] : '?'; -} - static void timehist_print_sample(struct perf_sched *sched, struct evsel *evsel, struct perf_sample *sample, struct addr_location *al, struct thread *thread, - u64 t, int state) + u64 t, const char state) { struct thread_runtime *tr = thread__priv(thread); const char *next_comm = evsel__strval(evsel, sample, "next_comm"); @@ -2080,7 +2054,7 @@ static void timehist_print_sample(struct perf_sched *sched, print_sched_time(tr->dt_run, 6); if (sched->show_state) - printf(" %5c ", task_state_char(thread, state)); + printf(" %5c ", thread->tid == 0 ? 'I' : state); if (sched->show_next) { snprintf(nstr, sizeof(nstr), "next: %s[%d]", next_comm, next_pid); @@ -2152,9 +2126,9 @@ static void timehist_update_runtime_stats(struct thread_runtime *r, else if (r->last_time) { u64 dt_wait = tprev - r->last_time; - if (r->last_state == TASK_RUNNING) + if (r->last_state == 'R') r->dt_preempt = dt_wait; - else if (r->last_state == TASK_UNINTERRUPTIBLE) + else if (r->last_state == 'D') r->dt_iowait = dt_wait; else r->dt_sleep = dt_wait; @@ -2579,7 +2553,7 @@ static int timehist_sched_change_event(struct perf_tool *tool, struct thread_runtime *tr = NULL; u64 tprev, t = sample->time; int rc = 0; - int state = evsel__intval(evsel, sample, "prev_state"); + const char state = evsel__taskstate(evsel, sample, "prev_state"); addr_location__init(&al); if (machine__resolve(machine, &al, sample) < 0) {