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 3B613C433F5 for ; Wed, 5 Jan 2022 06:31:58 +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=gfiu2Z5/KhdZFDE+ttYRWC88Zob+DCHitFhUUKuOCmw=; b=K2p1cLeTreV83UVa+hpg8yIbMA jZgazSwwFMbEflQCA6kBYNiIkuKDx+GbZT4un9KnqNQFVnoMbO7rz5B5YpbYv1gVwzjajUK/GfRIL XE8fzSWSpTHAFNpj8hXZqXnpfCnFsrOgXONKnPNCzudUUIwECW9oXBzbzi7P2nG2cZYaRk3pTfrfO /mAivlhpwxNaw6Gqk98Ksa+4QlvB0h/RuigodaGWTTUF+4rspNwtekM/IjGHKoJWu1HhP9HiYikMY ZXbiWikOtHWmGH2VQj/FaDSeET4+HS8X0yLUhZ+G/b7+UTi1tSKhKhZVdRjlylhTvsa2fzqX5BRG2 q6dDlu5w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n4zoW-00DmTW-J0; Wed, 05 Jan 2022 06:30:25 +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 1n4zZW-00Dfyu-27 for linux-arm-kernel@lists.infradead.org; Wed, 05 Jan 2022 06:14:55 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 66-20020a251245000000b0060d05da9c4eso45797184ybs.10 for ; Tue, 04 Jan 2022 22:14:53 -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=1/7nME/op8w7Xw8Ct+c++XCwH/8x/MyevrC1VX7Tajk=; b=RJrLSnxc5JxUa6ZYoNewWHV+2aK8Z/muSepTRwKPqYKfEc+gAy7TukBfscpP1lIlA+ lnKcMr1SS9sOindg9cEfikme79arHm0IKkB7dHoONl+A978BodnC66P8kBH4zCb0/WTo o62W+ZkcMBYkyFCMM8ETa/FO0P3XdA/YVC2n/VjMdnETl7atU98EmBeeB8YU5TJl/AFG /sJOL3tSF6P5SCcbsU4IfgGoTUX68u6hPSwMFhO0vhswgSClGbYdehxtbCEdejwK3Ocb EfCrj/BmcvF48idrFSKPQOGEBGD+XYTjHKzRMi7tMOw6sYJ5L4kkRuO5DUu3WNmW15m6 PF2w== 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=1/7nME/op8w7Xw8Ct+c++XCwH/8x/MyevrC1VX7Tajk=; b=Y6rPiHJZRWQP17a+4dSyP8bDIXsK3kqdTchl7Vr/r+lwPf/wsmGkeA4YNzFwiCNKWr Xu/4losgK8IpeInPpgqkj1b1i9Wf+Au+8/nKqWpL4Ki2fHL2ct4gP0/MV//9cqgO9NBL P5yD7a8vmQrw4105OpFQMxvMPM6YQqwYCb9YiZTEvbZFvLWlPjMkSBZVl6D2USBRgGP6 UarxjDWX/+I75uWYFPQtHaI5ZbcQxOp0o9fLIkHxPbIYmEwu6DCzGwy5QSxx2WU+gP+I 2m5WF1aWm8h8dwkUk+5VTT4+MJLhHUFl96x/o4SG7TzeyJeQ+AYR1h2z3t0ud1SJVail ocUw== X-Gm-Message-State: AOAM531Vzn1w2APfD+hPN8fIqoaPUdFJe/LzuKZqTy5pYpV8953vMyAF AZgWgJO0ivSMCP/rBbf7sne35NXkpa1b X-Google-Smtp-Source: ABdhPJwsZz3Z7YaXUyXAOxmUXrnu/jXT+I7MJ/5bK9KlVVcutDnnM8+3CEoIwkwuNqXjluLZaWPbs0Z6igD3 X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:3af1:caef:2937:5d2b]) (user=irogers job=sendgmr) by 2002:a25:86c4:: with SMTP id y4mr51236247ybm.440.1641363292381; Tue, 04 Jan 2022 22:14:52 -0800 (PST) Date: Tue, 4 Jan 2022 22:13:25 -0800 In-Reply-To: <20220105061351.120843-1-irogers@google.com> Message-Id: <20220105061351.120843-23-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 22/48] perf cpumap: Trim the cpu_aggr_map 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_221454_147931_5FF91779 X-CRM114-Status: GOOD ( 13.39 ) 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 cpu_aggr_map__new removes duplicates, when this happens shrink the array. Reviewed-by: James Clark Signed-off-by: Ian Rogers --- tools/perf/util/cpumap.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c index f1d76a8e92e8..2779474f39db 100644 --- a/tools/perf/util/cpumap.c +++ b/tools/perf/util/cpumap.c @@ -185,7 +185,15 @@ struct cpu_aggr_map *cpu_aggr_map__new(const struct perf_cpu_map *cpus, c->nr++; } } - + /* Trim. */ + if (c->nr != cpus->nr) { + struct cpu_aggr_map *trimmed_c = + realloc(c, + sizeof(struct cpu_aggr_map) + sizeof(struct aggr_cpu_id) * c->nr); + + if (trimmed_c) + c = trimmed_c; + } /* ensure we process id in increasing order */ qsort(c->map, c->nr, sizeof(struct aggr_cpu_id), aggr_cpu_id__cmp); -- 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