From patchwork Wed Oct 9 16:38:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13828828 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 70835CEE330 for ; Wed, 9 Oct 2024 17:03:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=j/+cRrIvKn3BRJxoXT+ZuGU7X9mkXiCk2Hwz6WSswrI=; b=AHY/fL8Na0xyfnvwmnxQmzGE8Q korzZmz/mqWgACKF4Uv6FmJnFRd2x8g1TutbbtKsMJwI0FKKONxRrmHRcd+eYSqksTLR2k50IbmSA f1m6PKpKkiq1TgkhCrOOB1oPrNnaTAWbW2bPfq/iJt8pqgExSIhMCoPfuuBDbLZDlKDhZ6QrdSit7 OyCJQXjWZX5/rM9v7d4xCjcZh/c1tWQ+FXFbSnZAnmrY9jtKtqSXuKykXLrO2qkIXYAs/9kAtDMpi BvIQkhBS9yedcZtTGLTKX1uclKSMVswWeaXU9WkD9up3yK+2+ptx1BMz5EI1njQ+BstJSvRWBrU9O f1RZEPMQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1sya5i-0000000A6i6-3zsB; Wed, 09 Oct 2024 17:03:14 +0000 Received: from mail-mw2nam10on2043.outbound.protection.outlook.com ([40.107.94.43] helo=NAM10-MW2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1syZiR-0000000A0UB-2Ln4 for linux-arm-kernel@lists.infradead.org; Wed, 09 Oct 2024 16:39:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZNdkGldGfIMe+MwkarVTkyV2Zme7ZZ/xi7u1muVE67ifJiwrsQT+Neilm2kboHohVHppiMmI0qNsCXewsWwy/sS3krDrJUu93M9X4IrJPuN9MWNuCGRp4lPVobCJvsGWUYr4WcoVC+35rJrmcSO29FaJv001xkatzFJDYLKH8luRsu7hP33DPZp3JwuGSGYrDO/wf4lAosA4yyLimZS8Mt8vanZipwQJpJr7eOS3+stElEI62tlIFdhMu3QzDmPEwOWU9N0AwTPwdv38CnAmo9qoMjkijcanbQ4XqSV7Vs4O6+PbxfINKrvNifRc2cvxxyrCyzGTQmloxlVXIkD4+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=j/+cRrIvKn3BRJxoXT+ZuGU7X9mkXiCk2Hwz6WSswrI=; b=gWOvw12ZU2JQyvg5phpbLbLZ7ZVBBhrZPCHNJ2RRvl/B/JDhB4sIJplpkxowZvINwqw9TmwfnFt5572JxB0guj5ghiEuTBdz4nfunpDG1/QBxOIajw8yymso3dTL9P0KxU/hDtqRRMriY5HuaioUwtSfOPo4IADjr0awxZYPRq2SW7PIqHV3r/pQ8brgx6dvh2dVdW9zSyUHJczLxdHcMN9uz+5pjWWM5vT9wGDqr6InOQw9jVecJTBcPyr9AwNeeKCtqLXN8IqXCpmDtx8w25WXoGl5eNBmT9b5PGXI7CLOQ4btIxVib9nQU8IjcKUuc5cm2aFF/VJU98cfJpTa/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j/+cRrIvKn3BRJxoXT+ZuGU7X9mkXiCk2Hwz6WSswrI=; b=EMjJuswXVvEjkg5KaMcChkwnV7cLoNo8YbpsRXuOmGrX3rqxU6CVXomrW2AUYBGhuY01qflvs0bUaj8NRcCUfgk5l0RZho/+lLhOjffpmBpSuW6x33qK0nZ7AreQgRICeOi5PxQXWiMCc8v1zgPK5biZAxMT8TaWoGpPspZLUkWdnrc881vCBhVnKmQRgeWFkUBBGKlgP8SXZG721INwDGWpA4TrfqR9zvFzWdX0DpWQ0NMSGeuSW8GluYTAvDLQzImjLQnh6yLXbtOO9c7/YwzaFctyadwNIUlIDYGvqZw1aCmo4tgccPiyQaXpjQoQQn/wS4lCEoL/7KULnKbDcg== Received: from DM6PR01CA0002.prod.exchangelabs.com (2603:10b6:5:296::7) by DM4PR12MB6495.namprd12.prod.outlook.com (2603:10b6:8:bc::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.23; Wed, 9 Oct 2024 16:39:00 +0000 Received: from DS3PEPF000099DB.namprd04.prod.outlook.com (2603:10b6:5:296:cafe::d6) by DM6PR01CA0002.outlook.office365.com (2603:10b6:5:296::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.34 via Frontend Transport; Wed, 9 Oct 2024 16:39:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by DS3PEPF000099DB.mail.protection.outlook.com (10.167.17.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.13 via Frontend Transport; Wed, 9 Oct 2024 16:38:59 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 9 Oct 2024 09:38:52 -0700 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 9 Oct 2024 09:38:51 -0700 Received: from Asurada-Nvidia.nvidia.com (10.127.8.12) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Wed, 9 Oct 2024 09:38:50 -0700 From: Nicolin Chen To: , , CC: , , , , , , , , , , , , , , , , , , Subject: [PATCH v3 09/11] iommufd/selftest: Add IOMMU_VIOMMU_ALLOC test coverage Date: Wed, 9 Oct 2024 09:38:09 -0700 Message-ID: <320e7f6a93f50d00d7273ad8a2f06be928a6ed35.1728491453.git.nicolinc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099DB:EE_|DM4PR12MB6495:EE_ X-MS-Office365-Filtering-Correlation-Id: f3365d40-c49d-457b-eb2f-08dce880e092 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|1800799024|7416014|82310400026; X-Microsoft-Antispam-Message-Info: K4sbhf/XLftZgX6m0zVo4RbnLQpzLt53XA4tCS8+B6lbelGB4kEHzUZtQ4RdjjybEJZW9KD3iSsL/qOW6Uh+fAmSBc6CpZUCvFgwwfCPuPZ3b2tp6SwONFyJzDymKFeEfK/JuPOdmG+KN2GTdIDKHRVjKmA9HR0oWmljSiTlBW32gtTRM/l/ClYf22iRPmPL9F2igC5raDjETqR+3NG58tWbZ4rJ7bKuNiGIkvZCaZYWs8VMc7+T2Odt2JdILjSj+oMqSF53WSEL/hZVWPdPCORIeP9Cw09UkPjG0raplK3qwNNqSJESengEc28VGpC9SUyu9ZI38Qa7kKthLtubVIhKTlLULy8kGbANQZlSgf8nfMYPrBqjBEp+O8gNcam/pZAZ3IdwMRWL6vac/nkQA0HaSXbvLfY1YJnJ20Q9h+Q9tRzBTa6vMoeNgsmarpqWjd7Z5YOP5Ehyxow1HYOHjYLRe4JxNihyPkcgS6L/p+OdjM6XrK+JCga1gnsQGQWQDcqfS6XY7UZZwuuZO5mMnrLcPeb68u7q6bb6JbF9fB+AcZab+9BlPLdFfpCTyEvdcmWuw0d9hVb4wIej+vWvw1r8cm/vO8ZcfjPHPObTXUDS/vZZ/1Y57Mke2Ins8VYT1exAcYCneb4jR53IXtjc3OseW026avAjKi7vNGJV7tRdQXxRzyaAdAKXa5eYzy+4FY4zBGKYrEYPIFaBjLNQktbYizi+GVWsxpwgBe8ORZ1K5kPq0m7PiRcgNfWX/uaKBQwUT0xTqDYjJG9qszlXo3nnO3pU2riGvFv1ZgsTAD/Ghy5+4O+dQs7QUhVaD5jBMYLeowwWk5afQnpDVRB5NAZzEwZZ44UAvtSQ5KG71H/lwrNJ8emELy8aqn2LMHcRlhnNeEy+Vs4FQvNhI35dcECkO2k3K8/3DYeN+D4EDgMnADlGOdf6L3KmRtEgcjGWxsrcIp6APjZcVu5YATT3KjdXRORJ6ENq/rxEvzH9Ly4mXI+56fCLsQQ+RF90wxGLSO1XgWFy0uTq62e90Vu8YbmxmTjDJgWj6nD881cQ6E2TA47z43Z/rjKLSwCd7yRkfGLnOtbXnaVQ19WNQUagqhNTfgpBvbKr+tbz+pbm2IlUnOACXNR0S7djEdWRELM3dYkRSCqkENgPg2x/+g2Baw17TkziU48UhsLMTLSDLbhDw9jPrMHx1+KZXTuiftcmJaR54ORfC45TLh+wvQBUvBVf8uBse19kLMtvLmj1Ro5IYaF+NN3jpxmPP1B3BHd9hUKNq5WMb01o948a7yNS0S8BPdaIPanwPoEl9tznoxf7Tcb6Fp1gD24JLIqZd9BizzoBSVGvul44u2tKjhpL+qCx77IUlMDg97MQv3pFR2oQBBaTCWjqLQp2VDNBYih6 X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(36860700013)(1800799024)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2024 16:38:59.9544 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f3365d40-c49d-457b-eb2f-08dce880e092 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099DB.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6495 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241009_093911_688349_D596A7E1 X-CRM114-Status: GOOD ( 14.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add a new iommufd_viommu FIXTURE and setup it up with a vIOMMU object. Any new vIOMMU feature will be added as a TEST_F under that. Signed-off-by: Nicolin Chen --- tools/testing/selftests/iommu/iommufd_utils.h | 28 +++++++ tools/testing/selftests/iommu/iommufd.c | 84 +++++++++++++++++++ 2 files changed, 112 insertions(+) diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h index 40f6f14ce136..307d097db9dd 100644 --- a/tools/testing/selftests/iommu/iommufd_utils.h +++ b/tools/testing/selftests/iommu/iommufd_utils.h @@ -762,3 +762,31 @@ static int _test_cmd_trigger_iopf(int fd, __u32 device_id, __u32 fault_fd) #define test_cmd_trigger_iopf(device_id, fault_fd) \ ASSERT_EQ(0, _test_cmd_trigger_iopf(self->fd, device_id, fault_fd)) + +static int _test_cmd_viommu_alloc(int fd, __u32 device_id, __u32 hwpt_id, + __u32 type, __u32 flags, __u32 *viommu_id) +{ + struct iommu_viommu_alloc cmd = { + .size = sizeof(cmd), + .flags = flags, + .type = type, + .dev_id = device_id, + .hwpt_id = hwpt_id, + }; + int ret; + + ret = ioctl(fd, IOMMU_VIOMMU_ALLOC, &cmd); + if (ret) + return ret; + if (viommu_id) + *viommu_id = cmd.out_viommu_id; + return 0; +} + +#define test_cmd_viommu_alloc(device_id, hwpt_id, type, viommu_id) \ + ASSERT_EQ(0, _test_cmd_viommu_alloc(self->fd, device_id, hwpt_id, \ + type, 0, viommu_id)) +#define test_err_viommu_alloc(_errno, device_id, hwpt_id, type, viommu_id) \ + EXPECT_ERRNO(_errno, _test_cmd_viommu_alloc(self->fd, device_id, \ + hwpt_id, type, 0, \ + viommu_id)) diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selftests/iommu/iommufd.c index 4927b9add5ad..c03705825576 100644 --- a/tools/testing/selftests/iommu/iommufd.c +++ b/tools/testing/selftests/iommu/iommufd.c @@ -128,6 +128,7 @@ TEST_F(iommufd, cmd_length) TEST_LENGTH(iommu_ioas_unmap, IOMMU_IOAS_UNMAP, length); TEST_LENGTH(iommu_option, IOMMU_OPTION, val64); TEST_LENGTH(iommu_vfio_ioas, IOMMU_VFIO_IOAS, __reserved); + TEST_LENGTH(iommu_viommu_alloc, IOMMU_VIOMMU_ALLOC, out_viommu_id); #undef TEST_LENGTH } @@ -2386,4 +2387,87 @@ TEST_F(vfio_compat_mock_domain, huge_map) } } +FIXTURE(iommufd_viommu) +{ + int fd; + uint32_t ioas_id; + uint32_t stdev_id; + uint32_t hwpt_id; + uint32_t device_id; + uint32_t viommu_id; +}; + +FIXTURE_VARIANT(iommufd_viommu) +{ + unsigned int viommu; + unsigned int viommu_type; +}; + +FIXTURE_SETUP(iommufd_viommu) +{ + self->fd = open("/dev/iommu", O_RDWR); + ASSERT_NE(-1, self->fd); + test_ioctl_ioas_alloc(&self->ioas_id); + test_ioctl_set_default_memory_limit(); + + if (variant->viommu) { + test_cmd_mock_domain(self->ioas_id, &self->stdev_id, NULL, + &self->device_id); + + /* Negative test -- invalid hwpt */ + test_err_viommu_alloc(ENOENT, self->device_id, self->hwpt_id, + variant->viommu_type, &self->viommu_id); + + /* Negative test -- not a nesting parent hwpt */ + test_cmd_hwpt_alloc(self->device_id, self->ioas_id, 0, + &self->hwpt_id); + test_err_viommu_alloc(EINVAL, self->device_id, self->hwpt_id, + variant->viommu_type, &self->viommu_id); + test_ioctl_destroy(self->hwpt_id); + + /* Allocate a nesting parent HWP */ + test_cmd_hwpt_alloc(self->device_id, self->ioas_id, + IOMMU_HWPT_ALLOC_NEST_PARENT, + &self->hwpt_id); + /* Negative test -- unsupported viommu type */ + test_err_viommu_alloc(EOPNOTSUPP, self->device_id, + self->hwpt_id, 0xdead, &self->viommu_id); + /* Allocate a default type of viommu */ + test_cmd_viommu_alloc(self->device_id, self->hwpt_id, + variant->viommu_type, &self->viommu_id); + } else { + test_err_viommu_alloc(ENOENT, self->device_id, self->hwpt_id, + variant->viommu_type, &self->viommu_id); + } +} + +FIXTURE_TEARDOWN(iommufd_viommu) +{ + if (variant->viommu) { + test_ioctl_destroy(self->viommu_id); + test_ioctl_destroy(self->hwpt_id); + } + teardown_iommufd(self->fd, _metadata); +} + +FIXTURE_VARIANT_ADD(iommufd_viommu, no_viommu) +{ +}; + +FIXTURE_VARIANT_ADD(iommufd_viommu, viommu_default) +{ + .viommu = 1, + .viommu_type = IOMMU_VIOMMU_TYPE_DEFAULT, +}; + +FIXTURE_VARIANT_ADD(iommufd_viommu, mock_viommu) +{ + .viommu = 1, + .viommu_type = IOMMU_VIOMMU_TYPE_SELFTEST, +}; + +TEST_F(iommufd_viommu, viommu_auto_destroy) +{ +} + TEST_HARNESS_MAIN