From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05E68C33C9B for ; Tue, 7 Jan 2020 13:35:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C68C4207E0 for ; Tue, 7 Jan 2020 13:35:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578404147; bh=Gh9+swwhSaSA8PUAsoRqL/goR/ZAuTg1bPNDKY/ljDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=J5qsc1o7lUYT37dmgUpimdvyKfXP0u3hVA9QFfWWdmSZSxfgCCquuZ7fpVa1UKsu1 eDZr/z3xBx/M3FjjbR9e01KoBgvmf5YMGtXJDXq+IQiePbG6wAPle6B2++VLfjOt2a Phydh9VGrtJ4t5WPrDT9glR8mNVbgq3w8q0VrGW8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728255AbgAGNfq (ORCPT ); Tue, 7 Jan 2020 08:35:46 -0500 Received: from mail-pj1-f68.google.com ([209.85.216.68]:54076 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728217AbgAGNfn (ORCPT ); Tue, 7 Jan 2020 08:35:43 -0500 Received: by mail-pj1-f68.google.com with SMTP id n96so9035658pjc.3; Tue, 07 Jan 2020 05:35:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NieGywN/PYVKvAvR47BM9FyPeVZ7rcKBLDx/ebg0UII=; b=V24cHNwBxgckqqPJ+sGgpeJ8x5Hh4UVzMPZqy6oDYTKwqeub0rW22OpGLo0Y1BmfTl smP/Gn5JyXaXrqi/16ffO2e7jfnU/7cEPXG9BB8J+MX5QR85Fn4s5qTNYMVGcy5vQluE kgxYt3R4cR7XHrXOOHU+HlwVgWY9iNFqVM7O82DW3IEANH359GnHk2253Rb6K15OSsMO V4ECGuiuZLmHLMax/p9EeIVhYDaPiorppHKyx4IqaSYn58Mz3j67ypWLbfDp654aOapj pLEWu88Sh3yLval3zTCjXgLLunDEQO70uZbEKwiPdjufP6d2F1lh6YyAarsJgk8spzeP HLVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NieGywN/PYVKvAvR47BM9FyPeVZ7rcKBLDx/ebg0UII=; b=aFu6eh2YcIPTiVZujVfsMiLngcbi01y2c91Icg6xLHDo8D2kh7BSh4iYnjiszSlbQg b25ppIJbQa4cMWhHHwiNbziQdDIS3Sfn8/8XusEaf5Z0UfSBEyRTp283E0DZTLJih+3/ sBc2GUVLB7Va+eENNCsHwv4Zp1Xy0VLQd7znUe7Y+9Km3Flk6bASwMeBtRLvIA+9VRvK E4z91V2B93yWyY3lmjK4YCIlP4+ZDVBFpLJlqWpBCknEyf3et98e+PBzeZssoMW8NWU0 ZMQgpaRVL7XjpS+lGLLZACC/FM0iPRIfafnWYF80g92ozIxIYa9QtqSch0G4KBdjmknz rGuw== X-Gm-Message-State: APjAAAVJ+PT2GsVCxjVRuz92CSneN3UzX5Rg72Ymv1u2LzMhBp560LPu +F9MnfogPKdaLyRe3TqY+da+B+OP X-Google-Smtp-Source: APXvYqzwQ26QmtNF3V3YvY3eYVvEen2JLyfDOXvhkSA09a4wODWn15E9Gep8vU1iqXK9y2IMacYYFw== X-Received: by 2002:a17:90a:2763:: with SMTP id o90mr47407353pje.110.1578404142795; Tue, 07 Jan 2020 05:35:42 -0800 (PST) Received: from gaurie.seo.corp.google.com ([2401:fa00:d:1:4eb0:a5ef:3975:7440]) by smtp.gmail.com with ESMTPSA id p17sm80358484pfn.31.2020.01.07.05.35.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 05:35:42 -0800 (PST) From: Namhyung Kim To: Ingo Molnar , Peter Zijlstra , Arnaldo Carvalho de Melo Cc: Jiri Olsa , Alexander Shishkin , Mark Rutland , Stephane Eranian , LKML , linux-perf-users@vger.kernel.org Subject: [PATCH 5/9] perf report: Add 'cgroup' sort key Date: Tue, 7 Jan 2020 22:34:57 +0900 Message-Id: <20200107133501.327117-6-namhyung@kernel.org> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog In-Reply-To: <20200107133501.327117-1-namhyung@kernel.org> References: <20200107133501.327117-1-namhyung@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The cgroup sort key is to show cgroup membership of each task. Currently it shows full path in the cgroupfs (not relative to the root of cgroup namespace) since it'd be more intuitive IMHO. Otherwise root cgroup in different namespaces will all show same name - "/". The cgroup sort key should come before cgroup_id otherwise sort_dimension__add() will match it to cgroup_id as it only matches with the given substring. For example it will look like following. Note that record patch adding --all-cgroups patch will come later. $ perf record -a --namespace --all-cgroups cgtest [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.208 MB perf.data (4090 samples) ] $ perf report -s cgroup_id,cgroup,pid ... # Overhead cgroup id (dev/inode) cgroup Pid:Command # ........ ..................... .......... ............... # 93.96% 0/0x0 / 0:swapper 1.25% 3/0xeffffffb / 278:looper0 0.86% 3/0xf000015f /sub/cgrp1 280:cgtest 0.37% 3/0xf0000160 /sub/cgrp2 281:cgtest 0.34% 3/0xf0000163 /sub/cgrp3 282:cgtest 0.22% 3/0xeffffffb /sub 278:looper0 0.20% 3/0xeffffffb / 280:cgtest 0.15% 3/0xf0000163 /sub/cgrp3 285:looper3 Signed-off-by: Namhyung Kim --- tools/perf/Documentation/perf-report.txt | 1 + tools/perf/util/hist.c | 7 ++++++ tools/perf/util/hist.h | 1 + tools/perf/util/sort.c | 31 ++++++++++++++++++++++++ tools/perf/util/sort.h | 2 ++ 5 files changed, 42 insertions(+) diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt index 8dbe2119686a..5af43f3faf9f 100644 --- a/tools/perf/Documentation/perf-report.txt +++ b/tools/perf/Documentation/perf-report.txt @@ -95,6 +95,7 @@ OPTIONS abort cost. This is the global weight. - local_weight: Local weight version of the weight above. - cgroup_id: ID derived from cgroup namespace device and inode numbers. + - cgroup: cgroup pathname in the cgroupfs. - transaction: Transaction abort flags. - overhead: Overhead percentage of sample - overhead_sys: Overhead percentage of sample running in system mode diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index ca5a8f4d007e..9f28d2f487c1 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -10,6 +10,7 @@ #include "mem-events.h" #include "session.h" #include "namespaces.h" +#include "cgroup.h" #include "sort.h" #include "units.h" #include "evlist.h" @@ -222,6 +223,11 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h) if (h->trace_output) hists__new_col_len(hists, HISTC_TRACE, strlen(h->trace_output)); + + if (h->cgroup) { + struct cgroup *cgrp = cgroup__findnew(h->cgroup, ""); + hists__new_col_len(hists, HISTC_CGROUP, strlen(cgrp->name)); + } } void hists__output_recalc_col_len(struct hists *hists, int max_rows) @@ -691,6 +697,7 @@ __hists__add_entry(struct hists *hists, .dev = ns ? ns->link_info[CGROUP_NS_INDEX].dev : 0, .ino = ns ? ns->link_info[CGROUP_NS_INDEX].ino : 0, }, + .cgroup = sample->cgroup, .ms = { .maps = al->maps, .map = al->map, diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 0aa63aeb58ec..f7fb9c32dda5 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -38,6 +38,7 @@ enum hist_column { HISTC_THREAD, HISTC_COMM, HISTC_CGROUP_ID, + HISTC_CGROUP, HISTC_PARENT, HISTC_CPU, HISTC_SOCKET, diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index ab0cfd790ad0..52073029e592 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -25,6 +25,7 @@ #include "mem-events.h" #include "annotate.h" #include "time-utils.h" +#include "cgroup.h" #include #include @@ -634,6 +635,35 @@ struct sort_entry sort_cgroup_id = { .se_width_idx = HISTC_CGROUP_ID, }; +/* --sort cgroup */ + +static int64_t +sort__cgroup_cmp(struct hist_entry *left, struct hist_entry *right) +{ + return right->cgroup - left->cgroup; +} + +static int hist_entry__cgroup_snprintf(struct hist_entry *he, + char *bf, size_t size, + unsigned int width __maybe_unused) +{ + const char *cgrp_name = "N/A"; + + if (he->cgroup) { + struct cgroup *cgrp = cgroup__findnew(he->cgroup, cgrp_name); + cgrp_name = cgrp->name; + } + + return repsep_snprintf(bf, size, "%s", cgrp_name); +} + +struct sort_entry sort_cgroup = { + .se_header = "cgroup", + .se_cmp = sort__cgroup_cmp, + .se_snprintf = hist_entry__cgroup_snprintf, + .se_width_idx = HISTC_CGROUP, +}; + /* --sort socket */ static int64_t @@ -1658,6 +1688,7 @@ static struct sort_dimension common_sort_dimensions[] = { DIM(SORT_TRACE, "trace", sort_trace), DIM(SORT_SYM_SIZE, "symbol_size", sort_sym_size), DIM(SORT_DSO_SIZE, "dso_size", sort_dso_size), + DIM(SORT_CGROUP, "cgroup", sort_cgroup), DIM(SORT_CGROUP_ID, "cgroup_id", sort_cgroup_id), DIM(SORT_SYM_IPC_NULL, "ipc_null", sort_sym_ipc_null), DIM(SORT_TIME, "time", sort_time), diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h index 6c862d62d052..cfa6ac6f7d06 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h @@ -101,6 +101,7 @@ struct hist_entry { struct thread *thread; struct comm *comm; struct namespace_id cgroup_id; + u64 cgroup; u64 ip; u64 transaction; s32 socket; @@ -224,6 +225,7 @@ enum sort_type { SORT_TRACE, SORT_SYM_SIZE, SORT_DSO_SIZE, + SORT_CGROUP, SORT_CGROUP_ID, SORT_SYM_IPC_NULL, SORT_TIME, -- 2.24.1.735.g03f4e72817-goog