From patchwork Tue Dec 12 02:27:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 13488391 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 58363C4167B for ; Tue, 12 Dec 2023 02:28: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=vT5Xq2YWIVG1IBNbVYZOUtXtn0pIsBrEXLugzQVZWAA=; b=J0Rxe1RKSUntM4 ElKbDRVE3vVhj2Svej7/kXQ2E3B7ZD+DNnti/tn4+Q+6cDh0jsdRrlYM6bfkVsdylNspkbetR/fR3 qEU8l30JWuJbNgqW3ywaVovaXtfZXJ+hDjBPgrZjwScD94F3sQ9+EQskyXZ3743g5e/XmgSy8Vw1o oqvekSYohfWyL0TMHx21vVaXAZC6ULXXQExJIeFc9Gcjyt/LoTTxHnTtF+Ji4u4hCh48GSu3Om/v5 GQYoqIbUZHZERNaLbX4v4Ml23kQF7PZ+w8MEq+0FM32O1G/kXs1dnvb5ii2aKJ0VsvrQ6Lg0cE9qh G5GuL1hdX44GAvMVCf3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rCsVa-00AWl7-0U; Tue, 12 Dec 2023 02:28:30 +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 1rCsVT-00AWdn-11 for linux-arm-kernel@lists.infradead.org; Tue, 12 Dec 2023 02:28:24 +0000 Received: by mail-yw1-x112a.google.com with SMTP id 00721157ae682-5e1a2253045so6491067b3.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=1702348102; x=1702952902; 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=GRgDjRdiQ3wMwyUy9FFnN6Mv3fA6CH+t16OZs0Rwzhk=; b=hb8bJzm0YV8Y8NuvxheqHEDnG+9QkW1p9ZE0Re6wT52RjrEQp+/ee865ajAIU7z6GU hD8KkEkjly1mttGHoXHwLvT60CA+rbPItsS6tdWCFTrx2v9IEsnkGa5tkIus33a3n4cZ tguIbp6CEfC6er7cbk7QCb9df2lsuOkt6tIXFfP011G829qoIRZxltAn65Dd7ES2lhqE N25u5aO1uCYCy/6FgORU/7LphLOau9rVaWHv8F/O4KGj3SVsMiQPWctV7Y3s03+THfx9 xBFinr57e+wUSr+gkGg/TTfj8Crg1jWkCRHTup+yIuP/B1x9Hr4y5rXLgIF9LJ22HURo vxcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702348102; x=1702952902; 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=GRgDjRdiQ3wMwyUy9FFnN6Mv3fA6CH+t16OZs0Rwzhk=; b=SdaHmaOSy16FNxHGHSq9ii+4JF7sKbFyPiddTRNrIZtccs4JGG3MYlm/TwYyxpz9gj Mtc2PJYf2ba/Ni27krIpb664RyHXHJYUegveE1O5bVpzwgpaA8mXDqOovEKIlFu6B1fN lDPUfbv8oc+QRT8d7fRBsCuOF2AhN7hylSaAVPLOKfkc/JNV1AC7h6KAcYvIyjGA0Kyl BR4JOPSi9/zcmDAPWfCq6pcporjSnspS2uuDZGKGiPl795+zuI4lgUzGPGDQHU8dk7lF lC/JFzBJ2OMw7aXzxrCgdJaOo9CtSfSDu23L6JepHoyOVOR90q+Lg548k4obgtgSWK3r gehw== X-Gm-Message-State: AOJu0Yz7FlI/v72q470rDrLSJ/lqrcxO7jkDltCsQ6hoFkR5+bgSrVff x00agyh6M/5zTJiiIC3O+xk= X-Google-Smtp-Source: AGHT+IGMwceB9+j1udge1W4cal0kKbCSQgG5Yh316/EdKS360cK7bZCjDy7dckWdtEwCMNE+mk/JJA== X-Received: by 2002:a05:690c:2c0a:b0:5e1:8405:8b3e with SMTP id eo10-20020a05690c2c0a00b005e184058b3emr1116070ywb.44.1702348101890; Mon, 11 Dec 2023 18:28:21 -0800 (PST) Received: from localhost ([2601:344:8301:57f0:38aa:1c88:df05:9b73]) by smtp.gmail.com with ESMTPSA id ff9-20020a05690c320900b005e184771849sm519809ywb.93.2023.12.11.18.28.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 18:28:21 -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 v3 19/35] iommu: optimize subsystem by using atomic find_bit() API Date: Mon, 11 Dec 2023 18:27:33 -0800 Message-Id: <20231212022749.625238-20-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231211_182823_390900_42194A1B X-CRM114-Status: GOOD ( 14.66 ) 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 Simplify __arm_smmu_alloc_bitmap() and msm_iommu_alloc_ctx() by using a 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; }