Received: by 2002:a25:ca44:0:0:0:0:0 with SMTP id a65csp58567ybg; Mon, 27 Jul 2020 23:22:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzA9/6i84kZbsEUUzWaX3RwOge9hYvwhEwWgggftXs3CvU9MV+ou4OxKQZ0oEtb5euO7vHw X-Received: by 2002:a05:6402:1c86:: with SMTP id cy6mr24251460edb.30.1595917325259; Mon, 27 Jul 2020 23:22:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595917325; cv=none; d=google.com; s=arc-20160816; b=sYouRM09oM2v2HHpuGGuGeGZ95i80VcVwRV2bQ/rE8g8srN2gAiKXXQPxhFkzxmY7j ugZfFRjlvw6xFvJtA3DH+73qjhzaya+stJ4dZX3FlOVeMkU7SpGS4s3vLmVVw6vZPoQL sfMihnBSGb/rteM6R+3sQJdfsT0g/oDPr+ajWOJS1/W0H2im/65JldvqvXqvtQCuOV/S J++lWYAVzTkTHMi48rBrkDrTQV+/XEoaFoXiSph9xgMRXpKPoKWv+rmmMlrf06cnC01j HznlmqXEKB+hGiVpQFki0gEmhbv8pO3oW0MA5CheKw6ltYCbX1/spBGrwwHjGa2ykWmk mKEQ== 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:ironport-sdr:ironport-sdr; bh=gkgufMUvcHY2vEe20vfgWznvADbfEl8XwBSTBZZvme0=; b=qJfFErbK/1tKC4oGbbYXAJz/ryKAEcC0ODhVbfG6L/QlQSiBApiMMJPbiCJK7FsJZZ oy2A9SVKW63xA7vL23a3ym2bmOAoyUXXJQsZFKFVEIkfqH9D+JL027QH9KC4J87eNnyu +pxa/63/G3J+t5yqSswDZFWjB7w6jljWgehW149IzvLacv/rRs0zARf5T6w2d9+MMOxj 3PFrcuMuIJuzyMYk6nKqeFRQNU7X3ArR90AIwJBbLWqSWumLOubSQNESL0U8LCmZiI+r gdRk1Kqrv0hjagWovM0lNHrSTTX3zjJAJyd6y4nzLhH29oIjAI00I49YocpFWAF5C9FZ BtKw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id ce2si7339919edb.531.2020.07.27.23.21.42; Mon, 27 Jul 2020 23:22:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1728010AbgG1GVO (ORCPT + 99 others); Tue, 28 Jul 2020 02:21:14 -0400 Received: from mga06.intel.com ([134.134.136.31]:26364 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727888AbgG1GVE (ORCPT ); Tue, 28 Jul 2020 02:21:04 -0400 IronPort-SDR: YMJ12cQh3ispe7RPVy9AdcOBJrXrN20W/5IGgMiTWuQ8OF/WA9qN50HEed5gerLFvowc6yYP5i zBnV3l0cqvuA== X-IronPort-AV: E=McAfee;i="6000,8403,9695"; a="212681250" X-IronPort-AV: E=Sophos;i="5.75,405,1589266800"; d="scan'208";a="212681250" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2020 23:20:56 -0700 IronPort-SDR: p1UVZ004okSxjsVLIrGxZ9aqC9yNRCXADll5y3/HIZmVuIjDSFvxfL/jDrcFW3cfymGSbZyYAw oTam00qM2mKQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,405,1589266800"; d="scan'208";a="320274430" Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by orsmga008.jf.intel.com with ESMTP; 27 Jul 2020 23:20:56 -0700 From: Liu Yi L To: alex.williamson@redhat.com, eric.auger@redhat.com, baolu.lu@linux.intel.com, joro@8bytes.org Cc: kevin.tian@intel.com, jacob.jun.pan@linux.intel.com, ashok.raj@intel.com, yi.l.liu@intel.com, jun.j.tian@intel.com, yi.y.sun@intel.com, jean-philippe@linaro.org, peterx@redhat.com, hao.wu@intel.com, stefanha@gmail.com, iommu@lists.linux-foundation.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 15/15] iommu/vt-d: Support reporting nesting capability info Date: Mon, 27 Jul 2020 23:27:44 -0700 Message-Id: <1595917664-33276-16-git-send-email-yi.l.liu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1595917664-33276-1-git-send-email-yi.l.liu@intel.com> References: <1595917664-33276-1-git-send-email-yi.l.liu@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch reports nesting info, and only supports the case where all the physical iomms have the same CAP/ECAP MASKS. Cc: Kevin Tian CC: Jacob Pan Cc: Alex Williamson Cc: Eric Auger Cc: Jean-Philippe Brucker Cc: Joerg Roedel Cc: Lu Baolu Signed-off-by: Liu Yi L Signed-off-by: Jacob Pan --- v2 -> v3: *) remove cap/ecap_mask in iommu_nesting_info. --- drivers/iommu/intel/iommu.c | 81 +++++++++++++++++++++++++++++++++++++++++++-- include/linux/intel-iommu.h | 16 +++++++++ 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 88f4647..0835804 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -5660,12 +5660,16 @@ static inline bool iommu_pasid_support(void) static inline bool nested_mode_support(void) { struct dmar_drhd_unit *drhd; - struct intel_iommu *iommu; + struct intel_iommu *iommu, *prev = NULL; bool ret = true; rcu_read_lock(); for_each_active_iommu(iommu, drhd) { - if (!sm_supported(iommu) || !ecap_nest(iommu->ecap)) { + if (!prev) + prev = iommu; + if (!sm_supported(iommu) || !ecap_nest(iommu->ecap) || + (VTD_CAP_MASK & (iommu->cap ^ prev->cap)) || + (VTD_ECAP_MASK & (iommu->ecap ^ prev->ecap))) { ret = false; break; } @@ -6081,6 +6085,78 @@ intel_iommu_domain_set_attr(struct iommu_domain *domain, return ret; } +static int intel_iommu_get_nesting_info(struct iommu_domain *domain, + struct iommu_nesting_info *info) +{ + struct dmar_domain *dmar_domain = to_dmar_domain(domain); + u64 cap = VTD_CAP_MASK, ecap = VTD_ECAP_MASK; + struct device_domain_info *domain_info; + struct iommu_nesting_info_vtd vtd; + unsigned long flags; + unsigned int size; + + if (domain->type != IOMMU_DOMAIN_UNMANAGED || + !(dmar_domain->flags & DOMAIN_FLAG_NESTING_MODE)) + return -ENODEV; + + if (!info) + return -EINVAL; + + size = sizeof(struct iommu_nesting_info) + + sizeof(struct iommu_nesting_info_vtd); + /* + * if provided buffer size is smaller than expected, should + * return 0 and also the expected buffer size to caller. + */ + if (info->argsz < size) { + info->argsz = size; + return 0; + } + + spin_lock_irqsave(&device_domain_lock, flags); + /* + * arbitrary select the first domain_info as all nesting + * related capabilities should be consistent across iommu + * units. + */ + domain_info = list_first_entry(&dmar_domain->devices, + struct device_domain_info, link); + cap &= domain_info->iommu->cap; + ecap &= domain_info->iommu->ecap; + spin_unlock_irqrestore(&device_domain_lock, flags); + + info->format = IOMMU_PASID_FORMAT_INTEL_VTD; + info->features = IOMMU_NESTING_FEAT_SYSWIDE_PASID | + IOMMU_NESTING_FEAT_BIND_PGTBL | + IOMMU_NESTING_FEAT_CACHE_INVLD; + info->addr_width = dmar_domain->gaw; + info->pasid_bits = ilog2(intel_pasid_max_id); + info->padding = 0; + vtd.flags = 0; + vtd.padding = 0; + vtd.cap_reg = cap; + vtd.ecap_reg = ecap; + + memcpy(info->data, &vtd, sizeof(vtd)); + return 0; +} + +static int intel_iommu_domain_get_attr(struct iommu_domain *domain, + enum iommu_attr attr, void *data) +{ + switch (attr) { + case DOMAIN_ATTR_NESTING: + { + struct iommu_nesting_info *info = + (struct iommu_nesting_info *)data; + + return intel_iommu_get_nesting_info(domain, info); + } + default: + return -ENOENT; + } +} + /* * Check that the device does not live on an external facing PCI port that is * marked as untrusted. Such devices should not be able to apply quirks and @@ -6103,6 +6179,7 @@ const struct iommu_ops intel_iommu_ops = { .domain_alloc = intel_iommu_domain_alloc, .domain_free = intel_iommu_domain_free, .domain_set_attr = intel_iommu_domain_set_attr, + .domain_get_attr = intel_iommu_domain_get_attr, .attach_dev = intel_iommu_attach_device, .detach_dev = intel_iommu_detach_device, .aux_attach_dev = intel_iommu_aux_attach_device, diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index f98146b..5acf795 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -197,6 +197,22 @@ #define ecap_max_handle_mask(e) ((e >> 20) & 0xf) #define ecap_sc_support(e) ((e >> 7) & 0x1) /* Snooping Control */ +/* Nesting Support Capability Alignment */ +#define VTD_CAP_FL1GP BIT_ULL(56) +#define VTD_CAP_FL5LP BIT_ULL(60) +#define VTD_ECAP_PRS BIT_ULL(29) +#define VTD_ECAP_ERS BIT_ULL(30) +#define VTD_ECAP_SRS BIT_ULL(31) +#define VTD_ECAP_EAFS BIT_ULL(34) +#define VTD_ECAP_PASID BIT_ULL(40) + +/* Only capabilities marked in below MASKs are reported */ +#define VTD_CAP_MASK (VTD_CAP_FL1GP | VTD_CAP_FL5LP) + +#define VTD_ECAP_MASK (VTD_ECAP_PRS | VTD_ECAP_ERS | \ + VTD_ECAP_SRS | VTD_ECAP_EAFS | \ + VTD_ECAP_PASID) + /* Virtual command interface capability */ #define vccap_pasid(v) (((v) & DMA_VCS_PAS)) /* PASID allocation */ -- 2.7.4