From nobody Thu Dec 25 05:11:08 2025 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lgcQS3L8" 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-Google-Smtp-Source: AGHT+IFTuJx1omZMnOjDAV1d4HiZgPXBgzBG3ZSbjMjZ96lN3hpbmXXFQXzDgIugy43VFQM7xfJS+A== 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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; }; =20 -#define TASK_STATE_TO_CHAR_STR "RSDTtZXxKWP" +#define TASK_STATE_TO_CHAR_STR "RSDTtXZPI" =20 /* 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 =20 enum thread_state { THREAD_SLEEPING =3D 0, --=20 2.41.0 From nobody Thu Dec 25 05:11:08 2025 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 74354FC17; Mon, 22 Jan 2024 07:10:55 +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=1705907456; cv=none; b=VEysBY/qnIMDg9cpaHVJ1CePchgc7diNt9KFUkhVxw9lIUk0jbnLUPNP+VwWhfroimIEuvDR9IVfLbdvK/o/kPVLPAy2RF7tw7pgk+g2zisBEBACklYtT1P1dib2dj6HlFcX8RvekbOBBWVZTjpe0BIgZncERqqtTiBXYhE4rMs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705907456; c=relaxed/simple; bh=8Gb7coVSYCWmwm4SIlpguImb0OvBQbhjaJZGhxwmrjA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u0hKeXUYaWoryUlacNW4mxNZYi9a8BShZ7kWrpRVMaPPCA5bir3Pnt/Ln9eo3JbkBQo1Cx5NoY1ivEuh90goH0vxq9ojUmwIcb2vuyuO+pBmxb6zY7bBohSDj3Ei8P1s7+YmSt1cHwPEcw/hoiEek/erHlYhQycXFAw2yHWOc8E= 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=Qg32+0b5; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Qg32+0b5" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1d6ff29293dso14204315ad.0; Sun, 21 Jan 2024 23:10:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705907455; x=1706512255; 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=3QuXd092D54YadSy57Dmk7KFbpauXmNaLBiWSqnwP5k=; b=Qg32+0b58+gx0tf6iU5oD1LSJdURukcfW021ST7KpN/kALkzqsF+iWGXTjDmzET7Cp 60WNXJPoZ2G8QIC0s3kMvd2/O9qJ0EU0nkvI+jRg15t/UnPgcSX2N4t4Bk8MA/2aKqj8 TXym10H57y+y7exwImFo16Et8icOPbxJU9/4+hiMesptSP6Gm0+TkoEeK3QoHt9cryLt UgycQORJWJf6Qs6faZ4D+Cqwp6Ag8JiViTPUxiaOEUj6PQwcXII5L5FSYBSybW03kuw4 LQOEKbk7yxJImhUDMcWsWGny2MCqKVR4c59PfjsSUrQlryUq9DvxF8lf0sYzeQXB1Hp/ PCKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705907455; x=1706512255; 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=3QuXd092D54YadSy57Dmk7KFbpauXmNaLBiWSqnwP5k=; b=HJ4plFvReybzsg4VO/HgF/BfoEPcW05KIZaCtA21dNBbiqoDdH5emAwkbziouppQ8e K8FQhFMIofZQFMkq+rjME1UDAjrmU+C3hfkO9ErlIEh/xlilouQ9/1FXUoLSxWfWjcoO C5csJGwjEtHp7FXn2rTI1GZ7Wr2BSlZB6JEwsNUEEDP2ZEDHVIaIdHaC0XeaImjC2aYy zHt0G3InCJS7TEFtd5SArD7fB/ETVEeIPMVjjW2vQhZTTtcIyqd7YfqwAoyirK4EaikS Sk4qKKRGhoVmsCfDibmXi3rZ8ugkPsgFnUsLpRXni+KhuNWvacmgCTZD5WWiYoyHDbyB 6RTw== X-Gm-Message-State: AOJu0YzxTOcZyesXNngf/JPiQ5zl0BHNMijfMoz2k6f7uEq2hvaxDPGn BMAN2APpSp9mvzG02Rw0lGcWmV5BMYUKHr1Y7s7LHkJqr/D0WrzG X-Google-Smtp-Source: AGHT+IEZCnsciI/VQ6Q4nAtw6flXBywAotKhszPP81zx18wHUMqv8jaQ1foj5jY2l7b4xxj3F+1Zag== X-Received: by 2002:a17:903:2346:b0:1d7:365c:8926 with SMTP id c6-20020a170903234600b001d7365c8926mr1086314plh.87.1705907454979; Sun, 21 Jan 2024 23:10:54 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 23:10:54 -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 2/4] perf util: Add helpers to parse task state string from libtraceevent Date: Mon, 22 Jan 2024 02:08:57 -0500 Message-ID: <20240122070859.1394479-4-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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Perf uses a hard coded string "RSDTtXZPI" to index the sched_switch prev_state field raw bitmask value. This works well except for when the kernel changes this string, in which case this will break again. Instead we add a new way to parse task state string from tracepoint print format already recorded by perf, which eliminates the further dependencies with this hardcode and unmaintainable macro, and this is exactly what libtraceevent[1] does for now. So we borrow the print flags parsing logic from libtraceevent[1]. And in get_states(), we walk the print arguments until the __print_flags() for the target state field is found, and use that to build the states string for future parsing. [1]: https://lore.kernel.org/linux-trace-devel/20231224140732.7d41698d@rors= chach.local.home/ Cc: Steven Rostedt (Google) Signed-off-by: Steven Rostedt (Google) Signed-off-by: Ze Gao --- tools/perf/util/evsel.c | 112 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 6d7c9c58a9bc..e08294c51cd4 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -2851,6 +2851,118 @@ u64 evsel__intval_common(struct evsel *evsel, struc= t perf_sample *sample, const return field ? format_field__intval(field, sample, evsel->needs_swap) : 0; } =20 +/* + * prev_state is of size long, which is 32 bits on 32 bit architectures. + * As it needs to have the same bits for both 32 bit and 64 bit architectu= res + * we can just assume that the flags we care about will all be within + * the 32 bits. + */ +#define MAX_STATE_BITS 32 + +static const char *convert_sym(struct tep_print_flag_sym *sym) +{ + static char save_states[MAX_STATE_BITS + 1]; + + memset(save_states, 0, sizeof(save_states)); + + /* This is the flags for the prev_state_field, now make them into a strin= g */ + for (; sym; sym =3D sym->next) { + long bitmask =3D strtoul(sym->value, NULL, 0); + int i; + + for (i =3D 0; !(bitmask & 1); i++) + bitmask >>=3D 1; + + if (i >=3D MAX_STATE_BITS) + continue; + + save_states[i] =3D sym->str[0]; + } + + return save_states; +} + +static struct tep_print_arg_field * +find_arg_field(struct tep_format_field *prev_state_field, struct tep_print= _arg *arg) +{ + struct tep_print_arg_field *field; + + if (!arg) + return NULL; + + if (arg->type =3D=3D TEP_PRINT_FIELD) + return &arg->field; + + if (arg->type =3D=3D TEP_PRINT_OP) { + field =3D find_arg_field(prev_state_field, arg->op.left); + if (field && field->field =3D=3D prev_state_field) + return field; + field =3D find_arg_field(prev_state_field, arg->op.right); + if (field && field->field =3D=3D prev_state_field) + return field; + } + return NULL; +} + +static struct tep_print_flag_sym * +test_flags(struct tep_format_field *prev_state_field, struct tep_print_arg= *arg) +{ + struct tep_print_arg_field *field; + + field =3D find_arg_field(prev_state_field, arg->flags.field); + if (!field) + return NULL; + + return arg->flags.flags; +} + +static struct tep_print_flag_sym * +search_op(struct tep_format_field *prev_state_field, struct tep_print_arg = *arg) +{ + struct tep_print_flag_sym *sym =3D NULL; + + if (!arg) + return NULL; + + if (arg->type =3D=3D TEP_PRINT_OP) { + sym =3D search_op(prev_state_field, arg->op.left); + if (sym) + return sym; + + sym =3D search_op(prev_state_field, arg->op.right); + if (sym) + return sym; + } else if (arg->type =3D=3D TEP_PRINT_FLAGS) { + sym =3D test_flags(prev_state_field, arg); + } + + return sym; +} + +static __maybe_unused const char *get_states(struct tep_format_field *prev= _state_field) +{ + struct tep_print_flag_sym *sym; + struct tep_print_arg *arg; + struct tep_event *event; + + event =3D prev_state_field->event; + + /* + * Look at the event format fields, and search for where + * the prev_state is parsed via the format flags. + */ + for (arg =3D event->print_fmt.args; arg; arg =3D arg->next) { + /* + * Currently, the __print_flags() for the prev_state + * is embedded in operations, so they too must be + * searched. + */ + sym =3D search_op(prev_state_field, arg); + if (sym) + return convert_sym(sym); + } + return NULL; +} #endif =20 bool evsel__fallback(struct evsel *evsel, struct target *target, int err, --=20 2.41.0 From nobody Thu Dec 25 05:11:08 2025 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bPRBTNEV" 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-Google-Smtp-Source: AGHT+IF9TlZjANbZBES5CcGCgR2qinVpvD2AilnbhHW3P6mnARvknZ6xtgdh2jg/KRM7EhTt65zM5A== 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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; } =20 -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, con= st 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 =3D '?'; /* '?' denotes unknown task state */ + + field =3D evsel__field(evsel, name); + + if (!field) + return state; + + if (!states || field !=3D prev_state_field) { + states =3D get_states(field); + if (!states) + return state; + prev_state_field =3D 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 =3D evsel__intval(evsel, sample, name); + bit =3D val ? ffs(val) : 0; + state =3D (!bit || bit > strlen(states)) ? 'R' : states[bit-1]; + return state; +} #endif =20 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 c= har *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, con= st char *name); =20 static inline char *evsel__strval(struct evsel *evsel, struct perf_sample = *sample, const char *name) { --=20 2.41.0 From nobody Thu Dec 25 05:11:08 2025 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="j2v3DQfn" 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-Google-Smtp-Source: AGHT+IH8N/aRIYyc67Ff6jyaVTTxBKkJJGE87EtIPf5gzDu/V/a/IH1tcJTXnt029qA6gCu/mB7xrw== 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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; }; =20 -#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 =3D 0, THREAD_WAIT_CPU, @@ -255,7 +248,7 @@ struct thread_runtime { u64 total_preempt_time; u64 total_delay_time; =20 - int last_state; + char last_state; =20 char shortname[3]; bool comm_changed; @@ -425,7 +418,7 @@ static void add_sched_event_wakeup(struct perf_sched *s= ched, struct task_desc *t } =20 static void add_sched_event_sleep(struct perf_sched *sched, struct task_de= sc *task, - u64 timestamp, u64 task_state __maybe_unused) + u64 timestamp, const char task_state __maybe_unused) { struct sched_atom *event =3D get_new_event(task, timestamp); =20 @@ -849,7 +842,7 @@ static int replay_switch_event(struct perf_sched *sched, *next_comm =3D evsel__strval(evsel, sample, "next_comm"); const u32 prev_pid =3D evsel__intval(evsel, sample, "prev_pid"), next_pid =3D evsel__intval(evsel, sample, "next_pid"); - const u64 prev_state =3D evsel__intval(evsel, sample, "prev_state"); + const char prev_state =3D evsel__taskstate(evsel, sample, "prev_state"); struct task_desc *prev, __maybe_unused *next; u64 timestamp0, timestamp =3D sample->time; int cpu =3D sample->cpu; @@ -1039,13 +1032,6 @@ static int thread_atoms_insert(struct perf_sched *sc= hed, struct thread *thread) return 0; } =20 -static char sched_out_state(u64 prev_state) -{ - const char *str =3D 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 *sc= hed, { const u32 prev_pid =3D evsel__intval(evsel, sample, "prev_pid"), next_pid =3D evsel__intval(evsel, sample, "next_pid"); - const u64 prev_state =3D evsel__intval(evsel, sample, "prev_state"); + const char prev_state =3D evsel__taskstate(evsel, sample, "prev_state"); struct work_atoms *out_events, *in_events; struct thread *sched_out, *sched_in; u64 timestamp0, timestamp =3D sample->time; @@ -1157,7 +1143,7 @@ static int latency_switch_event(struct perf_sched *sc= hed, goto out_put; } } - if (add_sched_out_event(out_events, sched_out_state(prev_state), timestam= p)) + if (add_sched_out_event(out_events, prev_state, timestamp)) return -1; =20 in_events =3D thread_atoms_search(&sched->atom_root, sched_in, &sched->cm= p_pid); @@ -2022,24 +2008,12 @@ static void timehist_header(struct perf_sched *sche= d) printf("\n"); } =20 -static char task_state_char(struct thread *thread, int state) -{ - static const char state_to_char[] =3D TASK_STATE_TO_CHAR_STR; - unsigned bit =3D state ? ffs(state) : 0; - - /* 'I' for idle */ - if (thread__tid(thread) =3D=3D 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 =3D thread__priv(thread); const char *next_comm =3D 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); =20 if (sched->show_state) - printf(" %5c ", task_state_char(thread, state)); + printf(" %5c ", thread->tid =3D=3D 0 ? 'I' : state); =20 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 thre= ad_runtime *r, else if (r->last_time) { u64 dt_wait =3D tprev - r->last_time; =20 - if (r->last_state =3D=3D TASK_RUNNING) + if (r->last_state =3D=3D 'R') r->dt_preempt =3D dt_wait; - else if (r->last_state =3D=3D TASK_UNINTERRUPTIBLE) + else if (r->last_state =3D=3D 'D') r->dt_iowait =3D dt_wait; else r->dt_sleep =3D dt_wait; @@ -2579,7 +2553,7 @@ static int timehist_sched_change_event(struct perf_to= ol *tool, struct thread_runtime *tr =3D NULL; u64 tprev, t =3D sample->time; int rc =3D 0; - int state =3D evsel__intval(evsel, sample, "prev_state"); + const char state =3D evsel__taskstate(evsel, sample, "prev_state"); =20 addr_location__init(&al); if (machine__resolve(machine, &al, sample) < 0) { --=20 2.41.0 From nobody Thu Dec 25 05:11:08 2025 Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) (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 7FD75524A4; Tue, 23 Jan 2024 07:03:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705993402; cv=none; b=jLkdG3Ik7DJPJsV3QZTtmlCzdofsHbDUNRWwZFs4tZ/8COmNXYj28PFRN+C7K84w2RG8TJNrfLnj1N1CJiXUrGQg2uBwHsAUoU2O/SYOfRGfGHaOPX51qx+4lwbwIDigDhWN8MUHMSMPiuOHnnXPkZhnhOS/UN/OaHeqXFp3lEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705993402; c=relaxed/simple; bh=zz2DhOsA7lKV454Wy4HlDezE8wkN5htlxq1g9lqRAWo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NVHx1bvkYOtdsI47WKeyvvFP0ODhBfZFq8Nlufj51TSIuuANL7IMJsespIVLx/F7lISMJ1EZcHyYgo/ryaTEWiF1D3M2Ahy/tkHyVHi1b+s2SwRcbifVzK4GowZSNUq83YKqlSfEXdmEE88/CrhwZt7tPBCRKOpX5eSuAKMl0t0= 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=B7m1VD26; arc=none smtp.client-ip=209.85.161.49 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="B7m1VD26" Received: by mail-oo1-f49.google.com with SMTP id 006d021491bc7-5999f3f6ce9so492463eaf.0; Mon, 22 Jan 2024 23:03:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705993399; x=1706598199; 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=LKSMteuWkKCP1Fe0jW8ClSMxtYeAHuiJeStYDwoZyCE=; b=B7m1VD260USnXrzU+4+hWUQN5CpMr0NWKXYuQVi1YeY3a/Nv2reIXdA3fLnHr+YPpu QItXH5gzew6O+sK4oJbApjL7xuYaofZlUfTi8SRWCTAcgvlrNLWjjv4WSZQtagaiujvx S0pf1/YO5KvrtloI2EHqYEhRkpRvHfu4MvwXcFF79g7057P4LQSqKRWwio6rcOeJw8Dz N20P3ZD8Iw7VpcqeHTETeYGsG1Urn7QZd00L+ucgOnrFoAoIusXIXXKy/r5XM8EDbFu0 dFZ5DXywswAN6Zfe7JOBgKPqs+XxOYi5mwvqQQpPsOyS1aTuM75Wcexeg1MF7YK5/6jA P7MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705993399; x=1706598199; 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=LKSMteuWkKCP1Fe0jW8ClSMxtYeAHuiJeStYDwoZyCE=; b=II3fRNUQu4bGALwZhj94RHVf9q+k8gHbEN1EwDAnUL/rDE80SfO/B7QMv6BbWE6QT7 TgjkE7URJzNCZe/3xWziO9ETi/WReGaDhZ/YkEgCdqnIDbar1OU9C0Yt1cQ8gAKuOGVD W3njtfzX22+9OAUyAHI0NsL3+B7lNaCLg9c08m651r35qXLv2nnDKn0U4IyFvCOFLAS8 oJ+17/nyxozVuq6oLNOX6A4+D8nZsWnfiEEpzcTtGXRfuwNPLRiO7OsK4Bc3UhhfB60S ljzetRspY+iCNTHmvxS/DyiHo388KYMV3HAcu9lNg/0+erQW+t/T3ntMsXQMNa+tVcPc 5tFQ== X-Gm-Message-State: AOJu0YzXoKE2IFLAIY5c+OqFxVASZRrwoefKtCgSUsdM5evCWA/TJxE6 9H12JL/Ypy4G76mNd30vhDP3rQpKaYm1ZJuUpJEH8rzcFfOjzRSi X-Google-Smtp-Source: AGHT+IE+tgIe+tNobDsNkDlBW1p4j8yuov2/PcOmj91vCjrHJTiqThxQMD+5plzBwX04sckZHrrm/A== X-Received: by 2002:a05:6358:7f18:b0:175:7274:99c4 with SMTP id p24-20020a0563587f1800b00175727499c4mr5253359rwn.39.1705993399332; Mon, 22 Jan 2024 23:03:19 -0800 (PST) Received: from localhost.localdomain ([43.132.98.115]) by smtp.googlemail.com with ESMTPSA id y39-20020a056a00182700b006dbd41ce285sm4619730pfa.16.2024.01.22.23.03.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 23:03:18 -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] perf evsel: Rename get_states() to parse_task_states() and make it public Date: Tue, 23 Jan 2024 02:02:11 -0500 Message-ID: <20240123070210.1669843-2-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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since get_states() assumes the existence of libtraceevent, so move to where it should belong, i.e, util/trace-event-parse.c, and also rename it to parse_task_states(). Leave evsel_getstate() untouched as it fits well in the evsel category. Also make some necessary tweaks for python support, and get it verified with: perf test python. Signed-off-by: Ze Gao --- Hi Namhyung, This is the promised refactoring patch for [1], and hopefully it works as what we all expected. [1]: https://lore.kernel.org/all/20240122070859.1394479-2-zegao@tencent.com/ Regards, -- Ze tools/perf/Makefile.perf | 2 +- tools/perf/util/evsel.c | 115 +--------------------------- tools/perf/util/python-ext-sources | 1 + tools/perf/util/setup.py | 1 + tools/perf/util/trace-event-parse.c | 113 +++++++++++++++++++++++++++ tools/perf/util/trace-event.h | 3 + 6 files changed, 120 insertions(+), 115 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 27e7c478880f..a5d274bd804b 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -370,7 +370,7 @@ python-clean :=3D $(call QUIET_CLEAN, python) $(RM) -r = $(PYTHON_EXTBUILD) $(OUTPUT ifeq ($(CONFIG_LIBTRACEEVENT),y) PYTHON_EXT_SRCS :=3D $(shell grep -v ^\# util/python-ext-sources) else - PYTHON_EXT_SRCS :=3D $(shell grep -v ^\#\\\|util/trace-event.c util/pyth= on-ext-sources) + PYTHON_EXT_SRCS :=3D $(shell grep -v ^\#\\\|util/trace-event.c\\\|util/t= race-event-parse.c util/python-ext-sources) endif =20 PYTHON_EXT_DEPS :=3D util/python-ext-sources util/setup.py $(LIBAPI) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 4d14f14f2506..9e67324b1608 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -2851,119 +2851,6 @@ u64 evsel__intval_common(struct evsel *evsel, struc= t perf_sample *sample, const return field ? format_field__intval(field, sample, evsel->needs_swap) : 0; } =20 -/* - * prev_state is of size long, which is 32 bits on 32 bit architectures. - * As it needs to have the same bits for both 32 bit and 64 bit architectu= res - * we can just assume that the flags we care about will all be within - * the 32 bits. - */ -#define MAX_STATE_BITS 32 - -static const char *convert_sym(struct tep_print_flag_sym *sym) -{ - static char save_states[MAX_STATE_BITS + 1]; - - memset(save_states, 0, sizeof(save_states)); - - /* This is the flags for the prev_state_field, now make them into a strin= g */ - for (; sym; sym =3D sym->next) { - long bitmask =3D strtoul(sym->value, NULL, 0); - int i; - - for (i =3D 0; !(bitmask & 1); i++) - bitmask >>=3D 1; - - if (i >=3D MAX_STATE_BITS) - continue; - - save_states[i] =3D sym->str[0]; - } - - return save_states; -} - -static struct tep_print_arg_field * -find_arg_field(struct tep_format_field *prev_state_field, struct tep_print= _arg *arg) -{ - struct tep_print_arg_field *field; - - if (!arg) - return NULL; - - if (arg->type =3D=3D TEP_PRINT_FIELD) - return &arg->field; - - if (arg->type =3D=3D TEP_PRINT_OP) { - field =3D find_arg_field(prev_state_field, arg->op.left); - if (field && field->field =3D=3D prev_state_field) - return field; - field =3D find_arg_field(prev_state_field, arg->op.right); - if (field && field->field =3D=3D prev_state_field) - return field; - } - return NULL; -} - -static struct tep_print_flag_sym * -test_flags(struct tep_format_field *prev_state_field, struct tep_print_arg= *arg) -{ - struct tep_print_arg_field *field; - - field =3D find_arg_field(prev_state_field, arg->flags.field); - if (!field) - return NULL; - - return arg->flags.flags; -} - -static struct tep_print_flag_sym * -search_op(struct tep_format_field *prev_state_field, struct tep_print_arg = *arg) -{ - struct tep_print_flag_sym *sym =3D NULL; - - if (!arg) - return NULL; - - if (arg->type =3D=3D TEP_PRINT_OP) { - sym =3D search_op(prev_state_field, arg->op.left); - if (sym) - return sym; - - sym =3D search_op(prev_state_field, arg->op.right); - if (sym) - return sym; - } else if (arg->type =3D=3D TEP_PRINT_FLAGS) { - sym =3D test_flags(prev_state_field, arg); - } - - return sym; -} - -static const char *get_states(struct tep_format_field *prev_state_field) -{ - struct tep_print_flag_sym *sym; - struct tep_print_arg *arg; - struct tep_event *event; - - event =3D prev_state_field->event; - - /* - * Look at the event format fields, and search for where - * the prev_state is parsed via the format flags. - */ - for (arg =3D event->print_fmt.args; arg; arg =3D arg->next) { - /* - * Currently, the __print_flags() for the prev_state - * is embedded in operations, so they too must be - * searched. - */ - sym =3D search_op(prev_state_field, arg); - if (sym) - return convert_sym(sym); - } - return NULL; -} - char evsel__taskstate(struct evsel *evsel, struct perf_sample *sample, con= st char *name) { static struct tep_format_field *prev_state_field; @@ -2979,7 +2866,7 @@ char evsel__taskstate(struct evsel *evsel, struct per= f_sample *sample, const cha return state; =20 if (!states || field !=3D prev_state_field) { - states =3D get_states(field); + states =3D parse_task_states(field); if (!states) return state; prev_state_field =3D field; diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ex= t-sources index 593b660ec75e..1bec945f4838 100644 --- a/tools/perf/util/python-ext-sources +++ b/tools/perf/util/python-ext-sources @@ -31,6 +31,7 @@ util/counts.c util/print_binary.c util/strlist.c util/trace-event.c +util/trace-event-parse.c ../lib/rbtree.c util/string.c util/symbol_fprintf.c diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py index 79d5e2955f85..3107f5aa8c9a 100644 --- a/tools/perf/util/setup.py +++ b/tools/perf/util/setup.py @@ -85,6 +85,7 @@ if '-DHAVE_LIBTRACEEVENT' in cflags: extra_libraries +=3D [ 'traceevent' ] else: ext_sources.remove('util/trace-event.c') + ext_sources.remove('util/trace-event-parse.c') =20 # use full paths with source files ext_sources =3D list(map(lambda x: '%s/%s' % (src_perf, x) , ext_sources)) diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-ev= ent-parse.c index 2d3c2576bab7..f0332bd3a501 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -122,6 +122,119 @@ void event_format__print(struct tep_event *event, return event_format__fprintf(event, cpu, data, size, stdout); } =20 +/* + * prev_state is of size long, which is 32 bits on 32 bit architectures. + * As it needs to have the same bits for both 32 bit and 64 bit architectu= res + * we can just assume that the flags we care about will all be within + * the 32 bits. + */ +#define MAX_STATE_BITS 32 + +static const char *convert_sym(struct tep_print_flag_sym *sym) +{ + static char save_states[MAX_STATE_BITS + 1]; + + memset(save_states, 0, sizeof(save_states)); + + /* This is the flags for the prev_state_field, now make them into a strin= g */ + for (; sym; sym =3D sym->next) { + long bitmask =3D strtoul(sym->value, NULL, 0); + int i; + + for (i =3D 0; !(bitmask & 1); i++) + bitmask >>=3D 1; + + if (i >=3D MAX_STATE_BITS) + continue; + + save_states[i] =3D sym->str[0]; + } + + return save_states; +} + +static struct tep_print_arg_field * +find_arg_field(struct tep_format_field *prev_state_field, struct tep_print= _arg *arg) +{ + struct tep_print_arg_field *field; + + if (!arg) + return NULL; + + if (arg->type =3D=3D TEP_PRINT_FIELD) + return &arg->field; + + if (arg->type =3D=3D TEP_PRINT_OP) { + field =3D find_arg_field(prev_state_field, arg->op.left); + if (field && field->field =3D=3D prev_state_field) + return field; + field =3D find_arg_field(prev_state_field, arg->op.right); + if (field && field->field =3D=3D prev_state_field) + return field; + } + return NULL; +} + +static struct tep_print_flag_sym * +test_flags(struct tep_format_field *prev_state_field, struct tep_print_arg= *arg) +{ + struct tep_print_arg_field *field; + + field =3D find_arg_field(prev_state_field, arg->flags.field); + if (!field) + return NULL; + + return arg->flags.flags; +} + +static struct tep_print_flag_sym * +search_op(struct tep_format_field *prev_state_field, struct tep_print_arg = *arg) +{ + struct tep_print_flag_sym *sym =3D NULL; + + if (!arg) + return NULL; + + if (arg->type =3D=3D TEP_PRINT_OP) { + sym =3D search_op(prev_state_field, arg->op.left); + if (sym) + return sym; + + sym =3D search_op(prev_state_field, arg->op.right); + if (sym) + return sym; + } else if (arg->type =3D=3D TEP_PRINT_FLAGS) { + sym =3D test_flags(prev_state_field, arg); + } + + return sym; +} + +const char *parse_task_states(struct tep_format_field *state_field) +{ + struct tep_print_flag_sym *sym; + struct tep_print_arg *arg; + struct tep_event *event; + + event =3D state_field->event; + + /* + * Look at the event format fields, and search for where + * the prev_state is parsed via the format flags. + */ + for (arg =3D event->print_fmt.args; arg; arg =3D arg->next) { + /* + * Currently, the __print_flags() for the prev_state + * is embedded in operations, so they too must be + * searched. + */ + sym =3D search_op(state_field, arg); + if (sym) + return convert_sym(sym); + } + return NULL; +} + void parse_ftrace_printk(struct tep_handle *pevent, char *file, unsigned int size __maybe_unused) { diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h index a69ee29419f3..bbf8b26bc8da 100644 --- a/tools/perf/util/trace-event.h +++ b/tools/perf/util/trace-event.h @@ -15,6 +15,7 @@ struct perf_tool; struct thread; struct tep_plugin_list; struct evsel; +struct tep_format_field; =20 struct trace_event { struct tep_handle *pevent; @@ -51,6 +52,8 @@ int parse_event_file(struct tep_handle *pevent, unsigned long long raw_field_value(struct tep_event *event, const char *name, void *data); =20 +const char *parse_task_states(struct tep_format_field *state_field); + void parse_proc_kallsyms(struct tep_handle *pevent, char *file, unsigned i= nt size); void parse_ftrace_printk(struct tep_handle *pevent, char *file, unsigned i= nt size); void parse_saved_cmdline(struct tep_handle *pevent, char *file, unsigned i= nt size); --=20 2.41.0