Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp283714rwb; Fri, 13 Jan 2023 23:52:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXv1YQz3AMHHqy9SH+WDYsTlvD3IQTLjrH58NWTOuSdZr7+fmqyo996hK0scWZ4b33vKY9jt X-Received: by 2002:a17:902:ec90:b0:188:6b9c:d17d with SMTP id x16-20020a170902ec9000b001886b9cd17dmr16719306plg.16.1673682769048; Fri, 13 Jan 2023 23:52:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673682769; cv=none; d=google.com; s=arc-20160816; b=a32BD19jIfkMVbn4iSx3iBNnpoC7a5hyRZJ3QSdegMiv2ltluwbgUtAmP/G9WjVtLk TvH7vKD5hRqKNLvfk/x0TJwj8me+p415Xji+2Mk0iT0EQYXqa7pjv/Gg6j+ZxMf0XkCH Awl9o0D6HgsLFKt3ZU1qaai8fDpDo0T8ntZuRGZzZRuhx3DFxcXkC5WN7eecM0fDkwzN lzRvUfXfL+q65Z4H/AY33cCu3wc4YmyVPUElYfUX6lbcnCjiKplflWdf6q3AOFXWeNcg 35v4ATDc9XB8T4L0EVYGMrPq0aF0thiBw6iCXv1UdJI+tBjG1T4Jne+pj+GIjEIm17nD Xsvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=gjciZsUlbuXUCKfszSljnsZ7vISM/QY0D4Rq21TWhR8=; b=jnDQYs1HbBiJ/2y2u1Sji2KRe9B35DSRz8jUB0auKa4sQyz7jNDNNbDX2rKeZ+cBuG fOyBApiu/AyHBUnxe4j2eTtHO3g4WryWcOLgYWvadPsJzCfnTOhd/7JcU+epUOqxY1tC fTpU8o3bJg5BrST6nrJWN77vdjU55KnronCf6+FaAX02pd++m2han0dCr3ZqKvEHWA5i PgoTgD7FlniIgGjqk6mP7wz0a8AGQNYI2P+Jmue0NTQ8P9pfjQpma5wkCMfY45UfpkK1 g1QzB/UFtcV2Nc04OdxohDIuD7sMMoHx1NDUc3EqNN0dtDFcUK0MFdzuHzU6iGnza6/2 TPRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ZcZ+5MYP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s13-20020a170902a50d00b001910b23667fsi18407236plq.213.2023.01.13.23.52.42; Fri, 13 Jan 2023 23:52:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ZcZ+5MYP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229709AbjANHm1 (ORCPT + 51 others); Sat, 14 Jan 2023 02:42:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229722AbjANHmZ (ORCPT ); Sat, 14 Jan 2023 02:42:25 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BDF3212B; Fri, 13 Jan 2023 23:42:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673682143; x=1705218143; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=BzXu35sjZYWmDFFcnSKsZ+w+vpfcyMxobL+k+iHSVtg=; b=ZcZ+5MYP4TTyqqZ7HfWS8LQh/EmMbWgvDfmsmW+lRFF0C0j4OV2UnhXb vvOv887+eSkms7s7SZt3O11xyUU/VXczUn5vs11YvtAYOf4uCtURnxi/9 HBLJDVa7lbqTHmd29G3r+NBXktxYvpOQmKPMvaKT3lbuMmp7YJ7VUyKtG WhtJ9vMwNtT1TqZdkvXQSWqfqfL6TIeQDp2mWJ46dOUlTrGugDANIMRo1 XcxtrTTgF5g0aE2pFwNCy8qlSQF218xqDwYcBOV4yBU5tQYeg1AbxCZtz yFx81RBkkJT9Va+dqIrVikCTyCuymexImnYvc7IeB5PVYkhksdYVlI+n5 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10589"; a="326228279" X-IronPort-AV: E=Sophos;i="5.97,216,1669104000"; d="scan'208";a="326228279" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2023 23:42:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10589"; a="690738110" X-IronPort-AV: E=Sophos;i="5.97,216,1669104000"; d="scan'208";a="690738110" Received: from allen-box.sh.intel.com ([10.239.159.48]) by orsmga001.jf.intel.com with ESMTP; 13 Jan 2023 23:42:19 -0800 From: Lu Baolu To: Bjorn Helgaas , Joerg Roedel Cc: Matt Fagnani , =?UTF-8?q?Christian=20K=C3=B6nig?= , Jason Gunthorpe , Kevin Tian , Vasant Hegde , Tony Zhu , linux-pci@vger.kernel.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v3 1/1] PCI: Add translated request only flag for pci_enable_pasid() Date: Sat, 14 Jan 2023 15:34:20 +0800 Message-Id: <20230114073420.759989-1-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The PCIe fabric routes Memory Requests based on the TLP address, ignoring the PASID. In order to ensure system integrity, commit 201007ef707a ("PCI: Enable PASID only when ACS RR & UF enabled on upstream path") requires some ACS features being supported on device's upstream path when enabling PCI/PASID. One alternative is ATS/PRI which lets the device resolve the PASID + addr pair before a memory request is made into a routeable TLB address through the translation agent. Those resolved addresses are then cached on the device instead of in the IOMMU TLB and the device always sets translated bit for PASID. One example of those devices are AMD graphic devices that always have ACS or ATS/PRI enabled together with PASID. This adds a flag parameter in the pci_enable_pasid() helper, with which the device driver could opt-in the fact that device always sets the translated bit for PASID. It also applies this opt-in for AMD graphic devices. Without this change, kernel boots to black screen on a system with below AMD graphic device: 00:01.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Wani [Radeon R5/R6/R7 Graphics] (rev ca) (prog-if 00 [VGA controller]) DeviceName: ATI EG BROADWAY Subsystem: Hewlett-Packard Company Device 8332 At present, it is a common practice to enable/disable PCI PASID in the iommu drivers. Considering that the device driver knows more about the specific device, we will follow up by moving pci_enable_pasid() into the specific device drivers. Fixes: 201007ef707a ("PCI: Enable PASID only when ACS RR & UF enabled on upstream path") Reported-and-tested-by: Matt Fagnani Link: https://bugzilla.kernel.org/show_bug.cgi?id=216865 Link: https://lore.kernel.org/r/15d0f9ff-2a56-b3e9-5b45-e6b23300ae3b@leemhuis.info/ Suggested-by: Jason Gunthorpe Suggested-by: Christian König Reviewed-by: Kevin Tian Signed-off-by: Lu Baolu --- include/linux/pci-ats.h | 6 ++++-- drivers/iommu/amd/iommu.c | 2 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- drivers/iommu/intel/iommu.c | 3 ++- drivers/pci/ats.c | 8 ++++++-- 5 files changed, 14 insertions(+), 7 deletions(-) Change log: v3: - Replace ATS with ATS/PRI in commit message; - Refine a code comment; - Patch tested by Matt Fagnani. v2:https://lore.kernel.org/linux-iommu/20230113014409.752405-1-baolu.lu@linux.intel.com/ - Convert the bool to a named flag; - Convert TRANSLED to XLATED. v1: - https://lore.kernel.org/linux-iommu/20230112084629.737653-1-baolu.lu@linux.intel.com/ diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h index df54cd5b15db..750fca736ef4 100644 --- a/include/linux/pci-ats.h +++ b/include/linux/pci-ats.h @@ -4,6 +4,8 @@ #include +#define PCI_PASID_XLATED_REQ_ONLY BIT(0) + #ifdef CONFIG_PCI_ATS /* Address Translation Service */ bool pci_ats_supported(struct pci_dev *dev); @@ -35,12 +37,12 @@ static inline bool pci_pri_supported(struct pci_dev *pdev) #endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID -int pci_enable_pasid(struct pci_dev *pdev, int features); +int pci_enable_pasid(struct pci_dev *pdev, int features, int flags); void pci_disable_pasid(struct pci_dev *pdev); int pci_pasid_features(struct pci_dev *pdev); int pci_max_pasids(struct pci_dev *pdev); #else /* CONFIG_PCI_PASID */ -static inline int pci_enable_pasid(struct pci_dev *pdev, int features) +static inline int pci_enable_pasid(struct pci_dev *pdev, int features, int flags) { return -EINVAL; } static inline void pci_disable_pasid(struct pci_dev *pdev) { } static inline int pci_pasid_features(struct pci_dev *pdev) diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index cbeaab55c0db..64a8c03d7dfa 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -1700,7 +1700,7 @@ static int pdev_pri_ats_enable(struct pci_dev *pdev) int ret; /* Only allow access to user-accessible pages */ - ret = pci_enable_pasid(pdev, 0); + ret = pci_enable_pasid(pdev, 0, PCI_PASID_XLATED_REQ_ONLY); if (ret) goto out_err; diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index ab160198edd6..891bf53c45dc 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2350,7 +2350,7 @@ static int arm_smmu_enable_pasid(struct arm_smmu_master *master) if (num_pasids <= 0) return num_pasids; - ret = pci_enable_pasid(pdev, features); + ret = pci_enable_pasid(pdev, features, 0); if (ret) { dev_err(&pdev->dev, "Failed to enable PASID\n"); return ret; diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 59df7e42fd53..5cc13f02a5ac 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -1425,7 +1425,8 @@ static void iommu_enable_pci_caps(struct device_domain_info *info) undefined. So always enable PASID support on devices which have it, even if we can't yet know if we're ever going to use it. */ - if (info->pasid_supported && !pci_enable_pasid(pdev, info->pasid_supported & ~1)) + if (info->pasid_supported && + !pci_enable_pasid(pdev, info->pasid_supported & ~1, 0)) info->pasid_enabled = 1; if (info->pri_supported && diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c index f9cc2e10b676..06168415d6d7 100644 --- a/drivers/pci/ats.c +++ b/drivers/pci/ats.c @@ -353,12 +353,15 @@ void pci_pasid_init(struct pci_dev *pdev) * pci_enable_pasid - Enable the PASID capability * @pdev: PCI device structure * @features: Features to enable + * @flags: device-specific flags + * - PCI_PASID_XLATED_REQ_ONLY: The PCI device always use translated type + * for all PASID memory requests. * * Returns 0 on success, negative value on error. This function checks * whether the features are actually supported by the device and returns * an error if not. */ -int pci_enable_pasid(struct pci_dev *pdev, int features) +int pci_enable_pasid(struct pci_dev *pdev, int features, int flags) { u16 control, supported; int pasid = pdev->pasid_cap; @@ -382,7 +385,8 @@ int pci_enable_pasid(struct pci_dev *pdev, int features) if (!pasid) return -EINVAL; - if (!pci_acs_path_enabled(pdev, NULL, PCI_ACS_RR | PCI_ACS_UF)) + if (!(flags & PCI_PASID_XLATED_REQ_ONLY) && + !pci_acs_path_enabled(pdev, NULL, PCI_ACS_RR | PCI_ACS_UF)) return -EINVAL; pci_read_config_word(pdev, pasid + PCI_PASID_CAP, &supported); -- 2.34.1