From patchwork Thu Feb 10 22:48:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 12742573 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 7335AC433EF for ; Thu, 10 Feb 2022 23:19:56 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IoUCltTSdId1pnxM3VgU5zDnUZse37+FF73ep6EpHws=; b=h/FmtvHsRh8Vhy mWMuVYbe+jonA73F2O8vdBPlhlRXieP8vBTPN2vA4NT2VfqRKFl3xRZm/jv6J/lckRySkWZd7oE/R eNN3mYlyzLF2e4rRGhrBo/5+7b/UlGahxdhOPBBZ4QSr3xlgILS4uivI4luJVwkOSbXmE8UDC6Jo8 YFti/EN3I9NBFj66b2B4fiVVo5OwrscWTINBpvrrfX7Df6kRrD5rN89buyLBwL/giAxaRYdxfkOPj ksB+ldpgMl4IhktbNzF2tAQbdiDNUWYepWPlCJL3W8vHon14UhS75pV+fT33sGJtLQXkgnst7Q+JL PYHhhwCG4o6PilAhxZCw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nIIhm-0059bT-Ir; Thu, 10 Feb 2022 23:18:26 +0000 Received: from mail-io1-xd35.google.com ([2607:f8b0:4864:20::d35]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nIIhj-0059ax-3I for linux-arm-kernel@lists.infradead.org; Thu, 10 Feb 2022 23:18:24 +0000 Received: by mail-io1-xd35.google.com with SMTP id 9so9452138iou.2 for ; Thu, 10 Feb 2022 15:18:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=TZjvXmQL+ezx3++i6ywjCYX2+WSMiXHIFAoZu2xGMQA=; b=dh1iu5XVFR9JgGmMSioQ2P16YMuiIHmUjr61dP4GMbiQ/DBV+xy86sSdWmO7JGy9if SiLJjyrhAkltJyEffBig8nn7rsqFuMeuHJldrAgRTAtSTjv8EpjOdC6vIIDTuX1vQG8X tyHGhTZ88Kz+/3L0/sgBvY4LT8htAeWWCbvSN6jtFh9goqGhVxab8f4MrhWEbhotDg6L D4rDahldztLcHt5JGGWa7cSD6YDdH1+OScMRhdxHt5HBLYDySnNVxkvB/+UwZ4lyLXil hJs2m820KUfV0pMU7wth5QjgU8v0NZ4f1LIii2okFvCOfDuYH3BHp1hpFfvaosO6XBbb ncUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TZjvXmQL+ezx3++i6ywjCYX2+WSMiXHIFAoZu2xGMQA=; b=IUyX3aRmuegA6vEXibSETqRkpZlkqz6Jiyt+lJxOWugfWi3bB2jeXt2vVFYr2QRTof 7F4PNTfyD4CbVSRcsFyky9jGdOK0qv4XTCYOyR7MpYpFJOBJJDq4Qa6KOp4y35cMkeT8 Z0lhAad+uuiufs4Yb+FQkROslLJg+7Yzi+kDpKoWRaMkW7zLN8EdTAaub7XP0jtZEFpb QTSOzWD8D6TLf1t/HmWB2yd0VfEwqaI7EGWXuy7ag3kanOSadatIgFuVTZLa+5s1QDQJ Wn89q4ATWnydwiDqnkPlkq+0+kyP+jRICPNhu3ZPWb4lo1xFi4uwMEIeEmIIiWu3TqhL ebCQ== X-Gm-Message-State: AOAM532w/EijiV+kp/om5llPghCLXN7nRxt860x2LhpyLN3voxQ3scZG pf0Z2iZbeNCP3rbIsvKi1y0= X-Google-Smtp-Source: ABdhPJzpdxrXi7jABYsEM7idoWZV3Dcam0pULppAeFkiKjAPVbRQOvUhQvFaYJB7D2HMiS0CGqRkmw== X-Received: by 2002:a05:6602:2b10:: with SMTP id p16mr5163745iov.44.1644535101887; Thu, 10 Feb 2022 15:18:21 -0800 (PST) Received: from localhost ([12.28.44.171]) by smtp.gmail.com with ESMTPSA id p16sm8877673ilm.85.2022.02.10.15.18.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Feb 2022 15:18:21 -0800 (PST) From: Yury Norov To: Yury Norov , Andy Shevchenko , Rasmus Villemoes , Andrew Morton , =?utf-8?b?TWljaGHFgiBNaXJvc8WC?= =?utf-8?b?YXc=?= , Greg Kroah-Hartman , Peter Zijlstra , David Laight , Joe Perches , Dennis Zhou , Emil Renner Berthing , Nicholas Piggin , Matti Vaittinen , Alexey Klimov , linux-kernel@vger.kernel.org, Will Deacon , Mark Rutland , Shaokun Zhang , Qi Liu , Khuong Dinh , linux-arm-kernel@lists.infradead.org Subject: [PATCH 12/49] perf: replace bitmap_weight with bitmap_empty where appropriate Date: Thu, 10 Feb 2022 14:48:56 -0800 Message-Id: <20220210224933.379149-13-yury.norov@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220210224933.379149-1-yury.norov@gmail.com> References: <20220210224933.379149-1-yury.norov@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220210_151823_183206_059A7F13 X-CRM114-Status: GOOD ( 15.65 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In some places, drivers/perf code calls bitmap_weight() to check if any bit of a given bitmap is set. It's better to use bitmap_empty() in that case because bitmap_empty() stops traversing the bitmap as soon as it finds first set bit, while bitmap_weight() counts all bits unconditionally. Signed-off-by: Yury Norov Acked-by: Mark Rutland --- drivers/perf/arm-cci.c | 2 +- drivers/perf/arm_pmu.c | 4 ++-- drivers/perf/hisilicon/hisi_uncore_pmu.c | 2 +- drivers/perf/xgene_pmu.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c index 54aca3a62814..96e09fa40909 100644 --- a/drivers/perf/arm-cci.c +++ b/drivers/perf/arm-cci.c @@ -1096,7 +1096,7 @@ static void cci_pmu_enable(struct pmu *pmu) { struct cci_pmu *cci_pmu = to_cci_pmu(pmu); struct cci_pmu_hw_events *hw_events = &cci_pmu->hw_events; - int enabled = bitmap_weight(hw_events->used_mask, cci_pmu->num_cntrs); + bool enabled = !bitmap_empty(hw_events->used_mask, cci_pmu->num_cntrs); unsigned long flags; if (!enabled) diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 295cc7952d0e..a31b302b0ade 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -524,7 +524,7 @@ static void armpmu_enable(struct pmu *pmu) { struct arm_pmu *armpmu = to_arm_pmu(pmu); struct pmu_hw_events *hw_events = this_cpu_ptr(armpmu->hw_events); - int enabled = bitmap_weight(hw_events->used_mask, armpmu->num_events); + bool enabled = !bitmap_empty(hw_events->used_mask, armpmu->num_events); /* For task-bound events we may be called on other CPUs */ if (!cpumask_test_cpu(smp_processor_id(), &armpmu->supported_cpus)) @@ -785,7 +785,7 @@ static int cpu_pm_pmu_notify(struct notifier_block *b, unsigned long cmd, { struct arm_pmu *armpmu = container_of(b, struct arm_pmu, cpu_pm_nb); struct pmu_hw_events *hw_events = this_cpu_ptr(armpmu->hw_events); - int enabled = bitmap_weight(hw_events->used_mask, armpmu->num_events); + bool enabled = !bitmap_empty(hw_events->used_mask, armpmu->num_events); if (!cpumask_test_cpu(smp_processor_id(), &armpmu->supported_cpus)) return NOTIFY_DONE; diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.c b/drivers/perf/hisilicon/hisi_uncore_pmu.c index a738aeab5c04..358e4e284a62 100644 --- a/drivers/perf/hisilicon/hisi_uncore_pmu.c +++ b/drivers/perf/hisilicon/hisi_uncore_pmu.c @@ -393,7 +393,7 @@ EXPORT_SYMBOL_GPL(hisi_uncore_pmu_read); void hisi_uncore_pmu_enable(struct pmu *pmu) { struct hisi_pmu *hisi_pmu = to_hisi_pmu(pmu); - int enabled = bitmap_weight(hisi_pmu->pmu_events.used_mask, + bool enabled = !bitmap_empty(hisi_pmu->pmu_events.used_mask, hisi_pmu->num_counters); if (!enabled) diff --git a/drivers/perf/xgene_pmu.c b/drivers/perf/xgene_pmu.c index 5283608dc055..0c32dffc7ede 100644 --- a/drivers/perf/xgene_pmu.c +++ b/drivers/perf/xgene_pmu.c @@ -867,7 +867,7 @@ static void xgene_perf_pmu_enable(struct pmu *pmu) { struct xgene_pmu_dev *pmu_dev = to_pmu_dev(pmu); struct xgene_pmu *xgene_pmu = pmu_dev->parent; - int enabled = bitmap_weight(pmu_dev->cntr_assign_mask, + bool enabled = !bitmap_empty(pmu_dev->cntr_assign_mask, pmu_dev->max_counters); if (!enabled)