From patchwork Sat Nov 18 15:50:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 13460152 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 87494C5ACB3 for ; Sat, 18 Nov 2023 15:51:51 +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:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=t4wR6iJsfdnrz3Tq3WJ3r4QrueFTeyKgFwOdF1NxMRw=; b=ULTU3PIZQPL4/V qFaR6QA0NsY4pCtJsSrxpaez8cAZvp+OwXTemuDjm8bxvvXvz706TxZc6AkmQ965ZP8/4IU7a1l7+ vpNeZ7d/U8ruTTikTW9UPSw9jPnUMXvKz1Fn+rnPUfJr4v4i2Z/j7BUuuule1qnJNiqrr+GjKwxKG iEwClYP6fGQzpLYFutVBACCn3pQ407pY0hfcifFhBHayXWuQxnMIDVnoHiDzJc+hhAzNqKWBFn5XB LX4sD0xY0n3ItbmlX9h4mh9LKp0C6ddQqwT6PjBO6IM/NSNcLcnPjJPgflyCwAtZZjnPgByzcmzaG Cdtv4CVw3cN+0HyBrluw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r4NbP-008l6p-2V; Sat, 18 Nov 2023 15:51:23 +0000 Received: from mail-yw1-x1133.google.com ([2607:f8b0:4864:20::1133]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r4NbN-008l3u-0D for linux-arm-kernel@lists.infradead.org; Sat, 18 Nov 2023 15:51:22 +0000 Received: by mail-yw1-x1133.google.com with SMTP id 00721157ae682-5c8c8f731aaso11741827b3.0 for ; Sat, 18 Nov 2023 07:51:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700322680; x=1700927480; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gyoEyO/BvLzExTTgi8khHbjKTjqWvT4r1T0zFU2+3B4=; b=iZPn+vYyMVJsFoOKMdossNmQMTT4gwTaca+3Hc1+sG/X+dTRCKNuGgk9E1Luw6TGcd bgg+oEbZA6fGcBqIB23FfUJt+dej6SZyyBzqtSr813FRpG02j65OXxcdjdw8HOKKG2tO l3GU8+PF9BGeUoEEEPHEfJHtu1p0ic519gKM2iiGRnmtFpQOJt14N8tgMWjT4+DjbLK7 9j3Ted0EpgzBsZWKDRxK5NPg07fXceNaou0hugR7mqvGKNUMDUP4i5CUsWE+eJj3BgRx Ewx9zwDImIO0WIzpmp5DDKXHWbkYfJJpMFxMAv2k2bi5mwXWLeWqF4uH2kZiFk+Vl2/y JznA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700322680; x=1700927480; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gyoEyO/BvLzExTTgi8khHbjKTjqWvT4r1T0zFU2+3B4=; b=lKxnXA9OSbHQaj3n9tvmlVL2i1Yypl0P9tl1PHu0KUHFe3gVAxauw0g4hskQrpmUMM nfdukrgpZEJkmZYiEyBbKLgJ1889c1sbhu0W4LUEecUHKB+0aOGQpPOtxsVs8Lvd40U2 swcKHWeShj5IInKlGgrgI63hejt/RGjlCBIRd3C6xlnZSz5+WqIvatWuvQqw4GQqzrwA 9Ae20z0W+rRjv7/HTgkhGwzmBN/3r5n8cOGZWKhDorLydQq6ZOjdyv8Hctlps0Uvf2YU FCWByICkanJuJJLGfpX02INVvqaV1Dy4Sn0Ln/ccav0mHime+P7ylQYuIN3kR36DVkQa zp/A== X-Gm-Message-State: AOJu0Yyx8m/pqmz9DQcX2SicvebdnZOR4tOC8VVMDYgwUnfRghDA7oFt P2qZdNpM52DOF1yee6dJQTc= X-Google-Smtp-Source: AGHT+IHj+eYHr1ru2W9s2X50eY6fyN3D8n3j9pP2d8TuQd1yVcJckTMxAXGClEhkj7DzHhTwgJSZvQ== X-Received: by 2002:a25:bb92:0:b0:daf:be86:a2ea with SMTP id y18-20020a25bb92000000b00dafbe86a2eamr2470792ybg.38.1700322680273; Sat, 18 Nov 2023 07:51:20 -0800 (PST) Received: from localhost ([2601:344:8301:57f0:48a9:bd4c:868d:dc97]) by smtp.gmail.com with ESMTPSA id d2-20020a25cd02000000b00d8679407796sm999292ybf.48.2023.11.18.07.51.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 07:51:19 -0800 (PST) From: Yury Norov To: linux-kernel@vger.kernel.org, Will Deacon , Mark Rutland , linux-arm-kernel@lists.infradead.org Cc: Yury Norov , Jan Kara , Mirsad Todorovac , Matthew Wilcox , Rasmus Villemoes , Andy Shevchenko , Maxim Kuvyrkov , Alexey Klimov Subject: [PATCH 07/34] perf/arm: optimize opencoded atomic find_bit() API Date: Sat, 18 Nov 2023 07:50:38 -0800 Message-Id: <20231118155105.25678-8-yury.norov@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231118155105.25678-1-yury.norov@gmail.com> References: <20231118155105.25678-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-20231118_075121_109479_81D89509 X-CRM114-Status: GOOD ( 15.87 ) 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 Switch subsystem to use atomic find_bit() or atomic iterators as appropriate. Signed-off-by: Yury Norov --- drivers/perf/arm-cci.c | 23 +++++------------------ drivers/perf/arm-ccn.c | 10 ++-------- drivers/perf/arm_dmc620_pmu.c | 9 ++------- drivers/perf/arm_pmuv3.c | 8 ++------ 4 files changed, 11 insertions(+), 39 deletions(-) diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c index 61de861eaf91..70fbf9d09d37 100644 --- a/drivers/perf/arm-cci.c +++ b/drivers/perf/arm-cci.c @@ -320,12 +320,8 @@ static int cci400_get_event_idx(struct cci_pmu *cci_pmu, return CCI400_PMU_CYCLE_CNTR_IDX; } - for (idx = CCI400_PMU_CNTR0_IDX; idx <= CCI_PMU_CNTR_LAST(cci_pmu); ++idx) - if (!test_and_set_bit(idx, hw->used_mask)) - return idx; - - /* No counters available */ - return -EAGAIN; + idx = find_and_set_bit(hw->used_mask, CCI_PMU_CNTR_LAST(cci_pmu) + 1); + return idx < CCI_PMU_CNTR_LAST(cci_pmu) + 1 ? idx : -EAGAIN; } static int cci400_validate_hw_event(struct cci_pmu *cci_pmu, unsigned long hw_event) @@ -802,13 +798,8 @@ static int pmu_get_event_idx(struct cci_pmu_hw_events *hw, struct perf_event *ev if (cci_pmu->model->get_event_idx) return cci_pmu->model->get_event_idx(cci_pmu, hw, cci_event); - /* Generic code to find an unused idx from the mask */ - for (idx = 0; idx <= CCI_PMU_CNTR_LAST(cci_pmu); idx++) - if (!test_and_set_bit(idx, hw->used_mask)) - return idx; - - /* No counters available */ - return -EAGAIN; + idx = find_and_set_bit(hw->used_mask, CCI_PMU_CNTR_LAST(cci_pmu) + 1); + return idx < CCI_PMU_CNTR_LAST(cci_pmu) + 1 ? idx : -EAGAIN; } static int pmu_map_event(struct perf_event *event) @@ -861,12 +852,8 @@ static void pmu_free_irq(struct cci_pmu *cci_pmu) { int i; - for (i = 0; i < cci_pmu->nr_irqs; i++) { - if (!test_and_clear_bit(i, &cci_pmu->active_irqs)) - continue; - + for_each_test_and_clear_bit(i, &cci_pmu->active_irqs, cci_pmu->nr_irqs) free_irq(cci_pmu->irqs[i], cci_pmu); - } } static u32 pmu_read_counter(struct perf_event *event) diff --git a/drivers/perf/arm-ccn.c b/drivers/perf/arm-ccn.c index 728d13d8e98a..d657701b1f23 100644 --- a/drivers/perf/arm-ccn.c +++ b/drivers/perf/arm-ccn.c @@ -589,15 +589,9 @@ static const struct attribute_group *arm_ccn_pmu_attr_groups[] = { static int arm_ccn_pmu_alloc_bit(unsigned long *bitmap, unsigned long size) { - int bit; - - do { - bit = find_first_zero_bit(bitmap, size); - if (bit >= size) - return -EAGAIN; - } while (test_and_set_bit(bit, bitmap)); + int bit = find_and_set_bit(bitmap, size); - return bit; + return bit < size ? bit : -EAGAIN; } /* All RN-I and RN-D nodes have identical PMUs */ diff --git a/drivers/perf/arm_dmc620_pmu.c b/drivers/perf/arm_dmc620_pmu.c index 30cea6859574..e41c84dabc3e 100644 --- a/drivers/perf/arm_dmc620_pmu.c +++ b/drivers/perf/arm_dmc620_pmu.c @@ -303,13 +303,8 @@ static int dmc620_get_event_idx(struct perf_event *event) end_idx = DMC620_PMU_MAX_COUNTERS; } - for (idx = start_idx; idx < end_idx; ++idx) { - if (!test_and_set_bit(idx, dmc620_pmu->used_mask)) - return idx; - } - - /* The counters are all in use. */ - return -EAGAIN; + idx = find_and_set_next_bit(dmc620_pmu->used_mask, end_idx, start_idx); + return idx < end_idx ? idx : -EAGAIN; } static inline diff --git a/drivers/perf/arm_pmuv3.c b/drivers/perf/arm_pmuv3.c index 18b91b56af1d..784b0383e9f8 100644 --- a/drivers/perf/arm_pmuv3.c +++ b/drivers/perf/arm_pmuv3.c @@ -825,13 +825,9 @@ static irqreturn_t armv8pmu_handle_irq(struct arm_pmu *cpu_pmu) static int armv8pmu_get_single_idx(struct pmu_hw_events *cpuc, struct arm_pmu *cpu_pmu) { - int idx; + int idx = find_and_set_next_bit(cpuc->used_mask, cpu_pmu->num_events, ARMV8_IDX_COUNTER0); - for (idx = ARMV8_IDX_COUNTER0; idx < cpu_pmu->num_events; idx++) { - if (!test_and_set_bit(idx, cpuc->used_mask)) - return idx; - } - return -EAGAIN; + return idx < cpu_pmu->num_events ? idx : -EAGAIN; } static int armv8pmu_get_chain_idx(struct pmu_hw_events *cpuc, From patchwork Sat Nov 18 15:50:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 13460153 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 11340C5ACB3 for ; Sat, 18 Nov 2023 15:51:59 +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:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6hSYMkJZmV8zo/Z78tgyD54lT8IEd8sPbSZW/KgMdRw=; b=PjcECcVEcz7RQb 67a5OG/Vhpdvu1jUdxQAkm6stF3m+dW3h6w3XB6BOSUasFohG4WQuB8QtZbKD3qqff6yIFEsn+1X2 n0LXX3tGs2jAL14g/VJef8aLXfdXjUSp6zg5rR7pPr1i5viFGwLnNDzB3q2QQxvueN+VtbMp02PJp /FZGEz4asAwcew00q+o3sX4yoSY2pH4uhPldGUMjNNhQ78JtBUR0Pw8xFfweQyzcQgELWThpobOVd MSxsuv9t95Y2jWg3Kqwt6CfaulbiPQRRckgxzuzDOrClaOvSwUrXXqJWK5MdmsHntpCEqEWTjSnRZ nFwPyef10bCE+klZuNQQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r4NbV-008lB0-1a; Sat, 18 Nov 2023 15:51:29 +0000 Received: from mail-yw1-x1133.google.com ([2607:f8b0:4864:20::1133]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r4NbO-008l5k-34 for linux-arm-kernel@lists.infradead.org; Sat, 18 Nov 2023 15:51:24 +0000 Received: by mail-yw1-x1133.google.com with SMTP id 00721157ae682-5c08c47c055so32759717b3.1 for ; Sat, 18 Nov 2023 07:51:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700322682; x=1700927482; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9UsBR6w3W758FRiCdHZSwpEWSnagR0QzKE5nlW0aMIc=; b=KLdNI7iqwXy38QVVO5aZMPaQSSsZQ3w+IHLWUpasoXoKyC4Y9rESradGAOtCf/ajig M89fV66d52AYUuuYSX+bAyETVTpkLtZyo3/0VslUPv48Y8b5Q7+2BAhCudu1ucs5V/Ab dwNMx0QhKJ9JNMHt/0qhsQPIoNDbUF+pzduWTLwz8LSdFMMu+2xbYrx572xRx92xNmTe 1wAY4TPDNicoSPgvwM4yfIvwdczBIQPpw3S/ENTCN7s2PHau5TO01BgGXU7e/nkaIQt6 sIhcJosiRHrW5xxPxJ3m63lZlzKFuSFGq4S3h2AR/QP+d8yF8NBTxJ6wfEqJOvj9atK1 3hAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700322682; x=1700927482; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9UsBR6w3W758FRiCdHZSwpEWSnagR0QzKE5nlW0aMIc=; b=WEc+VCdUFUMOhbwIMaREqaf7vWrKGVsTEGUxUr5hMN3OEKFG8EoWGPjXp6aKjEo5od SxhVyt8NESrVUinbyIq8ywN4HTsExfJlN8WUMVsj6vcNjXmugn5VEeFc+9aWm46kg6GK StRYl2QGrSItRkipl6sK9UGX4tKBJOfagKa3nkhl+1a+jaQx7KA3e5H4bTNhfAHITUv7 tVvj5Y1ILtwj5xWv5CGjx5gJhROzoJiTlImjus9MqQvzAvZQR2IygxO6V3KKx+V+/sUK zz8YqodEIiv+CJaOaQTtZhn3Z+0I0z3gX/HXcoawBfxXAx1jZmbnrH9ZS+osqxXhfCaM HKvg== X-Gm-Message-State: AOJu0YxN6uBUggUGYBiJxhHdhprRv6S9SMEcrPwn8/Cr6JUEq1bzVPEB ChaGqyXFCKMI5PSaP+zcPCg= X-Google-Smtp-Source: AGHT+IFMi3zL8WSF03nEf+gU11A9ztIok6tcrLg24vsR46a+e0EFl+1hnebBli0fdxvl68Hs4Jerug== X-Received: by 2002:a0d:dc43:0:b0:59b:ec85:54ee with SMTP id f64-20020a0ddc43000000b0059bec8554eemr3160808ywe.39.1700322682161; Sat, 18 Nov 2023 07:51:22 -0800 (PST) Received: from localhost ([2601:344:8301:57f0:48a9:bd4c:868d:dc97]) by smtp.gmail.com with ESMTPSA id d19-20020a814f13000000b0058ddb62f99bsm1187785ywb.38.2023.11.18.07.51.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 07:51:21 -0800 (PST) From: Yury Norov To: linux-kernel@vger.kernel.org, Shuai Xue , Will Deacon , Mark Rutland , linux-arm-kernel@lists.infradead.org Cc: Yury Norov , Jan Kara , Mirsad Todorovac , Matthew Wilcox , Rasmus Villemoes , Andy Shevchenko , Maxim Kuvyrkov , Alexey Klimov Subject: [PATCH 08/34] drivers/perf: optimize ali_drw_get_counter_idx() by using find_bit() Date: Sat, 18 Nov 2023 07:50:39 -0800 Message-Id: <20231118155105.25678-9-yury.norov@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231118155105.25678-1-yury.norov@gmail.com> References: <20231118155105.25678-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-20231118_075122_991564_ADD63B71 X-CRM114-Status: GOOD ( 12.70 ) 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 The function searches used_mask for a set bit in a for-loop bit by bit. We can do it faster by using atomic find_and_set_bit(). Signed-off-by: Yury Norov Acked-by: Will Deacon --- drivers/perf/alibaba_uncore_drw_pmu.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/perf/alibaba_uncore_drw_pmu.c b/drivers/perf/alibaba_uncore_drw_pmu.c index 19d459a36be5..2a3b7701d568 100644 --- a/drivers/perf/alibaba_uncore_drw_pmu.c +++ b/drivers/perf/alibaba_uncore_drw_pmu.c @@ -274,15 +274,9 @@ static const struct attribute_group *ali_drw_pmu_attr_groups[] = { static int ali_drw_get_counter_idx(struct perf_event *event) { struct ali_drw_pmu *drw_pmu = to_ali_drw_pmu(event->pmu); - int idx; + int idx = find_and_set_bit(drw_pmu->used_mask, ALI_DRW_PMU_COMMON_MAX_COUNTERS); - for (idx = 0; idx < ALI_DRW_PMU_COMMON_MAX_COUNTERS; ++idx) { - if (!test_and_set_bit(idx, drw_pmu->used_mask)) - return idx; - } - - /* The counters are all in use. */ - return -EBUSY; + return idx < ALI_DRW_PMU_COMMON_MAX_COUNTERS ? idx : -EBUSY; } static u64 ali_drw_pmu_read_counter(struct perf_event *event) From patchwork Sat Nov 18 15:50:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 13460154 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 45EEAC5ACB3 for ; Sat, 18 Nov 2023 15:52:06 +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:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PcYaZNxJXvQfQh34yL6cFtvO3bvqP9MAoSXtYCK9zrI=; b=jkk6wkMPIHDYt/ At9d1Y39ayBH+eFed8yrgqclBQk767laDmYPGlrVe23xQIzcTCx2bDfgv4wc7cYr69iyIpviozsc6 Gta59uxYJ5eLfQUhL33Vf3qpVriXfCqmOHc+FqWV5OOvnaUOEchFxwWMXRtKfmBjsGvzj3T3xPEoe Ep51vh7y4HtVe3LMywlumlrTNLefqMDnX5uk+xjeNn0XnXYo8rGoP07eMi9TwWHBGdvnFb6QkqreF /oZdwn0DFMELGlXHomTTJzLDu1TPLP04pB4jz/Mg+tKh1MZgf60cNe9sqHFMi3GOBgGwN+yCuZFiB DnFsgMmz9NnBsSJXFtEg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r4Nbf-008lIu-26; Sat, 18 Nov 2023 15:51:39 +0000 Received: from mail-yw1-x1132.google.com ([2607:f8b0:4864:20::1132]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r4Nbb-008lFv-2k for linux-arm-kernel@lists.infradead.org; Sat, 18 Nov 2023 15:51:38 +0000 Received: by mail-yw1-x1132.google.com with SMTP id 00721157ae682-5c8ebf18a21so9327127b3.2 for ; Sat, 18 Nov 2023 07:51:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700322695; x=1700927495; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V1XoIiNxFuF4VYuiH6Quz1F4aXv1fFJNE5bF8jDHsU4=; b=imYrh0QJwfi9O+jQ/f/zDqDXWQ8Kb5bwsueOA7C0d7uhss6+Mb4Inqvnsmgo8q9nAw xt82L1LxJ8MgqEg5YVFGMFBmjvFFtsmhjt/yqhBAt4BqWekqrGtPT3hZL6zOdmBmNhbO 4vF2+i4FVnmEMUp+zoFrGH6RO4VZZyw78QjOnzyfdjGU5Gz+IcnKDROvyxVY5AlhEpVt OPKgCSeWjFxEo9ZUf/ZgvXJTtza/jIRYPTHavD32sEp90p5svwt+kBLLK1liM5y+brUr p9MNaAcwfN/WxkL34SXaHdiE6Kpb5YajTHPHAmlFL7q3LfeUDi11C5ZtHBNFJpxdykGH fFBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700322695; x=1700927495; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V1XoIiNxFuF4VYuiH6Quz1F4aXv1fFJNE5bF8jDHsU4=; b=nLPRSOo41xpZ1Z01ss/V4jH28cs+81MGVQzzKPbCYdeeowq8vuPiKFvB7MRSc8HoO6 nR2PfqUzQmQ70Yno+6WrBYtbrBeviVf7nk6YhZGY4+lMuXSTg9aQfj4W9OWawbKF4CPj 2TrVHgu3mWEXxCkv7h8TGmOqA/n75FS7swnQClLxbZ5usw4nQgJjYxhJnf0bk98KI6/a Oa5gcZHHlSsfWgIsKi5xjHs10cYcIZl+dZzeB25PF4ymsiPht4Xeg7IjEGBGaxuYdmBY IT9h/cRrrd7+AuXJUFILhOEqzWM/gm7UmMXesDC4r6qqxDsjqn1oTIWv3A3YSasTVTPr 10ZA== X-Gm-Message-State: AOJu0Ywqupbc+iXPfanwTBulCUh7asaaIyxJK2w27vyxn4c5HovUfvn8 5Mo3OA3VVTPanGakjlIMDd0= X-Google-Smtp-Source: AGHT+IEY1WAEs4kNKd75UVdANlei8VDfd1gVdWYThj+rx1F0zxh+1GBN8rubfJYMqdp79r+pN+9YDQ== X-Received: by 2002:a81:8447:0:b0:5a7:a81d:e410 with SMTP id u68-20020a818447000000b005a7a81de410mr3105570ywf.18.1700322695050; Sat, 18 Nov 2023 07:51:35 -0800 (PST) Received: from localhost ([2601:344:8301:57f0:48a9:bd4c:868d:dc97]) by smtp.gmail.com with ESMTPSA id h12-20020a816c0c000000b005c5a3f80239sm1158114ywc.88.2023.11.18.07.51.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 07:51:34 -0800 (PST) From: Yury Norov To: linux-kernel@vger.kernel.org, Will Deacon , Robin Murphy , Joerg Roedel , Andy Gross , Bjorn Andersson , Konrad Dybcio , Yury Norov , linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org Cc: Jan Kara , Mirsad Todorovac , Matthew Wilcox , Rasmus Villemoes , Andy Shevchenko , Maxim Kuvyrkov , Alexey Klimov Subject: [PATCH 17/34] iommu: use atomic find_bit() API where appropriate Date: Sat, 18 Nov 2023 07:50:48 -0800 Message-Id: <20231118155105.25678-18-yury.norov@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231118155105.25678-1-yury.norov@gmail.com> References: <20231118155105.25678-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-20231118_075135_888811_4F4685BF X-CRM114-Status: GOOD ( 14.16 ) 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 Fix opencoded find_and_set_next_bit() in __arm_smmu_alloc_bitmap() and msm_iommu_alloc_ctx(), and make them nice one-liner wrappers. While here, refactor msm_iommu_attach_dev() and msm_iommu_alloc_ctx() so that error codes don't mismatch. Signed-off-by: Yury Norov --- drivers/iommu/arm/arm-smmu/arm-smmu.h | 10 ++-------- drivers/iommu/msm_iommu.c | 18 ++++-------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.h b/drivers/iommu/arm/arm-smmu/arm-smmu.h index 703fd5817ec1..004a4704ebf1 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.h +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.h @@ -453,15 +453,9 @@ struct arm_smmu_impl { static inline int __arm_smmu_alloc_bitmap(unsigned long *map, int start, int end) { - int idx; + int idx = find_and_set_next_bit(map, end, start); - do { - idx = find_next_zero_bit(map, end, start); - if (idx == end) - return -ENOSPC; - } while (test_and_set_bit(idx, map)); - - return idx; + return idx < end ? idx : -ENOSPC; } static inline void __iomem *arm_smmu_page(struct arm_smmu_device *smmu, int n) diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c index f86af9815d6f..67124f4228b1 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu.c @@ -185,17 +185,9 @@ static const struct iommu_flush_ops msm_iommu_flush_ops = { .tlb_add_page = __flush_iotlb_page, }; -static int msm_iommu_alloc_ctx(unsigned long *map, int start, int end) +static int msm_iommu_alloc_ctx(struct msm_iommu_dev *iommu) { - int idx; - - do { - idx = find_next_zero_bit(map, end, start); - if (idx == end) - return -ENOSPC; - } while (test_and_set_bit(idx, map)); - - return idx; + return find_and_set_bit(iommu->context_map, iommu->ncb); } static void msm_iommu_free_ctx(unsigned long *map, int idx) @@ -418,10 +410,8 @@ static int msm_iommu_attach_dev(struct iommu_domain *domain, struct device *dev) ret = -EEXIST; goto fail; } - master->num = - msm_iommu_alloc_ctx(iommu->context_map, - 0, iommu->ncb); - if (IS_ERR_VALUE(master->num)) { + master->num = msm_iommu_alloc_ctx(iommu); + if (master->num >= iommu->ncb) { ret = -ENODEV; goto fail; } From patchwork Sat Nov 18 15:51:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 13460155 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 02972C2BB3F for ; Sat, 18 Nov 2023 15:52:27 +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:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vI03d4fLw1RP+AMK/qA8pK4omFuLZL4iJwApD2SREas=; b=Ks14xC0H77eMGN S+/oFV8z1SnhoO6x1H0cfpKk7aQBLrFITJiPZRAfjFaf4R+Y78g2/JsI1Ombv3YGctBImaeglf/Yz 4xcOpEJF74cPtxByoWhXzXYs+NVF1NhCMjn/MMFhxn6NV6WLgv0/NXiKuroaZ73Dxckcwh5eeRd0i 1Pt0UUiIHKAHmOHRSKA4Pxe4jmlPgjBtw3apbVS9QWU7okH6ingqSjJ6+v55A9pWiZWWbsGUEaMY6 tjwcy6BKPOYA3ugiUGGxCuMEtvxN5bX4fH2lmoW443ScrsdtAt1BiRkpfMutx0GsErrz6fz3jk0rW QzEnu5vrRXYBU64SkwjA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r4Nbx-008lVk-31; Sat, 18 Nov 2023 15:51:57 +0000 Received: from mail-yw1-x1131.google.com ([2607:f8b0:4864:20::1131]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r4Nbv-008lTT-1p for linux-arm-kernel@lists.infradead.org; Sat, 18 Nov 2023 15:51:56 +0000 Received: by mail-yw1-x1131.google.com with SMTP id 00721157ae682-5a86b6391e9so34001447b3.0 for ; Sat, 18 Nov 2023 07:51:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700322715; x=1700927515; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Faq88orJ2tLAcgJ6Ak512QARxmUWD9dLolef7kGFuP8=; b=ZBoPmrxKrFr8hq22N5TKQMrlWQjCiQ+8aOEpNwqTe9ecwbAy3jf/FwRZjNs3+HGnxk asMXXuDCPYsAfBrNt5I8FXR+gkn8cHcfMSKk1ui66K4iIpk0tceOe7DqaNavfR+IUG1U DLEXzsaVrrsz4mLmi/SHz8+A8nMeOkmBcti6SbMfGthY6XDeI1E3q9NS4aG77QUd3jdo cOKeAqIAfhv488srrEu2uC1CuXjKKHfK8GB+MmzLLTBbTbqJr3S1hPoOwrHoDEe9WR1f LEK5mpx4NV9JDQyscg4dMMs+0OD9mAmrwQOvoe3OBSqCw68RsAFDA/66nXKMMTXvNise 4pjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700322715; x=1700927515; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Faq88orJ2tLAcgJ6Ak512QARxmUWD9dLolef7kGFuP8=; b=FHq/+gGE/0w6faakekmQRoy6xAYShhS8qY8LiiXD8jvMxCMOGQ7kuN/RYPta0Nz3Kl imkrNYU7Z18xF7n1SbMcML8cWle+OnVDsma5JCEDX739bPHL4HMMT/Qzcq5BYld2oITN bWvyZXwJ/tXX3C2KA5uj2BMwfElqfL3phQUtXokOcuB21/Yr1wqdnr6ropyakwngonC9 trlYO9AFmyJfepoir53J05E+9g2MBFHg1SDXu2RH9UD0MAiGACXCBqqF7ahh2tDhgq7z w5NYT3YPZIioooCLdzr48NTOR/VXnU5qvJ8SP6Z02o1/MIyYmTQAxk2r8pnVIKUb4PQ1 2Ajw== X-Gm-Message-State: AOJu0YxxycC5i4OlP9dleZnUJBXS3pdspO4f1pdfMufxrRQDfC0+c02h AbWgCieDLQLIlc7f/0yJ/Q4= X-Google-Smtp-Source: AGHT+IEN5VHZ3duafcnm/k8t+mVTB/cJ3CeGZaVa462hMjL/JpTWc3yeLMLvRrae0wvqSgJiWcTX/g== X-Received: by 2002:a0d:cb0b:0:b0:5a7:dda6:cbaf with SMTP id n11-20020a0dcb0b000000b005a7dda6cbafmr2882441ywd.19.1700322714741; Sat, 18 Nov 2023 07:51:54 -0800 (PST) Received: from localhost ([2601:344:8301:57f0:48a9:bd4c:868d:dc97]) by smtp.gmail.com with ESMTPSA id k186-20020a0dfac3000000b00559f1cb8444sm1186383ywf.70.2023.11.18.07.51.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 07:51:54 -0800 (PST) From: Yury Norov To: linux-kernel@vger.kernel.org, Will Deacon , Mark Rutland , Marc Zyngier , linux-arm-kernel@lists.infradead.org Cc: Yury Norov , Jan Kara , Mirsad Todorovac , Matthew Wilcox , Rasmus Villemoes , Andy Shevchenko , Maxim Kuvyrkov , Alexey Klimov Subject: [PATCH 31/34] drivers/perf: optimize m1_pmu_get_event_idx() by using find_bit() API Date: Sat, 18 Nov 2023 07:51:02 -0800 Message-Id: <20231118155105.25678-32-yury.norov@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231118155105.25678-1-yury.norov@gmail.com> References: <20231118155105.25678-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-20231118_075155_602960_31030EAF X-CRM114-Status: GOOD ( 13.42 ) 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 The function searches used_mask for a bit in a for-loop bit by bit. We can do it faster by using atomic find_and_set_bit(). The comment to the function says that it searches for the first free counter, but obviously for_each_set_bit() searches for the first set counter. The following test_and_set_bit() tries to enable already set bit, which is weird. This patch, by using find_and_set_bit(), fixes this automatically. Fixes: a639027a1be1 ("drivers/perf: Add Apple icestorm/firestorm CPU PMU driver") Signed-off-by: Yury Norov --- drivers/perf/apple_m1_cpu_pmu.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pmu.c index cd2de44b61b9..2d50670ffb01 100644 --- a/drivers/perf/apple_m1_cpu_pmu.c +++ b/drivers/perf/apple_m1_cpu_pmu.c @@ -447,12 +447,8 @@ static int m1_pmu_get_event_idx(struct pmu_hw_events *cpuc, * counting on the PMU at any given time, and by placing the * most constraining events first. */ - for_each_set_bit(idx, &affinity, M1_PMU_NR_COUNTERS) { - if (!test_and_set_bit(idx, cpuc->used_mask)) - return idx; - } - - return -EAGAIN; + idx = find_and_set_bit(cpuc->used_mask, M1_PMU_NR_COUNTERS); + return idx < M1_PMU_NR_COUNTERS ? idx : -EAGAIN; } static void m1_pmu_clear_event_idx(struct pmu_hw_events *cpuc,