From patchwork Mon Sep 12 16:01:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Piszczek X-Patchwork-Id: 116232 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 511D1A0032; Tue, 13 Sep 2022 09:00:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1D7A5427EE; Tue, 13 Sep 2022 09:00:17 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2072.outbound.protection.outlook.com [40.107.102.72]) by mails.dpdk.org (Postfix) with ESMTP id 2BB174003C for ; Mon, 12 Sep 2022 18:02:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lYQST5TTto5CHEXYI74nMAspzdccTOwwT71ZIwJ4uxsNjl1L/pnC1DZ+gltHKlW3yt9s2R3Q3ggjltS0CJKY8fA3ETG2PCZU6tng8wwsz27uE57s4cZIBwWvNfNTEW/8ZyLr9pqlp8mlXwctGBmCWQrJMgpn/jbQhpZ8iLxBXAz7lMO+LKfySC0J1/daxsGDV3E1A1tD7GX/XZpVj6ywAU+keXB5epMYCKuXJBPidH0xIgFcUmgaHcnm0zaXZmxGvs1ZwyH4e/Fun2lxiRIzToOG6YxhPEdSSHn6NpTEjz8lPN1ZDvLVUdeQr107CqEvnbQjYR4Qp401Y/zJjK+Y8w== 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=m90N9Duo3+UC5gdS7C5TDaoKL27YBCLKvigt0/C5VyI=; b=ZRpevyICAXzu52XUwyqSE5qlr1Q2EoSmOUMkc+lEvpZZ6Ti56yEQk7Tz9W+EakhlGxnivrTbJDQMmK3CsudhQCEDY6v4Zk5K19WLu4xzkR5R0y4GHq4z0qKEw8VLfMae5xwXTsswxCNtx4gk6dwA1o3UWVD7ytwC06OYWddA/PVcjZEBiq/QknCmshp5y2HpD4Wx1GDJsOxTmnLb/6/X7cizR+OuBN08FOxkIcHFBEdm27tKUvTLtjW9sUPHylIkxd3ayPfRSSRYjABm1ybZXQTxpjXNS7cn/QjuLItG9BHbRd49NsWPEcdMLseV4v1NH5uMeQgm3LN3GXeKfUHXUQ== 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=m90N9Duo3+UC5gdS7C5TDaoKL27YBCLKvigt0/C5VyI=; b=jUtukpIlzzMPhgR3MsLOfYhKd77ZsZMN+INH3+l4yT0Q8Rtfk8bh49gn+HmAU1L7dU9uO95Wl3qG867/iPOPrvnvAXTTYRcuymM+9zFFAsN8/Dh+/sMBkluhukb08aOIeS22UHpDpAc5rT8lMBZkjfeKLiMDfbRPErmZt8Z9IA0= Received: from DS7PR03CA0107.namprd03.prod.outlook.com (2603:10b6:5:3b7::22) by MN0PR19MB5753.namprd19.prod.outlook.com (2603:10b6:208:374::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12; Mon, 12 Sep 2022 16:02:12 +0000 Received: from DM6NAM04FT061.eop-NAM04.prod.protection.outlook.com (2603:10b6:5:3b7:cafe::63) by DS7PR03CA0107.outlook.office365.com (2603:10b6:5:3b7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12 via Frontend Transport; Mon, 12 Sep 2022 16:02:12 +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 DM6NAM04FT061.mail.protection.outlook.com (10.13.159.64) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.13 via Frontend Transport; Mon, 12 Sep 2022 16:02:11 +0000 Received: from localhost (unknown [10.68.0.8]) by uww-mx01.datadirectnet.com (Postfix) with ESMTP id E1A7D20C684B; Mon, 12 Sep 2022 10:03:21 -0600 (MDT) From: Michael Piszczek To: Cc: dev@dpdk.org, Michael Piszczek Subject: [PATCH 1/1] pci: read amd iommu virtual address width Date: Mon, 12 Sep 2022 18:01:57 +0200 Message-Id: <20220912160157.3642968-2-mpiszczek@ddn.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220912160157.3642968-1-mpiszczek@ddn.com> References: <20220912160157.3642968-1-mpiszczek@ddn.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM04FT061:EE_|MN0PR19MB5753:EE_ X-MS-Office365-Filtering-Correlation-Id: 077e0e51-b2b9-4970-8f7d-08da94d826d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bGR1Zd45gciLQQcns3r2CbtRYHpWGEOgu5dgV1eAuOO6Bq6h9rPRr8WebT3fshp2/tAbb4XC5yWNZtV1VWoqFZZK6NWuB0OsFeI9cY/+Ol3C3bYfnrOqcTgRGGuAhDeFKHm+ELcwnXkipin0GsXEDPoP89+Vzm60DbVHf7zYz8LIq1ewXTvu9tJwA45qGaEa67AIvSPf/cMFoK2nZOO/IRAST5WqamYTvuBWxoyNnIE2vUDcMyLJFwivYvwfhKgUKswNMvjh21WQMxgNlTp2hebo/GT2ZSKWGIp/FwLzCAQ/xpzqb8T6gESurEJ9YmX819jpuQQhXPXK3UMamtojXZ0Qln5oyEsj19xiVXyx+qtf8rn8BsLrN+izfqQnURLlN4o8D1I3TqAsoUdE2hW+LtExYjaIhw6iLe+/M2uNr5ez2GnIvDk3M7cJda2crsECP/dsYscbvL4LFrsolmMJpMNUamPgTbHdYR0wlOMJQTMua5UCFCooduFnHHPI2NuxKLInait7R5xKZs3bPjSgEvUF2PQtKIEK24D90FOTjZRXBTTm9JE2UBitIQA0Ost9fFya99eB+YPpZhnx/y4alRyYowsDfRoIcLW7McGBVvknVrS18pn+8cjD55I/1a2JLsGUMdCk7ihG3D06dpJwVrnoW9xXZpUDGN3GNTP0CTWCZA0U/lwI+wAc1ixVRb5zDUomHzZ0rTpK1QY4xECycvFBmmpGK0oMAfAT2BH2JhPWEoewd0bdQOO8kFb3X228y42UcnfcJnnGbpU2b5JUQSEzSxQRXBElS/UxglH+Zgc= 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:(13230016)(4636009)(376002)(136003)(396003)(39850400004)(346002)(36840700001)(46966006)(41300700001)(8936002)(82740400003)(82310400005)(336012)(186003)(83380400001)(36756003)(4326008)(36860700001)(70586007)(478600001)(2616005)(47076005)(70206006)(5660300002)(8676002)(316002)(1076003)(86362001)(6266002)(2906002)(109986005)(81166007)(26005)(40480700001)(356005)(6666004)(266003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: ddn.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2022 16:02:11.1204 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 077e0e51-b2b9-4970-8f7d-08da94d826d9 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: DM6NAM04FT061.eop-NAM04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR19MB5753 X-Mailman-Approved-At: Tue, 13 Sep 2022 09:00:15 +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. Signed-off-by: Michael Piszczek --- drivers/bus/pci/linux/pci.c | 42 +++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index e521459870..df9da78e45 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -492,6 +492,38 @@ rte_pci_scan(void) } #if defined(RTE_ARCH_X86) + +static uint64_t +pci_device_amd_iommu_support_va(const struct rte_pci_addr *addr) +{ +#define RD_AMD_CAP_VASIZE_SHIFT 15 +#define RD_AMD_CAP_VASIZE_MASK (0x7F << RD_AMD_CAP_VASIZE_SHIFT) + + char filename[PATH_MAX]; + FILE *fp; + uint64_t amd_cap_reg = 0; + + snprintf(filename, sizeof(filename), + "%s/" PCI_PRI_FMT "/iommu/amd-iommu/cap", + rte_pci_get_sysfs_path(), addr->domain, addr->bus, addr->devid, + addr->function); + + fp = fopen(filename, "r"); + if (fp == NULL) + return 0; + + /* We have an Amd IOMMU */ + if (fscanf(fp, "%" PRIx64, &amd_cap_reg) != 1) { + RTE_LOG(ERR, EAL, "%s(): can't read %s\n", __func__, filename); + fclose(fp); + return 0; + } + + fclose(fp); + + return ((amd_cap_reg & RD_AMD_CAP_VASIZE_MASK) >> RD_AMD_CAP_VASIZE_SHIFT) + 1; +} + bool pci_device_iommu_support_va(const struct rte_pci_device *dev) { @@ -501,6 +533,16 @@ pci_device_iommu_support_va(const struct rte_pci_device *dev) char filename[PATH_MAX]; FILE *fp; uint64_t mgaw, vtd_cap_reg = 0; + struct stat s; + + if (stat("/sys/class/iommu/ivhd2/amd-iommu", &s) == 0) { + mgaw = pci_device_amd_iommu_support_va(addr); + if (mgaw > 0) { + rte_mem_set_dma_mask(mgaw); + return true; + } + return false; + } snprintf(filename, sizeof(filename), "%s/" PCI_PRI_FMT "/iommu/intel-iommu/cap",