Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1078438yba; Fri, 3 May 2019 15:44:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqykVIvvdJCoHWyrfhXnbM8he2AZEWXnbfCz52v00aYFbaFbDM2dRNL/CPg/e27T+4RfU3II X-Received: by 2002:a17:902:382:: with SMTP id d2mr14294186pld.253.1556923498703; Fri, 03 May 2019 15:44:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556923498; cv=none; d=google.com; s=arc-20160816; b=XIHjohz7SqoF/udLEgzkebXIpqw3dvUFdS9FgvDHzJ6ygslCuMWd2+83yTIm5mRzPf HlTUxHlwPSQNQznVNvgUPWJROxCRsXxFHkTrvBNhY0IVCexwvf9MCHAZVl1bNsXeXSAr 51VfVtqlVufoG0NyZpWVyQXEZV9qFxyQlZgWaIcL4hrrHlJNNjAzE8s+2YIYQJ62pfFZ DsXgUbpuoF6ZT2+Uckk9akMOZlGHTGC0kax1ndIpheNAIR9GlwhRmsxeNgTQDyKllhL/ N9GQ13MYo3hOi5vZf1boO0Prq0TVPaxR8qJzdvZD4GRH7ceEqgUsANyB4e3HfkciHfST 3bfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=UdFsz/9YUJtoGmJf1CfHfa2dfq9LR6JCsXzFdGBcLLo=; b=CVdLuB8byOqlVYxSvoo0dbFTtiUJqj4BpYhd3fGXHFZ6c4CvLCfKI9GEBAvIx1Ql5m VEFOcZw/vhQZfClWGOKEMnnM2UWr4x29/kzVD6CflGtQ8jHQiug4m/HyFt0oc1zasvzD 84YDasFmOa0upyNZmlNLgnbKbkCuY99XILYlG6KsIxdQ4xgpQ+LBc/DwHeO/nHVtAZMM M5W4bKAFcW4Gj7KCyRiNxA1Zlnh32zk0e5zFWbcZEet4eosibqeDoz3/WCgaqL8/Uj71 9M5Wl8fyP103Adx3FyWSqRSVpgVdzdmQiKlCGR2hr+CuFI6xjqhoKqeJbT5e2vaD6tVj 9Tbw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w6si4425696pgf.221.2019.05.03.15.44.43; Fri, 03 May 2019 15:44:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727020AbfECW3n (ORCPT + 99 others); Fri, 3 May 2019 18:29:43 -0400 Received: from mga02.intel.com ([134.134.136.20]:7006 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726620AbfECW3e (ORCPT ); Fri, 3 May 2019 18:29:34 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 May 2019 15:29:33 -0700 X-ExtLoop1: 1 Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by orsmga002.jf.intel.com with ESMTP; 03 May 2019 15:29:32 -0700 From: Jacob Pan To: iommu@lists.linux-foundation.org, LKML , Joerg Roedel , David Woodhouse , Eric Auger , Alex Williamson , Jean-Philippe Brucker Cc: "Yi Liu" , "Tian, Kevin" , Raj Ashok , "Christoph Hellwig" , "Lu Baolu" , Andriy Shevchenko , Jacob Pan Subject: [PATCH v3 04/16] ioasid: Add custom IOASID allocator Date: Fri, 3 May 2019 15:32:05 -0700 Message-Id: <1556922737-76313-5-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556922737-76313-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1556922737-76313-1-git-send-email-jacob.jun.pan@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sometimes, IOASID allocation must be handled by platform specific code. The use cases are guest vIOMMU and pvIOMMU where IOASIDs need to be allocated by the host via enlightened or paravirt interfaces. This patch adds an extension to the IOASID allocator APIs such that platform drivers can register a custom allocator, possibly at boot time, to take over the allocation. Xarray is still used for tracking and searching purposes internal to the IOASID code. Private data of an IOASID can also be set after the allocation. There can be multiple custom allocators registered but only one is used at a time. In case of hot removal of devices that provides the allocator, all IOASIDs must be freed prior to unregistering the allocator. Default XArray based allocator cannot be mixed with custom allocators, i.e. custom allocators will not be used if there are outstanding IOASIDs allocated by the default XA allocator. Signed-off-by: Jacob Pan --- drivers/iommu/ioasid.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/drivers/iommu/ioasid.c b/drivers/iommu/ioasid.c index 99f5e0a..ed2915a 100644 --- a/drivers/iommu/ioasid.c +++ b/drivers/iommu/ioasid.c @@ -17,6 +17,100 @@ struct ioasid_data { }; static DEFINE_XARRAY_ALLOC(ioasid_xa); +static DEFINE_MUTEX(ioasid_allocator_lock); +static struct ioasid_allocator *active_custom_allocator; + +static LIST_HEAD(custom_allocators); +/* + * A flag to track if ioasid default allocator is in use, this will + * prevent custom allocator from being used. The reason is that custom allocator + * must have unadulterated space to track private data with xarray, there cannot + * be a mix been default and custom allocated IOASIDs. + */ +static int default_allocator_active; + +/** + * ioasid_register_allocator - register a custom allocator + * @allocator: the custom allocator to be registered + * + * Custom allocators take precedence over the default xarray based allocator. + * Private data associated with the ASID are managed by ASID common code + * similar to data stored in xa. + * + * There can be multiple allocators registered but only one is active. In case + * of runtime removal of a custom allocator, the next one is activated based + * on the registration ordering. + */ +int ioasid_register_allocator(struct ioasid_allocator *allocator) +{ + struct ioasid_allocator *pallocator; + int ret = 0; + + if (!allocator) + return -EINVAL; + + mutex_lock(&ioasid_allocator_lock); + /* + * No particular preference since all custom allocators end up calling + * the host to allocate IOASIDs. We activate the first one and keep + * the later registered allocators in a list in case the first one gets + * removed due to hotplug. + */ + if (list_empty(&custom_allocators)) + active_custom_allocator = allocator; + else { + /* Check if the allocator is already registered */ + list_for_each_entry(pallocator, &custom_allocators, list) { + if (pallocator == allocator) { + pr_err("IOASID allocator already registered\n"); + ret = -EEXIST; + goto out_unlock; + } + } + } + list_add_tail(&allocator->list, &custom_allocators); + +out_unlock: + mutex_unlock(&ioasid_allocator_lock); + return ret; +} +EXPORT_SYMBOL_GPL(ioasid_register_allocator); + +/** + * ioasid_unregister_allocator - Remove a custom IOASID allocator + * @allocator: the custom allocator to be removed + * + * Remove an allocator from the list, activate the next allocator in + * the order it was registered. + */ +void ioasid_unregister_allocator(struct ioasid_allocator *allocator) +{ + if (!allocator) + return; + + if (list_empty(&custom_allocators)) { + pr_warn("No custom IOASID allocators active!\n"); + return; + } + + mutex_lock(&ioasid_allocator_lock); + list_del(&allocator->list); + if (list_empty(&custom_allocators)) { + pr_info("No custom IOASID allocators\n"); + /* + * All IOASIDs should have been freed before the last custom + * allocator is unregistered. Unless default allocator is in + * use. + */ + BUG_ON(!xa_empty(&ioasid_xa) && !default_allocator_active); + active_custom_allocator = NULL; + } else if (allocator == active_custom_allocator) { + active_custom_allocator = list_entry(&custom_allocators, struct ioasid_allocator, list); + pr_info("IOASID allocator changed"); + } + mutex_unlock(&ioasid_allocator_lock); +} +EXPORT_SYMBOL_GPL(ioasid_unregister_allocator); /** * ioasid_set_data - Set private data for an allocated ioasid @@ -68,6 +162,29 @@ ioasid_t ioasid_alloc(struct ioasid_set *set, ioasid_t min, ioasid_t max, data->set = set; data->private = private; + mutex_lock(&ioasid_allocator_lock); + /* + * Use custom allocator if available, otherwise use default. + * However, if there are active IOASIDs already been allocated by default + * allocator, custom allocator cannot be used. + */ + if (!default_allocator_active && active_custom_allocator) { + id = active_custom_allocator->alloc(min, max, active_custom_allocator->pdata); + if (id == INVALID_IOASID) { + pr_err("Failed ASID allocation by custom allocator\n"); + mutex_unlock(&ioasid_allocator_lock); + goto exit_free; + } + /* + * Use XA to manage private data also sanitiy check custom + * allocator for duplicates. + */ + min = id; + max = id + 1; + } else + default_allocator_active = 1; + mutex_unlock(&ioasid_allocator_lock); + 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; @@ -91,9 +208,17 @@ void ioasid_free(ioasid_t ioasid) { struct ioasid_data *ioasid_data; + mutex_lock(&ioasid_allocator_lock); + if (active_custom_allocator) + active_custom_allocator->free(ioasid, active_custom_allocator->pdata); + mutex_unlock(&ioasid_allocator_lock); + ioasid_data = xa_erase(&ioasid_xa, ioasid); kfree_rcu(ioasid_data, rcu); + + if (xa_empty(&ioasid_xa)) + default_allocator_active = 0; } EXPORT_SYMBOL_GPL(ioasid_free); -- 2.7.4