From patchwork Sun Dec 3 19:32:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 13477476 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 CBFF9C4167B for ; Sun, 3 Dec 2023 19:33:54 +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=/mzjkU2dLDBsYbT3mEABOn5WdhI3qLaHdoufOIHKabc=; b=iBRjU9f6BZi/Pg xZSXK0JhLTvYcjKKGZMMryYG0/Pn/f/t5fjYta/7I63E/qHj5CYOfbQWeVWWESVviC+bhn7U9KgDm IzbxOLWuJFtyz4rd661Nb6c6Wvnp0UOXVipnili09Sk96EBhhV+n8jQTt3TMjBTbLbWam9aKzLzHX kMvjo07qh56+Nv4/7Ef1+HtVBFUiTwKC8gmOwP0AhowwltOyFLmeZPMpmY07OeeB60chxRLjUIktC sv8vI+Dq+nS362cfO7tt4Lh+x0JC9dPFqfeiSw4VYIfJUPAZUtW8yKIbZHWq1RYzDFpW60jELqLpM OlIzcSo6I6/rTG8RyTQg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r9sDX-002W3A-0r; Sun, 03 Dec 2023 19:33:27 +0000 Received: from mail-yb1-xb29.google.com ([2607:f8b0:4864:20::b29]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r9sDT-002W0G-1o for linux-arm-kernel@lists.infradead.org; Sun, 03 Dec 2023 19:33:25 +0000 Received: by mail-yb1-xb29.google.com with SMTP id 3f1490d57ef6-d9caf5cc948so2028335276.0 for ; Sun, 03 Dec 2023 11:33:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701632001; x=1702236801; 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=FZPakVxWlxnbzBNDYA4K8T6rUoFlEZh7KPlMV1qoLxo=; b=bSy8AkWoc2zQCyO07EjBTBzZ8wvFMuKy3L/up6WsfjzCdaxENrO7lNg2K+sopfv23a Uvj6RMYrlH8PwXk2j0WGEo398bWh6g+pHu00zXEWkd+WaLVaHBved5K2q43s7yNvO3bu XO59u2zVXzTGcmg/8E7vznEf6qrx7i2Hfpjq/xdmDRad8retn4oGb8j3Jg3oSdGxHTL5 4XJ2HKl3Lm+f0YQiGKsFl3kxUcITIchcLmm9n4agATrl5bWU2CfWcIhh/SZxAiyWuFFx wQ0gsWdYbOYMMY5s2z6P1j0ji8o+fqA/6Aq+eGcE0I+1IVFFms8ZPvLAINJJ1005/9LZ Z52g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701632001; x=1702236801; 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=FZPakVxWlxnbzBNDYA4K8T6rUoFlEZh7KPlMV1qoLxo=; b=R0WrBrJVPddbOeWUy3pldUJmJuFFhRBQ+zdlI/AfZQAQWru9yS9SNHeu78xNT9hjVq cXlrljSFVWWwRmkRLw0FrHTEBKURaQ9J63eqeOxY5SgARR/I2PbRxcJHujd9NnIyfOyp CY776YardR1HUHkzfTzHDl5AGp6PdCOjWb0+ECKn/e98L3WUzQHXbQJGwCbaqTW4eajY gGe7K3j2ANHQgMzXKAzjdW9amwOSOcgFhO/Htpc75pD9M9y2aAY8vmQjLDXHEyg4Bwbu c5ZS20+Ps2STx1iTFAokYmiik6dhw1YpSb/5iGF0Jd6L38L+AAkMHrEhrwWdcgTjCayI 8urg== X-Gm-Message-State: AOJu0Yxlz292AntEQo1jAvgxa9Oo/MuyUTMhtrv6Iu/VwO4GQiVSV4Oa C0W5krkmkYEH+U5rg1uQPGM= X-Google-Smtp-Source: AGHT+IFcOwjzzSJPY/fJ6Ygrs7Bbu8glZ6eJVVRSauIyWCdlQc35hV5jh0qhazhU+rrH6Q3tLL/L0Q== X-Received: by 2002:a25:506:0:b0:db5:4e94:78bd with SMTP id 6-20020a250506000000b00db54e9478bdmr4651888ybf.56.1701632001470; Sun, 03 Dec 2023 11:33:21 -0800 (PST) Received: from localhost ([2601:344:8301:57f0:cb98:c3e:57c:8191]) by smtp.gmail.com with ESMTPSA id k27-20020a25b29b000000b00da02a2ef6afsm1800908ybj.30.2023.12.03.11.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 11:33:21 -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 , Bart Van Assche , Sergey Shtylyov Subject: [PATCH v2 08/35] perf/arm: optimize opencoded atomic find_bit() API Date: Sun, 3 Dec 2023 11:32:40 -0800 Message-Id: <20231203193307.542794-7-yury.norov@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231203193307.542794-1-yury.norov@gmail.com> References: <20231203192422.539300-1-yury.norov@gmail.com> <20231203193307.542794-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-20231203_113323_641611_FAF96F89 X-CRM114-Status: GOOD ( 15.88 ) 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. CC: Will Deacon Signed-off-by: Yury Norov --- drivers/perf/arm-cci.c | 24 ++++++------------------ drivers/perf/arm-ccn.c | 10 ++-------- drivers/perf/arm_dmc620_pmu.c | 9 ++------- drivers/perf/arm_pmuv3.c | 8 ++------ 4 files changed, 12 insertions(+), 39 deletions(-) diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c index 61de861eaf91..cb15b4cee5f7 100644 --- a/drivers/perf/arm-cci.c +++ b/drivers/perf/arm-cci.c @@ -320,12 +320,9 @@ 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_next_bit(hw->used_mask, CCI_PMU_CNTR_LAST(cci_pmu) + 1, + CCI400_PMU_CNTR0_IDX); + 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 +799,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 +853,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 6ca7be05229c..f046ad9e71f1 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 Sun Dec 3 19:32:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 13477475 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 383C2C10DCE for ; Sun, 3 Dec 2023 19:33:53 +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=tpP3nPf58Gp0taPNP29WVuAy8VudyFsYMAtV4wKHC+0=; b=rSZF8FguinytDN nWnFarjTFt9N8Ik+QkyyGQJsbd6sMci+AA6cULQlvaxjcSVAR9kzy/OkBBRtsnAgbTxNP1BzvUXLN rNIFCih/kT8QZx4TGQIM4x/VvaBgbjXQMT2wOnyuOCuNXCEkFm5P7vY1bfdLnyQAKvrxL+xaHWYeV P19BXHIxtB5Wa2EYWbZVx82cjgXuMSrj1FjENBB6YquLL4qFV4z3oILNUa07J2jBihKs1judgnNjh 7OvmWJOb2eZjzN2T5+j+4lbwt98A/2FdPN2e4e0A6HJGjvIATKy1+QBV/GesHwJ6Mtg7A+IhipE6N exYaf0zcJ9R+GqAaZKiA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r9sDZ-002W4N-0F; Sun, 03 Dec 2023 19:33:29 +0000 Received: from mail-yw1-x112a.google.com ([2607:f8b0:4864:20::112a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r9sDV-002W2H-2E for linux-arm-kernel@lists.infradead.org; Sun, 03 Dec 2023 19:33:27 +0000 Received: by mail-yw1-x112a.google.com with SMTP id 00721157ae682-5d3efc071e2so27866817b3.0 for ; Sun, 03 Dec 2023 11:33:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701632005; x=1702236805; 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=Ngf7R2trkvhy5az0BJAYMgMmwp9GyrCv5kj64azD/XY=; b=b0Ayi0j2tOvjUlsLfSfGLzas90iXqc2OUx0pQ0nva8NHf2692fiVHtQE5yKizKcYxo x1czVZpZA6XQlTSe1n6t4H/kF1y+aR4XHstmvDBVwwPs1EQ5m2Kyx+haxfqPk5KIPCV/ KuMazxXrf3ruqLpv5ASHD8yYV+tcs2uWMhMmVvhr8RtkMiw5BHs9ygolTvnNs7a0op8Z anNbpEgr3XcVrh0MHcrERhownJr4SlN+yCYWcBuyj9cmQlL0H0BRp99X6uNjzTtRHT8b Ec4+bHqwJK09q2ZuWW8bZ/FynMimWficdGYWy4yqfGfKHTqwAYGp+n/pjvB8Jja6LptR +K5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701632005; x=1702236805; 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=Ngf7R2trkvhy5az0BJAYMgMmwp9GyrCv5kj64azD/XY=; b=O3urjlYtHq06Tj9Rr3HjkugvXDPWyfAqAJx3Ecy57HyaXNWFnMM+nLzX0nC79EabF3 0+D01CmaJjbQqbh1wrwOS5jElZEgULJQEmzgzadYky4kR+whKdkkZRVgSzxUEK57la5U 3X6joVSRN54ktdcQPrRLvKhOplv26SfMWVRmOhY4s8RpBY9cypySOv6vBiH/8rKYow9Z OPCwz3/TE/BDnviE+3UQVCJIIojgd/yU4ggoubXIbCNNtwCt9F1vFoZ9ZfIsB58RQg5o 3LyGyizbwxXVhfgYHG7eaKEqYHz4MfUQlHxa29iJH2NyGtWYkgHljwLjXZd19Uy7v+Ie nfdA== X-Gm-Message-State: AOJu0Yzx2ih371kbcdQIqwT7j73h/FkFiv0OmRHyuQ4wvkDQMiWOFdxi WerwsL0daqsAH3P4mRmjm2U= X-Google-Smtp-Source: AGHT+IGAhPIRobNSBd8Xh5ROPApH6LYXWQ7wTkKlfC05Y42RMAU/7AhplYR/16C573v1Ku+fj2bMHA== X-Received: by 2002:a81:af4c:0:b0:5d7:1941:2c1e with SMTP id x12-20020a81af4c000000b005d719412c1emr2165207ywj.75.1701632003638; Sun, 03 Dec 2023 11:33:23 -0800 (PST) Received: from localhost ([2601:344:8301:57f0:cb98:c3e:57c:8191]) by smtp.gmail.com with ESMTPSA id z14-20020a814c0e000000b005d14e254367sm2752264ywa.80.2023.12.03.11.33.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 11:33:22 -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 , Bart Van Assche , Sergey Shtylyov Subject: [PATCH v2 09/35] drivers/perf: optimize ali_drw_get_counter_idx() by using find_bit() Date: Sun, 3 Dec 2023 11:32:41 -0800 Message-Id: <20231203193307.542794-8-yury.norov@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231203193307.542794-1-yury.norov@gmail.com> References: <20231203192422.539300-1-yury.norov@gmail.com> <20231203193307.542794-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-20231203_113325_805284_FD18ADED X-CRM114-Status: GOOD ( 12.75 ) 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 Sun Dec 3 19:32:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 13477477 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 7E2DFC4167B for ; Sun, 3 Dec 2023 19:34:08 +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=Uh3PNWHrtFyDzz8M8/rn1Fdwny54eaBhHmGm2SuZLh8=; b=NvAlS4sbdY4QuU W32PSSM7XQW5HjYmdagfU8IlgGw9lSvMDgYLSNRtLYqMHL3UVcmAjuqiO0GFbKgvVXP9zJ36xDofT kxWcXjrI0U04ghi2C+gNqViuPDLnwnV47hilw5tI6FtBObqJvH/lW6CxHhSA07dYHp47aoiszDFeh nU17U2lI8V2w9cNef8HPpWVUbPE5/n53L6rqDrrrFSJmKk4WaCAo+2eJRv9cfL5eHKCFdKgO7Rtkk 0GG2EXaAis5U1N2sZykejXjkMvuKpWzRvJ4iRO4xD7Fl8RAk4l+LaA7zkWhrJGNQm282Pz1LSfpyL TSTfFf1TY+l2TlI5Lw1g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r9sDq-002WGO-04; Sun, 03 Dec 2023 19:33:46 +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 1r9sDn-002WED-1D for linux-arm-kernel@lists.infradead.org; Sun, 03 Dec 2023 19:33:44 +0000 Received: by mail-yw1-x1132.google.com with SMTP id 00721157ae682-5c8c26cf056so42215847b3.1 for ; Sun, 03 Dec 2023 11:33:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701632022; x=1702236822; 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=vguNRNHZWUrDOSu/TVKVOPIB86L1io3LlGEpKJkKhiw=; b=JY71bYNTokQqAUWGoPm9PjtAl16phqwWThEgLw0DsX/FNW1jq8Nj2PCdznsFjpbgAR 9Zi/e4VPpQa+kGfZ4vpoXwmbAXnkB2zdtgdlf5gdy7DsBeCQIYkOIF3U2Yd/ageDPF3m VhMiCp2waBQCtkqFo56rrDOlB7vwZ17q/1yecrg2wQ49nkX7/WiHYaNB05mSRqw6ABBz v8fPs1D9RA1AtagOEY3VpcvGAeFoGQwBSSMzVxWuj0Tvb+7YGPiU+1LuTfnLUonyommE wrpsefcux7UhlRsFGxXeQf7/yaGYps/1APTfGS8R4YAuETXk8CJyCF/Zt5fgNyBX6X8K 3uJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701632022; x=1702236822; 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=vguNRNHZWUrDOSu/TVKVOPIB86L1io3LlGEpKJkKhiw=; b=twAPZp1i2Ro37Lj5NDhgwliwlusmp2HgJ4yTWxnKmN3i5wK4ooaW6W3u3aLtIdUv4z OR7dv+QM5WWa4f6A9qLo8DyEa5Zv3WLgqov+IxrdhhCbAaY/Y4G1Ei8FMOroyfwhrjg5 2MBsHWRvtLQ6XPUyQ9U9PAm7OPnP3yKI0q+TSk1Eo2yKaUeP5UlCwf3tdVGdTSqUKWeT 7s4WlXYjm3yAnvstbVKk7mxlxWM1p27Vt0q3ZCRkyKngzsRqL4yFIPxxjBOzShWJqCUr uy/Py3hRi46kPqdBSVqDrUbgi53g1/aUyM4GRZIzP5N/tUtSpTvIx/YQS8RB2xQhc5uy CuBw== X-Gm-Message-State: AOJu0YyKwtlbPA3TiGskpdiNDEMM0QvoPsP92dLUWl7ZCNBS1bmADVOb BAchIgoUq/ucdFS8wMiMoK8= X-Google-Smtp-Source: AGHT+IFSv+65IiQiN8WCGcLVQvQiuR6hHdW5qXQ7nf6ECXpLpXmmUxxmzvhwBggjw2vBz5nonWlXlg== X-Received: by 2002:a05:690c:3745:b0:5d8:5fad:8dcc with SMTP id fw5-20020a05690c374500b005d85fad8dccmr507589ywb.29.1701632022542; Sun, 03 Dec 2023 11:33:42 -0800 (PST) Received: from localhost ([2601:344:8301:57f0:cb98:c3e:57c:8191]) by smtp.gmail.com with ESMTPSA id m190-20020a0dfcc7000000b005463e45458bsm2765478ywf.123.2023.12.03.11.33.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 11:33:41 -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 , Bart Van Assche , Sergey Shtylyov Subject: [PATCH v2 19/35] iommu: use atomic find_bit() API where appropriate Date: Sun, 3 Dec 2023 11:32:51 -0800 Message-Id: <20231203193307.542794-18-yury.norov@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231203193307.542794-1-yury.norov@gmail.com> References: <20231203192422.539300-1-yury.norov@gmail.com> <20231203193307.542794-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-20231203_113343_417437_A479EA3D X-CRM114-Status: GOOD ( 14.31 ) 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 opencoded find_and_set_next_bit() in __arm_smmu_alloc_bitmap() and msm_iommu_alloc_ctx() to use dedicated API, 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; }