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 60956C433F5 for ; Wed, 5 Jan 2022 06:42:26 +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=hcmy7TpRF3EVlnnAhJJY8Dn/5ZJG+6n/7hpFZ664Kbo=; b=bJ3+8XPwQXsiWzdvp7NZi2pbIp sSc/8CO9gXyFH1tFrx88fFErEe8/9Ajg5ywPkjmGteAyu7KAqzi2sU85xSl3CswjWTqEYpyQJDKSt tE4QLYs37l9HcyXnvL1cqJr/f1AOFwIYY9FljQDUhi8t5uR5MYVWa0pMhQJXRYLUzmIYa84G90wn6 i9/geKKytGJCg1fezF9Q1Y4BNaUQNdMvRpAmzt57dznO2I9g5vLjp51SdXQlEELIoU1aPSL+LBAFx Xv07K76w7IKKiFcZsGQ8zFc3AJjHVldayDafzHMSv8S1NfyomDMy/5JZhu5qZQtqoDhJgG917aNdR 7zef0pRw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n4zyf-00DqHh-GP; Wed, 05 Jan 2022 06:40:54 +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 1n4zZx-00DgJ2-GN for linux-arm-kernel@lists.infradead.org; Wed, 05 Jan 2022 06:15:22 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id d5-20020a25be45000000b0060fdc206836so11909733ybm.21 for ; Tue, 04 Jan 2022 22:15:20 -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=zx3eoMgk2E9Q1m2Vv8UqlZ4wRR3W4iMt/10PWukXDj0=; b=JzhU/p628/opiLcLIsURp0pnOITWo3VMDbz1xTScpyWKXTQ80ky+9phYvVj5YskKIC ihV1UilgKg+fxIR4lNRHT2jbRH5xt6z9qcMV2CsvJwr2ey6a884uofLI44XNilaitkIZ t1vI3Whq21gSG5xhKvTtflEVRoIWzAK4x+EyoUSDkQVPS4z0aBp0uNzVJlG10nbmRXf8 Qimi21bEbywjJXYALyBU8WePexxl8cnJyM5mN8wwdJ4Rd1VvdhyoWg/m61iwNEXsXuM7 IW2j4cuizU/2649UP7UvfnXkYyF4DloSnqBcS5aq9woNDszcs1uyavBg6D5cRuOkmLwR +xdw== 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=zx3eoMgk2E9Q1m2Vv8UqlZ4wRR3W4iMt/10PWukXDj0=; b=psaeZN59OApjIi2PSZLdOSWQA4Lk+k2ktY8BD/M+66H4GBh49HfkgKtEeDieNzq0da uft4cy7hbfaCs4zODtquXA+sqJcfQVllxnC6mZqgAgF3HIJsvA4n01raWSF4t7rGwvCe l7jsBbFHJGXoO9xNlb85CQeIJhjwP/t6U0nBf2wViPKsjapFQbPIzkw1bBWayfpahX0T tj1tq0F7EDZQQ2ZjF9xQkqkD1yHarCC3eT4Dt+QeBriBxssiAE6p8XOchagiiVmVDoMb ztiNYSmvzVuz8OQn/HIGK5p2hKFc3t+oi/I4wwed+uQnxCIuKc5f1Mp+A2EBC7Bz4QY6 h5SA== X-Gm-Message-State: AOAM532MTOoIcclxbRHE7gt6KUS7Jy3t3Or3X4BP88wjPKAg2/FSGQNT ePL8njJm4s0q3EmcmlVXrY56Qga0Z22n X-Google-Smtp-Source: ABdhPJzsyfej2FDjgM0ae4+/ARSD37iN1p79WMe+BCIr76RgnKeFFpZkmXOBSkD22Il0+R8oWA1ghKXmKhIm X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:3af1:caef:2937:5d2b]) (user=irogers job=sendgmr) by 2002:a5b:350:: with SMTP id q16mr367766ybp.639.1641363319931; Tue, 04 Jan 2022 22:15:19 -0800 (PST) Date: Tue, 4 Jan 2022 22:13:36 -0800 In-Reply-To: <20220105061351.120843-1-irogers@google.com> Message-Id: <20220105061351.120843-34-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 33/48] libperf: Allow NULL in perf_cpu_map__idx 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_221521_582289_2C9A612A X-CRM114-Status: GOOD ( 12.19 ) 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 Return -1, not found, if NULL is passed. Signed-off-by: Ian Rogers --- tools/lib/perf/cpumap.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/lib/perf/cpumap.c b/tools/lib/perf/cpumap.c index 3c36a06771af..eacea3ab965a 100644 --- a/tools/lib/perf/cpumap.c +++ b/tools/lib/perf/cpumap.c @@ -270,8 +270,13 @@ bool perf_cpu_map__empty(const struct perf_cpu_map *map) int perf_cpu_map__idx(const struct perf_cpu_map *cpus, int cpu) { - int low = 0, high = cpus->nr; + int low, high; + if (!cpus) + return -1; + + low = 0; + high = cpus->nr; while (low < high) { int idx = (low + high) / 2, cpu_at_idx = cpus->map[idx]; -- 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