From patchwork Thu Aug 3 08:33:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ze Gao X-Patchwork-Id: 130453 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1029286vqx; Thu, 3 Aug 2023 02:50:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlF4WTk1l3fU2+yqTQFOGhrR5jOe5j/DUtSVD9gLYj1NSaGaVJ5gROlBPE+qh3QLQI9xv872 X-Received: by 2002:a17:90a:ad91:b0:262:ebfd:ce44 with SMTP id s17-20020a17090aad9100b00262ebfdce44mr15331887pjq.34.1691056251701; Thu, 03 Aug 2023 02:50:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691056251; cv=none; d=google.com; s=arc-20160816; b=hAXjZKReWf0ORR0qbIXWfDwl/daksNA522rVhRwWVM+rWfEVTiRFrwrwaX5rgBd+PW Fi89nHN8FaIxyXqX4Za4AT+V4NPmmcxmD9w2uw+VSo/qLFwuDYd+JC4dvmmGIBtN4O63 gTeM6LINNxBBWtfL/UYwLGw87OKx8SVPz6c60qPASfUQB5oNy535j0X3uttfd2kMBii1 HcuOWftcxAQgWXhdZ8DDnfnB3wsY9LO6nuDM2oe91J+wyyJf+jZyGa8DorlhZTN/G5jg BFQflbTqhOF7AmABsojF38QOWzaLIblwvM46ktczC/4OuV78NtNHiLRxHVmULYV6Mf6W axhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Tnemojx1FZtx2Li9vOAprJUm0iuiB3b7IS7depvyVaE=; fh=TgT5K4Z1kLXalrYfkT8XvOWNi122otFfxWyimjdT30Y=; b=lunnVDMzUufg8aHNmRl2hkbrLMDvaRyIzTnJKud2Frh5VZMiEd4K0MO/yDMqxYTIRY b66LtsBXGst4sB044sroSvCcIBPjpsrqblX4rQ1PiOqZHMO+iF5XwANmfgVFqP4MFTuQ +Vmy1qqzy2gsywZBertDNwlSu3TGX8AWW1mDaMiVm+7iE8uvVvrwK13F630NkLp/c0XC mEoM74hSF/7WRFMwc/SC8U7qBpzMGX1KjyClNJHj26+wLaqV97+Olx4Kn9NET1nUQgph 8Odg9ZgEiYcMjlrdcJ6qPlbzFYbFouhthy2Cmp3r9vYQBYpDT6UrCOfI6mPDBntyte1i I8mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=qSSSnjKG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z9-20020a637e09000000b0055fdd303745si12064398pgc.421.2023.08.03.02.50.37; Thu, 03 Aug 2023 02:50:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=qSSSnjKG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234742AbjHCIg6 (ORCPT + 99 others); Thu, 3 Aug 2023 04:36:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234574AbjHCIgY (ORCPT ); Thu, 3 Aug 2023 04:36:24 -0400 Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C0A11BE; Thu, 3 Aug 2023 01:34:58 -0700 (PDT) Received: by mail-oi1-x230.google.com with SMTP id 5614622812f47-3a6f87b2993so521799b6e.3; Thu, 03 Aug 2023 01:34:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691051698; x=1691656498; 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=Tnemojx1FZtx2Li9vOAprJUm0iuiB3b7IS7depvyVaE=; b=qSSSnjKGejBP6Yomeu290FoFNqM817vMqLWUN5KoweAJlOAnf1LB5lncn6seQpXWil tbjfNCirCNiP9SBeViyFB3RGYCgWYh7VUrLz6oS2XiHjPycK7I+jkdA5ZNqzv2cqVxWZ q2q8mMc9guZei4vo1SKOmgNXEySqpBlL2cXa6INxgqBXEvej8S0bTYOcgl3UAiD5jmh0 DOsUYTqjHJi6J2MtKIDJq3W/FEeptmBM3qNmk8P9tK++jUqIxN6aGdU3KXO5uwGZgVzX T1M4sHHLx942q8pAAV4arLo2Mgefn28qbDrcoHSWQ1Lzv+kjn7eJP27AeHWmvF6rO9S6 9qow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691051698; x=1691656498; 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=Tnemojx1FZtx2Li9vOAprJUm0iuiB3b7IS7depvyVaE=; b=JVHrdJhpSa+mKC0sNDK4kraYRrPQhzFbpo0gtl5aE3mfXcW7YlvK/b5fa4q1/HJ0VT MwHCGVCZDP29c4JJMzrNfsDBCt9+l8EROBvBZzlUhRvfDrd9MwL2Nczvo0dFREi5xBlH 2zJwW2QyvTQRcSR6UPdxetaXXEVDYiuZJcRRhubUDxbDDJe/6z+EecikOuC4HhX9VOYQ IipQs1uHagCtIUVILCExp0vhYh5fWG6AIevNjdt0YaEkZlPbGw8SYBiuYs/kgt78Na4B gpW9y7soYIIFv9NBeTysybwLT1btx1FkLLWlkwNo2SiHM44GMN1/KCSxsqWF4LTSVjYI VACQ== X-Gm-Message-State: ABy/qLZ1xrdhgb9HtObTjrXMw4sfsZ5Z3WD0rxoxVxlbyvP4QLNFrfN9 YWkd7SDaM1DL2u0Po6wIGCc= X-Received: by 2002:a05:6358:98a2:b0:134:c279:c829 with SMTP id q34-20020a05635898a200b00134c279c829mr9475891rwa.18.1691051697678; Thu, 03 Aug 2023 01:34:57 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.83]) by smtp.googlemail.com with ESMTPSA id r6-20020a63b106000000b00563feb7113dsm12541876pgf.91.2023.08.03.01.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 01:34:57 -0700 (PDT) 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 , Masami Hiramatsu , Namhyung Kim , Peter Zijlstra , Steven Rostedt Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Ze Gao Subject: [RFC PATCH v6 5/5] perf sched: prefer to use prev_state_char introduced in sched_switch Date: Thu, 3 Aug 2023 04:33:52 -0400 Message-ID: <20230803083352.1585-6-zegao@tencent.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230803083352.1585-1-zegao@tencent.com> References: <20230803083352.1585-1-zegao@tencent.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773201000093890091 X-GMAIL-MSGID: 1773201000093890091 Since the sched_switch tracepoint introduces a new variable to report sched-out task state in symbolic char, we prefer to use it to spare from knowing internal implementations in kernel. Also we keep the old parsing logic intact but sync the state char array with the latest kernel. Signed-off-by: Ze Gao --- tools/perf/builtin-sched.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 5042874ba204..6f99a36206c9 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -837,7 +837,7 @@ replay_wakeup_event(struct perf_sched *sched, static inline char task_state_char(int state) { - static const char state_to_char[] = "RSDTtXZPI"; + static const char state_to_char[] = "RSDTtXZPIp"; unsigned int bit = state ? ffs(state) : 0; return bit < sizeof(state_to_char) - 1 ? state_to_char[bit] : '?'; @@ -846,9 +846,20 @@ static inline char task_state_char(int state) static inline char get_task_prev_state(struct evsel *evsel, struct perf_sample *sample) { - const int prev_state = evsel__intval(evsel, sample, "prev_state"); + char prev_state_char; + int prev_state; - return task_state_char(prev_state); + /* prefer to use prev_state_char */ + if (evsel__field(evsel, "prev_state_char")) + prev_state_char = (char) evsel__intval(evsel, + sample, "prev_state_char"); + else { + prev_state = (int) evsel__intval(evsel, + sample, "prev_state"); + prev_state_char = task_state_char(prev_state); + } + + return prev_state_char; } static int replay_switch_event(struct perf_sched *sched, @@ -2145,7 +2156,7 @@ 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 == 'R') + if (r->last_state == 'R' || r->last_state == 'p') r->dt_preempt = dt_wait; else if (r->last_state == 'D') r->dt_iowait = dt_wait;