From nobody Wed Dec 17 08:28:14 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D879C4332F for ; Tue, 12 Dec 2023 02:29:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345839AbjLLC2y (ORCPT ); Mon, 11 Dec 2023 21:28:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345728AbjLLC2b (ORCPT ); Mon, 11 Dec 2023 21:28:31 -0500 Received: from mail-yb1-xb32.google.com (mail-yb1-xb32.google.com [IPv6:2607:f8b0:4864:20::b32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36768D2 for ; Mon, 11 Dec 2023 18:28:22 -0800 (PST) Received: by mail-yb1-xb32.google.com with SMTP id 3f1490d57ef6-db548cd1c45so4754297276.2 for ; Mon, 11 Dec 2023 18:28:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702348100; x=1702952900; darn=vger.kernel.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=cRG7J1XhtxmqjKk8mPyX2ntR1/BM7lRJBdNSI5UPjng=; b=dh7KC/SmTEaQFhWvABinw27Psg2pc37hmo3Ycxfyx9eXjx8h8ZNP3a02gFsiJFg1XD p8lBQCtqF86u/hsMdEXJwerT6zDx9Id6tarrxmKEhuygHmtPqUlth0W0lNgoLXQO3Reh vVxmxgsIqQgWZrEL6qfgt2LUZOfYXujFOJbV+ZGeetaRTY4+ePl11mpEJiyhIQI34+2X yDxyRuApXIDMIuYDsB9yAD35+lDXRIXtxGqL44yZnFYeKV3BHCzTdXakPtO/KME9Hf/b m2V2EYdr0CHGcttIl/kcOfLvJ8MNBdVqpZDCQi+61v785ocKk2/YeQMJDXfjrYtFEaAr MBNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702348100; x=1702952900; 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=cRG7J1XhtxmqjKk8mPyX2ntR1/BM7lRJBdNSI5UPjng=; b=SLBcISXYwuTKPDncDcI4+ZJb5U+9QnzcVrLONtUiGn823ghY6lKZTiHlf/+KZQN2DD LRM4UHu8y0ohmaqEVGMBFxMzBGFMxMb8srO/kWA6+eW+f/uUKvLbvPLfyI2yPKDL4b7w Lcg6hJs+43hxiktqvvbh5dU4tluJ8wph4eR8esjs2LHTYSW+dTaCRLGzvkF+5nL9G9zR ue4MyLrvJxoPhHz5KHl+OSAxeVHD/IlT1RyK/Rlpwqxrka2zoL8FbsDSkqn8xAvT34Uw B+sbDTWMhWpayV8WllxbF1YXtBG//UajOP7Pp/Sa+pzl2IcyDQc4lT8kIlZtBxxtUp6y OAqw== X-Gm-Message-State: AOJu0YyatXtI11ZcY2Blz6PyC2vz6yf+BtMc/a58EiDh0ek5kUETTv+s trJI3o1CaAe3t/CW6kKe1QYqBBMTHqw+gw== X-Google-Smtp-Source: AGHT+IEDe1TuBstt/JdS9sN5Jdici8f/pUIezbr57W0n76Ca29aTWuI7Tr1KCRpW5+wpaFn4T9eZhA== X-Received: by 2002:a25:6b52:0:b0:dbc:af4d:e1a6 with SMTP id o18-20020a256b52000000b00dbcaf4de1a6mr1177824ybm.1.1702348100254; Mon, 11 Dec 2023 18:28:20 -0800 (PST) Received: from localhost ([2601:344:8301:57f0:38aa:1c88:df05:9b73]) by smtp.gmail.com with ESMTPSA id k15-20020a056902024f00b00d89679f6d22sm2865838ybs.64.2023.12.11.18.28.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 18:28:19 -0800 (PST) From: Yury Norov To: linux-kernel@vger.kernel.org, Michael Ellerman , Nicholas Piggin , Christophe Leroy , Yury Norov , Colin Ian King , linuxppc-dev@lists.ozlabs.org Cc: Jan Kara , Mirsad Todorovac , Matthew Wilcox , Rasmus Villemoes , Andy Shevchenko , Maxim Kuvyrkov , Alexey Klimov , Bart Van Assche , Sergey Shtylyov Subject: [PATCH v3 18/35] powerpc: optimize arch code by using atomic find_bit() API Date: Mon, 11 Dec 2023 18:27:32 -0800 Message-Id: <20231212022749.625238-19-yury.norov@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231212022749.625238-1-yury.norov@gmail.com> References: <20231212022749.625238-1-yury.norov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use find_and_{set,clear}_bit() where appropriate and simplify the logic. Signed-off-by: Yury Norov --- arch/powerpc/mm/book3s32/mmu_context.c | 10 ++--- arch/powerpc/platforms/pasemi/dma_lib.c | 45 +++++----------------- arch/powerpc/platforms/powernv/pci-sriov.c | 12 ++---- 3 files changed, 17 insertions(+), 50 deletions(-) diff --git a/arch/powerpc/mm/book3s32/mmu_context.c b/arch/powerpc/mm/book3= s32/mmu_context.c index 1922f9a6b058..7db19f173c2e 100644 --- a/arch/powerpc/mm/book3s32/mmu_context.c +++ b/arch/powerpc/mm/book3s32/mmu_context.c @@ -50,13 +50,11 @@ static unsigned long context_map[LAST_CONTEXT / BITS_PE= R_LONG + 1]; =20 unsigned long __init_new_context(void) { - unsigned long ctx =3D next_mmu_context; + unsigned long ctx; =20 - while (test_and_set_bit(ctx, context_map)) { - ctx =3D find_next_zero_bit(context_map, LAST_CONTEXT+1, ctx); - if (ctx > LAST_CONTEXT) - ctx =3D 0; - } + ctx =3D find_and_set_next_bit(context_map, LAST_CONTEXT + 1, next_mmu_con= text); + if (ctx > LAST_CONTEXT) + ctx =3D 0; next_mmu_context =3D (ctx + 1) & LAST_CONTEXT; =20 return ctx; diff --git a/arch/powerpc/platforms/pasemi/dma_lib.c b/arch/powerpc/platfor= ms/pasemi/dma_lib.c index 1be1f18f6f09..906dabee0132 100644 --- a/arch/powerpc/platforms/pasemi/dma_lib.c +++ b/arch/powerpc/platforms/pasemi/dma_lib.c @@ -118,14 +118,9 @@ static int pasemi_alloc_tx_chan(enum pasemi_dmachan_ty= pe type) limit =3D MAX_TXCH; break; } -retry: - bit =3D find_next_bit(txch_free, MAX_TXCH, start); - if (bit >=3D limit) - return -ENOSPC; - if (!test_and_clear_bit(bit, txch_free)) - goto retry; - - return bit; + + bit =3D find_and_clear_next_bit(txch_free, MAX_TXCH, start); + return bit < limit ? bit : -ENOSPC; } =20 static void pasemi_free_tx_chan(int chan) @@ -136,15 +131,9 @@ static void pasemi_free_tx_chan(int chan) =20 static int pasemi_alloc_rx_chan(void) { - int bit; -retry: - bit =3D find_first_bit(rxch_free, MAX_RXCH); - if (bit >=3D MAX_TXCH) - return -ENOSPC; - if (!test_and_clear_bit(bit, rxch_free)) - goto retry; - - return bit; + int bit =3D find_and_clear_bit(rxch_free, MAX_RXCH); + + return bit < MAX_TXCH ? bit : -ENOSPC; } =20 static void pasemi_free_rx_chan(int chan) @@ -374,16 +363,9 @@ EXPORT_SYMBOL(pasemi_dma_free_buf); */ int pasemi_dma_alloc_flag(void) { - int bit; + int bit =3D find_and_clear_bit(flags_free, MAX_FLAGS); =20 -retry: - bit =3D find_first_bit(flags_free, MAX_FLAGS); - if (bit >=3D MAX_FLAGS) - return -ENOSPC; - if (!test_and_clear_bit(bit, flags_free)) - goto retry; - - return bit; + return bit < MAX_FLAGS ? bit : -ENOSPC; } EXPORT_SYMBOL(pasemi_dma_alloc_flag); =20 @@ -439,16 +421,9 @@ EXPORT_SYMBOL(pasemi_dma_clear_flag); */ int pasemi_dma_alloc_fun(void) { - int bit; - -retry: - bit =3D find_first_bit(fun_free, MAX_FLAGS); - if (bit >=3D MAX_FLAGS) - return -ENOSPC; - if (!test_and_clear_bit(bit, fun_free)) - goto retry; + int bit =3D find_and_clear_bit(fun_free, MAX_FLAGS); =20 - return bit; + return bit < MAX_FLAGS ? bit : -ENOSPC; } EXPORT_SYMBOL(pasemi_dma_alloc_fun); =20 diff --git a/arch/powerpc/platforms/powernv/pci-sriov.c b/arch/powerpc/plat= forms/powernv/pci-sriov.c index 59882da3e742..640e387e6d83 100644 --- a/arch/powerpc/platforms/powernv/pci-sriov.c +++ b/arch/powerpc/platforms/powernv/pci-sriov.c @@ -397,18 +397,12 @@ static int64_t pnv_ioda_map_m64_single(struct pnv_phb= *phb, =20 static int pnv_pci_alloc_m64_bar(struct pnv_phb *phb, struct pnv_iov_data = *iov) { - int win; + int win =3D find_and_set_bit(&phb->ioda.m64_bar_alloc, phb->ioda.m64_bar_= idx + 1); =20 - do { - win =3D find_next_zero_bit(&phb->ioda.m64_bar_alloc, - phb->ioda.m64_bar_idx + 1, 0); - - if (win >=3D phb->ioda.m64_bar_idx + 1) - return -1; - } while (test_and_set_bit(win, &phb->ioda.m64_bar_alloc)); + if (win >=3D phb->ioda.m64_bar_idx + 1) + return -1; =20 set_bit(win, iov->used_m64_bar_mask); - return win; } =20 --=20 2.40.1