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 AB4A1C433EF for ; Wed, 5 Jan 2022 06:37:48 +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:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=TaoQSjFCvizHYNNoCS+IyieEpMTZqTF/mJ3uU8QY4qo=; b=iwPHs5jW4C83WQizSug1cTIi72 VXdYNmYNFOthxrLKCuMAN4kmiNIpChi4vspufeoDIEnytSZ3bqDplhlIvBgC1jVIBXML9pOx0Riwf V77QTjmDLpjX8+oYOVzOQPkI/TowH72BfFbv/toKbYvG78nLPzOE7BS8YGFFf+DXWVPonQyQ3MOOk VckX2svOo7N0LsdylxjlFCgyOsb28WRfY0kT54bZlsMVClUux89xz+dqpmTT4+zTLB2X9k+Kd13wv ca1fwUFV3JGHqCuCHqq20z36YAd0qQ+UBA9qcVlZ4OrFXrKeG6SsP65PEqHSuJQZ+sRr+D+3w6zrO Hiuh88jA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n4ztz-00DoYC-NI; Wed, 05 Jan 2022 06:36:05 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n4zZk-00Dg9U-Pb for linux-arm-kernel@lists.infradead.org; Wed, 05 Jan 2022 06:15:10 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id e2-20020a25d302000000b0060c57942183so50885491ybf.18 for ; Tue, 04 Jan 2022 22:15:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=awNrzmXXwhgHegLo/XT1TXhJodtpZbEQSRhdkuOAA7A=; b=QFLce7E7aw2wwlYSdhG76Mpmen0FL+9PXvm2nIZ1r2kh35f/ju+N1FCwEycFEVF+HA j9L20RILujNFaYcOFh3OooBobOOyomezKdufRMIeJnH7G5n2P1cLqvQZIF9ZiHsYsRqr R19Trg4sfEvg87wq53ikPM7oBHSTNvu9sdTPNK7Pc+0o0AeewmBgYa7ekaORz6gpmiAN n6FKnJZWOP3wyF2OE6rVCjXIBgrqGYfz8Qkwoc7VBNe7E+Xav0mef4br/KP4tYrivEWB TCpU708CTEvJLltlNr2zSKirA/ckTIphnNdqI5JgZQGcUz7m4m7yRcEEOJMZ8dv1tS8q N6gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=awNrzmXXwhgHegLo/XT1TXhJodtpZbEQSRhdkuOAA7A=; b=o6blEkQa5BVON+f052O3A9LwdQFVD5oS+AqXW4dzEw7hVmELkYjJ31dDbFteZkdiJE 7LiGZNZsZl/s1yyuyRpPtgvLHs25nkz5pleJjyWb3fVbOSZFCyA3fbw17UQHNEF/aIFj 6vRRzNv0U6gJrmfadb1uXlkHWfbqpL0Gr5nmaWDm7oQlnF4F9NMJkjcxSP/km/Ks0J/n WSzLfw48Z3EbuQfYTDQW3YlAPXEw7Oq4f4v+bxElVfkETFvLhjlDxqmmhIPfcnELAzAs 2wyrKaSmqqeFfMDga4XhJ6L1ahVWY1zRuAu+emN94wARiitGk2gQL2sLMi8/Odq3sopi DGlQ== X-Gm-Message-State: AOAM532HbAE4dPcXKCsiRjqYV64Sa+/vYh0ScLtJLUJmSlUX7L/tJ4J3 xPLmecN6S6r+3srroKwRZ/lGFpCei1xR X-Google-Smtp-Source: ABdhPJw47VEO8qrbLlvO3Iqg8kT9Hr62ZveuqAWJWNul5pXD8VWdsG+ExLGh23eaZ4TCVNC/10WgF1m3m/qA X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:3af1:caef:2937:5d2b]) (user=irogers job=sendgmr) by 2002:a25:2c05:: with SMTP id s5mr51759848ybs.402.1641363307149; Tue, 04 Jan 2022 22:15:07 -0800 (PST) Date: Tue, 4 Jan 2022 22:13:31 -0800 In-Reply-To: <20220105061351.120843-1-irogers@google.com> Message-Id: <20220105061351.120843-29-irogers@google.com> Mime-Version: 1.0 References: <20220105061351.120843-1-irogers@google.com> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog Subject: [PATCH v4 28/48] libperf: Use cpu not index for evsel mmap From: Ian Rogers To: Andi Kleen , Jiri Olsa , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , 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 Cc: eranian@google.com, Ian Rogers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220104_221508_900336_0BF78BDD X-CRM114-Status: GOOD ( 12.67 ) 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="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Fix issue where evsel's CPU map index was being used as the mmap cpu. Signed-off-by: Ian Rogers --- tools/lib/perf/evsel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lib/perf/evsel.c b/tools/lib/perf/evsel.c index 8028b5a4da69..f1e1665ef4bd 100644 --- a/tools/lib/perf/evsel.c +++ b/tools/lib/perf/evsel.c @@ -252,6 +252,7 @@ int perf_evsel__mmap(struct perf_evsel *evsel, int pages) for (thread = 0; thread < xyarray__max_y(evsel->fd); thread++) { int *fd = FD(evsel, idx, thread); struct perf_mmap *map; + int cpu = perf_cpu_map__cpu(evsel->cpus, idx); if (fd == NULL || *fd < 0) continue; @@ -259,7 +260,7 @@ int perf_evsel__mmap(struct perf_evsel *evsel, int pages) map = MMAP(evsel, idx, thread); perf_mmap__init(map, NULL, false, NULL); - ret = perf_mmap__mmap(map, &mp, *fd, idx); + ret = perf_mmap__mmap(map, &mp, *fd, cpu); if (ret) { perf_evsel__munmap(evsel); return ret; -- 2.34.1.448.ga2b2bfdf31-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel