From patchwork Tue Jul 18 03:33:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changbin Du X-Patchwork-Id: 121753 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1488753vqt; Mon, 17 Jul 2023 20:50:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlFycl70mInQTsymyHyG756tTUV2xokUfwZajr7lcWrfsUziyRBYvAJN4mJQuq/A7+ps9HS4 X-Received: by 2002:a05:6512:2384:b0:4fb:8603:f6aa with SMTP id c4-20020a056512238400b004fb8603f6aamr11824923lfv.11.1689652217766; Mon, 17 Jul 2023 20:50:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689652217; cv=none; d=google.com; s=arc-20160816; b=Et7FS5UbekuHO9Oahi7TiKLF2J88XMA9t7EBNCVzXi6O6wyKOjHbbS8zy4FFFU+u9y i1amec/dtBILCSpEfn+ONisLttRmrqnfWwOx+zGy2CYgceFEPX19kS/1GxkvrFsqGi+x NgMox+bRN6LVwnmpL45ZTFrqXt89vBIdHAVGp6bEcwbC4vStuFXSPmEgf8xoJLnufvoe 6k61OHA8Sx2KbVdObvhgkbspCvHhVatWrIboDPWv8YuwtnSDshG12QVWUqKpT2vl00R3 fs8bkNrXFFwcWWcA3sKiccA5q9E1sRmLWeZY/+khIfnU8xoU1MM0ObqwhyDK5fJvyYcR vQVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=4WXuNiq2XksXyJcd/DafobBIKOIi9/bRrPT+S1CDZuE=; fh=ApeLdK2xurAeWAFDrmxfomKJVPpeLi5+JFM/i5kBxGg=; b=SYiu//p8x8l0D1hm8OB0EF7Hm+aDtxC02rNRETyUevEVihMOC0t7lSQi9narCNhjiH lK4soc7VFbo+ke9M+vLpcRbTwZ+aosskCd3gauxqPmMesxbRRw3PpOcCF08+qugBCV+/ 2EyDQVYGpGnJ8qlhBJPO+8HGDyz0mRA7V9YNutw+Pn3otS1WhYoxVnBOqyLIu0HtIuM8 dSLC3NRsvlwCwlATYJqtm9YS2cEdfzk+Mgn1cdqz5JWyIFp5yvpxfilaTkgR8/AJk79p LMjDosZu5M2nYFtUbV7VXXl7/HZ9qSQAgPyhJsTQn9fETornpMFZ5mJ2ow74d5NBFGyu AbUA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g21-20020aa7d1d5000000b0051dd07680f2si580549edp.370.2023.07.17.20.49.54; Mon, 17 Jul 2023 20:50:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229963AbjGRDe0 (ORCPT + 99 others); Mon, 17 Jul 2023 23:34:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229633AbjGRDeW (ORCPT ); Mon, 17 Jul 2023 23:34:22 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 863D4BB; Mon, 17 Jul 2023 20:34:20 -0700 (PDT) Received: from kwepemi500013.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4R4l0c1c5Fz18M3f; Tue, 18 Jul 2023 11:33:36 +0800 (CST) Received: from M910t.huawei.com (10.110.54.157) by kwepemi500013.china.huawei.com (7.221.188.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 18 Jul 2023 11:34:17 +0800 From: Changbin Du To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo CC: Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , , , Hui Wang , Changbin Du Subject: [PATCH v3 1/3] perf cpumap: Add __perf_cpu_map__new and perf_cpu_map__2_cpuset Date: Tue, 18 Jul 2023 11:33:53 +0800 Message-ID: <20230718033355.2960912-2-changbin.du@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230718033355.2960912-1-changbin.du@huawei.com> References: <20230718033355.2960912-1-changbin.du@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.110.54.157] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500013.china.huawei.com (7.221.188.120) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771728763635850935 X-GMAIL-MSGID: 1771728763635850935 This adds two new api which will be used later. - __perf_cpu_map__new: accept a specified separator instead of ','. - perf_cpu_map__2_cpuset: convert perf_cpu_map to cpu_set_t. Signed-off-by: Changbin Du --- tools/lib/perf/cpumap.c | 45 ++++++++++++++++++++++++++-- tools/lib/perf/include/perf/cpumap.h | 4 +++ tools/lib/perf/libperf.map | 2 ++ tools/perf/tests/cpumap.c | 23 ++++++++++++++ 4 files changed, 71 insertions(+), 3 deletions(-) diff --git a/tools/lib/perf/cpumap.c b/tools/lib/perf/cpumap.c index 2a5a29217374..23e907078b28 100644 --- a/tools/lib/perf/cpumap.c +++ b/tools/lib/perf/cpumap.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only +#define _GNU_SOURCE #include #include #include @@ -7,6 +8,7 @@ #include #include #include +#include #include #include @@ -201,7 +203,7 @@ static struct perf_cpu_map *cpu_map__read_all_cpu_map(void) return cpus; } -struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list) +struct perf_cpu_map *__perf_cpu_map__new(const char *cpu_list, char sep) { struct perf_cpu_map *cpus = NULL; unsigned long start_cpu, end_cpu = 0; @@ -225,7 +227,7 @@ struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list) p = NULL; start_cpu = strtoul(cpu_list, &p, 0); if (start_cpu >= INT_MAX - || (*p != '\0' && *p != ',' && *p != '-')) + || (*p != '\0' && *p != sep && *p != '-')) goto invalid; if (*p == '-') { @@ -233,7 +235,7 @@ struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list) p = NULL; end_cpu = strtoul(cpu_list, &p, 0); - if (end_cpu >= INT_MAX || (*p != '\0' && *p != ',')) + if (end_cpu >= INT_MAX || (*p != '\0' && *p != sep)) goto invalid; if (end_cpu < start_cpu) @@ -278,6 +280,11 @@ struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list) return cpus; } +struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list) +{ + return __perf_cpu_map__new(cpu_list, ','); +} + static int __perf_cpu_map__nr(const struct perf_cpu_map *cpus) { return RC_CHK_ACCESS(cpus)->nr; @@ -479,3 +486,35 @@ struct perf_cpu_map *perf_cpu_map__intersect(struct perf_cpu_map *orig, free(tmp_cpus); return merged; } + +/* The caller is responsible for freeing returned cpu_set_t with CPU_FREE(). */ +cpu_set_t *perf_cpu_map__2_cpuset(struct perf_cpu_map *cpus, size_t *cpuset_size) +{ + cpu_set_t *cpusetp; + int max_cpu; + struct perf_cpu cpu; + int idx; + + if (perf_cpu_map__has_any_cpu(cpus)) + return NULL; + + max_cpu = perf_cpu_map__max(cpus).cpu; + if (max_cpu < 0) + return NULL; + + cpusetp = CPU_ALLOC(max_cpu + 1); + if (cpusetp == NULL) + return NULL; + + *cpuset_size = CPU_ALLOC_SIZE(max_cpu + 1); + CPU_ZERO_S(*cpuset_size, cpusetp); + + perf_cpu_map__for_each_cpu(cpu, idx, cpus) { + if (cpu.cpu == -1) + continue; + + CPU_SET_S(cpu.cpu, *cpuset_size, cpusetp); + } + + return cpusetp; +} diff --git a/tools/lib/perf/include/perf/cpumap.h b/tools/lib/perf/include/perf/cpumap.h index e38d859a384d..1a0498f92dbe 100644 --- a/tools/lib/perf/include/perf/cpumap.h +++ b/tools/lib/perf/include/perf/cpumap.h @@ -3,6 +3,7 @@ #define __LIBPERF_CPUMAP_H #include +#include #include #include @@ -23,6 +24,7 @@ struct perf_cpu_map; */ LIBPERF_API struct perf_cpu_map *perf_cpu_map__dummy_new(void); LIBPERF_API struct perf_cpu_map *perf_cpu_map__default_new(void); +LIBPERF_API struct perf_cpu_map *__perf_cpu_map__new(const char *cpu_list, char sep); LIBPERF_API struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list); LIBPERF_API struct perf_cpu_map *perf_cpu_map__read(FILE *file); LIBPERF_API struct perf_cpu_map *perf_cpu_map__get(struct perf_cpu_map *map); @@ -46,6 +48,8 @@ LIBPERF_API bool perf_cpu_map__equal(const struct perf_cpu_map *lhs, */ LIBPERF_API bool perf_cpu_map__has_any_cpu(const struct perf_cpu_map *map); +LIBPERF_API cpu_set_t *perf_cpu_map__2_cpuset(struct perf_cpu_map *cpus, size_t *cpuset_size); + #define perf_cpu_map__for_each_cpu(cpu, idx, cpus) \ for ((idx) = 0, (cpu) = perf_cpu_map__cpu(cpus, idx); \ (idx) < perf_cpu_map__nr(cpus); \ diff --git a/tools/lib/perf/libperf.map b/tools/lib/perf/libperf.map index 190b56ae923a..fe0946e34471 100644 --- a/tools/lib/perf/libperf.map +++ b/tools/lib/perf/libperf.map @@ -5,6 +5,7 @@ LIBPERF_0.0.1 { perf_cpu_map__default_new; perf_cpu_map__get; perf_cpu_map__put; + __perf_cpu_map__new; perf_cpu_map__new; perf_cpu_map__read; perf_cpu_map__nr; @@ -12,6 +13,7 @@ LIBPERF_0.0.1 { perf_cpu_map__empty; perf_cpu_map__max; perf_cpu_map__has; + perf_cpu_map__2_cpuset; perf_thread_map__new_array; perf_thread_map__new_dummy; perf_thread_map__set_pid; diff --git a/tools/perf/tests/cpumap.c b/tools/perf/tests/cpumap.c index 7730fc2ab40b..ae5e5337ea4f 100644 --- a/tools/perf/tests/cpumap.c +++ b/tools/perf/tests/cpumap.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "tests.h" +#include #include #include "cpumap.h" #include "event.h" @@ -247,12 +248,34 @@ static int test__cpu_map_equal(struct test_suite *test __maybe_unused, int subte return TEST_OK; } +static int test__cpu_map_convert(struct test_suite *test __maybe_unused, int subtest __maybe_unused) +{ + struct perf_cpu_map *any = perf_cpu_map__dummy_new(); + struct perf_cpu_map *cpus = perf_cpu_map__new("1-2"); + cpu_set_t *cpu_set; + size_t setsize; + + cpu_set = perf_cpu_map__2_cpuset(any, &setsize); + TEST_ASSERT_VAL("not equal", cpu_set == NULL); + CPU_FREE(cpu_set); + + cpu_set = perf_cpu_map__2_cpuset(cpus, &setsize); + TEST_ASSERT_VAL("cpus", cpu_set != NULL); + TEST_ASSERT_VAL("bad cpuset", !CPU_ISSET_S(0, setsize, cpu_set)); + TEST_ASSERT_VAL("bad cpuset", CPU_ISSET_S(1, setsize, cpu_set)); + TEST_ASSERT_VAL("bad cpuset", CPU_ISSET_S(2, setsize, cpu_set)); + CPU_FREE(cpu_set); + + return TEST_OK; +} + static struct test_case tests__cpu_map[] = { TEST_CASE("Synthesize cpu map", cpu_map_synthesize), TEST_CASE("Print cpu map", cpu_map_print), TEST_CASE("Merge cpu map", cpu_map_merge), TEST_CASE("Intersect cpu map", cpu_map_intersect), TEST_CASE("Equal cpu map", cpu_map_equal), + TEST_CASE("Convert cpu map", cpu_map_convert), { .name = NULL, } }; From patchwork Tue Jul 18 03:33:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changbin Du X-Patchwork-Id: 121752 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1486920vqt; Mon, 17 Jul 2023 20:44:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlGfSIeppIIAt8FS9ZQJUBNlACu3BqoLGX9t5s1/2Li/ARy06xxL/Q5WmdZVrP7O0WYtP+Bm X-Received: by 2002:a17:906:5185:b0:993:d617:bdc5 with SMTP id y5-20020a170906518500b00993d617bdc5mr11361101ejk.37.1689651856107; Mon, 17 Jul 2023 20:44:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689651856; cv=none; d=google.com; s=arc-20160816; b=GI5HL3BpdiDOA/CSvHBg5icNbOJBHuzFENyIe+FG7dPJbejQ313wwl0iix9ilSroGU RtNWTHjh3t26bFLHpHw1V5VBJv+OzOK5hWbWH5Gh9mIJo2AeJtOkgiJu9Yr/E52ld8Cu nI4XfnRrVBE7CSWS0FQBrtHXGhZcyMcPnReUkKxO1RtcUvSSBVsJ36YB4oe98bvR+9QE YZaS6g3lcdLWLfEjCBMD2OJsJqc5kCGFOTicLHlUGHtkKiJ30x8rOhRHGfdIJKaIIXKx 5Moha9vMYv26/Klm+lWM7uUgD0W1wnxDn69BDqoIHbFc/+DROmTSUWh5yZErEgHvsyUv OgWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ivE/nQqta4jclkDLzsS3vnhuZArD+hHatWijnfytWok=; fh=ApeLdK2xurAeWAFDrmxfomKJVPpeLi5+JFM/i5kBxGg=; b=b3BOgnknuqRMf5B1pCcbMP9TVDyR/2XFr7eEOSKao5yFrVmAOVLxePCs1jvwcLaeEC WbflEzJynWgRpqrvMV1lX7aaWhELfseBAM8Em9jRI+5jxgzqq43X+k4f4QB5WNmqVZkK AX4Ab3PKx80WKErZxovUhDiVdkum7KIfPglyqoY5wjMLGvxgfpIMbkGwn6Fk8RjwPPH5 xCh85+q5Uy4zjxRTsu2vLxmvkTWlUF5Jn5uZpACZ05eBoX7oKFIM102s2EpVhb+mt8DE iIi0Ja9xjtu07JUeVmiX3q5G3xfZe5iRok/xNuFwGEjtTdAGy3fCy43rL5xhla5YxyJV 2r2Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a13-20020a1709065f8d00b00992a9bdb0e4si546549eju.309.2023.07.17.20.43.52; Mon, 17 Jul 2023 20:44:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230128AbjGRDec (ORCPT + 99 others); Mon, 17 Jul 2023 23:34:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229920AbjGRDeZ (ORCPT ); Mon, 17 Jul 2023 23:34:25 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20979C0; Mon, 17 Jul 2023 20:34:22 -0700 (PDT) Received: from kwepemi500013.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4R4kxb6vkPzNm84; Tue, 18 Jul 2023 11:30:59 +0800 (CST) Received: from M910t.huawei.com (10.110.54.157) by kwepemi500013.china.huawei.com (7.221.188.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 18 Jul 2023 11:34:18 +0800 From: Changbin Du To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo CC: Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , , , Hui Wang , Changbin Du Subject: [PATCH v3 2/3] perf: add new option '--workload-attr' to set workload sched_policy/priority/mask Date: Tue, 18 Jul 2023 11:33:54 +0800 Message-ID: <20230718033355.2960912-3-changbin.du@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230718033355.2960912-1-changbin.du@huawei.com> References: <20230718033355.2960912-1-changbin.du@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.110.54.157] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500013.china.huawei.com (7.221.188.120) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771728384907488952 X-GMAIL-MSGID: 1771728384907488952 To get consistent benchmarking results, sometimes we need to set the sched_policy/priority/mask of the workload to reduce system noise. For example, CPU binding is required on big.little system. $ perf stat -- taskset -c 0 ls Nevertheless, the 'taskset' is also counted here. To get away of the middleman, this adds a new option '--workload-attr' to do the same jobs for stat and record commands. $ sudo perf stat --workload-attr fifo,40,0-3:7 -- ls Above will make 'ls' run on CPU #0-#3 and #7 with fifo scheduler and realtime priority is 40. Signed-off-by: Changbin Du --- v2: Use cpu list spec instead of cpu mask number. --- tools/perf/Documentation/perf-record.txt | 7 ++ tools/perf/Documentation/perf-stat.txt | 6 ++ tools/perf/builtin-record.c | 26 +++++ tools/perf/builtin-stat.c | 18 ++++ tools/perf/util/evlist.c | 117 +++++++++++++++++++++++ tools/perf/util/evlist.h | 3 + tools/perf/util/target.h | 9 ++ 7 files changed, 186 insertions(+) diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt index 680396c56bd1..9c01076f6c89 100644 --- a/tools/perf/Documentation/perf-record.txt +++ b/tools/perf/Documentation/perf-record.txt @@ -838,6 +838,13 @@ filtered through the mask provided by -C option. only, as of now. So the applications built without the frame pointer might see bogus addresses. +--workload-attr :: + setup target workload (the ) attributes: + + sched_policy: other|fifo|rr|batch|idle + priority: scheduling priority for fifo|rr, nice value for other + cpu-list: CPU affinity. e.g. 1-2:4 is processors #1, #2, and #4 + include::intel-hybrid.txt[] SEE ALSO diff --git a/tools/perf/Documentation/perf-stat.txt b/tools/perf/Documentation/perf-stat.txt index 8f789fa1242e..18d0f73458b1 100644 --- a/tools/perf/Documentation/perf-stat.txt +++ b/tools/perf/Documentation/perf-stat.txt @@ -262,6 +262,12 @@ disable events during measurements: wait -n ${perf_pid} exit $? +--workload-attr :: + setup target workload (the ) attributes: + + sched_policy: other|fifo|rr|batch|idle + priority: scheduling priority for fifo|rr, nice value for other + cpu-list: CPU affinity. e.g. 1-2:4 is processors #1, #2, and #4 --pre:: --post:: diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index aec18db7ff23..c16e230afcd5 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -3289,6 +3289,17 @@ static int parse_record_synth_option(const struct option *opt, return 0; } +static int record_parse_workload_attr_opt(const struct option *opt, + const char *arg, + int unset __maybe_unused) +{ + struct record_opts *opts = opt->value; + + return evlist__parse_workload_attr(arg, &opts->target.workload.sched_policy, + &opts->target.workload.sched_priority, + &opts->target.workload.cpu_map); +} + /* * XXX Ideally would be local to cmd_record() and passed to a record__new * because we need to have access to it in record__exit, that is called @@ -3309,6 +3320,8 @@ static struct record record = { .target = { .uses_mmap = true, .default_per_cpu = true, + .workload.sched_policy = -1, + .workload.sched_priority = 0, }, .mmap_flush = MMAP_FLUSH_DEFAULT, .nr_threads_synthesize = 1, @@ -3333,6 +3346,12 @@ static struct record record = { const char record_callchain_help[] = CALLCHAIN_RECORD_HELP "\n\t\t\t\tDefault: fp"; +const char record_workload_attr_help[] = + "setup target workload (the ) attributes:\n\n" + HELP_PAD "sched_policy: other|fifo|rr|batch|idle\n" + HELP_PAD "priority: scheduling priority for fifo|rr, nice value for other\n" + HELP_PAD "cpu-list: CPU affinity. e.g. 1-2:4 is processors #1, #2, and #4"; + static bool dry_run; static struct parse_events_option_args parse_events_option_args = { @@ -3551,6 +3570,9 @@ static struct option __record_options[] = { "write collected trace data into several data files using parallel threads", record__parse_threads), OPT_BOOLEAN(0, "off-cpu", &record.off_cpu, "Enable off-cpu analysis"), + OPT_CALLBACK(0, "workload-attr", &record.opts, + "sched_policy[,priority][,cpu-list]", record_workload_attr_help, + &record_parse_workload_attr_opt), OPT_END() }; @@ -4266,6 +4288,10 @@ int cmd_record(int argc, const char **argv) record__free_thread_masks(rec, rec->nr_threads); rec->nr_threads = 0; evlist__close_control(rec->opts.ctl_fd, rec->opts.ctl_fd_ack, &rec->opts.ctl_fd_close); + if (rec->opts.target.workload.cpu_map) { + perf_cpu_map__put(rec->opts.target.workload.cpu_map); + rec->opts.target.workload.cpu_map = NULL; + } return err; } diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 07b48f6df48e..bb755cb44103 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -108,6 +108,8 @@ static bool all_counters_use_bpf = true; static struct target target = { .uid = UINT_MAX, + .workload.sched_policy = -1, + .workload.sched_priority = 0, }; #define METRIC_ONLY_LEN 20 @@ -1160,6 +1162,14 @@ static int parse_cache_level(const struct option *opt, return 0; } +static int parse_workload_attr_opt(const struct option *opt __maybe_unused, const char *arg, + int unset __maybe_unused) +{ + return evlist__parse_workload_attr(arg, &target.workload.sched_policy, + &target.workload.sched_priority, + &target.workload.cpu_map); +} + static struct option stat_options[] = { OPT_BOOLEAN('T', "transaction", &transaction_run, "hardware transaction statistics"), @@ -1220,6 +1230,9 @@ static struct option stat_options[] = { OPT_BOOLEAN(0, "append", &append_file, "append to the output file"), OPT_INTEGER(0, "log-fd", &output_fd, "log output to fd, instead of stderr"), + OPT_CALLBACK(0, "workload-attr", &stat_config, + "sched_policy[,priority][,cpu-list]", record_workload_attr_help, + &parse_workload_attr_opt), OPT_STRING(0, "pre", &pre_cmd, "command", "command to run prior to the measured command"), OPT_STRING(0, "post", &post_cmd, "command", @@ -2893,5 +2906,10 @@ int cmd_stat(int argc, const char **argv) metricgroup__rblist_exit(&stat_config.metric_events); evlist__close_control(stat_config.ctl_fd, stat_config.ctl_fd_ack, &stat_config.ctl_fd_close); + if (target.workload.cpu_map) { + perf_cpu_map__put(target.workload.cpu_map); + target.workload.cpu_map = NULL; + } + return status; } diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 7ef43f72098e..cbdc2184f8a1 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -58,6 +59,7 @@ #include #include #include +#include #include @@ -1398,6 +1400,118 @@ int evlist__open(struct evlist *evlist) return err; } +int evlist__parse_workload_attr(const char *str, int *sched_policy, int *sched_priority, + struct perf_cpu_map **cpu_map) +{ + char *tok, *saveptr = NULL; + char *buf; + int ret = -1; + + /* We need buffer that we know we can write to. */ + buf = strdup(str); + if (!buf) + return -ENOMEM; + + tok = strtok_r((char *)buf, ",", &saveptr); + do { + /* sched policy */ + if (!strncmp(tok, "other", sizeof("other"))) + *sched_policy = SCHED_OTHER; + else if (!strncmp(tok, "fifo", sizeof("fifo"))) { + *sched_policy = SCHED_FIFO; + /* default to lowest priority */ + *sched_priority = 99; + } else if (!strncmp(tok, "rr", sizeof("rr"))) { + *sched_policy = SCHED_RR; + *sched_priority = 99; + } else if (!strncmp(tok, "batch", sizeof("batch"))) + *sched_policy = SCHED_BATCH; + else if (!strncmp(tok, "idle", sizeof("idle"))) + *sched_policy = SCHED_IDLE; + else { + pr_err("workload_attr: unknown sched policy %s\n", tok); + break; + } + + /* sched priority */ + tok = strtok_r(NULL, ",", &saveptr); + if (tok) { + int priority; + char *endptr; + + priority = strtol(tok, &endptr, 0); + if (*endptr) { + pr_err("workload_attr: invalid sched priority %s\n", tok); + break; + } + + if (*sched_policy == SCHED_FIFO || *sched_policy == SCHED_RR) { + if (priority < 1 || priority > 99) { + pr_err("workload_attr: invalid priority %d for fifo and rr, allowed [1,99]\n", + priority); + break; + } + } + *sched_priority = priority; + } + + /* cpu list */ + tok = strtok_r(NULL, ",", &saveptr); + if (tok) { + *cpu_map = __perf_cpu_map__new(tok, ':'); + if (!*cpu_map) { + pr_err("workload_attr: failed to get cpus map from %s\n", tok); + break; + } + } + ret = 0; + } while (0); + + free(buf); + return ret; +} + +static int setup_workload_attr(struct target *target) +{ + struct sched_param param; + int policy = target->workload.sched_policy; + int priority = target->workload.sched_priority; + + if (policy >= 0) { + param.sched_priority = (policy == SCHED_FIFO || policy == SCHED_RR) ? + priority : 0; + if (sched_setscheduler(0, policy, ¶m) != 0) { + perror("failed to set the sched policy"); + return -1; + } + + if (policy == SCHED_OTHER) { + if (setpriority(PRIO_PROCESS, 0, priority) != 0) { + perror("failed to set the nice value"); + return -1; + } + } + } + + if (target->workload.cpu_map) { + size_t cpuset_size = -1; + cpu_set_t *cpu_set; + + cpu_set = perf_cpu_map__2_cpuset(target->workload.cpu_map, &cpuset_size); + if (!cpu_set) + return -1; + + if (sched_setaffinity(0, cpuset_size, cpu_set) != 0) { + perror("failed to set the sched affinity"); + CPU_FREE(cpu_set); + return -1; + } + CPU_FREE(cpu_set); + } + + return 0; +} + int evlist__prepare_workload(struct evlist *evlist, struct target *target, const char *argv[], bool pipe_output, void (*exec_error)(int signo, siginfo_t *info, void *ucontext)) { @@ -1464,6 +1578,9 @@ int evlist__prepare_workload(struct evlist *evlist, struct target *target, const exit(ret); } + if (setup_workload_attr(target) != 0) + exit(-1); + execvp(argv[0], (char **)argv); if (exec_error) { diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 664c6bf7b3e0..761ae102dda6 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -15,6 +15,7 @@ #include #include #include +#include struct pollfd; struct thread_map; @@ -180,6 +181,8 @@ void evlist__set_id_pos(struct evlist *evlist); void evlist__config(struct evlist *evlist, struct record_opts *opts, struct callchain_param *callchain); int record_opts__config(struct record_opts *opts); +int evlist__parse_workload_attr(const char *str, int *sched_policy, int *sched_priority, + struct perf_cpu_map **cpu_set); int evlist__prepare_workload(struct evlist *evlist, struct target *target, const char *argv[], bool pipe_output, void (*exec_error)(int signo, siginfo_t *info, void *ucontext)); diff --git a/tools/perf/util/target.h b/tools/perf/util/target.h index d582cae8e105..16fe33dda2ef 100644 --- a/tools/perf/util/target.h +++ b/tools/perf/util/target.h @@ -4,6 +4,7 @@ #include #include +#include struct target { const char *pid; @@ -19,6 +20,12 @@ struct target { bool use_bpf; int initial_delay; const char *attr_map; + + struct { + int sched_policy; + int sched_priority; + struct perf_cpu_map *cpu_map; + } workload; }; enum target_errno { @@ -103,4 +110,6 @@ static inline bool target__uses_dummy_map(struct target *target) return use_dummy; } +extern const char record_workload_attr_help[]; + #endif /* _PERF_TARGET_H */ From patchwork Tue Jul 18 03:33:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changbin Du X-Patchwork-Id: 121751 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1486893vqt; Mon, 17 Jul 2023 20:44:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlHVRQGZ7BRVVXMLEw0rdfZuD07XopMEG1NtcVObkJyvMOYygqCmBQWI8agNNScG/kIUqlP0 X-Received: by 2002:aa7:c586:0:b0:521:775b:ec95 with SMTP id g6-20020aa7c586000000b00521775bec95mr7833933edq.25.1689651850227; Mon, 17 Jul 2023 20:44:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689651850; cv=none; d=google.com; s=arc-20160816; b=Uu73ArsO2yHkLkKTa9BIEH1Q8VZB8z4YYieYT+49BYIuXj45i18oe22AiCrokjNcee G4fkxKXcPTa+ty2ikpW48ttCMCo/IAcdTSpJyXZOUevNOdM0ylOBtttm7Zq5Gvan+N9B iVWIPDffV6/XmDeQ2vQmCGfGMw1P31NyV3afTpRULGyu9zqRiG6quhbEdXEmd1xxv7Pc Z6Ez5kiTDkdyps2eywJTHnYoB1pHLe2ll6Cm2HqoK/VRyh0tnMGw/tv3K+azCVF1hHr/ xhcSGSM6j4lQRdG/UntB2tRlsKnwcv2cfifH5AwmyrDnmjG71UDhPY0o4LqPZBRGmkz5 XZKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=71VE8a/1Tx49GpbNs96CsMzbmBJ+k4OzpaO5mZwJ58g=; fh=ApeLdK2xurAeWAFDrmxfomKJVPpeLi5+JFM/i5kBxGg=; b=B4ex5DX9CQ4IRmfQqpdW9AeHGNv3jE4f0F06xdL33ircRo1xnyQ0pOYtNttfpsOqcU uFAEgbBZYaiPg719IaeUQCaYr4BNGnzwBP1MHZ6ejWON+KQuIVjciW7nzujRb8D3/dyY fo1QAFBGvZ8eTSEUqnotk4sI25Ur0QnkcuuOURpZQQ3vtT+M0HCf0Sv7LaclJjaqr3YV A/NgiuZVP0r390O0JbnQd/IkPj22J5c1p4gdyKXi1axbaIdfdQ6mUj/AnLgZv1VbOXkO 05ZKG9+r2ewWH+rV1CaVJNfXNAu1s8DzII4D3hWSTcqM5cDeyyBwUrG47AWSRs4pk86Y FOBA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u3-20020aa7d543000000b0051e10991ea9si541578edr.142.2023.07.17.20.43.46; Mon, 17 Jul 2023 20:44:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230089AbjGRDe3 (ORCPT + 99 others); Mon, 17 Jul 2023 23:34:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229825AbjGRDeZ (ORCPT ); Mon, 17 Jul 2023 23:34:25 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80AD6BB; Mon, 17 Jul 2023 20:34:22 -0700 (PDT) Received: from kwepemi500013.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R4l0d4QvyzrRpm; Tue, 18 Jul 2023 11:33:37 +0800 (CST) Received: from M910t.huawei.com (10.110.54.157) by kwepemi500013.china.huawei.com (7.221.188.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 18 Jul 2023 11:34:19 +0800 From: Changbin Du To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo CC: Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , , , Hui Wang , Changbin Du Subject: [PATCH v3 3/3] perf: replace taskset with --workload-attr option Date: Tue, 18 Jul 2023 11:33:55 +0800 Message-ID: <20230718033355.2960912-4-changbin.du@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230718033355.2960912-1-changbin.du@huawei.com> References: <20230718033355.2960912-1-changbin.du@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.110.54.157] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500013.china.huawei.com (7.221.188.120) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771728378143844531 X-GMAIL-MSGID: 1771728378143844531 Replace the taskset with our new option --workload-attr. Signed-off-by: Changbin Du --- tools/perf/Documentation/intel-hybrid.txt | 2 +- tools/perf/Documentation/perf-stat.txt | 2 +- tools/perf/tests/shell/stat_bpf_counters_cgrp.sh | 2 +- tools/perf/tests/shell/test_arm_coresight.sh | 2 +- tools/perf/tests/shell/test_data_symbol.sh | 2 +- tools/perf/tests/shell/test_intel_pt.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/perf/Documentation/intel-hybrid.txt b/tools/perf/Documentation/intel-hybrid.txt index e7a776ad25d7..b4adb1eeba3f 100644 --- a/tools/perf/Documentation/intel-hybrid.txt +++ b/tools/perf/Documentation/intel-hybrid.txt @@ -132,7 +132,7 @@ displayed. The percentage is the event's running time/enabling time. One example, 'triad_loop' runs on cpu16 (atom core), while we can see the scaled value for core cycles is 160,444,092 and the percentage is 0.47%. -perf stat -e cycles \-- taskset -c 16 ./triad_loop +perf stat -e cycles --workload-attr other,0,16 \-- ./triad_loop As previous, two events are created. diff --git a/tools/perf/Documentation/perf-stat.txt b/tools/perf/Documentation/perf-stat.txt index 18d0f73458b1..fb52ddcea622 100644 --- a/tools/perf/Documentation/perf-stat.txt +++ b/tools/perf/Documentation/perf-stat.txt @@ -464,7 +464,7 @@ on workload with changing phases. To interpret the results it is usually needed to know on which CPUs the workload runs on. If needed the CPUs can be forced using -taskset. +--workload-attr option. --td-level:: Print the top-down statistics that equal the input level. It allows diff --git a/tools/perf/tests/shell/stat_bpf_counters_cgrp.sh b/tools/perf/tests/shell/stat_bpf_counters_cgrp.sh index d724855d097c..b13bf391b137 100755 --- a/tools/perf/tests/shell/stat_bpf_counters_cgrp.sh +++ b/tools/perf/tests/shell/stat_bpf_counters_cgrp.sh @@ -64,7 +64,7 @@ check_cpu_list_counted() { local output - output=$(perf stat -C 1 --bpf-counters --for-each-cgroup ${test_cgroups} -e cpu-clock -x, taskset -c 1 sleep 1 2>&1) + output=$(perf stat -C 1 --bpf-counters --for-each-cgroup ${test_cgroups} -e cpu-clock -x, --workload-attr other,0,1 -- sleep 1 2>&1) if echo ${output} | grep -q -F " $1" rm -f $file perf record -o ${perfdata} -e cs_etm/@$1/u --per-thread \ - -- taskset -c $2 touch $file > /dev/null 2>&1 + --workload-attr other,0,$2 -- touch $file > /dev/null 2>&1 } perf_script_branch_samples() { diff --git a/tools/perf/tests/shell/test_data_symbol.sh b/tools/perf/tests/shell/test_data_symbol.sh index 69bb6fe86c50..02c6a97e3d0f 100755 --- a/tools/perf/tests/shell/test_data_symbol.sh +++ b/tools/perf/tests/shell/test_data_symbol.sh @@ -50,7 +50,7 @@ echo "Recording workload..." # specific CPU and test in per-CPU mode. is_amd=$(grep -E -c 'vendor_id.*AuthenticAMD' /proc/cpuinfo) if (($is_amd >= 1)); then - perf mem record -o ${PERF_DATA} -C 0 -- taskset -c 0 $TEST_PROGRAM & + perf mem record -o ${PERF_DATA} -C 0 --workload-attr other,0,0 -- $TEST_PROGRAM & else perf mem record --all-user -o ${PERF_DATA} -- $TEST_PROGRAM & fi diff --git a/tools/perf/tests/shell/test_intel_pt.sh b/tools/perf/tests/shell/test_intel_pt.sh index 3a8b9bffa022..0dc085c72593 100755 --- a/tools/perf/tests/shell/test_intel_pt.sh +++ b/tools/perf/tests/shell/test_intel_pt.sh @@ -110,7 +110,7 @@ test_system_wide_side_band() can_cpu_wide 1 || return $? # Record on CPU 0 a task running on CPU 1 - perf_record_no_decode -o "${perfdatafile}" -e intel_pt//u -C 0 -- taskset --cpu-list 1 uname + perf_record_no_decode -o "${perfdatafile}" -e intel_pt//u -C 0 --workload-attr other,0,1 -- uname # Should get MMAP events from CPU 1 because they can be needed to decode mmap_cnt=$(perf script -i "${perfdatafile}" --no-itrace --show-mmap-events -C 1 2>/dev/null | grep -c MMAP)