perf lock contention: Add --lock-cgroup option

[linux-2.6-block.git] / tools / perf / builtin-lock.c

diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index 06430980dfd75b86dfeb9c2c6b5178d4d52fdb6e..03d82f5a9afc0e597f605f3d9512ba5f992ddcbf 100644 (file)
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -60,6 +60,7 @@ static bool combine_locks;
 static bool show_thread_stats;
 static bool show_lock_addrs;
 static bool show_lock_owner;
+static bool show_lock_cgroups;
 static bool use_bpf;
 static unsigned long bpf_map_entries = MAX_ENTRIES;
 static int max_stack_depth = CONTENTION_STACK_DEPTH;
@@ -619,6 +620,7 @@ static int get_key_by_aggr_mode_simple(u64 *key, u64 addr, u32 tid)
                *key = tid;
                break;
        case LOCK_AGGR_CALLER:
+       case LOCK_AGGR_CGROUP:
        default:
                pr_err("Invalid aggregation mode: %d\n", aggr_mode);
                return -EINVAL;
@@ -1103,6 +1105,7 @@ static int report_lock_contention_begin_event(struct evsel *evsel,
                        if (lock_contention_caller(evsel, sample, buf, sizeof(buf)) < 0)
                                name = "Unknown";
                        break;
+               case LOCK_AGGR_CGROUP:
                case LOCK_AGGR_TASK:
                default:
                        break;
@@ -1653,6 +1656,9 @@ static void print_header_stdio(void)
        case LOCK_AGGR_ADDR:
                fprintf(lock_output, "  %16s   %s\n\n", "address", "symbol");
                break;
+       case LOCK_AGGR_CGROUP:
+               fprintf(lock_output, "  %s\n\n", "cgroup");
+               break;
        default:
                break;
        }
@@ -1680,6 +1686,9 @@ static void print_header_csv(const char *sep)
        case LOCK_AGGR_ADDR:
                fprintf(lock_output, "%s%s %s%s %s\n", "address", sep, "symbol", sep, "type");
                break;
+       case LOCK_AGGR_CGROUP:
+               fprintf(lock_output, "%s\n", "cgroup");
+               break;
        default:
                break;
        }
@@ -1720,6 +1729,9 @@ static void print_lock_stat_stdio(struct lock_contention *con, struct lock_stat
                fprintf(lock_output, "  %016llx   %s (%s)\n", (unsigned long long)st->addr,
                        st->name, get_type_name(st->flags));
                break;
+       case LOCK_AGGR_CGROUP:
+               fprintf(lock_output, "  %s\n", st->name);
+               break;
        default:
                break;
        }
@@ -1770,6 +1782,9 @@ static void print_lock_stat_csv(struct lock_contention *con, struct lock_stat *s
                fprintf(lock_output, "%llx%s %s%s %s\n", (unsigned long long)st->addr, sep,
                        st->name, sep, get_type_name(st->flags));
                break;
+       case LOCK_AGGR_CGROUP:
+               fprintf(lock_output, "%s\n",st->name);
+               break;
        default:
                break;
        }
@@ -1999,6 +2014,27 @@ static int check_lock_contention_options(const struct option *options,
                return -1;
        }
 
+       if (show_lock_cgroups && !use_bpf) {
+               pr_err("Cgroups are available only with BPF\n");
+               parse_options_usage(usage, options, "lock-cgroup", 0);
+               parse_options_usage(NULL, options, "use-bpf", 0);
+               return -1;
+       }
+
+       if (show_lock_cgroups && show_lock_addrs) {
+               pr_err("Cannot use cgroup and addr mode together\n");
+               parse_options_usage(usage, options, "lock-cgroup", 0);
+               parse_options_usage(NULL, options, "lock-addr", 0);
+               return -1;
+       }
+
+       if (show_lock_cgroups && show_thread_stats) {
+               pr_err("Cannot use cgroup and thread mode together\n");
+               parse_options_usage(usage, options, "lock-cgroup", 0);
+               parse_options_usage(NULL, options, "threads", 0);
+               return -1;
+       }
+
        if (symbol_conf.field_sep) {
                if (strstr(symbol_conf.field_sep, ":") || /* part of type flags */
                    strstr(symbol_conf.field_sep, "+") || /* part of caller offset */
@@ -2060,7 +2096,8 @@ static int __cmd_contention(int argc, const char **argv)
        con.machine = &session->machines.host;
 
        con.aggr_mode = aggr_mode = show_thread_stats ? LOCK_AGGR_TASK :
-               show_lock_addrs ? LOCK_AGGR_ADDR : LOCK_AGGR_CALLER;
+               show_lock_addrs ? LOCK_AGGR_ADDR :
+               show_lock_cgroups ? LOCK_AGGR_CGROUP : LOCK_AGGR_CALLER;
 
        if (con.aggr_mode == LOCK_AGGR_CALLER)
                con.save_callstack = true;
@@ -2524,6 +2561,7 @@ int cmd_lock(int argc, const char **argv)
        OPT_BOOLEAN('o', "lock-owner", &show_lock_owner, "show lock owners instead of waiters"),
        OPT_STRING_NOEMPTY('x', "field-separator", &symbol_conf.field_sep, "separator",
                   "print result in CSV format with custom separator"),
+       OPT_BOOLEAN(0, "lock-cgroup", &show_lock_cgroups, "show lock stats by cgroup"),
        OPT_PARENT(lock_options)
        };