From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jacob Pan Subject: [PATCH v2 07/19] ioasid: Convert ioasid_idr to XArray Date: Tue, 23 Apr 2019 16:31:07 -0700 Message-ID: <1556062279-64135-8-git-send-email-jacob.jun.pan@linux.intel.com> References: <1556062279-64135-1-git-send-email-jacob.jun.pan@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1556062279-64135-1-git-send-email-jacob.jun.pan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, LKML , Joerg Roedel , David Woodhouse , Eric Auger , Alex Williamson , Jean-Philippe Brucker Cc: "Tian, Kevin" , Raj Ashok , Andriy Shevchenko List-Id: iommu@lists.linux-foundation.org IDR is to be replaced by XArray, keep up with the changes. XArray has internal locking for normal APIs used here, also removed radix tree related preload. Suggested-by: Ira Weiny Signed-off-by: Jacob Pan --- drivers/base/ioasid.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/drivers/base/ioasid.c b/drivers/base/ioasid.c index cf122b2..c4012aa 100644 --- a/drivers/base/ioasid.c +++ b/drivers/base/ioasid.c @@ -4,7 +4,7 @@ * subsets. Users create a subset with DECLARE_IOASID_SET, then allocate and * free IOASIDs with ioasid_alloc and ioasid_free. */ -#include +#include #include #include #include @@ -16,13 +16,12 @@ struct ioasid_data { struct rcu_head rcu; }; -static DEFINE_IDR(ioasid_idr); - +static DEFINE_XARRAY_ALLOC(ioasid_xa); /** * ioasid_alloc - Allocate an IOASID * @set: the IOASID set * @min: the minimum ID (inclusive) - * @max: the maximum ID (exclusive) + * @max: the maximum ID (inclusive) * @private: data private to the caller * * Allocate an ID between @min and @max (or %0 and %INT_MAX). Return the @@ -41,13 +40,13 @@ ioasid_t ioasid_alloc(struct ioasid_set *set, ioasid_t min, ioasid_t max, data->set = set; data->private = private; + if (xa_alloc(&ioasid_xa, &id, data, XA_LIMIT(min, max), GFP_KERNEL)) { + pr_err("Failed to alloc ioasid from %d to %d\n", min, max); + goto exit_free; + } - idr_preload(GFP_KERNEL); - idr_lock(&ioasid_idr); - data->id = id = idr_alloc(&ioasid_idr, data, min, max, GFP_ATOMIC); - idr_unlock(&ioasid_idr); - idr_preload_end(); - + data->id = id; +exit_free: if (id < 0) { kfree(data); return INVALID_IOASID; @@ -64,12 +63,8 @@ void ioasid_free(ioasid_t ioasid) { struct ioasid_data *ioasid_data; - idr_lock(&ioasid_idr); - ioasid_data = idr_remove(&ioasid_idr, ioasid); - idr_unlock(&ioasid_idr); - - if (ioasid_data) - kfree_rcu(ioasid_data, rcu); + ioasid_data = xa_erase(&ioasid_xa, ioasid); + kfree_rcu(ioasid_data, rcu); } EXPORT_SYMBOL_GPL(ioasid_free); @@ -93,7 +88,7 @@ void *ioasid_find(struct ioasid_set *set, ioasid_t ioasid, struct ioasid_data *ioasid_data; rcu_read_lock(); - ioasid_data = idr_find(&ioasid_idr, ioasid); + ioasid_data = xa_load(&ioasid_xa, ioasid); if (ioasid_data && ioasid_data->set == set) { priv = ioasid_data->private; if (getter && !getter(priv)) -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED348C10F03 for ; Tue, 23 Apr 2019 23:29:41 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C2722218DA for ; Tue, 23 Apr 2019 23:29:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2722218DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 71B3AF07; Tue, 23 Apr 2019 23:28:45 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 0A38BEBC for ; Tue, 23 Apr 2019 23:28:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9644582B for ; Tue, 23 Apr 2019 23:28:41 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Apr 2019 16:28:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,387,1549958400"; d="scan'208";a="293981272" Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by orsmga004.jf.intel.com with ESMTP; 23 Apr 2019 16:28:38 -0700 From: Jacob Pan To: iommu@lists.linux-foundation.org, LKML , Joerg Roedel , David Woodhouse , Eric Auger , Alex Williamson , Jean-Philippe Brucker Subject: [PATCH v2 07/19] ioasid: Convert ioasid_idr to XArray Date: Tue, 23 Apr 2019 16:31:07 -0700 Message-Id: <1556062279-64135-8-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556062279-64135-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1556062279-64135-1-git-send-email-jacob.jun.pan@linux.intel.com> Cc: "Tian, Kevin" , Raj Ashok , Andriy Shevchenko X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org Message-ID: <20190423233107.KzBk1yuSDBkGzhEwp9mTW1R6pYzPBFfxKbCWHhnib1A@z> IDR is to be replaced by XArray, keep up with the changes. XArray has internal locking for normal APIs used here, also removed radix tree related preload. Suggested-by: Ira Weiny Signed-off-by: Jacob Pan --- drivers/base/ioasid.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/drivers/base/ioasid.c b/drivers/base/ioasid.c index cf122b2..c4012aa 100644 --- a/drivers/base/ioasid.c +++ b/drivers/base/ioasid.c @@ -4,7 +4,7 @@ * subsets. Users create a subset with DECLARE_IOASID_SET, then allocate and * free IOASIDs with ioasid_alloc and ioasid_free. */ -#include +#include #include #include #include @@ -16,13 +16,12 @@ struct ioasid_data { struct rcu_head rcu; }; -static DEFINE_IDR(ioasid_idr); - +static DEFINE_XARRAY_ALLOC(ioasid_xa); /** * ioasid_alloc - Allocate an IOASID * @set: the IOASID set * @min: the minimum ID (inclusive) - * @max: the maximum ID (exclusive) + * @max: the maximum ID (inclusive) * @private: data private to the caller * * Allocate an ID between @min and @max (or %0 and %INT_MAX). Return the @@ -41,13 +40,13 @@ ioasid_t ioasid_alloc(struct ioasid_set *set, ioasid_t min, ioasid_t max, data->set = set; data->private = private; + if (xa_alloc(&ioasid_xa, &id, data, XA_LIMIT(min, max), GFP_KERNEL)) { + pr_err("Failed to alloc ioasid from %d to %d\n", min, max); + goto exit_free; + } - idr_preload(GFP_KERNEL); - idr_lock(&ioasid_idr); - data->id = id = idr_alloc(&ioasid_idr, data, min, max, GFP_ATOMIC); - idr_unlock(&ioasid_idr); - idr_preload_end(); - + data->id = id; +exit_free: if (id < 0) { kfree(data); return INVALID_IOASID; @@ -64,12 +63,8 @@ void ioasid_free(ioasid_t ioasid) { struct ioasid_data *ioasid_data; - idr_lock(&ioasid_idr); - ioasid_data = idr_remove(&ioasid_idr, ioasid); - idr_unlock(&ioasid_idr); - - if (ioasid_data) - kfree_rcu(ioasid_data, rcu); + ioasid_data = xa_erase(&ioasid_xa, ioasid); + kfree_rcu(ioasid_data, rcu); } EXPORT_SYMBOL_GPL(ioasid_free); @@ -93,7 +88,7 @@ void *ioasid_find(struct ioasid_set *set, ioasid_t ioasid, struct ioasid_data *ioasid_data; rcu_read_lock(); - ioasid_data = idr_find(&ioasid_idr, ioasid); + ioasid_data = xa_load(&ioasid_xa, ioasid); if (ioasid_data && ioasid_data->set == set) { priv = ioasid_data->private; if (getter && !getter(priv)) -- 2.7.4 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu