Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp4010877ybg; Fri, 25 Oct 2019 12:03:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqwl6OQRRU1djid7dIbzcVjWoAmoL1tL74r2Y+hH+DDwugOnlrE6STFdoA6cxDyrmQXa3cTF X-Received: by 2002:a17:906:7f06:: with SMTP id d6mr2641344ejr.323.1572030238755; Fri, 25 Oct 2019 12:03:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572030238; cv=none; d=google.com; s=arc-20160816; b=NdPJhkwPagLKwpZ88WJqkqJXnOavPhYgH33GLtpXEtSuDZqOMeVlLT6q3ABsQxOHYw 1c9Aw6dnnI6M31uodlpvxPF6dwVjoOBhqlTAFfUfphURhRMDj0/scDHqOTLQl0b6PmQ1 P2wQB4QjiC20PXL3mUlzv7Xc/WrJzePGbbO6Ra/72tnSDCJPjF30OfTWEdPJextwPfLs xJv/6ebZ68nN/aICnzM4R8JgyC6KfZ9hs+KJkmUHFvmudB+vaWpEXPksx0D4fgJNksRi aCTVeF7VBXAulq0FVW80rBaG67043lmHO9CkDnePU+46suTTaP8q3Z/w9zqcJtrccQYO 0OgQ== 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=Pwk45YwlbmPBuf9l0WAH73NAgIr4jUKOZXrCiQZb32A=; b=bxpNsfHBxzbZB/S2syvNe1xOYm3GwdhECszVTqru/cKLa3SJLIcqm84MzpE7e8n+y2 u2fzbGgXIA5pe3cuwmeegE+zKee9ASQx4B4y5RcGfklolqH6wbb2fKug/Zl6O/tJw+36 WmfAk0byakINu3K3Opx622VTOibcz2SNlmgg0ybWtYq322a2Y9PIxi5qo5JxQZlzGxbZ INJeLcPqsuswpm0Muu0ycV/01O/11e2HtBUHsdZTr5x6jdVtjUBAkyIrYskoyGToJiZm js27o5UiacEaSe2efp/tG+IEaneaDw/Xpes9UPK90YEHmVfWh6X5fMUzt15UNz2+S0HH 7EjQ== 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 f4si1814874ejc.218.2019.10.25.12.03.32; Fri, 25 Oct 2019 12:03: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 S2502134AbfJXTvQ (ORCPT + 99 others); Thu, 24 Oct 2019 15:51:16 -0400 Received: from mga07.intel.com ([134.134.136.100]:62203 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437405AbfJXTuq (ORCPT ); Thu, 24 Oct 2019 15:50:46 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Oct 2019 12:50:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,225,1569308400"; d="scan'208";a="282043142" Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by orsmga001.jf.intel.com with ESMTP; 24 Oct 2019 12:50:43 -0700 From: Jacob Pan To: iommu@lists.linux-foundation.org, LKML , Joerg Roedel , David Woodhouse , Alex Williamson , Jean-Philippe Brucker Cc: "Yi Liu" , "Tian, Kevin" , Raj Ashok , "Christoph Hellwig" , "Lu Baolu" , Jonathan Cameron , Eric Auger , Jacob Pan Subject: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID Date: Thu, 24 Oct 2019 12:54:56 -0700 Message-Id: <1571946904-86776-4-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571946904-86776-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1571946904-86776-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 When VT-d driver runs in the guest, PASID allocation must be performed via virtual command interface. This patch registers a custom IOASID allocator which takes precedence over the default XArray based allocator. The resulting IOASID allocation will always come from the host. This ensures that PASID namespace is system- wide. Signed-off-by: Lu Baolu Signed-off-by: Liu, Yi L Signed-off-by: Jacob Pan --- drivers/iommu/Kconfig | 1 + drivers/iommu/intel-iommu.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 2 ++ 3 files changed, 70 insertions(+) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index fd50ddffffbf..961fe5795a90 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -211,6 +211,7 @@ config INTEL_IOMMU_SVM bool "Support for Shared Virtual Memory with Intel IOMMU" depends on INTEL_IOMMU && X86 select PCI_PASID + select IOASID select MMU_NOTIFIER help Shared Virtual Memory (SVM) provides a facility for devices diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 3f974919d3bd..ced1d89ef977 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -1706,6 +1706,9 @@ static void free_dmar_iommu(struct intel_iommu *iommu) if (ecap_prs(iommu->ecap)) intel_svm_finish_prq(iommu); } + if (ecap_vcs(iommu->ecap) && vccap_pasid(iommu->vccap)) + ioasid_unregister_allocator(&iommu->pasid_allocator); + #endif } @@ -4910,6 +4913,44 @@ static int __init probe_acpi_namespace_devices(void) return 0; } +#ifdef CONFIG_INTEL_IOMMU_SVM +static ioasid_t intel_ioasid_alloc(ioasid_t min, ioasid_t max, void *data) +{ + struct intel_iommu *iommu = data; + ioasid_t ioasid; + + /* + * VT-d virtual command interface always uses the full 20 bit + * PASID range. Host can partition guest PASID range based on + * policies but it is out of guest's control. + */ + if (min < PASID_MIN || max > intel_pasid_max_id) + return INVALID_IOASID; + + if (vcmd_alloc_pasid(iommu, &ioasid)) + return INVALID_IOASID; + + return ioasid; +} + +static void intel_ioasid_free(ioasid_t ioasid, void *data) +{ + struct intel_iommu *iommu = data; + + if (!iommu) + return; + /* + * Sanity check the ioasid owner is done at upper layer, e.g. VFIO + * We can only free the PASID when all the devices are unbond. + */ + if (ioasid_find(NULL, ioasid, NULL)) { + pr_alert("Cannot free active IOASID %d\n", ioasid); + return; + } + vcmd_free_pasid(iommu, ioasid); +} +#endif + int __init intel_iommu_init(void) { int ret = -ENODEV; @@ -5020,6 +5061,32 @@ int __init intel_iommu_init(void) "%s", iommu->name); iommu_device_set_ops(&iommu->iommu, &intel_iommu_ops); iommu_device_register(&iommu->iommu); +#ifdef CONFIG_INTEL_IOMMU_SVM + if (ecap_vcs(iommu->ecap) && vccap_pasid(iommu->vccap)) { + pr_info("Register custom PASID allocator\n"); + /* + * Register a custom ASID allocator if we are running + * in a guest, the purpose is to have a system wide PASID + * namespace among all PASID users. + * There can be multiple vIOMMUs in each guest but only + * one allocator is active. All vIOMMU allocators will + * eventually be calling the same host allocator. + */ + iommu->pasid_allocator.alloc = intel_ioasid_alloc; + iommu->pasid_allocator.free = intel_ioasid_free; + iommu->pasid_allocator.pdata = (void *)iommu; + ret = ioasid_register_allocator(&iommu->pasid_allocator); + if (ret) { + pr_warn("Custom PASID allocator registeration failed\n"); + /* + * Disable scalable mode on this IOMMU if there + * is no custom allocator. Mixing SM capable vIOMMU + * and non-SM vIOMMU are not supported. + */ + intel_iommu_sm = 0; + } + } +#endif } bus_set_iommu(&pci_bus_type, &intel_iommu_ops); diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 1d4b8dcdc5d8..c624733cb2e6 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -546,6 +547,7 @@ struct intel_iommu { #ifdef CONFIG_INTEL_IOMMU_SVM struct page_req_dsc *prq; unsigned char prq_name[16]; /* Name for PRQ interrupt */ + struct ioasid_allocator_ops pasid_allocator; /* Custom allocator for PASIDs */ #endif struct q_inval *qi; /* Queued invalidation info */ u32 *iommu_state; /* Store iommu states between suspend and resume.*/ -- 2.7.4