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 B49EAC33C9B for ; Tue, 7 Jan 2020 13:35:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DDB22051A for ; Tue, 7 Jan 2020 13:35:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578404153; bh=46uNJRB5JBzCzs8HFKGDRpqaYuzHdJqsDNFFCtZQOeY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=z3M739LS/TLevjFZWKB77VOjujgPauVZjuw5EXj4WsLt2xnrHrlgUBXqV8l1VuYtG DzDVzWGUuW6rbOECLqvJfVWalp0H4F8ITtgCjRBjA3t7N+PJKpEELfLqtYpgDX3ERk YcIEA/P82KYWBA/rPljH+HCgFNl56c+EXk++ZLxI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728284AbgAGNfw (ORCPT ); Tue, 7 Jan 2020 08:35:52 -0500 Received: from mail-pj1-f68.google.com ([209.85.216.68]:55745 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728250AbgAGNft (ORCPT ); Tue, 7 Jan 2020 08:35:49 -0500 Received: by mail-pj1-f68.google.com with SMTP id d5so9029051pjz.5; Tue, 07 Jan 2020 05:35:49 -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=g8zFN4u1s+ibahYyH5XQDwxGFJc14mdBoek3gA8QsyM=; b=BEIz3BUkrEDp2H9ARdSCvkm5Q7a3h285JthYvdH7YbDh4nHOwKFqiwqLgs1OsrRD4N 2UGndbBcbovLXMPaJsCEeXM5kiYCPF76GJlYJ2k6PGGvNtPMweI88GevdMkdrGe47AhD x+UYdyt+IZXC/xdVSbf0YSfC+frfcLkER78WPla436q3yEX/MKKKvFNtwqDWJnUzA3dY RcWdKWnm1YyGBB4OSEG9MHiQWhJNsc1f4LzAFSCKeEKJb8/ev8vMB1zvIyY5id8P9dBi ceWO8N8Lkw0e/1IvJ1lQZEITw1zVsQZsQah+ETplC54pT3z9v0GIBOGnCmYxBbhxhfSG SwKg== 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=g8zFN4u1s+ibahYyH5XQDwxGFJc14mdBoek3gA8QsyM=; b=Cm6eDM1YcmYogXdbQhhPM8DF6ceJvv+fTAvypxNhk33I82+YA7e5Oqw2zr2ifauTKP NOsTKdfjYt/EgI4r71nk1xC12tkNPXgFAV+v9zhvaJlENcmGtCJO3O/DAlfv88a4SwPK 3LZnUe4anRJcY3m6NtINwzRBNVVuUZ+diwrilEeY3WA+BXOti9tR8b2RqL0vpUItwm2t RGftDMCkewqS+dsvbVZRmZGPUNv/jrTbYsMXTGxU5S19DccjMCyBhu95Ck3PgD0GRk5e M8TzDIooT//7fZ+5C9zS5p8ZiEQb1RewfO5iIvXsgydX3tDzLUw5IFKVnE8q9oi/9VJt L5kw== X-Gm-Message-State: APjAAAWLM2Jy1GCDEqcoqc8MX9jmjbFqbvlwqoVQiTGVj6gIkVQiCqAB Nl0ssVtbR25t6PmEOjAyNzo= X-Google-Smtp-Source: APXvYqxwkGtv+/eIH9ucGf55CG27a8y+AFM/ZY6nWcZhpA5yzPyLu/1Z4rZ9RuWc2RZCmJrG/bscTQ== X-Received: by 2002:a17:902:6909:: with SMTP id j9mr85853342plk.269.1578404148645; Tue, 07 Jan 2020 05:35:48 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 05:35:48 -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 7/9] perf record: Add --all-cgroups option Date: Tue, 7 Jan 2020 22:34:59 +0900 Message-Id: <20200107133501.327117-8-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 --all-cgroups option is to enable cgroup profiling support. It tells kernel to record CGROUP events in the ring buffer so that perf report can identify task/cgroup association later. Signed-off-by: Namhyung Kim --- tools/perf/Documentation/perf-record.txt | 5 ++++- tools/perf/builtin-record.c | 5 +++++ tools/perf/util/evsel.c | 11 ++++++++++- tools/perf/util/evsel.h | 1 + tools/perf/util/record.h | 1 + 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt index b23a4012a606..6dd9d69d7dee 100644 --- a/tools/perf/Documentation/perf-record.txt +++ b/tools/perf/Documentation/perf-record.txt @@ -385,7 +385,10 @@ displayed with the weight and local_weight sort keys. This currently works for abort events and some memory events in precise mode on modern Intel CPUs. --namespaces:: -Record events of type PERF_RECORD_NAMESPACES. +Record events of type PERF_RECORD_NAMESPACES. This enables 'cgroup_id' sort key. + +--all-cgroups:: +Record events of type PERF_RECORD_CGROUP. This enables 'cgroup' sort key. --transaction:: Record transaction flags for transaction related events. diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 2802de9538ff..7d7912e121d6 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1433,6 +1433,9 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) if (rec->opts.record_namespaces) tool->namespace_events = true; + if (rec->opts.record_cgroup) + tool->cgroup_events = true; + if (rec->opts.auxtrace_snapshot_mode || rec->switch_output.enabled) { signal(SIGUSR2, snapshot_sig_handler); if (rec->opts.auxtrace_snapshot_mode) @@ -2363,6 +2366,8 @@ static struct option __record_options[] = { "per thread proc mmap processing timeout in ms"), OPT_BOOLEAN(0, "namespaces", &record.opts.record_namespaces, "Record namespaces events"), + OPT_BOOLEAN(0, "all-cgroups", &record.opts.record_cgroup, + "Record cgroup events"), OPT_BOOLEAN(0, "switch-events", &record.opts.record_switch_events, "Record context switch events"), OPT_BOOLEAN_FLAG(0, "all-kernel", &record.opts.all_kernel, diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 0f5a67603139..ff6c6683a32b 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1102,6 +1102,11 @@ void perf_evsel__config(struct evsel *evsel, struct record_opts *opts, if (opts->record_namespaces) attr->namespaces = track; + if (opts->record_cgroup) { + attr->cgroup = track && !perf_missing_features.cgroup; + perf_evsel__set_sample_bit(evsel, CGROUP); + } + if (opts->record_switch_events) attr->context_switch = track; @@ -1782,7 +1787,11 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus, * Must probe features in the order they were added to the * perf_event_attr interface. */ - if (!perf_missing_features.aux_output && evsel->core.attr.aux_output) { + if (!perf_missing_features.cgroup && evsel->core.attr.cgroup) { + perf_missing_features.cgroup = true; + pr_debug2_peo("Kernel has no cgroup sampling support, bailing out\n"); + goto out_close; + } else if (!perf_missing_features.aux_output && evsel->core.attr.aux_output) { perf_missing_features.aux_output = true; pr_debug2_peo("Kernel has no attr.aux_output support, bailing out\n"); goto out_close; diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index dc14f4a823cd..df71b530740b 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -119,6 +119,7 @@ struct perf_missing_features { bool ksymbol; bool bpf; bool aux_output; + bool cgroup; }; extern struct perf_missing_features perf_missing_features; diff --git a/tools/perf/util/record.h b/tools/perf/util/record.h index 5421fd2ad383..24316458be20 100644 --- a/tools/perf/util/record.h +++ b/tools/perf/util/record.h @@ -34,6 +34,7 @@ struct record_opts { bool auxtrace_snapshot_on_exit; bool auxtrace_sample_mode; bool record_namespaces; + bool record_cgroup; bool record_switch_events; bool all_kernel; bool all_user; -- 2.24.1.735.g03f4e72817-goog