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.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 7398CC2D0E5 for ; Wed, 25 Mar 2020 17:49:58 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 5815F2077D for ; Wed, 25 Mar 2020 17:49:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5815F2077D 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 localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0011A86D4D; Wed, 25 Mar 2020 17:49:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Jxj39S9w-aSS; Wed, 25 Mar 2020 17:49:54 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id A932C86D4C; Wed, 25 Mar 2020 17:49:54 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 92580C1D89; Wed, 25 Mar 2020 17:49:54 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id E1B9FC0177 for ; Wed, 25 Mar 2020 17:49:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D12AB2002F for ; Wed, 25 Mar 2020 17:49:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eB1ByVEVfbq5 for ; Wed, 25 Mar 2020 17:49:50 +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 silver.osuosl.org (Postfix) with ESMTPS id 020AF203C8 for ; Wed, 25 Mar 2020 17:49:49 +0000 (UTC) IronPort-SDR: 4TVhMLUn58nZHmBlSxO4VEVRnJT53Yzy/4pmjgrErKuj7LgfLAq/2qGdImwoN3/m1T3H3wYboB 3xotPSQLSXGQ== 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/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2020 10:49:49 -0700 IronPort-SDR: JHNxqwN5HbSN55qRt7J9LFpd4xR92JoIojOa2cG3wliONfcRq/smDB4zRNCAB0h2TDgFJuJiw8 ufoGisK49q3g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,305,1580803200"; d="scan'208";a="393702210" Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by orsmga004.jf.intel.com with ESMTP; 25 Mar 2020 10:49:48 -0700 From: Jacob Pan To: Joerg Roedel , Alex Williamson , "Lu Baolu" , iommu@lists.linux-foundation.org, LKML , David Woodhouse , Jean-Philippe Brucker Subject: [PATCH 07/10] iommu/ioasid: Use mutex instead of spinlock Date: Wed, 25 Mar 2020 10:55:28 -0700 Message-Id: <1585158931-1825-8-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1585158931-1825-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1585158931-1825-1-git-send-email-jacob.jun.pan@linux.intel.com> Cc: "Tian, Kevin" , Raj Ashok , Jonathan Cameron X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 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="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" Each IOASID or set could have multiple users with its own HW context to maintain. Often times access to the HW context requires thread context. For example, consumers of IOASIDs can register notification blocks to sync up its states. Having an atomic notifier is not feasible for these update operations. This patch converts allocator lock from spinlock to mutex in preparation for IOASID notifier. Signed-off-by: Jacob Pan --- drivers/iommu/ioasid.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/drivers/iommu/ioasid.c b/drivers/iommu/ioasid.c index f89a595f6978..8612fe6477dc 100644 --- a/drivers/iommu/ioasid.c +++ b/drivers/iommu/ioasid.c @@ -98,7 +98,7 @@ struct ioasid_allocator_data { struct rcu_head rcu; }; -static DEFINE_SPINLOCK(ioasid_allocator_lock); +static DEFINE_MUTEX(ioasid_allocator_lock); static LIST_HEAD(allocators_list); static ioasid_t default_alloc(ioasid_t min, ioasid_t max, void *opaque); @@ -121,7 +121,7 @@ static ioasid_t default_alloc(ioasid_t min, ioasid_t max, void *opaque) { ioasid_t id; - if (xa_alloc(&default_allocator.xa, &id, opaque, XA_LIMIT(min, max), GFP_ATOMIC)) { + if (xa_alloc(&default_allocator.xa, &id, opaque, XA_LIMIT(min, max), GFP_KERNEL)) { pr_err("Failed to alloc ioasid from %d to %d\n", min, max); return INVALID_IOASID; } @@ -142,7 +142,7 @@ static struct ioasid_allocator_data *ioasid_alloc_allocator(struct ioasid_alloca { struct ioasid_allocator_data *ia_data; - ia_data = kzalloc(sizeof(*ia_data), GFP_ATOMIC); + ia_data = kzalloc(sizeof(*ia_data), GFP_KERNEL); if (!ia_data) return NULL; @@ -184,7 +184,7 @@ int ioasid_register_allocator(struct ioasid_allocator_ops *ops) struct ioasid_allocator_data *pallocator; int ret = 0; - spin_lock(&ioasid_allocator_lock); + mutex_lock(&ioasid_allocator_lock); ia_data = ioasid_alloc_allocator(ops); if (!ia_data) { @@ -228,12 +228,12 @@ int ioasid_register_allocator(struct ioasid_allocator_ops *ops) } list_add_tail(&ia_data->list, &allocators_list); - spin_unlock(&ioasid_allocator_lock); + mutex_unlock(&ioasid_allocator_lock); return 0; out_free: kfree(ia_data); out_unlock: - spin_unlock(&ioasid_allocator_lock); + mutex_unlock(&ioasid_allocator_lock); return ret; } EXPORT_SYMBOL_GPL(ioasid_register_allocator); @@ -251,7 +251,7 @@ void ioasid_unregister_allocator(struct ioasid_allocator_ops *ops) struct ioasid_allocator_data *pallocator; struct ioasid_allocator_ops *sops; - spin_lock(&ioasid_allocator_lock); + mutex_lock(&ioasid_allocator_lock); if (list_empty(&allocators_list)) { pr_warn("No custom IOASID allocators active!\n"); goto exit_unlock; @@ -296,7 +296,7 @@ void ioasid_unregister_allocator(struct ioasid_allocator_ops *ops) } exit_unlock: - spin_unlock(&ioasid_allocator_lock); + mutex_unlock(&ioasid_allocator_lock); } EXPORT_SYMBOL_GPL(ioasid_unregister_allocator); @@ -313,13 +313,13 @@ int ioasid_attach_data(ioasid_t ioasid, void *data) struct ioasid_data *ioasid_data; int ret = 0; - spin_lock(&ioasid_allocator_lock); + mutex_lock(&ioasid_allocator_lock); ioasid_data = xa_load(&active_allocator->xa, ioasid); if (ioasid_data) rcu_assign_pointer(ioasid_data->private, data); else ret = -ENOENT; - spin_unlock(&ioasid_allocator_lock); + mutex_unlock(&ioasid_allocator_lock); /* * Wait for readers to stop accessing the old private data, so the @@ -374,7 +374,7 @@ ioasid_t ioasid_alloc(int sid, ioasid_t min, ioasid_t max, void *private) * Custom allocator needs allocator data to perform platform specific * operations. */ - spin_lock(&ioasid_allocator_lock); + mutex_lock(&ioasid_allocator_lock); adata = active_allocator->flags & IOASID_ALLOCATOR_CUSTOM ? active_allocator->ops->pdata : data; id = active_allocator->ops->alloc(min, max, adata); if (id == INVALID_IOASID) { @@ -383,7 +383,7 @@ ioasid_t ioasid_alloc(int sid, ioasid_t min, ioasid_t max, void *private) } if ((active_allocator->flags & IOASID_ALLOCATOR_CUSTOM) && - xa_alloc(&active_allocator->xa, &id, data, XA_LIMIT(id, id), GFP_ATOMIC)) { + xa_alloc(&active_allocator->xa, &id, data, XA_LIMIT(id, id), GFP_KERNEL)) { /* Custom allocator needs framework to store and track allocation results */ pr_err("Failed to alloc ioasid from %d\n", id); active_allocator->ops->free(id, active_allocator->ops->pdata); @@ -394,10 +394,11 @@ ioasid_t ioasid_alloc(int sid, ioasid_t min, ioasid_t max, void *private) /* Store IOASID in the per set data */ xa_store(&sdata->xa, id, data, GFP_KERNEL); sdata->nr_ioasids++; - spin_unlock(&ioasid_allocator_lock); + mutex_unlock(&ioasid_allocator_lock); + return id; exit_free: - spin_unlock(&ioasid_allocator_lock); + mutex_unlock(&ioasid_allocator_lock); kfree(data); return INVALID_IOASID; } @@ -440,9 +441,9 @@ static void ioasid_free_locked(ioasid_t ioasid) */ void ioasid_free(ioasid_t ioasid) { - spin_lock(&ioasid_allocator_lock); + mutex_lock(&ioasid_allocator_lock); ioasid_free_locked(ioasid); - spin_unlock(&ioasid_allocator_lock); + mutex_unlock(&ioasid_allocator_lock); } EXPORT_SYMBOL_GPL(ioasid_free); @@ -473,7 +474,7 @@ int ioasid_alloc_set(struct ioasid_set *token, ioasid_t quota, int *sid) if (!sdata) return -ENOMEM; - spin_lock(&ioasid_allocator_lock); + mutex_lock(&ioasid_allocator_lock); ret = xa_alloc(&ioasid_sets, &id, sdata, XA_LIMIT(0, ioasid_capacity_avail - quota), @@ -497,7 +498,7 @@ int ioasid_alloc_set(struct ioasid_set *token, ioasid_t quota, int *sid) *sid = id; error: - spin_unlock(&ioasid_allocator_lock); + mutex_unlock(&ioasid_allocator_lock); return ret; } @@ -518,7 +519,7 @@ void ioasid_free_set(int sid, bool destroy_set) struct ioasid_data *entry; unsigned long index; - spin_lock(&ioasid_allocator_lock); + mutex_lock(&ioasid_allocator_lock); sdata = xa_load(&ioasid_sets, sid); if (!sdata) { pr_err("No IOASID set found to free %d\n", sid); @@ -549,7 +550,7 @@ void ioasid_free_set(int sid, bool destroy_set) } done_unlock: - spin_unlock(&ioasid_allocator_lock); + mutex_unlock(&ioasid_allocator_lock); } EXPORT_SYMBOL_GPL(ioasid_free_set); @@ -613,11 +614,11 @@ int ioasid_find_sid(ioasid_t ioasid) struct ioasid_data *ioasid_data; int ret = 0; - spin_lock(&ioasid_allocator_lock); + mutex_lock(&ioasid_allocator_lock); ioasid_data = xa_load(&active_allocator->xa, ioasid); ret = (ioasid_data) ? ioasid_data->sdata->sid : -ENOENT; - spin_unlock(&ioasid_allocator_lock); + mutex_unlock(&ioasid_allocator_lock); return ret; } -- 2.7.4 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu