Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp4206127pxf; Tue, 6 Apr 2021 10:20:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2lFU4y/Dofv66qy94ogXNnwrqSqer7WLFJQv6/063ZwC2jLM9+P6N/Kn2tG/wVijoJZO6 X-Received: by 2002:a05:6638:2044:: with SMTP id t4mr30742243jaj.12.1617729644690; Tue, 06 Apr 2021 10:20:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617729644; cv=none; d=google.com; s=arc-20160816; b=xp0AJrvr9x4fln84BlTT+Pji+zaW99fUjcosAioqrBD1rOf636DyQiuWfBdlQua18M 3Jtd1jIH8P//Un+Y1j4TJsQchHzO9eGzb7Xp4aSfTUhnbavryQjscmXtf/nneIRZVHcn LYbCRZzRzv8tHn6doGWHETJJoQL0bXKsozTc5u3iySCKcoDUcM4fGOSIE3iIzO1i/SQj bUURpYdmq+1IBXPfd+C1k9SNLYJFfJUm2nWOq02SnLuhp6/uggjzXVNl7WSX/kHeM1QH jXu3MD/93VTSJF/71/DnO41yiATXvbAY/QYFk4SgFr4oux2p5t/koSvYuOx1kWNyHF04 Hovg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:organization :references:cc:to:from:subject:ironport-sdr:ironport-sdr; bh=dk1qDIrIdp3f0A8gvB3jMfaJejjxmwTpiC5FjyJeAHs=; b=ji6GQ3aDNT6DEB5GJNpFNXUZDMbe/6wc3fb29d7HudFVo4GxUeSy6cfaeVBI8zLxj1 5C1ESLjpA4WKzXiQy/9JjirdY8B6uZOIuXQz9/VuhAPSR2rUws0n1rS27C9m30RtAKBe k3YgiPnjse1cRD2QkukADCMSj9qeuR6zqokhYIIjTfd3H3tW4sc+L7pYufTMVN2cZZUU Okm8z21zZHfJnbkRuBO6ZGp8OJ6eR0D50FgCPZas4TT18ZVQA3mO46524HI2NymwebBm y/yEiga6oJxLeQuSsoDBQOqesy2ntYvUDWp1G6CtN5sUNI7+1+SqggBhSb/PUgYnNXg0 TOzQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k9si18276833jap.68.2021.04.06.10.20.32; Tue, 06 Apr 2021 10:20:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244555AbhDFItX (ORCPT + 99 others); Tue, 6 Apr 2021 04:49:23 -0400 Received: from mga05.intel.com ([192.55.52.43]:60201 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232593AbhDFItX (ORCPT ); Tue, 6 Apr 2021 04:49:23 -0400 IronPort-SDR: fv84YHiZt1DVJjLyV5OiC59ZdE0Y4xQfp2bT159VlbzU1jUn8GOWZ5+s9f5Ueb0xkrzbUKQuTo jRvV0KJyF1cg== X-IronPort-AV: E=McAfee;i="6000,8403,9945"; a="278279808" X-IronPort-AV: E=Sophos;i="5.81,308,1610438400"; d="scan'208";a="278279808" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2021 01:49:16 -0700 IronPort-SDR: 4V3wjHF/HqVw8WXFPtkVqWgLZYsW8dMwyDJcQVwKnsoP29BbKTrkwidhJZxP3MTGlMBR+DDOdA G8f4pRSWLNpA== X-IronPort-AV: E=Sophos;i="5.81,308,1610438400"; d="scan'208";a="421123155" Received: from abaydur-mobl1.ccr.corp.intel.com (HELO [10.249.228.164]) ([10.249.228.164]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2021 01:49:08 -0700 Subject: [PATCH v4 08/12] perf record: introduce --threads= command line option From: "Bayduraev, Alexey V" To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Ingo Molnar , linux-kernel , Andi Kleen , Adrian Hunter , Alexei Budankov , Alexander Antonov References: <6c15adcb-6a9d-320e-70b5-957c4c8b6ff2@linux.intel.com> Organization: Intel Corporation Message-ID: Date: Tue, 6 Apr 2021 11:49:06 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <6c15adcb-6a9d-320e-70b5-957c4c8b6ff2@linux.intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Provide --threads option in perf record command line interface. The option can have a value in the form of masks that specify cpus to be monitored with data streaming threads and its layout in system topology. The masks can be filtered using cpu mask provided via -C option. The specification value can be user defined list of masks. Masks separated by colon define cpus to be monitored by one thread and affinity mask of that thread is separated by slash. For example: /:/ specifies parallel threads layout that consists of two threads with corresponding assigned cpus to be monitored. The specification value can be a string e.g. "cpu", "core" or "socket" meaning creation of data streaming thread for every cpu or core or socket to monitor distinct cpus or cpus grouped by core or socket. The option provided with no or empty value defaults to per-cpu parallel threads layout creating data streaming thread for every cpu being monitored. Feature design and implementation are based on prototypes [1], [2]. [1] git clone https://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git -b perf/record_threads [2] https://lore.kernel.org/lkml/20180913125450.21342-1-jolsa@kernel.org/ Suggested-by: Jiri Olsa Suggested-by: Namhyung Kim Signed-off-by: Alexey Bayduraev --- tools/include/linux/bitmap.h | 11 ++ tools/lib/bitmap.c | 14 ++ tools/perf/builtin-record.c | 317 ++++++++++++++++++++++++++++++++++- tools/perf/util/record.h | 1 + 4 files changed, 341 insertions(+), 2 deletions(-) diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h index 477a1cae513f..2eb1d1084543 100644 --- a/tools/include/linux/bitmap.h +++ b/tools/include/linux/bitmap.h @@ -18,6 +18,8 @@ int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, int __bitmap_equal(const unsigned long *bitmap1, const unsigned long *bitmap2, unsigned int bits); void bitmap_clear(unsigned long *map, unsigned int start, int len); +int __bitmap_intersects(const unsigned long *bitmap1, + const unsigned long *bitmap2, unsigned int bits); #define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) & (BITS_PER_LONG - 1))) @@ -178,4 +180,13 @@ static inline int bitmap_equal(const unsigned long *src1, return __bitmap_equal(src1, src2, nbits); } +static inline int bitmap_intersects(const unsigned long *src1, + const unsigned long *src2, unsigned int nbits) +{ + if (small_const_nbits(nbits)) + return ((*src1 & *src2) & BITMAP_LAST_WORD_MASK(nbits)) != 0; + else + return __bitmap_intersects(src1, src2, nbits); +} + #endif /* _PERF_BITOPS_H */ diff --git a/tools/lib/bitmap.c b/tools/lib/bitmap.c index 5043747ef6c5..3cc3a5b43bb5 100644 --- a/tools/lib/bitmap.c +++ b/tools/lib/bitmap.c @@ -86,3 +86,17 @@ int __bitmap_equal(const unsigned long *bitmap1, return 1; } + +int __bitmap_intersects(const unsigned long *bitmap1, + const unsigned long *bitmap2, unsigned int bits) +{ + unsigned int k, lim = bits/BITS_PER_LONG; + for (k = 0; k < lim; ++k) + if (bitmap1[k] & bitmap2[k]) + return 1; + + if (bits % BITS_PER_LONG) + if ((bitmap1[k] & bitmap2[k]) & BITMAP_LAST_WORD_MASK(bits)) + return 1; + return 0; +} diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index c1416d28ac6d..41a22f48037d 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -49,6 +49,7 @@ #include "util/clockid.h" #include "asm/bug.h" #include "perf.h" +#include "cputopo.h" #include #include @@ -120,6 +121,20 @@ static const char *thread_msg_tags[THREAD_MSG__MAX] = { "UNDEFINED", "READY" }; +enum thread_spec { + THREAD_SPEC__UNDEFINED = 0, + THREAD_SPEC__CPU, + THREAD_SPEC__CORE, + THREAD_SPEC__SOCKET, + THREAD_SPEC__NUMA, + THREAD_SPEC__USER, + THREAD_SPEC__MAX, +}; + +static const char *thread_spec_tags[THREAD_SPEC__MAX] = { + "undefined", "cpu", "core", "socket", "numa", "user" +}; + struct record { struct perf_tool tool; struct record_opts opts; @@ -2662,6 +2677,63 @@ static void record__thread_mask_free(struct thread_mask *mask) record__mmap_cpu_mask_free(&mask->affinity); } +static int record__thread_mask_or(struct thread_mask *dest, struct thread_mask *src1, + struct thread_mask *src2) +{ + if (src1->maps.nbits != src2->maps.nbits || src1->affinity.nbits != src2->affinity.nbits || + dest->maps.nbits != src1->maps.nbits || dest->affinity.nbits != src1->affinity.nbits) + return -EINVAL; + + bitmap_or(dest->maps.bits, src1->maps.bits, src2->maps.bits, src1->maps.nbits); + bitmap_or(dest->affinity.bits, src1->affinity.bits, src2->affinity.bits, src1->affinity.nbits); + + return 0; +} + +static int record__thread_mask_intersects(struct thread_mask *mask_1, struct thread_mask *mask_2) +{ + int res1, res2; + + if (mask_1->maps.nbits != mask_2->maps.nbits || mask_1->affinity.nbits != mask_2->affinity.nbits) + return -EINVAL; + + res1 = bitmap_intersects(mask_1->maps.bits, mask_2->maps.bits, mask_1->maps.nbits); + res2 = bitmap_intersects(mask_1->affinity.bits, mask_2->affinity.bits, mask_1->affinity.nbits); + if (res1 || res2) + return 1; + + return 0; +} + +static int record__parse_threads(const struct option *opt, const char *str, int unset) +{ + int s; + struct record_opts *opts = opt->value; + + if (unset || !str || !strlen(str)) { + opts->threads_spec = THREAD_SPEC__CPU; + } else { + for (s = 1; s < THREAD_SPEC__MAX; s++) { + if (s == THREAD_SPEC__USER) { + opts->threads_user_spec = strdup(str); + opts->threads_spec = THREAD_SPEC__USER; + break; + } + if (!strncasecmp(str, thread_spec_tags[s], strlen(thread_spec_tags[s]))) { + opts->threads_spec = s; + break; + } + } + } + + pr_debug("threads_spec: %s", thread_spec_tags[opts->threads_spec]); + if (opts->threads_spec == THREAD_SPEC__USER) + pr_debug("=[%s]", opts->threads_user_spec); + pr_debug("\n"); + + return 0; +} + static int parse_output_max_size(const struct option *opt, const char *str, int unset) { @@ -3092,6 +3164,9 @@ static struct option __record_options[] = { "\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor.\n" "\t\t\t Alternatively, ctl-fifo / ack-fifo will be opened and used as ctl-fd / ack-fd.", parse_control_option), + OPT_CALLBACK_OPTARG(0, "threads", &record.opts, NULL, "spec", + "write collected trace data into several data files using parallel threads", + record__parse_threads), OPT_END() }; @@ -3105,6 +3180,17 @@ static void record__mmap_cpu_mask_init(struct mmap_cpu_mask *mask, struct perf_c set_bit(cpus->map[c], mask->bits); } +static void record__mmap_cpu_mask_init_spec(struct mmap_cpu_mask *mask, char *mask_spec) +{ + struct perf_cpu_map *cpus; + + cpus = perf_cpu_map__new(mask_spec); + if (cpus) { + record__mmap_cpu_mask_init(mask, cpus); + perf_cpu_map__put(cpus); + } +} + static int record__alloc_thread_masks(struct record *rec, int nr_threads, int nr_bits) { int t, ret; @@ -3124,6 +3210,206 @@ static int record__alloc_thread_masks(struct record *rec, int nr_threads, int nr return 0; } + +static int record__init_thread_cpu_masks(struct record *rec, struct perf_cpu_map *cpus) +{ + int t, ret, nr_cpus = perf_cpu_map__nr(cpus); + + ret = record__alloc_thread_masks(rec, nr_cpus, cpu__max_cpu()); + if (ret) + return ret; + + rec->nr_threads = nr_cpus; + pr_debug("threads: nr_threads=%d\n", rec->nr_threads); + + for (t = 0; t < rec->nr_threads; t++) { + set_bit(cpus->map[t], rec->thread_masks[t].maps.bits); + pr_debug("thread_masks[%d]: maps mask [%d]\n", t, cpus->map[t]); + set_bit(cpus->map[t], rec->thread_masks[t].affinity.bits); + pr_debug("thread_masks[%d]: affinity mask [%d]\n", t, cpus->map[t]); + } + + return 0; +} + +static int record__init_thread_masks_spec(struct record *rec, struct perf_cpu_map *cpus, + char **maps_spec, char **affinity_spec, u32 nr_spec) +{ + u32 s; + int ret, nr_threads = 0; + struct mmap_cpu_mask cpus_mask; + struct thread_mask thread_mask, full_mask; + + ret = record__mmap_cpu_mask_alloc(&cpus_mask, cpu__max_cpu()); + if (ret) + return ret; + record__mmap_cpu_mask_init(&cpus_mask, cpus); + ret = record__thread_mask_alloc(&thread_mask, cpu__max_cpu()); + if (ret) + goto out_free_cpu_mask; + ret = record__thread_mask_alloc(&full_mask, cpu__max_cpu()); + if (ret) + goto out_free_thread_mask; + record__thread_mask_clear(&full_mask); + + for (s = 0; s < nr_spec; s++) { + record__thread_mask_clear(&thread_mask); + + record__mmap_cpu_mask_init_spec(&thread_mask.maps, maps_spec[s]); + record__mmap_cpu_mask_init_spec(&thread_mask.affinity, affinity_spec[s]); + + if (!bitmap_and(thread_mask.maps.bits, thread_mask.maps.bits, + cpus_mask.bits, thread_mask.maps.nbits) || + !bitmap_and(thread_mask.affinity.bits, thread_mask.affinity.bits, + cpus_mask.bits, thread_mask.affinity.nbits)) + continue; + + ret = record__thread_mask_intersects(&thread_mask, &full_mask); + if (ret) + return ret; + record__thread_mask_or(&full_mask, &full_mask, &thread_mask); + + rec->thread_masks = realloc(rec->thread_masks, + (nr_threads + 1) * sizeof(struct thread_mask)); + if (!rec->thread_masks) { + pr_err("Failed to allocate thread masks\n"); + ret = -ENOMEM; + goto out_free_full_mask; + } + rec->thread_masks[nr_threads] = thread_mask; + pr_debug("thread_masks[%d]: addr=", nr_threads); + mmap_cpu_mask__scnprintf(&rec->thread_masks[nr_threads].maps, "maps"); + pr_debug("thread_masks[%d]: addr=", nr_threads); + mmap_cpu_mask__scnprintf(&rec->thread_masks[nr_threads].affinity, "affinity"); + nr_threads++; + ret = record__thread_mask_alloc(&thread_mask, cpu__max_cpu()); + if (ret) + return ret; + } + + rec->nr_threads = nr_threads; + pr_debug("threads: nr_threads=%d\n", rec->nr_threads); + +out_free_full_mask: + record__thread_mask_free(&full_mask); +out_free_thread_mask: + record__thread_mask_free(&thread_mask); +out_free_cpu_mask: + record__mmap_cpu_mask_free(&cpus_mask); + + return 0; +} + +static int record__init_thread_core_masks(struct record *rec, struct perf_cpu_map *cpus) +{ + int ret; + struct cpu_topology *topo; + + topo = cpu_topology__new(); + if (!topo) + return -EINVAL; + + ret = record__init_thread_masks_spec(rec, cpus, topo->thread_siblings, + topo->thread_siblings, topo->thread_sib); + cpu_topology__delete(topo); + + return ret; +} + +static int record__init_thread_socket_masks(struct record *rec, struct perf_cpu_map *cpus) +{ + int ret; + struct cpu_topology *topo; + + topo = cpu_topology__new(); + if (!topo) + return -EINVAL; + + ret = record__init_thread_masks_spec(rec, cpus, topo->core_siblings, + topo->core_siblings, topo->core_sib); + cpu_topology__delete(topo); + + return ret; +} + +static int record__init_thread_numa_masks(struct record *rec, struct perf_cpu_map *cpus) +{ + u32 s; + int ret; + char **spec; + struct numa_topology *topo; + + topo = numa_topology__new(); + if (!topo) + return -EINVAL; + spec = zalloc(topo->nr * sizeof(char *)); + if (!spec) { + ret = -ENOMEM; + goto out_delete_topo; + } + for (s = 0; s < topo->nr; s++) + spec[s] = topo->nodes[s].cpus; + + ret = record__init_thread_masks_spec(rec, cpus, spec, spec, topo->nr); + + zfree(&spec); + +out_delete_topo: + numa_topology__delete(topo); + + return ret; +} + +static int record__init_thread_user_masks(struct record *rec, struct perf_cpu_map *cpus) +{ + int t, ret; + u32 s, nr_spec = 0; + char **maps_spec = NULL, **affinity_spec = NULL; + char *spec, *spec_ptr, *user_spec, *mask, *mask_ptr; + + for (t = 0, user_spec = (char *)rec->opts.threads_user_spec; ; t++, user_spec = NULL) { + spec = strtok_r(user_spec, ":", &spec_ptr); + if (spec == NULL) + break; + pr_debug(" spec[%d]: %s\n", t, spec); + mask = strtok_r(spec, "/", &mask_ptr); + if (mask == NULL) + break; + pr_debug(" maps mask: %s\n", mask); + maps_spec = realloc(maps_spec, (nr_spec + 1) * sizeof(char *)); + if (!maps_spec) { + pr_err("Failed to realloc maps_spec\n"); + ret = -ENOMEM; + goto out_free_all_specs; + } + maps_spec[nr_spec] = strdup(mask); + mask = strtok_r(NULL, "/", &mask_ptr); + if (mask == NULL) + break; + pr_debug(" affinity mask: %s\n", mask); + affinity_spec = realloc(affinity_spec, (nr_spec + 1) * sizeof(char *)); + if (!maps_spec) { + pr_err("Failed to realloc affinity_spec\n"); + ret = -ENOMEM; + goto out_free_all_specs; + } + affinity_spec[nr_spec] = strdup(mask); + nr_spec++; + } + + ret = record__init_thread_masks_spec(rec, cpus, maps_spec, affinity_spec, nr_spec); + +out_free_all_specs: + for (s = 0; s < nr_spec; s++) { + free(maps_spec[s]); + free(affinity_spec[s]); + } + free(affinity_spec); + free(maps_spec); + + return ret; +} + static int record__init_thread_default_masks(struct record *rec, struct perf_cpu_map *cpus) { int ret; @@ -3141,9 +3427,33 @@ static int record__init_thread_default_masks(struct record *rec, struct perf_cpu static int record__init_thread_masks(struct record *rec) { + int ret = 0; struct perf_cpu_map *cpus = rec->evlist->core.cpus; - return record__init_thread_default_masks(rec, cpus); + if (!record__threads_enabled(rec)) + return record__init_thread_default_masks(rec, cpus); + + switch (rec->opts.threads_spec) { + case THREAD_SPEC__CPU: + ret = record__init_thread_cpu_masks(rec, cpus); + break; + case THREAD_SPEC__CORE: + ret = record__init_thread_core_masks(rec, cpus); + break; + case THREAD_SPEC__SOCKET: + ret = record__init_thread_socket_masks(rec, cpus); + break; + case THREAD_SPEC__NUMA: + ret = record__init_thread_numa_masks(rec, cpus); + break; + case THREAD_SPEC__USER: + ret = record__init_thread_user_masks(rec, cpus); + break; + default: + break; + } + + return ret; } static int record__fini_thread_masks(struct record *rec) @@ -3385,7 +3695,10 @@ int cmd_record(int argc, const char **argv) err = record__init_thread_masks(rec); if (err) { - pr_err("record__init_thread_masks failed, error %d\n", err); + if (err > 0) + pr_err("ERROR: parallel data streaming masks (--threads) intersect.\n"); + else + pr_err("record__init_thread_masks failed, error %d\n", err); goto out; } diff --git a/tools/perf/util/record.h b/tools/perf/util/record.h index 4d68b7e27272..3da156498f47 100644 --- a/tools/perf/util/record.h +++ b/tools/perf/util/record.h @@ -78,6 +78,7 @@ struct record_opts { int ctl_fd_ack; bool ctl_fd_close; int threads_spec; + const char *threads_user_spec; }; extern const char * const *record_usage; -- 2.19.0