From patchwork Wed Sep 14 13:49:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Piszczek X-Patchwork-Id: 116321 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 54AA8A00C5; Thu, 15 Sep 2022 08:40:11 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F3E744021D; Thu, 15 Sep 2022 08:40:10 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id D05FB40156 for ; Wed, 14 Sep 2022 15:49:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iNyG1HBXJj36BhAVauDhMMHSU38cjTH4SOo9CpNbMONnaUttBWfFaCtjNBTMlAkMgGvW01bAw1+afWwEHMXKkXzx4C4jdYVG7WHDcVpCzZnLNMsmcwBmB2Xf6UEXa2WwhQwWZyhVDztJM0tYukhZcyC2KTxhj0LrDTKkg4TaiV473NlOQ5Lk8Efb3SDLOn3n3kQJh3WAprCBY6+nAQ/GskInUJHkRHSnSXeQSlJl39y4i4DepY7kENouN6VIZrNrGbKhT0pM1j6l9JHWVg8y2ZnVJgIpdOW6JIV0tKlj9Cr7iOc/EY7IIQmTpQ63AuelswyExUt0PgCRIRsf5BgRBw== 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=kkjhiawSdYspH9kVYTnA8ASx1yzIKy0SAspjE0/CzeA=; b=inYnWbalTUu28SRg3FLAytKA7/OaTApFRHWOP1+NoNY4G9giFYrabOteG3fwiKwSoPewe37vJ9FR4lduKm8vr1Idct0P++MlXMJ9hbvC1m5IYCkQKYinpUqb4nFNIDUFI3E0AQ6HabnhECPuP2+7w+GTCjje9xHA9nFP5GY+/j0pQWxztXalmmPFWaWmfSI0g5X+FrVf6Yl/AabChmfroHfF83rSIzKL52rLQQ2+4bQJ3LNxPVXM5LYzPHFk5qPmUa/+wLFM8Wsw7p4/nyEldi1fTL/n/MiveKHPiukvp4u82hVs0I2GPQWVY7u0ezcJm3Llx3lIHcVkfioXJGL6Cw== 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=kkjhiawSdYspH9kVYTnA8ASx1yzIKy0SAspjE0/CzeA=; b=NV+OMCJcqTb2W526xhn2sMqfOf1qQI6LLc+i+dA5A3jXar/sFdOLsOnr2hyODBRJr7N6LB9hyFezraewviXn5ZzymdvBhYPqqj7jZ7jhfXHtc8ZNE6qJ3KXdoQqexy1Rv3UNA7r5pEEDg1veSGR4lCYwu4wAA9T1FG8TzJ97Xek= Received: from DM6PR05CA0048.namprd05.prod.outlook.com (2603:10b6:5:335::17) by SJ0PR19MB4400.namprd19.prod.outlook.com (2603:10b6:a03:28b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Wed, 14 Sep 2022 13:49:54 +0000 Received: from DM6NAM04FT062.eop-NAM04.prod.protection.outlook.com (2603:10b6:5:335:cafe::ad) by DM6PR05CA0048.outlook.office365.com (2603:10b6:5:335::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.8 via Frontend Transport; Wed, 14 Sep 2022 13:49:53 +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 DM6NAM04FT062.mail.protection.outlook.com (10.13.158.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.12 via Frontend Transport; Wed, 14 Sep 2022 13:49:53 +0000 Received: from localhost (unknown [10.68.0.8]) by uww-mx01.datadirectnet.com (Postfix) with ESMTP id 6255420C6848; Wed, 14 Sep 2022 07:51:04 -0600 (MDT) From: Michael Piszczek To: dev@dpdk.org Cc: Michael Piszczek Subject: [PATCH v2] pci: read amd iommu virtual address width Date: Wed, 14 Sep 2022 15:49:50 +0200 Message-Id: <20220914134950.3675770-1-mpiszczek@ddn.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220912160157.3642968-2-mpiszczek@ddn.com> References: <20220912160157.3642968-2-mpiszczek@ddn.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM04FT062:EE_|SJ0PR19MB4400:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d147f45-d389-4b04-70d1-08da9658008d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IOHXl/+5Mpgj2r2vgvA2xpY1sOLzG5aAojSsA51lXdq64lkSSTxvaQn6wEzwtKViekrszfikO1cn9720hgSjZ+DN+Okm9dvHVuzlC5JO3vBNn0a0p2arkhnHK8reYj397E6OOrUjU7m5IXS2dVmNnBO53FrYU43pjfJJg+ywVVDLZ37UXPzWCN09hqUH8Sugp1BLEfNO99TFb/q8ZZJcp+ITJzSE0s8w0q6A6jPKiWIaVqkHlfzjrMTgQa/xmCPgTcBnMzZ/P1FIf4zpG6X7Sc5PPaypDshMDyqTQ8mmSiw+YxiCaFwFUsf6E+fWWuhzVV7nqSRlG2UeynkxQ8GXfevMgfWtnbmnrFl0Fts0q7Kh/UxZ9Eu8EVfHywL9BWS3noOM4dlN0dKhvbLU49KYs7SghO+ucrXChDKEc3S5sUXYK21MNz+hi5y6pE5Y65QQWzas2Txel7cSOph1XxPBxkSZQNJooRQ9DxIzavXwNzuex0Y5mr7o9OorZS3Ylt41p3U7DdF29gX3Q297Jz62MHj/j91taes2bWUUhIrk5i5VkS8kvTa6YbZQB3Hpx0rnx406jDwiSuInKqlPf3dm605lIoLS4q1wXLcn4NYSvi/N67KGDo7WFf9rM4lFUCC/Ge0t6XpJVa+uAbUS28TRFHj/B6C2l2++ZFtkfSa4RrrLIWaWCpBGxZ8CJ2tUxibt6YwkyUgGriqwEkrnoEpLC55PjI7Cfp2hgjakKq5EY5PccGCnqWkM3yENH9cgGiexD2dvHqZ4D/v46T+avyEs4g== 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)(396003)(39850400004)(346002)(376002)(136003)(451199015)(46966006)(36840700001)(82310400005)(6916009)(2906002)(4326008)(40480700001)(316002)(2616005)(8676002)(41300700001)(86362001)(70586007)(26005)(70206006)(186003)(6666004)(8936002)(83380400001)(478600001)(36756003)(5660300002)(82740400003)(36860700001)(356005)(336012)(47076005)(6266002)(1076003)(81166007)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: ddn.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2022 13:49:53.6123 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3d147f45-d389-4b04-70d1-08da9658008d 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: DM6NAM04FT062.eop-NAM04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR19MB4400 X-Mailman-Approved-At: Thu, 15 Sep 2022 08:40:09 +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 | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index e521459870..0c6d79ca74 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -492,6 +493,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 +534,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",