From patchwork Tue Jan 23 02:24:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ze Gao X-Patchwork-Id: 190696 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp93173dyi; Mon, 22 Jan 2024 19:06:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IGF+v67ARjVKQHHxsz61MPi4Q5cnHzd94IIn7XrxXp0CFDCN40Bl7WsJZyP8huN1GtNyG6h X-Received: by 2002:a05:6a21:a581:b0:191:6d71:cebf with SMTP id gd1-20020a056a21a58100b001916d71cebfmr3270790pzc.32.1705979180539; Mon, 22 Jan 2024 19:06:20 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705979180; cv=pass; d=google.com; s=arc-20160816; b=o5rZsyM7GnWqiLN8FZVijQVZdUH9Fi8kZCA1d+5RuNMYwc8t4IHo6cEexAC46ryvwL lPvO1aArm7NHM3G5WKcKPZ+UcuJbzszLHTyGvy5pvgFUlCxtcIafC9Oo9NyWzahFM66t vyU27cK+SJ9u++OPBpJPUvB++wBz+LQyCBAHbfl7hAEC/rgF0ZN2TXkhBterKitFnbUf doQ1qCG+deK3bYf5TUZQ+9x/xp/O8m8IF0kbamJxq6Z3dlwIdKRJpZCpy1vlRE9eTSOZ ai06Yi8qdlvxSaKPFmeHZys/KnbgSVaiJ8Dtfoe1hvOcOS+RY926phHsNSOsypKTh22o tx/w== 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=dJCK2M7LB9SyuCjZ6GojvA3LjnB/Kpgb+uEzSJT58cQ=; fh=BA7X0Fh+nH6aOBOR/HncHKQUGXeIUOSOgeWoVcIZnUI=; b=wd9lQzK5x51ZpCGAROSrVSfkx+optU6LReoQm5wdTEfHb/3M41KzSeGE4dhGYuSdxU CojX1znTb0o+Lp48Wt777KnYEJ4C+PIfiI8cqF03tbcJ2348DAFn7dZS7QRF31wKT+GZ 3Ydv/p1OFu2AAkkxGHOUrODM1WUs+jvnsbfW/ldgCK55zM7VHsH7P6LpUf2o9ttTORaQ k5BVszZcEYXSlZHIR9xBI6kpJ3kirH/XOYJu7uJwW39N/+uZKlWKhH0iucUQdaHMIVN2 TONQSJtR1+IKacDOhe0LoJFORJWGoWhg4G1Bo1TEZI/mZCm44kB7qYSssQPYm9Fi9euf 9DDA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=m3HZPL1c; 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-34634-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-34634-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. [147.75.48.161]) by mx.google.com with ESMTPS id i7-20020a17090a974700b00290bd80293bsi1337789pjw.153.2024.01.22.19.06.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 19:06:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-34634-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=m3HZPL1c; 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-34634-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-34634-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 7F849B2ADEB for ; Tue, 23 Jan 2024 02:42:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 418032C681; Tue, 23 Jan 2024 02:24:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="m3HZPL1c" Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 86BBD3FF4; Tue, 23 Jan 2024 02:24:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705976686; cv=none; b=dmd8IKNZ9Bhmh9Mv5TfL+t/+TT0wMtzf8woLuPXN1Dd6ZwdD4Uy+NOAWjuZQeCTbX/snd8QO82dfLCz7vYRJoMzn1cryeADfUvG7R0Ax6we0y1IannhL00jVgU5OkXPkvSITBe/N2EHj3Zsc+gNTFcyx+7DohbcVYfu+uWeYeHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705976686; c=relaxed/simple; bh=P8IqwavDl4sxT3s7h3WPgX6/J+hWe6wTMjAMlNDEaAI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O7Yrzw2SV+qcdGf/pp7w7Bvfx1r2Ty/g9k1AokkVQZf5XWvDx/rtF94VlLytyzYnmyO9JpClUv9Ghw+dHqgMVn2HIfAydKr/+ApfIwgXBz16SjK2wFCnf3aCqKj8/GUjzXgizuP1SzYjBTl4pEdvwKPhA5Otpo217uuzZR23iq8= 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=m3HZPL1c; arc=none smtp.client-ip=209.85.216.41 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-pj1-f41.google.com with SMTP id 98e67ed59e1d1-29041136f73so1837300a91.0; Mon, 22 Jan 2024 18:24:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705976684; x=1706581484; 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=dJCK2M7LB9SyuCjZ6GojvA3LjnB/Kpgb+uEzSJT58cQ=; b=m3HZPL1cyDC2hUDFaoX3oH8Sc/j1Bcp8O1izXu7pZtntdyQAgTqcpT3ZEX+RASUZ1H 7j4qfYZ6HHu2uh7Woe8lSprEaBnBc0QGvtOvj1r9mkzk9S4mJRWefQrHla5EaEoRZURs C53ubGzZE6KZvkAT3nhPxiY/eaYEjFaBiFKOkk8AbVC9jzXyJxjAH5wWYiFYeDQmJY3t 0/zOCAymqaeibVChF/cglxECcso7ABvUieqIMSfJdV8IHGdZ2Ik/2Nt1gM0v73irVWre ZkkUHUIPCCGHw23v7/tBql/zxxZGZUS+XsRVlNGV4KBvg7gnmdf+Jn/2D+RoKx3WEk9D jdPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705976684; x=1706581484; 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=dJCK2M7LB9SyuCjZ6GojvA3LjnB/Kpgb+uEzSJT58cQ=; b=dv4tkpncpjM2/5QsREN4SQV8RYCiKQ0q3EPs97du7CPsijlJol9PLbaYIJ9eP5pFLe Gv0iEGAGVQhA9UoEyQQtOMQ40maUWc6a1JlA+3ZZIzPQGdolmVj4TQ2wgwK07NiRemyU x5tTGNprWiFENauxXq3RtA/Nd28UXucvTsI/1DfMGjSWuE+WDlOutFZNxcnH3bJlplRh 2qYpIHs/goMcA2dMPLJZ0Hk8/Z3rVti3IrgH8fIZGMRKuAgpcrEkjMqkPWZ7y/CglGNX gdM/WrvqP6xlH4gyM1qTDpHiOUiuqp980a65SBnP1IXZ4jvo9F0TzpsNQ9jAkPdK8DSw bnaQ== X-Gm-Message-State: AOJu0YwGjx2Jsc0IP8BAYKpbeHLGGAk5fHWBoMks8EXw+cKGLuYbDM1c 7nGeQgZf/aorcd15xcAOpe0WnjZyhR5As6m53lIjY18eD7Su1S8jIUFA4J0rQXA2Lw== X-Received: by 2002:a17:90a:d705:b0:28c:374f:8028 with SMTP id y5-20020a17090ad70500b0028c374f8028mr1948530pju.27.1705976683721; Mon, 22 Jan 2024 18:24:43 -0800 (PST) Received: from localhost.localdomain ([43.132.98.110]) by smtp.googlemail.com with ESMTPSA id g14-20020a17090a578e00b002903e629403sm265062pji.0.2024.01.22.18.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 18:24:43 -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 21:24:25 -0500 Message-ID: <20240123022425.1611483-1-zegao@tencent.com> X-Mailer: git-send-email 2.41.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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788773714813025059 X-GMAIL-MSGID: 1788848825137562956 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..42d5fc5d6b7b 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(thread) == 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) {