From mboxrd@z Thu Jan 1 00:00:00 1970 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 DB8F3C433F5 for ; Mon, 10 Jan 2022 19:06:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243113AbiAJTGb (ORCPT ); Mon, 10 Jan 2022 14:06:31 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:59850 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243115AbiAJTGa (ORCPT ); Mon, 10 Jan 2022 14:06:30 -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 69C5BB81780; Mon, 10 Jan 2022 19:06:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14156C36AE9; Mon, 10 Jan 2022 19:06:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1641841588; bh=4zzAcLgdq9DkpcnpCCY22+jkfUyytnRZHAHbnXa/7L0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=UJbXyE2Qm090IHaFqPRtqentqzgBE24zpL9ahTLxr2FNAP/no1lr94LvQG8bQGR1h SocASsttLSKxiJIenogdRnMr/SQVD6lOhqIJRmoZdkybtE87zf5fwYTQkssJG2qd0Y XIVcdOnPPlNU5A2u0tWU6qUkH1drELbPJGNMM+NCtGDHIm04HQqFnu4OyGQIKOLW5V X5HCdcpvAtyizvFktrDvDBtDgWK2yk0m/EWSB1Q1qGDfA13UCh8Kf8IE0EFBZzVVBg fHr1JGHm+0eotqJqqIXZm+7JuxYosarGxzd1n494UFi3GYuSbzs3VpVzFFJyz64qxY EHL0el0s8sK1A== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 6CF3540B92; Mon, 10 Jan 2022 16:06:26 -0300 (-03) Date: Mon, 10 Jan 2022 16:06:26 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: Andi Kleen , Jiri Olsa , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Vineet Singh , James Clark , Mathieu Poirier , Suzuki K Poulose , Mike Leach , Leo Yan , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, zhengjun.xing@intel.com, eranian@google.com Subject: Re: [PATCH v4 17/48] perf cpumap: Remove cpu_map__cpu, use libperf function. Message-ID: References: <20220105061351.120843-1-irogers@google.com> <20220105061351.120843-18-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Url: http://acmel.wordpress.com Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Em Mon, Jan 10, 2022 at 04:04:08PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Mon, Jan 10, 2022 at 04:02:49PM -0300, Arnaldo Carvalho de Melo escreveu: > > Em Tue, Jan 04, 2022 at 10:13:20PM -0800, Ian Rogers escreveu: > > > Switch the remaining few users of cpu_map__cpu to perf_cpu_map__cpu and > > > remove the function. > > > > > > Reviewed-by: James Clark > > > Signed-off-by: Ian Rogers > > > > util/bpf_ftrace.c: In function ‘perf_ftrace__latency_prepare_bpf’: > > util/bpf_ftrace.c:66:31: error: implicit declaration of function ‘cpu_map__cpu’; did you mean ‘cpu_map__has’? [-Werror=implicit-function-declaration] > > 66 | cpu = cpu_map__cpu(ftrace->evlist->core.cpus, i); > > | ^~~~~~~~~~~~ > > | cpu_map__has > > cc1: all warnings being treated as errors > > make[4]: *** [/var/home/acme/git/perf/tools/build/Makefile.build:96: /tmp/build/perf/util/bpf_ftrace.o] Error 1 > > make[4]: *** Waiting for unfinished jobs.... > > LD /tmp/build/perf/ui/browsers/perf-in.o > > LD /tmp/build/perf/ui/perf-in.o > > LD /tmp/build/perf/util/scripting-engines/perf-in.o > > make[3]: *** [/var/home/acme/git/perf/tools/build/Makefile.build:139: util] Error 2 > > make[2]: *** [Makefile.perf:665: /tmp/build/perf/perf-in.o] Error 2 > > make[2]: *** Waiting for unfinished jobs.... > > make[1]: *** [Makefile.perf:240: sub-make] Error 2 > > make: *** [Makefile:113: install-bin] Error 2 > > make: Leaving directory '/var/home/acme/git/perf/tools/perf' > > > > Performance counter stats for 'make -k BUILD_BPF_SKEL=1 CORESIGHT=1 PYTHON=python3 O=/tmp/build/perf -C tools/perf install-bin': > > > > 163,635,422,196 cycles:u > > 213,602,262,800 instructions:u # 1.31 insn per cycle > > > > 3.804738555 seconds time elapsed > > > > 40.622581000 seconds user > > 6.589980000 seconds sys > > > > > > ⬢[acme@toolbox perf]$ git log --oneline -1 > > dfe103e757aeff79 (HEAD) perf cpumap: Remove cpu_map__cpu, use libperf function. > > > > This is the first breakage, trying to fix now. > > ⬢[acme@toolbox perf]$ find tools/perf/ -name "*.c" | xargs grep -w cpu_map__cpu > tools/perf/util/bpf_ftrace.c: cpu = cpu_map__cpu(ftrace->evlist->core.cpus, i); > ⬢[acme@toolbox perf]$ > > Only this one remaining, so just moving to perf_cpu_map__cpu() like done > elsewhere in this patch. > ⬢[acme@toolbox perf]$ git diff diff --git a/tools/perf/util/bpf_ftrace.c b/tools/perf/util/bpf_ftrace.c index f00a2de6778ccb97..28dc4c60c7884818 100644 --- a/tools/perf/util/bpf_ftrace.c +++ b/tools/perf/util/bpf_ftrace.c @@ -63,7 +63,7 @@ int perf_ftrace__latency_prepare_bpf(struct perf_ftrace *ftrace) fd = bpf_map__fd(skel->maps.cpu_filter); for (i = 0; i < ncpus; i++) { - cpu = cpu_map__cpu(ftrace->evlist->core.cpus, i); + cpu = perf_cpu_map__cpu(ftrace->evlist->core.cpus, i); bpf_map_update_elem(fd, &cpu, &val, BPF_ANY); } } ⬢[acme@toolbox perf]$ From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CC630C433EF for ; Mon, 10 Jan 2022 19:07:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=E/xB1mTsZW8Je5a8ecR6s53AAKx+jqNmbCLPXIDNpZ8=; b=1Cy6y3sKXkkITu 5TfSn7vOt7wwVX4Iqz+Ryo+6qHhk6jwOh9Aue9oGORuDN2i0yDInMZAbWE07IKmeXemN47V4jv+um eNsvJdHRAulL+c4a9lmHth9Bd56eeZIp6kwkM2A4cA5KzNOIzjtStgI9Ir+ZatvPqHmeuDRzEArDl tmReObKsky8GzvHp10DcaTqy90V11gJo2HqUpL4ReMFgIh9bqKQTP7dzIxWXtj2xdkWRZyaQUBemI KBYNKahNyd2FtOsfgpaXqcPZltpq8CYSJvKj/B/Uu2I/XPnab8X1C08etTjzwtYU46q03A9SK69Le VUd5BPy5i+slKxYBmO+Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7001-00CwNp-6e; Mon, 10 Jan 2022 19:06:33 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n6zzy-00CwNF-My for linux-arm-kernel@bombadil.infradead.org; Mon, 10 Jan 2022 19:06:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=In-Reply-To:Content-Transfer-Encoding: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date: Sender:Reply-To:Content-ID:Content-Description; bh=FFhN7EwOp6HFfDIy1ogFOE+hhYF9Fh9CBaousHVl2K8=; b=cEYlwF96EcAi8K+Zfpsra9IEOJ 4NQzO8y9/gzOjp2WW3Qqk8y8icqHftZTt/FPQFf/yEX9wvMQ6FcHzIcKA6AHBGLFVqU1gPEYpeq2G /GqXJ4nbAUX48q/dSuhdKLPOn5K3/bo7K0IURPcxybHrFeKARi9KIlO1CWQIf7R9dtsvQJSn6yRoa CTZCdtKvWAN6JFvZqh5cX0oAaAT9E42M4b7BHev1Pr/lcESPOlcCvumvfiOE1ZkUFutdhZ8sv8PDh 5ni8DUTqb3jbPN0rZ/OiBetjS5/tQqhdy3qqr0ivsuCabkgE4jcHTpdvBByF47g5ztvudIcfzqS8p oWqKB5iA==; Received: from [179.97.37.151] (helo=quaco.ghostprotocols.net) by desiato.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1n6zzw-000RVE-VA; Mon, 10 Jan 2022 19:06:29 +0000 Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 6CF3540B92; Mon, 10 Jan 2022 16:06:26 -0300 (-03) Date: Mon, 10 Jan 2022 16:06:26 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: Andi Kleen , Jiri Olsa , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Vineet Singh , James Clark , Mathieu Poirier , Suzuki K Poulose , Mike Leach , Leo Yan , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, zhengjun.xing@intel.com, eranian@google.com Subject: Re: [PATCH v4 17/48] perf cpumap: Remove cpu_map__cpu, use libperf function. Message-ID: References: <20220105061351.120843-1-irogers@google.com> <20220105061351.120843-18-irogers@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Url: http://acmel.wordpress.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RW0gTW9uLCBKYW4gMTAsIDIwMjIgYXQgMDQ6MDQ6MDhQTSAtMDMwMCwgQXJuYWxkbyBDYXJ2YWxo byBkZSBNZWxvIGVzY3JldmV1Ogo+IEVtIE1vbiwgSmFuIDEwLCAyMDIyIGF0IDA0OjAyOjQ5UE0g LTAzMDAsIEFybmFsZG8gQ2FydmFsaG8gZGUgTWVsbyBlc2NyZXZldToKPiA+IEVtIFR1ZSwgSmFu IDA0LCAyMDIyIGF0IDEwOjEzOjIwUE0gLTA4MDAsIElhbiBSb2dlcnMgZXNjcmV2ZXU6Cj4gPiA+ IFN3aXRjaCB0aGUgcmVtYWluaW5nIGZldyB1c2VycyBvZiBjcHVfbWFwX19jcHUgdG8gcGVyZl9j cHVfbWFwX19jcHUgYW5kCj4gPiA+IHJlbW92ZSB0aGUgZnVuY3Rpb24uCj4gPiA+IAo+ID4gPiBS ZXZpZXdlZC1ieTogSmFtZXMgQ2xhcmsgPGphbWVzLmNsYXJrQGFybS5jb20+Cj4gPiA+IFNpZ25l ZC1vZmYtYnk6IElhbiBSb2dlcnMgPGlyb2dlcnNAZ29vZ2xlLmNvbT4KPiA+IAo+ID4gdXRpbC9i cGZfZnRyYWNlLmM6IEluIGZ1bmN0aW9uIOKAmHBlcmZfZnRyYWNlX19sYXRlbmN5X3ByZXBhcmVf YnBm4oCZOgo+ID4gdXRpbC9icGZfZnRyYWNlLmM6NjY6MzE6IGVycm9yOiBpbXBsaWNpdCBkZWNs YXJhdGlvbiBvZiBmdW5jdGlvbiDigJhjcHVfbWFwX19jcHXigJk7IGRpZCB5b3UgbWVhbiDigJhj cHVfbWFwX19oYXPigJk/IFstV2Vycm9yPWltcGxpY2l0LWZ1bmN0aW9uLWRlY2xhcmF0aW9uXQo+ ID4gICAgNjYgfCAgICAgICAgICAgICAgICAgICAgICAgICBjcHUgPSBjcHVfbWFwX19jcHUoZnRy YWNlLT5ldmxpc3QtPmNvcmUuY3B1cywgaSk7Cj4gPiAgICAgICB8ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIF5+fn5+fn5+fn5+fgo+ID4gICAgICAgfCAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjcHVfbWFwX19oYXMKPiA+IGNjMTogYWxsIHdhcm5pbmdzIGJlaW5nIHRyZWF0 ZWQgYXMgZXJyb3JzCj4gPiBtYWtlWzRdOiAqKiogWy92YXIvaG9tZS9hY21lL2dpdC9wZXJmL3Rv b2xzL2J1aWxkL01ha2VmaWxlLmJ1aWxkOjk2OiAvdG1wL2J1aWxkL3BlcmYvdXRpbC9icGZfZnRy YWNlLm9dIEVycm9yIDEKPiA+IG1ha2VbNF06ICoqKiBXYWl0aW5nIGZvciB1bmZpbmlzaGVkIGpv YnMuLi4uCj4gPiAgIExEICAgICAgL3RtcC9idWlsZC9wZXJmL3VpL2Jyb3dzZXJzL3BlcmYtaW4u bwo+ID4gICBMRCAgICAgIC90bXAvYnVpbGQvcGVyZi91aS9wZXJmLWluLm8KPiA+ICAgTEQgICAg ICAvdG1wL2J1aWxkL3BlcmYvdXRpbC9zY3JpcHRpbmctZW5naW5lcy9wZXJmLWluLm8KPiA+IG1h a2VbM106ICoqKiBbL3Zhci9ob21lL2FjbWUvZ2l0L3BlcmYvdG9vbHMvYnVpbGQvTWFrZWZpbGUu YnVpbGQ6MTM5OiB1dGlsXSBFcnJvciAyCj4gPiBtYWtlWzJdOiAqKiogW01ha2VmaWxlLnBlcmY6 NjY1OiAvdG1wL2J1aWxkL3BlcmYvcGVyZi1pbi5vXSBFcnJvciAyCj4gPiBtYWtlWzJdOiAqKiog V2FpdGluZyBmb3IgdW5maW5pc2hlZCBqb2JzLi4uLgo+ID4gbWFrZVsxXTogKioqIFtNYWtlZmls ZS5wZXJmOjI0MDogc3ViLW1ha2VdIEVycm9yIDIKPiA+IG1ha2U6ICoqKiBbTWFrZWZpbGU6MTEz OiBpbnN0YWxsLWJpbl0gRXJyb3IgMgo+ID4gbWFrZTogTGVhdmluZyBkaXJlY3RvcnkgJy92YXIv aG9tZS9hY21lL2dpdC9wZXJmL3Rvb2xzL3BlcmYnCj4gPiAKPiA+ICBQZXJmb3JtYW5jZSBjb3Vu dGVyIHN0YXRzIGZvciAnbWFrZSAtayBCVUlMRF9CUEZfU0tFTD0xIENPUkVTSUdIVD0xIFBZVEhP Tj1weXRob24zIE89L3RtcC9idWlsZC9wZXJmIC1DIHRvb2xzL3BlcmYgaW5zdGFsbC1iaW4nOgo+ ID4gCj4gPiAgICAxNjMsNjM1LDQyMiwxOTYgICAgICBjeWNsZXM6dSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKPiA+ICAgIDIxMyw2MDIsMjYyLDgw MCAgICAgIGluc3RydWN0aW9uczp1ICAgICAgICAgICAgIyAgICAxLjMxICBpbnNuIHBlciBjeWNs ZSAgICAgICAgIAo+ID4gCj4gPiAgICAgICAgMy44MDQ3Mzg1NTUgc2Vjb25kcyB0aW1lIGVsYXBz ZWQKPiA+IAo+ID4gICAgICAgNDAuNjIyNTgxMDAwIHNlY29uZHMgdXNlcgo+ID4gICAgICAgIDYu NTg5OTgwMDAwIHNlY29uZHMgc3lzCj4gPiAKPiA+IAo+ID4g4qyiW2FjbWVAdG9vbGJveCBwZXJm XSQgZ2l0IGxvZyAtLW9uZWxpbmUgLTEKPiA+IGRmZTEwM2U3NTdhZWZmNzkgKEhFQUQpIHBlcmYg Y3B1bWFwOiBSZW1vdmUgY3B1X21hcF9fY3B1LCB1c2UgbGlicGVyZiBmdW5jdGlvbi4KPiA+IAo+ ID4gVGhpcyBpcyB0aGUgZmlyc3QgYnJlYWthZ2UsIHRyeWluZyB0byBmaXggbm93Lgo+IAo+IOKs olthY21lQHRvb2xib3ggcGVyZl0kIGZpbmQgdG9vbHMvcGVyZi8gLW5hbWUgIiouYyIgfCB4YXJn cyBncmVwIC13IGNwdV9tYXBfX2NwdQo+IHRvb2xzL3BlcmYvdXRpbC9icGZfZnRyYWNlLmM6CQkJ Y3B1ID0gY3B1X21hcF9fY3B1KGZ0cmFjZS0+ZXZsaXN0LT5jb3JlLmNwdXMsIGkpOwo+IOKsolth Y21lQHRvb2xib3ggcGVyZl0kCj4gCj4gT25seSB0aGlzIG9uZSByZW1haW5pbmcsIHNvIGp1c3Qg bW92aW5nIHRvIHBlcmZfY3B1X21hcF9fY3B1KCkgbGlrZSBkb25lCj4gZWxzZXdoZXJlIGluIHRo aXMgcGF0Y2guCj4gCgrirKJbYWNtZUB0b29sYm94IHBlcmZdJCBnaXQgZGlmZgpkaWZmIC0tZ2l0 IGEvdG9vbHMvcGVyZi91dGlsL2JwZl9mdHJhY2UuYyBiL3Rvb2xzL3BlcmYvdXRpbC9icGZfZnRy YWNlLmMKaW5kZXggZjAwYTJkZTY3NzhjY2I5Ny4uMjhkYzRjNjBjNzg4NDgxOCAxMDA2NDQKLS0t IGEvdG9vbHMvcGVyZi91dGlsL2JwZl9mdHJhY2UuYworKysgYi90b29scy9wZXJmL3V0aWwvYnBm X2Z0cmFjZS5jCkBAIC02Myw3ICs2Myw3IEBAIGludCBwZXJmX2Z0cmFjZV9fbGF0ZW5jeV9wcmVw YXJlX2JwZihzdHJ1Y3QgcGVyZl9mdHJhY2UgKmZ0cmFjZSkKICAgICAgICAgICAgICAgIGZkID0g YnBmX21hcF9fZmQoc2tlbC0+bWFwcy5jcHVfZmlsdGVyKTsKCiAgICAgICAgICAgICAgICBmb3Ig KGkgPSAwOyBpIDwgbmNwdXM7IGkrKykgewotICAgICAgICAgICAgICAgICAgICAgICBjcHUgPSBj cHVfbWFwX19jcHUoZnRyYWNlLT5ldmxpc3QtPmNvcmUuY3B1cywgaSk7CisgICAgICAgICAgICAg ICAgICAgICAgIGNwdSA9IHBlcmZfY3B1X21hcF9fY3B1KGZ0cmFjZS0+ZXZsaXN0LT5jb3JlLmNw dXMsIGkpOwogICAgICAgICAgICAgICAgICAgICAgICBicGZfbWFwX3VwZGF0ZV9lbGVtKGZkLCAm Y3B1LCAmdmFsLCBCUEZfQU5ZKTsKICAgICAgICAgICAgICAgIH0KICAgICAgICB9CuKsolthY21l QHRvb2xib3ggcGVyZl0kCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxp c3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0 aW5mby9saW51eC1hcm0ta2VybmVsCg==