From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E33AEA0542; Mon, 24 Oct 2022 17:34:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 67F8942BFA; Mon, 24 Oct 2022 17:33:17 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id 996394021E for ; Mon, 17 Oct 2022 17:45:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F1BN/LJ0n9hDDnzWsoQRxzdsIXi1hEvx1KKw7EkJ00rg3kAUU+rulJLYwrxR5EQLMr0WovIgHc0+ISp6pemK6zjfvn9ohJHOMgEHIdgqOoLjQU45MLyXjju3oVjRWmoL97KcuLh8WPxwX24dHtI2ncOS42JKn1xUfmw5au8uwF5EL9tNjNbl70ayG7EBw29emHl4LOZCAqminBrU+2Il1Bv7gzYqXat7MXgmzPY4kWA5OXdCIRGckEGNfePoA8s6wB8vwkqTUwGdIQ70A8y/1jusbdr2l1A/ld9ev2b0CjImc78M7l5xQDzB8A1qMNd/PUwifaHKOg09R1IDz59gxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=P/QgIsfJNQJZWj7D2U65f+unczDVrzhgcShhpM2IABk=; b=dOqbfcwFqPoiVQWNgw4QVEbFPDGSk0GzfDXt2pS9rMESrlO9HsQ3BiuiLMYUavset9SOeXARYrfrz2amIYl2GW2obLdsAYaPsEFLXQFJiex29Ygv7EeusnOS27NH1ctw2adjVn3qukMIvE6Mb/Cla4YJTLZth8+QefkN19WvpEIOLHVP4XSDP76s3VdCFS3GdRNgeKxtgJG86hMDZlIue/mZOq+EAZL5FzmwXlFJ8LEptARs/WfQoNZ5Im4JPjR4C3gw5y0m6LCowWzMEOZyPbjrLaOHVHzRD4iqDs8saEk491hXUUcTU179lqKuW0T2QedoPv4wvB9nilmgHPDmKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 50.222.100.11) smtp.rcpttodomain=ddn.com smtp.mailfrom=ddn.com; dmarc=pass (p=reject sp=none pct=100) action=none header.from=ddn.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ddn.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P/QgIsfJNQJZWj7D2U65f+unczDVrzhgcShhpM2IABk=; b=ShblwrFlOXrJe/zjrZHVH0dTD2o9yc3QBLg22An97oc7k6+xZzV9Xdq4TzXVlIc0Kp+89z7yYnnBhHSAvLzH4u5SmID+X5SxP0JfBPrN2Aj/N3nXmFudqAtDxpUDruNq1qYxhFmB961+FzSjOvebXhKl7xnoVLOtPENjeF0p1rM= Received: from BN9PR03CA0375.namprd03.prod.outlook.com (2603:10b6:408:f7::20) by DM6PR19MB3996.namprd19.prod.outlook.com (2603:10b6:5:240::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.22; Mon, 17 Oct 2022 15:45:16 +0000 Received: from BN8NAM04FT068.eop-NAM04.prod.protection.outlook.com (2603:10b6:408:f7:cafe::b3) by BN9PR03CA0375.outlook.office365.com (2603:10b6:408:f7::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.31 via Frontend Transport; Mon, 17 Oct 2022 15:45:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 50.222.100.11) smtp.mailfrom=ddn.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=ddn.com; Received-SPF: Pass (protection.outlook.com: domain of ddn.com designates 50.222.100.11 as permitted sender) receiver=protection.outlook.com; client-ip=50.222.100.11; helo=uww-mx01.datadirectnet.com; pr=C Received: from uww-mx01.datadirectnet.com (50.222.100.11) by BN8NAM04FT068.mail.protection.outlook.com (10.13.160.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20 via Frontend Transport; Mon, 17 Oct 2022 15:45:15 +0000 Received: from localhost (unknown [10.68.0.8]) by uww-mx01.datadirectnet.com (Postfix) with ESMTP id 70ACF20C687A; Mon, 17 Oct 2022 09:46:25 -0600 (MDT) From: Michael Piszczek To: dev@dpdk.org Cc: Michael Piszczek Subject: [PATCH v6] pci: read amd iommu virtual address width Date: Mon, 17 Oct 2022 17:45:07 +0200 Message-Id: <20221017154507.934995-2-mpiszczek@ddn.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221017154507.934995-1-mpiszczek@ddn.com> References: <20220912160157.3642968-2-mpiszczek@ddn.com> <20221017154507.934995-1-mpiszczek@ddn.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM04FT068:EE_|DM6PR19MB3996:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 7496191e-0406-4adf-0ae1-08dab0569624 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hDjVl/cluxgvTQF43/s22ZqkCyFWalveG8AHPjzBu5Zd6TGDsp5i3ETfNwKmOLfgQ4+mHJaIPp9pCWf7qMpPuVIZtsEil8e3Y+NW7boYzL5Cx8RuJb/4960syKcf2nTPa0i3FXEpUzCzZcQs3tAWrjtA6WpHotYioDa6IKcHr00wUaxoLZ697EN4nEzs6sxYj9OAPTvh8OuJyM8zBZe0onjDoWvqdWVKb3VNNxV2uw79KltP+MtqwYTFW3YudMuMmVHKJ+uIsWNC86tDWnz3bgkXU0AePH3NGTKCBK035Uc//fM6cS43BrMf/+liCOgUS4sHmzUQ7zTMQhU2m4S8dy6weuCK0eQyIsNckTpoBnOSAoujx3FvdgEYSJjAF+PocdyqYUDxr8rN36UD7udp/sHWbmVCnEwkqDurEIkULvSbEEv0nTUKGNbXNp4aBsskGcBK+0GRAhMCuUnRr/SziZqWceFziOQ4ECQ058LbGqD1mVxN1vHseVtE7ACYpPJ4fJv0RCnNakkYeFJsPPR0IraCS9fpdzR1GZkaDx8s6sgL1kfTFXy0zqA573UfaRfHM3AcdJg7pTtjV0GG8yPBZtDF+hgsWOdlm9qPtxNRilnEX3zgjvLDUDwUaivqs43YRWnB9/IMnEWQge4+L/1H5TC3sNl7jGJALfVLipR4myHkoFSifuBEMYwspl25XXBGtD8ZANuQzWv2CURcfQR7qTcIJKebrv9JKxbElMj3SKR00ctb91sYLHLndoOAx16z3iLHVP5PBHYHv9bqkPyTlA== X-Forefront-Antispam-Report: CIP:50.222.100.11; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:uww-mx01.datadirectnet.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230022)(4636009)(346002)(39850400004)(396003)(136003)(376002)(451199015)(46966006)(36840700001)(6916009)(8676002)(316002)(478600001)(41300700001)(4326008)(6266002)(26005)(1076003)(186003)(336012)(2906002)(5660300002)(8936002)(2616005)(82740400003)(36756003)(356005)(81166007)(82310400005)(47076005)(6666004)(36860700001)(83380400001)(70206006)(70586007)(40480700001)(86362001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: ddn.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 15:45:15.7404 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7496191e-0406-4adf-0ae1-08dab0569624 X-MS-Exchange-CrossTenant-Id: 753b6e26-6fd3-43e6-8248-3f1735d59bb4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=753b6e26-6fd3-43e6-8248-3f1735d59bb4; Ip=[50.222.100.11]; Helo=[uww-mx01.datadirectnet.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM04FT068.eop-NAM04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR19MB3996 X-Mailman-Approved-At: Mon, 24 Oct 2022 17:33:01 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add code to read the virtual address width for AMD processors. Updated pci_device_iommu_support_va() to use glob to find iommu capability files. Signed-off-by: Michael Piszczek --- drivers/bus/pci/linux/pci.c | 58 ++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index ebd1395502..291090ba7b 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -480,42 +481,53 @@ rte_pci_scan(void) } #if defined(RTE_ARCH_X86) + bool pci_device_iommu_support_va(const struct rte_pci_device *dev) { -#define VTD_CAP_MGAW_SHIFT 16 -#define VTD_CAP_MGAW_MASK (0x3fULL << VTD_CAP_MGAW_SHIFT) +#define VTD_CAP_MGAW_SHIFT 16 +#define VTD_CAP_MGAW_MASK (0x3fULL << VTD_CAP_MGAW_SHIFT) +#define RD_AMD_CAP_VASIZE_SHIFT 15 +#define RD_AMD_CAP_VASIZE_MASK (0x7F << RD_AMD_CAP_VASIZE_SHIFT) + int rc; const struct rte_pci_addr *addr = &dev->addr; - char filename[PATH_MAX]; - FILE *fp; - uint64_t mgaw, vtd_cap_reg = 0; + char pattern[PATH_MAX]; + glob_t glob_results; + uint64_t mgaw = 0; - snprintf(filename, sizeof(filename), - "%s/" PCI_PRI_FMT "/iommu/intel-iommu/cap", + snprintf(pattern, sizeof(pattern), + "%s/" PCI_PRI_FMT "/iommu/*-iommu/cap", rte_pci_get_sysfs_path(), addr->domain, addr->bus, addr->devid, addr->function); - fp = fopen(filename, "r"); - if (fp == NULL) { - /* We don't have an Intel IOMMU, assume VA supported */ - if (errno == ENOENT) - return true; + rc = glob(pattern, 0, NULL, &glob_results); + if (rc != 0 && glob_results.gl_pathc == 1) { + const char *filename = glob_results.gl_pathv[0]; + FILE *fp = fopen(filename, "r"); - RTE_LOG(ERR, EAL, "%s(): can't open %s: %s\n", - __func__, filename, strerror(errno)); - return false; - } + if (fp != NULL) { + uint64_t cap_reg = 0; - /* We have an Intel IOMMU */ - if (fscanf(fp, "%" PRIx64, &vtd_cap_reg) != 1) { - RTE_LOG(ERR, EAL, "%s(): can't read %s\n", __func__, filename); - fclose(fp); - return false; + if (fscanf(fp, "%" PRIx64, &cap_reg) != 1) { + RTE_LOG(ERR, EAL, "%s(): can't read %s\n", __func__, filename); + } + else if (strstr(filename, "intel-iommu") != NULL) { + /* We have an Intel IOMMU */ + mgaw = ((cap_reg & VTD_CAP_MGAW_MASK) >> VTD_CAP_MGAW_SHIFT) + 1; + } + else if (strstr(filename, "amd-iommu") != NULL) { + /* We have an Amd IOMMU */ + mgaw = ((cap_reg & RD_AMD_CAP_VASIZE_MASK) >> RD_AMD_CAP_VASIZE_SHIFT) + 1; + } + + fclose(fp); + } } - fclose(fp); + globfree(&glob_results); - mgaw = ((vtd_cap_reg & VTD_CAP_MGAW_MASK) >> VTD_CAP_MGAW_SHIFT) + 1; + if (mgaw == 0) + return false; /* * Assuming there is no limitation by now. We can not know at this point -- 2.34.1