From patchwork Mon Feb 5 10:46:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 196730 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp793688dyb; Mon, 5 Feb 2024 02:52:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IEeOu1C4Z+rpiFPAhFC+V3Wcl+GQKIzMs4xhBpzsZ88uS8xWrfpYBPQKm/HZFtEGySyxrEL X-Received: by 2002:a17:907:7893:b0:a37:8574:357a with SMTP id ku19-20020a170907789300b00a378574357amr3798483ejc.4.1707130322956; Mon, 05 Feb 2024 02:52:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707130322; cv=pass; d=google.com; s=arc-20160816; b=kpioxJ1u7659pDCGx1ZO2QC9ZPaYHZ1YTFYhh+UX6v+/uHijytuLKtJ+wKFD08olFM 1LCtSZkiYZrRDkElzVzQJnWKpSc8LJYVM5cZxY3WB7el742RlR0jzRxri54h1QfVx6fu fL3h76TGrZlSJ00tOIsR8b72vjYJUMwWVI39pkWLwiR1V1h3khXH7fspqZDDn+gfjaAp VDKCjlOyXQhJOoUYNVcyBFwbSbFsRZ2+R0dESZCwb7K+E+ts3hD4irPG0Pgctz9YPd7o h9hqFJFiHWn/ROaRpCVZBq6bNNx01lzWdItZGFd24Fc0BZqBPyZ66nue3wot0iZFhvFu 6S+g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=0rZ7Mn40zs8ZL6JMCWiuhTnESZ8O9HDi4L//V5dsRs4=; fh=pusOhQiA/Y2aj+twf6Refrt45QfBmCSjOIrFG+brd0k=; b=rqmFHwR+OeWVCOKVoVh1k3nJB6MTanZ/Mbbwb6YRyLLVqONf0gumavkjBtL/jKHLR7 TOY7RjFhCv/e8s4/Tc0bMgnfTcmLLfuymhxOORJbjg6+dmNabH0H85eQ/hHXD8sv27MF CrN1g7BTzwk/ZrcU5VXKigTPBAV2loL2QKkXxSRirOlkAMvYFaKKspXBO5D8dGy932nl kereNGeaKYuRu39Fh4lZqVk4ZkSRMRD/iqhwzMBWqfxs6wd4fYKXz4qWZ7JYn6yGAUB8 uAI/wEPi8sz+LBBaehFkcDHTyAhHJSB9Ia5h/r1LwJgijcaYrv6OAOFX5gCtmePKFTWG sdqA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-52433-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52433-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com X-Forwarded-Encrypted: i=1; AJvYcCUCCZPL/D0idCe7Go/EGlkdn3I7Ojw8l0kahuC/bySVqa5kjFBLhGs66prbTeVftu0Axj8zrZkVmz0pY4oUzwRWJDWGnA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id a16-20020a1709064a5000b00a37e514d4c2si287977ejv.656.2024.02.05.02.52.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 02:52:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-52433-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-52433-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52433-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 918411F21799 for ; Mon, 5 Feb 2024 10:52:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5FEFD18035; Mon, 5 Feb 2024 10:51:20 +0000 (UTC) Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6330F17586; Mon, 5 Feb 2024 10:51:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.190 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707130278; cv=none; b=QBa6owSr2eO3quJHU3cGWUkU0MWAaTM2Vcdl/J8xmC2SFXMqBzULMDdAGmVBE9u+l2sClHXkbJzu9uSVP8wTuo/Z448Ak8Lq4Y2vVsrVC0mPdT8KAwaEj3NO66gxbGqh1AnISdyeSsEkmVbJvig0bGTaX5TuK+7O9c5FOB4p2FA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707130278; c=relaxed/simple; bh=akxPEgyMnsMulfBbKHAmf+qbvnaNRYhrNfJ8MDEIybA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XR8muLUagK5opN0/wO0v3hnRK1OlFDBdhgNqOAVqzxn+wAxoxgSeGXYVzHIPZz0hqLJlNf+YqRM/inOiclCz+c5idgl4h8GlVw05W3rwh81Ag2givoMD3BM/vTlmfW+Ykyerf/zQNhz9stgYG87s5DXxIEc3Pr2trpyKOELkFQM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.190 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4TT3735jqCz1xnGw; Mon, 5 Feb 2024 18:50:07 +0800 (CST) Received: from kwepemm600003.china.huawei.com (unknown [7.193.23.202]) by mail.maildlp.com (Postfix) with ESMTPS id 2B8211402E0; Mon, 5 Feb 2024 18:51:13 +0800 (CST) Received: from ubuntu2204.huawei.com (10.67.174.22) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 5 Feb 2024 18:51:12 +0800 From: Yang Jihong To: , , , , , , , , , , CC: Subject: [PATCH 1/5] perf sched: Move start_work_mutex and work_done_wait_mutex initialization to perf_sched__replay() Date: Mon, 5 Feb 2024 10:46:12 +0000 Message-ID: <20240205104616.132417-2-yangjihong1@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240205104616.132417-1-yangjihong1@huawei.com> References: <20240205104616.132417-1-yangjihong1@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm600003.china.huawei.com (7.193.23.202) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790055885869076258 X-GMAIL-MSGID: 1790055885869076258 The start_work_mutex and work_done_wait_mutex are used only for the 'perf sched replay'. Put their initialization in perf_sched__replay () to reduce unnecessary actions in other commands. Simple functional testing: # perf sched record perf bench sched messaging # Running 'sched/messaging' benchmark: # 20 sender and receiver processes per group # 10 groups == 400 processes run Total time: 0.197 [sec] [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 14.952 MB perf.data (134165 samples) ] # perf sched replay run measurement overhead: 108 nsecs sleep measurement overhead: 65658 nsecs the run test took 999991 nsecs the sleep test took 1079324 nsecs nr_run_events: 42378 nr_sleep_events: 43102 nr_wakeup_events: 31852 target-less wakeups: 17 multi-target wakeups: 712 task 0 ( swapper: 0), nr_events: 10451 task 1 ( swapper: 1), nr_events: 3 task 2 ( swapper: 2), nr_events: 1 task 717 ( sched-messaging: 74483), nr_events: 152 task 718 ( sched-messaging: 74484), nr_events: 1944 task 719 ( sched-messaging: 74485), nr_events: 73 task 720 ( sched-messaging: 74486), nr_events: 163 task 721 ( sched-messaging: 74487), nr_events: 942 task 722 ( sched-messaging: 74488), nr_events: 78 task 723 ( sched-messaging: 74489), nr_events: 1090 ------------------------------------------------------------ #1 : 1366.507, ravg: 1366.51, cpu: 7682.70 / 7682.70 #2 : 1410.072, ravg: 1370.86, cpu: 7723.88 / 7686.82 #3 : 1396.296, ravg: 1373.41, cpu: 7568.20 / 7674.96 #4 : 1381.019, ravg: 1374.17, cpu: 7531.81 / 7660.64 #5 : 1393.826, ravg: 1376.13, cpu: 7725.25 / 7667.11 #6 : 1401.581, ravg: 1378.68, cpu: 7594.82 / 7659.88 #7 : 1381.337, ravg: 1378.94, cpu: 7371.22 / 7631.01 #8 : 1373.842, ravg: 1378.43, cpu: 7894.92 / 7657.40 #9 : 1364.697, ravg: 1377.06, cpu: 7324.91 / 7624.15 #10 : 1363.613, ravg: 1375.72, cpu: 7209.55 / 7582.69 # echo $? 0 Signed-off-by: Yang Jihong --- tools/perf/builtin-sched.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 42d5fc5d6b7b..08dec557e6be 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -3285,15 +3285,20 @@ static int perf_sched__map(struct perf_sched *sched) static int perf_sched__replay(struct perf_sched *sched) { + int ret; unsigned long i; + mutex_init(&sched->start_work_mutex); + mutex_init(&sched->work_done_wait_mutex); + calibrate_run_measurement_overhead(sched); calibrate_sleep_measurement_overhead(sched); test_calibrations(sched); - if (perf_sched__read_events(sched)) - return -1; + ret = perf_sched__read_events(sched); + if (ret) + goto out_mutex_destroy; printf("nr_run_events: %ld\n", sched->nr_run_events); printf("nr_sleep_events: %ld\n", sched->nr_sleep_events); @@ -3318,7 +3323,11 @@ static int perf_sched__replay(struct perf_sched *sched) sched->thread_funcs_exit = true; destroy_tasks(sched); - return 0; + +out_mutex_destroy: + mutex_destroy(&sched->start_work_mutex); + mutex_destroy(&sched->work_done_wait_mutex); + return ret; } static void setup_sorting(struct perf_sched *sched, const struct option *options, @@ -3556,8 +3565,6 @@ int cmd_sched(int argc, const char **argv) unsigned int i; int ret = 0; - mutex_init(&sched.start_work_mutex); - mutex_init(&sched.work_done_wait_mutex); sched.curr_thread = calloc(MAX_CPUS, sizeof(*sched.curr_thread)); if (!sched.curr_thread) { ret = -ENOMEM; @@ -3645,8 +3652,6 @@ int cmd_sched(int argc, const char **argv) free(sched.curr_pid); free(sched.cpu_last_switched); free(sched.curr_thread); - mutex_destroy(&sched.start_work_mutex); - mutex_destroy(&sched.work_done_wait_mutex); return ret; } From patchwork Mon Feb 5 10:46:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 196729 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp793670dyb; Mon, 5 Feb 2024 02:51:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IGyaXJEr3+RxilXWW389fA1T0b3K7df2m8aE9Gyw3L6bq84Rp07wP6HF+iTKOn0jOBLD3v0 X-Received: by 2002:a17:906:eb5b:b0:a37:9de6:5370 with SMTP id mc27-20020a170906eb5b00b00a379de65370mr2415571ejb.0.1707130318433; Mon, 05 Feb 2024 02:51:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707130318; cv=pass; d=google.com; s=arc-20160816; b=ivmxR8V3UVcQkPy4b7XXh/s6nGTfoEONVnkqvbYy7bShAZZ5PSDmMWsRC/j4AuWcUM +Ps/lojv7Yp0VXYbqmCsPlL85mUKN6qomNAkUlxlSfqQHsc0g6qvG9whftAXO6/CVkK3 Tuvxsb+zlgQqZJEEZi+QFdeajuT2iRH/vcjXRZt46g9efOqeG+Ddov9JXaViCySPe6hQ +XOi2effKRHTiAuCoubYL0WDrfGOMngaKBrQqgyiexZgQPYYjExCpxNbprV/CA+90MQ+ X7WzWOTToZDh27JDaQbBZdouztl9O7bILO1kg+w3xZkWPKJm3n3C4Un/EPAo3bhvt1qt PX8A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=6hMgtE+VLE8fUIyUiIEBq+MWzTpXjrltrxxvXdQgW8Q=; fh=YuQ2IZZ/bEjumPt0Jx6fKIHTkMWq87RWvMavvJumcAk=; b=D/GaZ9EOSIOT69DkHElzTDhQHPFNqicTMp8r4wToGDyEzN0Bomgq5Z6dFzv2LWJW1t S7Kkye1OQU3BaCGjBpfZIBaVF7I9HGnBJlnWsTFt1bxRAp6VrJdM+IJ2FPTGvmZ9cdTb /36b88Dq85i+hEZDUTiJUlbNRlLcl8rhZOusFdShlIQ5EDWZInq3K6apAh6g9Lj12pBg 60/UHfPEYvXj3177ivhjV9r0nI8liswJXjjSSK4xeX99ti5futWlI1EHeVMmxL7w85V5 7VPzSpW9NGuTcrSoYqPRkoxnHUwYMQkkfarrOUZncPXFXRuxn/h7KQ/oZUsMGPNdLg6+ eD2w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-52434-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52434-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com X-Forwarded-Encrypted: i=1; AJvYcCVK4B4nyrfVjHOnbBz68mLyvPkiRmzfaTIBiKApmUigqBjFTu99KUOMlLAsPPPqcN5e+01iwPeBhL51Vj4TxjJy0M0f3w== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id lo22-20020a170906fa1600b00a35dce64af7si3968584ejb.211.2024.02.05.02.51.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 02:51:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-52434-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-52434-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52434-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 0FD021F21C67 for ; Mon, 5 Feb 2024 10:51:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 27AE117C95; Mon, 5 Feb 2024 10:51:20 +0000 (UTC) Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0AD9B1758C; Mon, 5 Feb 2024 10:51:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707130278; cv=none; b=fyzK+ZSc+wZTIxPm+xorlaVBVce+MHc9KRMlig+jIgLfhxKnLjC4VnoeKbMje2msIxUCoGQxa1sPMJbbtZfjS6XryTp8Uy1YtHaThAqbqVV4g5yiR9qRc940vmt7grY+ZukP8tMWg0kJvpvSuqGCxkMoGpwEaXDIeYEBV2M4qDI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707130278; c=relaxed/simple; bh=JjeSrbemceHFE/nambjoDi3fcqhVMNeiizzzXuFlnPs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qXUKg4nkc8+Oqa6VTx8vj9U34KsY6M0OpbTQCw4NJH+6LzTcb7RjVKB6yUUEWDvxQqJ08TcZKn0zaB+219N2F+A/Txq1zTl632fzs9i7tbt2JoXsUR1jtnCsbjcjSW68W+B5LgTAo0quW3KR9isykHx778H9pQLG35RIuBnQ22U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4TT37p37zpz1vsVw; Mon, 5 Feb 2024 18:50:46 +0800 (CST) Received: from kwepemm600003.china.huawei.com (unknown [7.193.23.202]) by mail.maildlp.com (Postfix) with ESMTPS id ABC9B140153; Mon, 5 Feb 2024 18:51:13 +0800 (CST) Received: from ubuntu2204.huawei.com (10.67.174.22) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 5 Feb 2024 18:51:13 +0800 From: Yang Jihong To: , , , , , , , , , , CC: Subject: [PATCH 2/5] perf sched: Fix memory leak in perf_sched__map() Date: Mon, 5 Feb 2024 10:46:13 +0000 Message-ID: <20240205104616.132417-3-yangjihong1@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240205104616.132417-1-yangjihong1@huawei.com> References: <20240205104616.132417-1-yangjihong1@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm600003.china.huawei.com (7.193.23.202) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790055881074202520 X-GMAIL-MSGID: 1790055881074202520 perf_sched__map() needs to free memory of map_cpus, color_pids and color_cpus in normal path and rollback allocated memory in error path. Signed-off-by: Yang Jihong --- tools/perf/builtin-sched.c | 41 ++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 08dec557e6be..26dbfa4aab61 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -3208,8 +3208,6 @@ static int perf_sched__lat(struct perf_sched *sched) static int setup_map_cpus(struct perf_sched *sched) { - struct perf_cpu_map *map; - sched->max_cpu.cpu = sysconf(_SC_NPROCESSORS_CONF); if (sched->map.comp) { @@ -3218,16 +3216,15 @@ static int setup_map_cpus(struct perf_sched *sched) return -1; } - if (!sched->map.cpus_str) - return 0; - - map = perf_cpu_map__new(sched->map.cpus_str); - if (!map) { - pr_err("failed to get cpus map from %s\n", sched->map.cpus_str); - return -1; + if (sched->map.cpus_str) { + sched->map.cpus = perf_cpu_map__new(sched->map.cpus_str); + if (!sched->map.cpus) { + pr_err("failed to get cpus map from %s\n", sched->map.cpus_str); + free(sched->map.comp_cpus); + return -1; + } } - sched->map.cpus = map; return 0; } @@ -3267,20 +3264,34 @@ static int setup_color_cpus(struct perf_sched *sched) static int perf_sched__map(struct perf_sched *sched) { + int rc = -1; + if (setup_map_cpus(sched)) - return -1; + return rc; if (setup_color_pids(sched)) - return -1; + goto out_free_map_cpus; if (setup_color_cpus(sched)) - return -1; + goto out_free_color_pids; setup_pager(); if (perf_sched__read_events(sched)) - return -1; + goto out_free_color_cpus; + + rc = 0; print_bad_events(sched); - return 0; + +out_free_color_cpus: + perf_cpu_map__put(sched->map.color_cpus); + +out_free_color_pids: + perf_thread_map__put(sched->map.color_pids); + +out_free_map_cpus: + free(sched->map.comp_cpus); + perf_cpu_map__put(sched->map.cpus); + return rc; } static int perf_sched__replay(struct perf_sched *sched) From patchwork Mon Feb 5 10:46:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 196731 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp793749dyb; Mon, 5 Feb 2024 02:52:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IHLpBHIFprEQG8CEyYf2cpYDd9sA4Q+uR45SqkUeyXbH3ZWRktJyHK92KTxXeTTxDvtfsJw X-Received: by 2002:a17:906:328a:b0:a37:a267:e2ea with SMTP id 10-20020a170906328a00b00a37a267e2eamr1847656ejw.61.1707130332901; Mon, 05 Feb 2024 02:52:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707130332; cv=pass; d=google.com; s=arc-20160816; b=PMqRyxYazB1OdX6xUpdMXaEz7WJyrBjHsstk7Ji473F66KThB/R65INXgNbHouHD5Y 2q+ANg1TBBiMD/wGtcp8tU9/s7AFumPlpinW/rLoTKqlJClyyqVD5Slf5qbLHTWYgTQa 8RDXQ/+MBWnY9PTptFNWfYwQ2Jt671oxK4h8kIMkfW6PmkLsBOKAd3h3Tj9X/QYaCQdP hBX9NKUypCEmVeCqTtPvvOtFsyXz7g6Xi61Ahb4/f4Hdw2mRtZghQDT8gbwjmst7zIcI NjEhnnfMggJ19sSBowUq8FcVp6PYOIN2wS5exLL0kGC1x5TDaZRZe+OPF1qp8GGwjKPs IJHw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=g/1rVEQBq79jfyOZ9bpyoTTJT7CiwgrKcNx70945/ZE=; fh=+7upI8faKSN9hXUt13qhZoLCgkUrygNTqIbWsHZmzzA=; b=jVRTphXr1VuqlgY0wYEyaxoYyhZ06vuZNtDQfQrow7+caKWu0oFgnETd0t/i3q6I9M yyePZS2Iq8LVbM3AFASz8MMlXfvkBWGe2VIBpVgVMSQiwQ3AwxjC+YdbtwmAejjmHuo+ vCDonnr44ayJh+Afn7U5GHvsuA6ZmSHbbkB2mp70/u1L6HW4RASswZx73Xvirqnfj+eW W8peXF2tp4j660ttX14hmbSSnfNR+54bUzQH5vc0ZTo27I3IJ9mGNzwY725sx9Tv4HzE 0RWugAJLsC/Z0BVoej8ePDVUBR8/0tbxUTATqrT4LC4GSOHhkiUNj2vhC/Xhx+9/x5VJ DhZA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-52435-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52435-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com X-Forwarded-Encrypted: i=1; AJvYcCVv6LdbmkSDWG5ALQ2csbnWwilGP1lW+X8S1fPtr+6bEpwdXyu9v94WrfP577gMChCMnQ/i9xm/eR6IOhYR5pXj72pcNg== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id z6-20020a170906714600b00a37177a08a2si3383150ejj.892.2024.02.05.02.52.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 02:52:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-52435-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-52435-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52435-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 75D061F2208B for ; Mon, 5 Feb 2024 10:52:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F0AED182DD; Mon, 5 Feb 2024 10:51:20 +0000 (UTC) Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0249F17592; Mon, 5 Feb 2024 10:51:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.191 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707130279; cv=none; b=GZK/gnUDzufdSHaeVkw94t3lxcC1kUVcX2M8tg9vm6sbxSsEl4OhEAwCjOKYwfArLroJBcc/Zin8wHUGjKWBNyXduZWmWDg4d1u5vLwqZ3Yzhq+yfHXwD84IHC/bohMXPeF0q+4R/CFdgLfS11xU8M4KgGJ/WRITHvVjW1ASO5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707130279; c=relaxed/simple; bh=DoB2mUJR1wZPUsVzLJzgRS7J/E0RabBNUzGJ8kWAyao=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UkvoByI9BSS3UvcPZS6sCZLneFb59kMA/dc8iTip0dl0A+L7m9KCHA+e3Poni7jbCSsG28vmIsYzSOaTQU3sJIRoYtaFau7vUPcMHQj/XOUf8dH2mNqLKsKNWUinnbvXd2C6H69JSuFbg7qZSfig7NWOgW75QAmzpPp0iUst/TM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.191 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4TT3673tzZz1gy2M; Mon, 5 Feb 2024 18:49:19 +0800 (CST) Received: from kwepemm600003.china.huawei.com (unknown [7.193.23.202]) by mail.maildlp.com (Postfix) with ESMTPS id 315371A0178; Mon, 5 Feb 2024 18:51:14 +0800 (CST) Received: from ubuntu2204.huawei.com (10.67.174.22) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 5 Feb 2024 18:51:13 +0800 From: Yang Jihong To: , , , , , , , , , , CC: Subject: [PATCH 3/5] perf sched: Move curr_thread initialization to perf_sched__map() Date: Mon, 5 Feb 2024 10:46:14 +0000 Message-ID: <20240205104616.132417-4-yangjihong1@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240205104616.132417-1-yangjihong1@huawei.com> References: <20240205104616.132417-1-yangjihong1@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm600003.china.huawei.com (7.193.23.202) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790055895977772968 X-GMAIL-MSGID: 1790055895977772968 The curr_thread is used only for the 'perf sched map'. Put initialization in perf_sched__map() to reduce unnecessary actions in other commands. Simple functional testing: # perf sched record perf bench sched messaging # Running 'sched/messaging' benchmark: # 20 sender and receiver processes per group # 10 groups == 400 processes run Total time: 0.197 [sec] [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 15.526 MB perf.data (140095 samples) ] # perf sched map *A0 451264.532445 secs A0 => migration/0:15 *. 451264.532468 secs . => swapper:0 . *B0 451264.532537 secs B0 => migration/1:21 . *. 451264.532560 secs . . *C0 451264.532644 secs C0 => migration/2:27 . . *. 451264.532668 secs . . . *D0 451264.532753 secs D0 => migration/3:33 . . . *. 451264.532778 secs . . . . *E0 451264.532861 secs E0 => migration/4:39 . . . . *. 451264.532886 secs . . . . . *F0 451264.532973 secs F0 => migration/5:45 A7 A7 A7 A7 A7 *A7 . . . . . . . . . . 451264.790785 secs A7 A7 A7 A7 A7 A7 *A7 . . . . . . . . . 451264.790858 secs A7 A7 A7 A7 A7 A7 A7 *A7 . . . . . . . . 451264.790934 secs A7 A7 A7 A7 A7 A7 A7 A7 *A7 . . . . . . . 451264.791004 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 . . . . . . 451264.791075 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 . . . . . 451264.791143 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 . . . . 451264.791232 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 . . . 451264.791336 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 . . 451264.791407 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 . 451264.791484 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 451264.791553 secs # echo $? 0 Signed-off-by: Yang Jihong --- tools/perf/builtin-sched.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 26dbfa4aab61..54d79e560617 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -3266,9 +3266,13 @@ static int perf_sched__map(struct perf_sched *sched) { int rc = -1; - if (setup_map_cpus(sched)) + sched->curr_thread = calloc(MAX_CPUS, sizeof(*(sched->curr_thread))); + if (!sched->curr_thread) return rc; + if (setup_map_cpus(sched)) + goto out_free_curr_thread; + if (setup_color_pids(sched)) goto out_free_map_cpus; @@ -3291,6 +3295,9 @@ static int perf_sched__map(struct perf_sched *sched) out_free_map_cpus: free(sched->map.comp_cpus); perf_cpu_map__put(sched->map.cpus); + +out_free_curr_thread: + free(sched->curr_thread); return rc; } @@ -3576,11 +3583,6 @@ int cmd_sched(int argc, const char **argv) unsigned int i; int ret = 0; - sched.curr_thread = calloc(MAX_CPUS, sizeof(*sched.curr_thread)); - if (!sched.curr_thread) { - ret = -ENOMEM; - goto out; - } sched.cpu_last_switched = calloc(MAX_CPUS, sizeof(*sched.cpu_last_switched)); if (!sched.cpu_last_switched) { ret = -ENOMEM; @@ -3662,7 +3664,6 @@ int cmd_sched(int argc, const char **argv) out: free(sched.curr_pid); free(sched.cpu_last_switched); - free(sched.curr_thread); return ret; } From patchwork Mon Feb 5 10:46:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 196733 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp793972dyb; Mon, 5 Feb 2024 02:52:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IHeCkBc5IZqdC3A4dePV3aC0raKh1musgiFRrkTzfsBbFeSZBXkLnww75thUBytBvKTGRoZ X-Received: by 2002:aa7:d055:0:b0:55f:c5b7:5855 with SMTP id n21-20020aa7d055000000b0055fc5b75855mr4170126edo.6.1707130372698; Mon, 05 Feb 2024 02:52:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707130372; cv=pass; d=google.com; s=arc-20160816; b=sfbFyVuCSl8v6fxitDVxKT1t1mtWlRvil9IHGgz0n5YoXWBaUH32XQBT0kvhZ4eoC5 8QyGoP47OrYNGu/OZUrQgwnCBpKnk0aNQ0fGXhvGGMY4rnAiWniipL4zZ3kGHvOfSJvd mZmoZDiYwBVwURiGq+caT9pXHLDsTEsNX2iV1BYSCAlnrK6EETFuX+iLopQTRbzrEnyp 43d7PK50zu2dGApe1Afn1GoDqbxoQvBu450KiMd79rwsD0RQnilX5i5/Mmv/uL/57qmN 1MaKmFAGULeUH3OU6bMyCWfqyRmYyRi5tOrumG33BAc/U/ZgHqsqt9dmtwRNx9ZrAHNs fO5w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=U0JGrrodCQ/ZOpI7RIbIne5pRTwDVEc8NrXHGzQVdEE=; fh=IhWhfUnWJ4L+0gjeoepC5jwKwn/ztEp/8U9ATyECJIg=; b=Ze+tbRNV2hz0YTXnPdOio81fq/XMVtmHAm+0U+ljj38pT32zRJ78gvCk1/6iFpMG3u va1EXAANnuzLrhGsvEfHxQQZ4pOXJ7UDaXCmp9QmLluoB2gJ6FvCPuZjRd6b/2yMY8YF kaKRxMZN4bu6eqmP5AWwPmyVVlVQSeTR44i1IbUs7mYicWpkGPqp02CU9FX0gDWKNBzK s1CppVVE+3DhlAGl6BbONilOAyZw/wZCagLkEFW5bEFtPuTo56jORiVToYjpxU6dWQw1 l6FNryheC6df8Gsi/2kVTwa6xbQRsXJ3ymj77N3FKILoAagNCdgyTRz6hjQ/MFR5TNdH whFw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-52438-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52438-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com X-Forwarded-Encrypted: i=1; AJvYcCX6LkMaWKEw+XWChAdBjSNgn/VYaXtWVb3aj91+13QdMKAxW9rZYPyNGJP5+WeqwCQWV7FRelRQ5l6xpQvS+rtaDA7J8A== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id h10-20020aa7de0a000000b0056019f3c989si2658132edv.295.2024.02.05.02.52.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 02:52:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-52438-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-52438-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52438-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 22F251F21F3F for ; Mon, 5 Feb 2024 10:52:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6B09E18EC3; Mon, 5 Feb 2024 10:51:28 +0000 (UTC) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E102418B09; Mon, 5 Feb 2024 10:51:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.255 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707130285; cv=none; b=vFhmyVbAzEyR6ryAKPYEiqtEm77l4YLaAFEQPU5Dr50jT1tBDnhXBDgEwChLH41aj/u9gd76y+MlxTSHUUmpP9z2dy2XYTnRmsqLxDrU9dYodteK6e6D+2VmnJyb/WXMvSeSTCEXc/XWnp+rjlsFJlZMPT8GXDvhHdzdN+npLCk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707130285; c=relaxed/simple; bh=zXhNFh2+xXr1e0hsI3fbcJljeW6AybzYMKFixJq3avk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LGo7wKUjwKKWgwtVOTC9bkkaWEXvS6mYVrxhq8jseBNdMkdmASD+goIdQz9OCcAXImkcPJfatwl7QYQC8PjXrPBJbaF2yHocYuB78FLe+EUfdM0RNOBZzbeDgIZHVVEURCmaJ7lf3Z9eXtQ6SGD8gOhG/aRZj77lPm3VcIV1A5Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.255 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.194]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4TT36r29F1z1Q8kB; Mon, 5 Feb 2024 18:49:56 +0800 (CST) Received: from kwepemm600003.china.huawei.com (unknown [7.193.23.202]) by mail.maildlp.com (Postfix) with ESMTPS id B434B140118; Mon, 5 Feb 2024 18:51:14 +0800 (CST) Received: from ubuntu2204.huawei.com (10.67.174.22) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 5 Feb 2024 18:51:14 +0800 From: Yang Jihong To: , , , , , , , , , , CC: Subject: [PATCH 4/5] perf sched: Move curr_pid and cpu_last_switched initialization to perf_sched__{lat|map|replay}() Date: Mon, 5 Feb 2024 10:46:15 +0000 Message-ID: <20240205104616.132417-5-yangjihong1@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240205104616.132417-1-yangjihong1@huawei.com> References: <20240205104616.132417-1-yangjihong1@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm600003.china.huawei.com (7.193.23.202) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790055937784958969 X-GMAIL-MSGID: 1790055937784958969 The curr_pid and cpu_last_switched are used only for the 'perf sched replay/latency/map'. Put their initialization in perf_sched__{lat|map|replay () to reduce unnecessary actions in other commands. Simple functional testing: # perf sched record perf bench sched messaging # Running 'sched/messaging' benchmark: # 20 sender and receiver processes per group # 10 groups == 400 processes run Total time: 0.209 [sec] [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 16.456 MB perf.data (147907 samples) ] # perf sched lat ------------------------------------------------------------------------------------------------------------------------------------------- Task | Runtime ms | Switches | Avg delay ms | Max delay ms | Max delay start | Max delay end | ------------------------------------------------------------------------------------------------------------------------------------------- sched-messaging:(401) | 2990.699 ms | 38705 | avg: 0.661 ms | max: 67.046 ms | max start: 456532.624830 s | max end: 456532.691876 s qemu-system-x86:(7) | 179.764 ms | 2191 | avg: 0.152 ms | max: 21.857 ms | max start: 456532.576434 s | max end: 456532.598291 s sshd:48125 | 0.522 ms | 2 | avg: 0.037 ms | max: 0.046 ms | max start: 456532.514610 s | max end: 456532.514656 s ksoftirqd/11:82 | 0.063 ms | 1 | avg: 0.005 ms | max: 0.005 ms | max start: 456532.769366 s | max end: 456532.769371 s kworker/9:0-mm_:34624 | 0.233 ms | 20 | avg: 0.004 ms | max: 0.007 ms | max start: 456532.690804 s | max end: 456532.690812 s migration/13:93 | 0.000 ms | 1 | avg: 0.004 ms | max: 0.004 ms | max start: 456532.512669 s | max end: 456532.512674 s ----------------------------------------------------------------------------------------------------------------- TOTAL: | 3180.750 ms | 41368 | --------------------------------------------------- # echo $? 0 # perf sched map *A0 456532.510141 secs A0 => migration/0:15 *. 456532.510171 secs . => swapper:0 . *B0 456532.510261 secs B0 => migration/1:21 . *. 456532.510279 secs L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 *L7 . . . . 456532.785979 secs L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 *L7 . . . 456532.786054 secs L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 *L7 . . 456532.786127 secs L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 *L7 . 456532.786197 secs L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 L7 *L7 456532.786270 secs # echo $? 0 # perf sched replay run measurement overhead: 108 nsecs sleep measurement overhead: 66473 nsecs the run test took 1000002 nsecs the sleep test took 1082686 nsecs nr_run_events: 49334 nr_sleep_events: 50054 nr_wakeup_events: 34701 target-less wakeups: 165 multi-target wakeups: 766 task 0 ( swapper: 0), nr_events: 15419 task 1 ( swapper: 1), nr_events: 1 task 2 ( swapper: 2), nr_events: 1 task 715 ( sched-messaging: 110248), nr_events: 1438 task 716 ( sched-messaging: 110249), nr_events: 512 task 717 ( sched-messaging: 110250), nr_events: 500 task 718 ( sched-messaging: 110251), nr_events: 537 task 719 ( sched-messaging: 110252), nr_events: 823 ------------------------------------------------------------ #1 : 1325.288, ravg: 1325.29, cpu: 7823.35 / 7823.35 #2 : 1363.606, ravg: 1329.12, cpu: 7655.53 / 7806.56 #3 : 1349.494, ravg: 1331.16, cpu: 7544.80 / 7780.39 #4 : 1311.488, ravg: 1329.19, cpu: 7495.13 / 7751.86 #5 : 1309.902, ravg: 1327.26, cpu: 7266.65 / 7703.34 #6 : 1309.535, ravg: 1325.49, cpu: 7843.86 / 7717.39 #7 : 1316.482, ravg: 1324.59, cpu: 7854.41 / 7731.09 #8 : 1366.604, ravg: 1328.79, cpu: 7955.81 / 7753.57 #9 : 1326.286, ravg: 1328.54, cpu: 7466.86 / 7724.90 #10 : 1356.653, ravg: 1331.35, cpu: 7566.60 / 7709.07 # echo $? 0 Signed-off-by: Yang Jihong --- tools/perf/builtin-sched.c | 94 +++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 33 deletions(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 54d79e560617..af76366ec798 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -3167,14 +3167,44 @@ static void perf_sched__merge_lat(struct perf_sched *sched) } } +static int setup_cpus_switch_event(struct perf_sched *sched) +{ + unsigned int i; + + sched->cpu_last_switched = calloc(MAX_CPUS, sizeof(*(sched->cpu_last_switched))); + if (!sched->cpu_last_switched) + return -1; + + sched->curr_pid = malloc(MAX_CPUS * sizeof(*(sched->curr_pid))); + if (!sched->curr_pid) { + free(sched->cpu_last_switched); + return -1; + } + + for (i = 0; i < MAX_CPUS; i++) + sched->curr_pid[i] = -1; + + return 0; +} + +static void free_cpus_switch_event(struct perf_sched *sched) +{ + free(sched->curr_pid); + free(sched->cpu_last_switched); +} + static int perf_sched__lat(struct perf_sched *sched) { + int rc = -1; struct rb_node *next; setup_pager(); + if (setup_cpus_switch_event(sched)) + return rc; + if (perf_sched__read_events(sched)) - return -1; + goto out_free_cpus_switch_event; perf_sched__merge_lat(sched); perf_sched__sort_lat(sched); @@ -3203,7 +3233,11 @@ static int perf_sched__lat(struct perf_sched *sched) print_bad_events(sched); printf("\n"); - return 0; + rc = 0; + +out_free_cpus_switch_event: + free_cpus_switch_event(sched); + return rc; } static int setup_map_cpus(struct perf_sched *sched) @@ -3270,9 +3304,12 @@ static int perf_sched__map(struct perf_sched *sched) if (!sched->curr_thread) return rc; - if (setup_map_cpus(sched)) + if (setup_cpus_switch_event(sched)) goto out_free_curr_thread; + if (setup_map_cpus(sched)) + goto out_free_cpus_switch_event; + if (setup_color_pids(sched)) goto out_free_map_cpus; @@ -3296,6 +3333,9 @@ static int perf_sched__map(struct perf_sched *sched) free(sched->map.comp_cpus); perf_cpu_map__put(sched->map.cpus); +out_free_cpus_switch_event: + free_cpus_switch_event(sched); + out_free_curr_thread: free(sched->curr_thread); return rc; @@ -3309,6 +3349,10 @@ static int perf_sched__replay(struct perf_sched *sched) mutex_init(&sched->start_work_mutex); mutex_init(&sched->work_done_wait_mutex); + ret = setup_cpus_switch_event(sched); + if (ret) + goto out_mutex_destroy; + calibrate_run_measurement_overhead(sched); calibrate_sleep_measurement_overhead(sched); @@ -3316,7 +3360,7 @@ static int perf_sched__replay(struct perf_sched *sched) ret = perf_sched__read_events(sched); if (ret) - goto out_mutex_destroy; + goto out_free_cpus_switch_event; printf("nr_run_events: %ld\n", sched->nr_run_events); printf("nr_sleep_events: %ld\n", sched->nr_sleep_events); @@ -3342,6 +3386,9 @@ static int perf_sched__replay(struct perf_sched *sched) sched->thread_funcs_exit = true; destroy_tasks(sched); +out_free_cpus_switch_event: + free_cpus_switch_event(sched); + out_mutex_destroy: mutex_destroy(&sched->start_work_mutex); mutex_destroy(&sched->work_done_wait_mutex); @@ -3580,21 +3627,7 @@ int cmd_sched(int argc, const char **argv) .switch_event = replay_switch_event, .fork_event = replay_fork_event, }; - unsigned int i; - int ret = 0; - - sched.cpu_last_switched = calloc(MAX_CPUS, sizeof(*sched.cpu_last_switched)); - if (!sched.cpu_last_switched) { - ret = -ENOMEM; - goto out; - } - sched.curr_pid = malloc(MAX_CPUS * sizeof(*sched.curr_pid)); - if (!sched.curr_pid) { - ret = -ENOMEM; - goto out; - } - for (i = 0; i < MAX_CPUS; i++) - sched.curr_pid[i] = -1; + int ret; argc = parse_options_subcommand(argc, argv, sched_options, sched_subcommands, sched_usage, PARSE_OPT_STOP_AT_NON_OPTION); @@ -3605,9 +3638,9 @@ int cmd_sched(int argc, const char **argv) * Aliased to 'perf script' for now: */ if (!strcmp(argv[0], "script")) { - ret = cmd_script(argc, argv); + return cmd_script(argc, argv); } else if (strlen(argv[0]) > 2 && strstarts("record", argv[0])) { - ret = __cmd_record(argc, argv); + return __cmd_record(argc, argv); } else if (strlen(argv[0]) > 2 && strstarts("latency", argv[0])) { sched.tp_handler = &lat_ops; if (argc > 1) { @@ -3616,7 +3649,7 @@ int cmd_sched(int argc, const char **argv) usage_with_options(latency_usage, latency_options); } setup_sorting(&sched, latency_options, latency_usage); - ret = perf_sched__lat(&sched); + return perf_sched__lat(&sched); } else if (!strcmp(argv[0], "map")) { if (argc) { argc = parse_options(argc, argv, map_options, map_usage, 0); @@ -3625,7 +3658,7 @@ int cmd_sched(int argc, const char **argv) } sched.tp_handler = &map_ops; setup_sorting(&sched, latency_options, latency_usage); - ret = perf_sched__map(&sched); + return perf_sched__map(&sched); } else if (strlen(argv[0]) > 2 && strstarts("replay", argv[0])) { sched.tp_handler = &replay_ops; if (argc) { @@ -3633,7 +3666,7 @@ int cmd_sched(int argc, const char **argv) if (argc) usage_with_options(replay_usage, replay_options); } - ret = perf_sched__replay(&sched); + return perf_sched__replay(&sched); } else if (!strcmp(argv[0], "timehist")) { if (argc) { argc = parse_options(argc, argv, timehist_options, @@ -3649,21 +3682,16 @@ int cmd_sched(int argc, const char **argv) parse_options_usage(NULL, timehist_options, "w", true); if (sched.show_next) parse_options_usage(NULL, timehist_options, "n", true); - ret = -EINVAL; - goto out; + return -EINVAL; } ret = symbol__validate_sym_arguments(); if (ret) - goto out; + return ret; - ret = perf_sched__timehist(&sched); + return perf_sched__timehist(&sched); } else { usage_with_options(sched_usage, sched_options); } -out: - free(sched.curr_pid); - free(sched.cpu_last_switched); - - return ret; + return 0; } From patchwork Mon Feb 5 10:46:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 196732 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp793892dyb; Mon, 5 Feb 2024 02:52:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IHnvEgOR6YGeVGypc1lz7V7zYw4EohYz7r6Aj8Odl5zP17h+QyDl2n0n+nRdi8RWn9uFxCI X-Received: by 2002:a17:906:3005:b0:a37:3668:be0 with SMTP id 5-20020a170906300500b00a3736680be0mr6177750ejz.1.1707130360974; Mon, 05 Feb 2024 02:52:40 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707130360; cv=pass; d=google.com; s=arc-20160816; b=ppv/P/WGBtNLjlWvpXuYT4nbF9/b5edcrIVPYgSNsnwsQu9IQmkyYXQgfA7xe4BbPC bWR8Py6Mr1vCTY9f/MpMjdlCEsY8Y8dP4T7EIBgvE7CYcrY68fxpz6E3TDbopiQyHrZP 5KcXOoWZn3x4QQF+ZSuP1AlSrzJJtiq/6UkOamzLgcMHPAq5jSLX25670KJeB3o2tUGc bwFrhiSL2zPJxgl4hpXAi6mLJO/z3/okZNUrkTmu2NCKN0M8X43gqKyr+ppcsYPwbItP oyZbt3bbumyANktAYxS34/hdZoCFR4s3L7PEUbVY67pmzq1AUc7N93abz9q3mwlbSA8s Ofqg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=b8HiQt/mbgboEAPU+LRiqCJPRgx9bTtuu7C53L0HKFE=; fh=IBj4my2SDMfD86u184HBlmzFVlO4Fv5Ljg9d4VmtSnk=; b=girqlOQ0wNDV4dCyCJpP/5LBLUJzb0PiaFiQcKdCbWmUAThTTENoKQmBpcjiL40Ml/ NQStHdXREw6Z6jSG07Mi56eTJ5BPPm7QRJcPBs9TMg0qrXrDHftMbF4fflKMw3eW7TB3 QoYcLCpWa8i1hfc4uu2JGrCcdtV3E5J3+ImmogXL0Q2THJDXq9bCiHh+yMKxuZMyftYB 4IvAt0x+nbhLzRIY7b9b0esJCGeARy+w6jlqzDJxUBkfUKhnpMcZ746jd3yZyA4JkIYI NSV69s2q8wHM4qfVi+I4xFPtDeH6HxrSPN6JyoemaQLbONhiPbXjjdjN8tYYuj6mv1V8 u0Og==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-52437-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52437-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com X-Forwarded-Encrypted: i=1; AJvYcCX3SUdccZmWmUUI67ma4iNsg1/aO0iuil/rAzbWY/XWsVNE03e2EC61uaRltAJXix2VEGHp7MbCaj6aXLr3xsNrS7t4GQ== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id b22-20020a170906039600b00a3671d5fd31si4019431eja.991.2024.02.05.02.52.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 02:52:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-52437-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-52437-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52437-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 8CBF01F21F3D for ; Mon, 5 Feb 2024 10:52:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3E03818E0E; Mon, 5 Feb 2024 10:51:26 +0000 (UTC) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B9AFC18B02; Mon, 5 Feb 2024 10:51:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707130284; cv=none; b=BQ0VhfDsvyxtGve3b/ILs/m40soq/d016zMtCf0YhBxoDAgC7ZXJ9t39jcfunHlAhbks53YZOWBncr3P68ck91+O997y5sANi7LsJcftxZ6NWfir4Zd2pYIJJ9CDOSXiF7hUnwyuLMnyzcOiEqGtYJi+41fkB74ozgzMLyD7GS4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707130284; c=relaxed/simple; bh=OC9l7go2HEf2topboS2tyvTMicjsAYygRox3AWA4BNs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=d9xprKaDbNptmRGJ3IgtOPyAg39DR8pJ749wqkp/W7AoOwratcqkieqqV7ksTL2chPAD2t61Dkrq4u7/3yTQDUQZV/nyDLImnBu1WTAiVJABzktXkgOT77KEnezyZITDXuqDoIs+uodJ/ECKBLKh7/xkm5yUioop15Pr7KaYoYA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4TT37p4L2GzLnZD; Mon, 5 Feb 2024 18:50:46 +0800 (CST) Received: from kwepemm600003.china.huawei.com (unknown [7.193.23.202]) by mail.maildlp.com (Postfix) with ESMTPS id 3A136140134; Mon, 5 Feb 2024 18:51:15 +0800 (CST) Received: from ubuntu2204.huawei.com (10.67.174.22) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 5 Feb 2024 18:51:14 +0800 From: Yang Jihong To: , , , , , , , , , , CC: Subject: [PATCH 5/5] perf thread_map: Free strlist on normal path in thread_map__new_by_tid_str() Date: Mon, 5 Feb 2024 10:46:16 +0000 Message-ID: <20240205104616.132417-6-yangjihong1@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240205104616.132417-1-yangjihong1@huawei.com> References: <20240205104616.132417-1-yangjihong1@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm600003.china.huawei.com (7.193.23.202) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790055925613091984 X-GMAIL-MSGID: 1790055925613091984 slist needs to be freed in both error path and normal path in thread_map__new_by_tid_str(). Signed-off-by: Yang Jihong Reviewed-by: Arnaldo Carvalho de Melo --- tools/perf/util/thread_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/thread_map.c b/tools/perf/util/thread_map.c index e848579e61a8..ea3b431b9783 100644 --- a/tools/perf/util/thread_map.c +++ b/tools/perf/util/thread_map.c @@ -280,13 +280,13 @@ struct perf_thread_map *thread_map__new_by_tid_str(const char *tid_str) threads->nr = ntasks; } out: + strlist__delete(slist); if (threads) refcount_set(&threads->refcnt, 1); return threads; out_free_threads: zfree(&threads); - strlist__delete(slist); goto out; }