From nobody Tue Jun 30 11:49:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EB4EC433EF for ; Mon, 17 Jan 2022 16:10:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240873AbiAQQKF (ORCPT ); Mon, 17 Jan 2022 11:10:05 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:50790 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240833AbiAQQJw (ORCPT ); Mon, 17 Jan 2022 11:09:52 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1404FB810F8; Mon, 17 Jan 2022 16:09:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14861C36AEC; Mon, 17 Jan 2022 16:09:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642435789; bh=TNg8IZ8rkhC/yp1VTmeue3vqYFJfk93+PZ5cIltGfWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C7HOIOLwOJ19xfXpnk/nBlOW79lKeHoFTEtvCEGzu79CgMwyyqUeC8YHH26dr6ZLB Ox13/Lxw+AqNW3IR5XNj56DmCOV2EfYN+869K4t5LWOpb2HumpCbCYWQmm3K5LgyHM D2c/AkdAkX5quNjZl5SS4eyLATNyGtW+zHP8gF9VkJuknSG4QCVZI1ZX35vPD+u9VA AMPhSchEy8w0eAO0QcpGtEXdXswnpt4hLtgcQaUpA0Z52eCroIiIqYnHYJ/I5FkZDY UsGwk8/d0X3mNdaUGzDKzR+4msayD7bZWbJJoBLPTQBeaNMiXOeSxQfHN8xi34r//T h2LwnYbIV9Wqg== From: Arnaldo Carvalho de Melo To: Andi Kleen Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , Ian Rogers , Jiri Olsa , Namhyung Kim Subject: [PATCH 1/4] perf affinity: Allow passing a NULL arg to affinity__cleanup() Date: Mon, 17 Jan 2022 13:09:28 -0300 Message-Id: <20220117160931.1191712-2-acme@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220117160931.1191712-1-acme@kernel.org> References: <20220117160931.1191712-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo Just like with free(), NULL is checked to avoid having all callers do it. Its convenient for when not using affinity setup/cleanup for dummy CPU maps, i.e. CPU maps for pid targets. Cc: Adrian Hunter Cc: Andi Kleen Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Signed-off-by: Arnaldo Carvalho de Melo Acked-by: Ian Rogers --- tools/perf/util/affinity.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/affinity.c b/tools/perf/util/affinity.c index f1e30d566db3c835..4d216c0dc4259b9e 100644 --- a/tools/perf/util/affinity.c +++ b/tools/perf/util/affinity.c @@ -62,7 +62,7 @@ void affinity__set(struct affinity *a, int cpu) clear_bit(cpu, a->sched_cpus); } =20 -void affinity__cleanup(struct affinity *a) +static void __affinity__cleanup(struct affinity *a) { int cpu_set_size =3D get_cpu_set_size(); =20 @@ -71,3 +71,9 @@ void affinity__cleanup(struct affinity *a) zfree(&a->sched_cpus); zfree(&a->orig_cpus); } + +void affinity__cleanup(struct affinity *a) +{ + if (a !=3D NULL) + __affinity__cleanup(a); +} --=20 2.34.1 From nobody Tue Jun 30 11:49:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3713C433FE for ; Mon, 17 Jan 2022 16:10:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240923AbiAQQKO (ORCPT ); Mon, 17 Jan 2022 11:10:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240834AbiAQQJx (ORCPT ); Mon, 17 Jan 2022 11:09:53 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD879C06161C; Mon, 17 Jan 2022 08:09:52 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7E338610A2; Mon, 17 Jan 2022 16:09:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37B40C36AE7; Mon, 17 Jan 2022 16:09:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642435791; bh=ZSQ5ho0teCkT9pTWbslhru7s+LtfklfD3T7qG27l5r8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZV8x33dGIDyobz5SQtQamWq6q+v8HEA9zisI3K36ZHlyh6m0C7ISw/gs4h9iSlPtz STcHcuplBufxZTFFDXK4NTzc5Fnu/b7ZcdOPYswLKGIbLwHO7oEvd3q2rvXTGWQMD4 GgqHU8TMX3NvjHPH6c8UZJnzAV9PgBwPB1EZBy4cs/PkEwfEmwqp5KS13g3Dt7Jr83 ggqhD/gnwc2aYEEdkmXbizA4/WrxjnCiuvnM1XZDcKFAlCBy/72rjtbEbpIhCPiubH Nj8pN0H+Dsj/+fTdZFdRHvMGLtKzni2L72O5a/ch2GMg4m4La9oS4l91JuP+MVwJU8 ebwPHD05MJf3Q== From: Arnaldo Carvalho de Melo To: Andi Kleen Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , Ian Rogers , Jiri Olsa , Namhyung Kim Subject: [PATCH 2/4] perf stat: No need to setup affinities when starting a workload Date: Mon, 17 Jan 2022 13:09:29 -0300 Message-Id: <20220117160931.1191712-3-acme@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220117160931.1191712-1-acme@kernel.org> References: <20220117160931.1191712-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo I.e. the simple: $ perf stat sleep 1 Uses a dummy CPU map and thus there is no need to setup/cleanup affinities to avoid IPIs, etc. With this we're down to a sched_getaffinity() call, in the libnuma initialization, that probably can be removed in a followup patch. Cc: Adrian Hunter Cc: Andi Kleen Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Signed-off-by: Arnaldo Carvalho de Melo Acked-by: Ian Rogers --- tools/perf/builtin-stat.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 973ade18b72a9479..934e992c966fb950 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -788,7 +788,7 @@ static int __run_perf_stat(int argc, const char **argv,= int run_idx) const bool forks =3D (argc > 0); bool is_pipe =3D STAT_RECORD ? perf_stat.data.is_pipe : false; struct evlist_cpu_iterator evlist_cpu_itr; - struct affinity affinity; + struct affinity saved_affinity, *affinity =3D NULL; int err; bool second_pass =3D false; =20 @@ -803,8 +803,11 @@ static int __run_perf_stat(int argc, const char **argv= , int run_idx) if (group) evlist__set_leader(evsel_list); =20 - if (affinity__setup(&affinity) < 0) - return -1; + if (!cpu_map__is_dummy(evsel_list->core.cpus)) { + if (affinity__setup(&saved_affinity) < 0) + return -1; + affinity =3D &saved_affinity; + } =20 evlist__for_each_entry(evsel_list, counter) { if (bpf_counter__load(counter, &target)) @@ -813,7 +816,7 @@ static int __run_perf_stat(int argc, const char **argv,= int run_idx) all_counters_use_bpf =3D false; } =20 - evlist__for_each_cpu(evlist_cpu_itr, evsel_list, &affinity) { + evlist__for_each_cpu(evlist_cpu_itr, evsel_list, affinity) { counter =3D evlist_cpu_itr.evsel; =20 /* @@ -869,7 +872,7 @@ static int __run_perf_stat(int argc, const char **argv,= int run_idx) */ =20 /* First close errored or weak retry */ - evlist__for_each_cpu(evlist_cpu_itr, evsel_list, &affinity) { + evlist__for_each_cpu(evlist_cpu_itr, evsel_list, affinity) { counter =3D evlist_cpu_itr.evsel; =20 if (!counter->reset_group && !counter->errored) @@ -878,7 +881,7 @@ static int __run_perf_stat(int argc, const char **argv,= int run_idx) perf_evsel__close_cpu(&counter->core, evlist_cpu_itr.cpu_map_idx); } /* Now reopen weak */ - evlist__for_each_cpu(evlist_cpu_itr, evsel_list, &affinity) { + evlist__for_each_cpu(evlist_cpu_itr, evsel_list, affinity) { counter =3D evlist_cpu_itr.evsel; =20 if (!counter->reset_group && !counter->errored) @@ -904,7 +907,7 @@ static int __run_perf_stat(int argc, const char **argv,= int run_idx) counter->supported =3D true; } } - affinity__cleanup(&affinity); + affinity__cleanup(affinity); =20 evlist__for_each_entry(evsel_list, counter) { if (!counter->supported) { --=20 2.34.1 From nobody Tue Jun 30 11:49:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76CB8C433F5 for ; Mon, 17 Jan 2022 16:10:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240868AbiAQQKH (ORCPT ); Mon, 17 Jan 2022 11:10:07 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:51384 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240847AbiAQQJz (ORCPT ); Mon, 17 Jan 2022 11:09:55 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9F99360F6D; Mon, 17 Jan 2022 16:09:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B67DC36AEF; Mon, 17 Jan 2022 16:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642435794; bh=ubLJ8zz+8eHFt3h+XlUNz0LmFutPStnoY3JZl/R2y0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qj39zzVuLpO8szOsubUtMREPkqTKG59CvCBBGJHrcP7bEf8KH6eoWlOPoi8GgYPct kUvBOTT9kKSoxDpSqddmIkXEe1tYXZnzm52q8MKW1JQJ7YSF2WyCSkG5O97CLuUJ7F M1vhr3bbVgRh6FaL6BLionH6OadAn23gaYxZidUZmFmHXtqI3DztEFeAac4lPdoOS0 vxu8rX7/hkOpgL1Ee7+Ox8xlJgbWLVNx9ivW4R01Q5qo1rFDyw9Y0iJd+CjGo4ExkB WrTiTUTNtHvlMk7SRoA7ZUZsv7Sx3zahhyKJuzy+cAEPPUWPAZeGf64/biniicP0fa icnt86qlS1JLg== From: Arnaldo Carvalho de Melo To: Andi Kleen Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , Ian Rogers , Jiri Olsa , Namhyung Kim Subject: [PATCH 3/4] perf evlist: No need to setup affinities when enabling events for pid targets Date: Mon, 17 Jan 2022 13:09:30 -0300 Message-Id: <20220117160931.1191712-4-acme@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220117160931.1191712-1-acme@kernel.org> References: <20220117160931.1191712-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo When the target is a pid, not started by 'perf stat' we need to enable the events, and in that case there is no need to setup affinities as we use a dummy CPU map, with just one entry set to -1. So stop doing it to avoid this needless call to sched_getaffinity(): # strace -ke sched_getaffinity perf stat -e cycles -p 241957 sleep 1 sched_getaffinity(0, 512, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, = 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31]) = =3D 8 > /usr/lib64/libc-2.33.so(sched_getaffinity@@GLIBC_2.3.4+0x1a) [0xe6eea] > /var/home/acme/bin/perf(affinity__setup+0x6a) [0x5329ca] > /var/home/acme/bin/perf(__evlist__enable.constprop.0+0x23) [0x4b9693] > /var/home/acme/bin/perf(enable_counters+0x14d) [0x42de5d] > /var/home/acme/bin/perf(cmd_stat+0x2358) [0x4310c8] > /var/home/acme/bin/perf(run_builtin+0x6a) [0x4a2cfa] > /var/home/acme/bin/perf(main+0x612) [0x40f8c2] > /usr/lib64/libc-2.33.so(__libc_start_main+0xd4) [0x27b74] > /var/home/acme/bin/perf(_start+0x2d) [0x40fadd] Cc: Adrian Hunter Cc: Andi Kleen Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Signed-off-by: Arnaldo Carvalho de Melo Acked-by: Ian Rogers --- tools/perf/util/evlist.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 6e88d404b5b3e96f..ae6d4363da76ec56 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -487,12 +487,16 @@ static void __evlist__enable(struct evlist *evlist, c= har *evsel_name) { struct evsel *pos; struct evlist_cpu_iterator evlist_cpu_itr; - struct affinity affinity; + struct affinity saved_affinity, *affinity =3D NULL; =20 - if (affinity__setup(&affinity) < 0) - return; + // See explanation in evlist__close() + if (!cpu_map__is_dummy(evlist->core.cpus)) { + if (affinity__setup(&saved_affinity) < 0) + return; + affinity =3D &saved_affinity; + } =20 - evlist__for_each_cpu(evlist_cpu_itr, evlist, &affinity) { + evlist__for_each_cpu(evlist_cpu_itr, evlist, affinity) { pos =3D evlist_cpu_itr.evsel; if (evsel__strcmp(pos, evsel_name)) continue; @@ -500,7 +504,7 @@ static void __evlist__enable(struct evlist *evlist, cha= r *evsel_name) continue; evsel__enable_cpu(pos, evlist_cpu_itr.cpu_map_idx); } - affinity__cleanup(&affinity); + affinity__cleanup(affinity); evlist__for_each_entry(evlist, pos) { if (evsel__strcmp(pos, evsel_name)) continue; --=20 2.34.1 From nobody Tue Jun 30 11:49:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA896C433EF for ; Mon, 17 Jan 2022 16:10:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237565AbiAQQKN (ORCPT ); Mon, 17 Jan 2022 11:10:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240817AbiAQQJ5 (ORCPT ); Mon, 17 Jan 2022 11:09:57 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C6B0C061574; Mon, 17 Jan 2022 08:09:57 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CB54F61113; Mon, 17 Jan 2022 16:09:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8159BC36AE7; Mon, 17 Jan 2022 16:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642435796; bh=LZwn1ndSplo/urrra+IACTj986KAuq6IFBR0er5UYCY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cl6tipUcpsWOrfI1eKIkXk+GNJLDJ6qBH17gp56f0j+/CKaI7rVq+c0KKrElqCI5P GfwmKX5JhmUUWxb/JuL3qNyoBxIvoSP31Q4okJrz010h4h4l9URushK7tHAjH+v943 5qET9SCobqVDOBq2ou4SzN2WF8OUaWwH6DF4MxePqhi5zAcqfBuqu09JAD0YRE6PhZ 9jfdouEju8OdxPm29CtaVYvKsloMc+ybkl/liJ/VJitFkmJqONaOHJPWVpdZR5v8m2 Da4RGtv5KNY3uPTAN3Up6DoOu91u8jYhm/YAtoYhy8n4NsvFGf3dVKr/eKqHIgMIVt U4xmY1EtPiVgg== From: Arnaldo Carvalho de Melo To: Andi Kleen Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , Ian Rogers , Jiri Olsa , Namhyung Kim Subject: [PATCH 4/4] perf evlist: No need to setup affinities when disabling events for pid targets Date: Mon, 17 Jan 2022 13:09:31 -0300 Message-Id: <20220117160931.1191712-5-acme@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220117160931.1191712-1-acme@kernel.org> References: <20220117160931.1191712-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo When the target is a pid, not started by 'perf stat' we need to disable the events, and in that case there is no need to setup affinities as we use a dummy CPU map, with just one entry set to -1. So stop doing it to avoid this needless call to sched_getaffinity(): # strace -ke sched_getaffinity perf stat -e cycles -p 241957 sleep 1 sched_getaffinity(0, 512, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, = 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31]) = =3D 8 > /usr/lib64/libc-2.33.so(sched_getaffinity@@GLIBC_2.3.4+0x1a) [0xe6eea] > /var/home/acme/bin/perf(affinity__setup+0x6a) [0x532a2a] > /var/home/acme/bin/perf(__evlist__disable.constprop.0+0x27) [0x4b9827] > /var/home/acme/bin/perf(cmd_stat+0x29b5) [0x431725] > /var/home/acme/bin/perf(run_builtin+0x6a) [0x4a2cfa] > /var/home/acme/bin/perf(main+0x612) [0x40f8c2] > /usr/lib64/libc-2.33.so(__libc_start_main+0xd4) [0x27b74] > /var/home/acme/bin/perf(_start+0x2d) [0x40fadd] Cc: Adrian Hunter Cc: Andi Kleen Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Signed-off-by: Arnaldo Carvalho de Melo Acked-by: Ian Rogers --- tools/perf/util/evlist.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index ae6d4363da76ec56..eaad04e1672a4752 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -430,15 +430,19 @@ static void __evlist__disable(struct evlist *evlist, = char *evsel_name) { struct evsel *pos; struct evlist_cpu_iterator evlist_cpu_itr; - struct affinity affinity; + struct affinity saved_affinity, *affinity =3D NULL; bool has_imm =3D false; =20 - if (affinity__setup(&affinity) < 0) - return; + // See explanation in evlist__close() + if (!cpu_map__is_dummy(evlist->core.cpus)) { + if (affinity__setup(&saved_affinity) < 0) + return; + affinity =3D &saved_affinity; + } =20 /* Disable 'immediate' events last */ for (int imm =3D 0; imm <=3D 1; imm++) { - evlist__for_each_cpu(evlist_cpu_itr, evlist, &affinity) { + evlist__for_each_cpu(evlist_cpu_itr, evlist, affinity) { pos =3D evlist_cpu_itr.evsel; if (evsel__strcmp(pos, evsel_name)) continue; @@ -454,7 +458,7 @@ static void __evlist__disable(struct evlist *evlist, ch= ar *evsel_name) break; } =20 - affinity__cleanup(&affinity); + affinity__cleanup(affinity); evlist__for_each_entry(evlist, pos) { if (evsel__strcmp(pos, evsel_name)) continue; --=20 2.34.1