From patchwork Mon Jan 15 07:23:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ze Gao X-Patchwork-Id: 188045 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp1548134dyc; Sun, 14 Jan 2024 23:24:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IFjkg6kvmh7kuiXf4ZVf72pdOo0SdK0lSb/GE7k1XME7L1ZKyHAammidDmr/wzcaRDdT1cQ X-Received: by 2002:a05:6a20:6f90:b0:19b:1da3:b9bf with SMTP id gv16-20020a056a206f9000b0019b1da3b9bfmr5241pzb.57.1705303496157; Sun, 14 Jan 2024 23:24:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705303496; cv=none; d=google.com; s=arc-20160816; b=fTIWuPM8NR+SMw8zbAGKoUaXdy+405I9r2BMnZkbw/WR8qFufM5bjTF+E4Cs+STXqM bn2FWy9dWqgSQXmelmWdAQ2pk4MyMUGHvA5IFwtz86Fz4Ej4yvOXOfKZcclbjnHrbMug DOJkW33aZuQvZKz2RM2tfsQGyzRogSz+aJsw+JRfJzrxqbXJ1C+0goMP2BEDzt+UqeHs U0SOp+PU/wNSHi4Wk0y3se6OXSfH/nqyu4xbnvJ/lgrTlzF0jI3SX6b8w8k9XvpTFtfp R5R0U0TvgmMPpkYBc9HsUWGxXR6iUu5P+HQBaaxGcW4/VkcXYp8bJE8P+CHl7WS+XkTO kNgA== ARC-Message-Signature: i=1; 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=A4mEeVaz0j6H7CVK4T2D5ptJ8rF2d9l7TQc2+TuglP6s/SbFMCM2jCWUaJ6F2s6bx3 6xdWkmq3T3G4sVqJ7c50vOseEJOErXtZcKLfhm3dvkyWamyRXlbaiXIp5ykjev1BTa5W VKREBuFZb5Oh2eanTHVB/mmBD+svEhGF7Ufqv1VC7VJZGbLLU0sD0CW0gm6+C+ImOs6H ooJP+YnA7HVmCQjlUyzJl9S0utTNb37tmQzhltMsgRFzcEquGvHihDxx7Ufq1fU68k9t /Dbsok7AmefxI4MoAVlCgeVSugh+JKun/KAOMDyQ9htm39cNsUqOnv26mwulW4YMXOOS ijTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="a0Min/Bp"; spf=pass (google.com: domain of linux-kernel+bounces-25680-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25680-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id u14-20020a17090a4bce00b002869d1b1921si8396028pjl.31.2024.01.14.23.24.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jan 2024 23:24:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-25680-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="a0Min/Bp"; spf=pass (google.com: domain of linux-kernel+bounces-25680-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25680-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 1318BB20F5B for ; Mon, 15 Jan 2024 07:24:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0611B5C97; Mon, 15 Jan 2024 07:23:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a0Min/Bp" 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 858C88814; Mon, 15 Jan 2024 07:23:28 +0000 (UTC) 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-1d51ba18e1bso71735725ad.0; Sun, 14 Jan 2024 23:23:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705303408; x=1705908208; 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=a0Min/BpgERqnBz4GkjZawDm1Tmtq7QwVUZqZp9TbVGFiLQ46BxC5h6oqGn4HxfC+x Pqz1yhNI6uptsKTplg10oBlA1rJPMnJpf9Y6eGThSxgdoADrC4v0JDgMmCDiHAatzpZI iIfo+wm0vSfR9J+Jx4G465RiVx4ToJ7OF1zyaJ3AWc+R282Oh8orfRBbXWddF/3tncJK e84eZfw4dttpMMbCQ72YB6SS85wipxc37dABfuEJ7EAIuFtLR/oi+cVdi/2YLw3h8eqQ A720EKQT7jfOPSIles8MBeYQpts+o/9Suq0GYBjTALuTbr8B65mPIa4bkav43ifVwFzK dIQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705303408; x=1705908208; 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=lMb9/GC/tp8/xMvYLlBBGaQkc1w1RSa5mfmP72oVESn7g+LmqiuJWRH+mBeiclZB4g zreJvnu0z2I5VGPxBX1mHFLFOn+4iajAsff9ePOtZhoZDa7uiV1TPDAgZrRDdAYcN6+9 Mg6xgY8LNOlIJxqRWfh2zIEkJelNN5yi4hy/g/HsJxcCR45kRAKeRUjad1b33lRmjUv2 PuF5RoXm8J0RE4ba56KEAOk3evO6ZQ+h+UmMi+zsGgEW1cW3//fvXlPUeHfnq1RLVVRO o2qcsWysKEQutGYeh5IyiTkxOqg+IOrBbDVfgcEUhOX5tEcLnKBK+B/c9inhsFenPpuJ PdPg== X-Gm-Message-State: AOJu0YzOcqDClTzG9m8+aCuCMw6y0q0g9KUIgMrUQIe/nOgSMzYX88Or 82HxkSYCtliB8ptqVnzkdFY= X-Received: by 2002:a17:902:e78a:b0:1d3:ee1f:ce54 with SMTP id cp10-20020a170902e78a00b001d3ee1fce54mr6201200plb.89.1705303407872; Sun, 14 Jan 2024 23:23:27 -0800 (PST) Received: from localhost.localdomain ([203.205.141.87]) by smtp.googlemail.com with ESMTPSA id mp13-20020a170902fd0d00b001d4ac8ac969sm6990545plb.275.2024.01.14.23.23.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jan 2024 23:23:27 -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 4/4] perf sched: Commit to evsel__taskstate() to parse task state info Date: Mon, 15 Jan 2024 02:23:06 -0500 Message-ID: <20240115072306.303993-5-zegao@tencent.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240115072306.303993-1-zegao@tencent.com> References: <20240115072306.303993-1-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: 1788140318308266065 X-GMAIL-MSGID: 1788140318308266065 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) {