From patchwork Tue Oct 22 00:19:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13844921 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 E79C6D1714E for ; Tue, 22 Oct 2024 00:33:08 +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=pv4VPS3l4q0xEzuM9E2RNzoeDh1ThJTm3rrynPATA+I=; b=46WagP57bNR/yydxjVDJoigRpP SV73CW1F0mCmcuIH0gNbnr4xD3u66kzQaa699Jghy6oauyatPBKvzSrevgJPnwp6ewWep6HuXLYVm Z2rQlAvAbQBzpz3/QwuZwyeMstURGicRDSsJHw4H6adHmgLslzxQ9cmm5nrh+GL4idyNBOJ/31Eir gjfny2cJYKEU0+iPAzbOvGBt5KrNvZIfpSnJz2ZGsB/rvGnFafzyMFfrF2Y2q46sLWv4ik0YqtDKe 7ksQN+RCECM+8Isgqr5NFIRVGXYJQC6g0Qvd+gJAzRJCLtEgCCM/HlsvvaCRp51vX2rhMFRx8AWXC +EQcWZIA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t32pT-000000095J4-1BfI; Tue, 22 Oct 2024 00:32:55 +0000 Received: from mail-bn1nam02on20608.outbound.protection.outlook.com ([2a01:111:f403:2407::608] helo=NAM02-BN1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t32dY-000000092Hc-2kCM for linux-arm-kernel@lists.infradead.org; Tue, 22 Oct 2024 00:20:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SdrdYZZVFxKuHkRPxRDgQplBsOYg80s0GDrbg0qzASGq+ewHvEHUyT51GitTZkkcqRnyns1e6qdXgfrXra3gNlvVKXdg7N2y8SeaY0I/9p24rDOGwKtk7X0+EQrBwcWlEHQWz/2RnlGrX9xJZ+/UiGNB1T35pYj9YOKVadqGipgej1UOFAg0UyCF/1A825DnbBRTSXVuRcV5k7W4hq6YJn1ylzRXuFiUiCv++u0/XL7lVJHS+Ji1vAhCLuw+l4vwVpJuXcKBSqobrG96FNFRHHt9OJQat8Sx1qpaATFkOTRrAP4xnpywWFDg/t7N0a2xFkW5Xxr4u52Jq+QwUMc6pw== 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=pv4VPS3l4q0xEzuM9E2RNzoeDh1ThJTm3rrynPATA+I=; b=MLO349mJHUnZIoQIoQe6oAm2Kn33JXIKgWZrM7hY7Bon/APG9Y3LkycB/32urMOApZIWYxKjWbDkuC7OXvwa137CxTL+0KAul6xSfuyvT/+3Cz0DVfVoYk4hzVHx2kRXqXKo8xKUve6LAr66v3prxzr3p74nExVEaFslFpm24QOFJCF7PN4jfdAXvTzb0eoZgIkNLuZD8akKb44tTI7p+ehXWVye25tpWIP3xzhKKPUwNrptZZrvJwBvR2656XY2Snrw9o1l7WkU+0bkbQH8/2h5p91KuNO4cDrccyL5XVVLQ91gicUTGFjnCjNrkGlLVbs8GrBEOArFbsn8LsSNbQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=amd.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=pv4VPS3l4q0xEzuM9E2RNzoeDh1ThJTm3rrynPATA+I=; b=UiEsvnVUHZgqdqaslOMpKyZ4zEEp4o5tmVqG5a35CKcDCODIIF3RxHXC6rdorjO473rEmARNn5dWYQZ/onPe4aboKi/n7SSyYwjewyynvU8x07sRI2S70JASC1SGMemZSgfMYNzqs2YOYhJTOndwLC4NGmNIS/BDPzrrzidXhddfCa47x9yo/aR/xQhYNk4DwWDOUW353J7sqFqHLtaD1/mgGuRKjiabkvg9+E2yHGvwpOMpbT2EYpwE/8Nzk/sDgNdLa1z5x25IAueyLe4IBpU7z6LiOaXPLtaMz/QpsNCn6LnqPNWWRI1aPIphF8Ghx0TNsAL28WIHukea69FW6Q== Received: from BN0PR08CA0001.namprd08.prod.outlook.com (2603:10b6:408:142::6) by BY5PR12MB4324.namprd12.prod.outlook.com (2603:10b6:a03:209::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.29; Tue, 22 Oct 2024 00:20:30 +0000 Received: from BL02EPF0001A108.namprd05.prod.outlook.com (2603:10b6:408:142:cafe::55) by BN0PR08CA0001.outlook.office365.com (2603:10b6:408:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.29 via Frontend Transport; Tue, 22 Oct 2024 00:20:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF0001A108.mail.protection.outlook.com (10.167.241.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.14 via Frontend Transport; Tue, 22 Oct 2024 00:20:30 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 21 Oct 2024 17:20:13 -0700 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 21 Oct 2024 17:20:12 -0700 Received: from Asurada-Nvidia.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Mon, 21 Oct 2024 17:20:11 -0700 From: Nicolin Chen To: , , CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 09/11] iommufd/selftest: Add IOMMU_VIOMMU_ALLOC test coverage Date: Mon, 21 Oct 2024 17:19:31 -0700 Message-ID: <47e6077c79b9bf97476aa91317d35af2e8974240.1729553811.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: BL02EPF0001A108:EE_|BY5PR12MB4324:EE_ X-MS-Office365-Filtering-Correlation-Id: c76aa39f-781d-49b4-6cb6-08dcf22f564d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|7416014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: Tbg6d2CBLXZKUVqwkizu2Nzja9CTQ/1H7GUMS4MFB7g/q/ggyJXQCIo+ZtK0cUPEgjAzVNDslnhJZOcU2UF1Blb745Olxp4+/fpPWUQ5Jc/b7pHkTNJykdYlT+eWkq3Ac4gAZSW9pTvXf9ZQ1E0uzlUJXdt47MADMlpcyNAWKRsFHP3NUESgpCodUFIA1/m979lgxP6j3wad3KfLzgc/Hm8MFE4Uo079Ov/J9Jr2NFOTtZNOz8grvZXCBg7RHUUXdkb7cSqMwiNQ/IAHTIlL8KBlfj2LVU1rVpkgwTlcHkONA0Zj9wG2XsyRCnSQJcw//pFtDVayfacdBofNymG5LGhSXQQAxSb4vSLABbrBfOizDRtwsA+w2ljGIwXQ50U52JhGoZq+2tdJLlBEM9mE+yyMvMkmI0xXNiHA2kFeAjeDjHY8B6s/6wGtPjTGem5gyzl+lXBGjwIqfnnmb4YmTZp9Mn7Di60QXXIjQ0PLJNLVvFZ35PXzS2aJwuTUmM9iHTZdxfo6ABp3qLikQrE3tIHWmX4o9pPSuwetGu/6u5ZEEjQaraz2wkZlfl+HLz5RXuhLeZFylgouMsFfsJXFiiOu2JvsVqVMRNdfj09xS2c0l8EIhi5NXe3rrEuW3Nh5rxK8An8rciaOr9HBEhw61rjS6fL+w9bKJOwASq4D29tWtgye7QUYZKxx6/aHDej8FgQ4nwq9fSx6DVGY9P2V9O1+uhJ1calqf0cYQRjaMS0BC5uQ+ae7E4VVl38+z/F1mf4zakqH6Z3ogb/BX40fMKVKFtXfpr5WBY9TNeu+yz5wzRuOaAoP90pa8PM+MZBh8yvxa+otwnnFwBy+icfj/4hnB8si5Sr2g75I1D9LxECAv/wyM6Cs3kh2vUso58Q8ty8l0QxhLOK0YKZboC8MFWh19O6IUeNB3ptUKp29o2fpsrTklYevti8fQIQZVA4jqyg03gqZHH/eWq/dMxKQ7v9wYOUDylUmiqEU2ScOdAtGxhyR32JoTT5Wk32QW3lDonwSpBb167FiTS+YxuM0DsQNlxGYrV1cZhTaOp3kowPXWkgHvq2tHUEv/W7UWkc6Sgi4ZPujXz8arRZ1y4jjU/x7E11L5nxxhyndhzEvSMjjkzMGjmRvAxo3m1ikUGyeTREjZ9pSPso3eaB1vCBdeOrNsyy9DlcOlYsza75+u/Fk4l2cEuj+M5t69ZtpV3bNVn9LjEBEllLz4mjIt1abc54LN4VNj5YGdmeUVv1yD/moPxBHupvd/ZPOZWb8zB/IYr/Vf+Q5f+XZBRsn9bviEyeZGXfDPp74M9jFr/iNpbhnPArtZio8TO9vz3EPByXhSOIrAOV3KnXnlq7do5oJkmlewJ0aWX9kxZ4x6DJJRQwcTF7yjDnpRxJVqGB90vsD3RdVdu9j8njj8QpwC2LkxQ== X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(36860700013)(7416014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2024 00:20:30.3035 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c76aa39f-781d-49b4-6cb6-08dcf22f564d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A108.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4324 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241021_172036_761194_3E0BBE41 X-CRM114-Status: GOOD ( 14.42 ) 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 | 78 +++++++++++++++++++ .../selftests/iommu/iommufd_fail_nth.c | 11 +++ 3 files changed, 117 insertions(+) diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h index 40f6f14ce136..ca09308dad6a 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..49ac144cf5a4 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,81 @@ 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; +}; + +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, + IOMMU_VIOMMU_TYPE_SELFTEST, NULL); + + /* 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, + IOMMU_VIOMMU_TYPE_SELFTEST, NULL); + 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, NULL); + + test_cmd_viommu_alloc(self->device_id, self->hwpt_id, + IOMMU_VIOMMU_TYPE_SELFTEST, + &self->viommu_id); + } else { + test_err_viommu_alloc(ENOENT, self->device_id, self->hwpt_id, + IOMMU_VIOMMU_TYPE_SELFTEST, NULL); + } +} + +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) +{ + .viommu = 0, +}; + +FIXTURE_VARIANT_ADD(iommufd_viommu, mock_viommu) +{ + .viommu = 1, +}; + +TEST_F(iommufd_viommu, viommu_auto_destroy) +{ +} + TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/iommu/iommufd_fail_nth.c b/tools/testing/selftests/iommu/iommufd_fail_nth.c index c5d5e69452b0..e9a980b7729b 100644 --- a/tools/testing/selftests/iommu/iommufd_fail_nth.c +++ b/tools/testing/selftests/iommu/iommufd_fail_nth.c @@ -582,6 +582,7 @@ TEST_FAIL_NTH(basic_fail_nth, device) uint32_t stdev_id; uint32_t idev_id; uint32_t hwpt_id; + uint32_t viommu_id; __u64 iova; self->fd = open("/dev/iommu", O_RDWR); @@ -624,6 +625,16 @@ TEST_FAIL_NTH(basic_fail_nth, device) if (_test_cmd_mock_domain_replace(self->fd, stdev_id, hwpt_id, NULL)) return -1; + + if (_test_cmd_hwpt_alloc(self->fd, idev_id, ioas_id, 0, + IOMMU_HWPT_ALLOC_NEST_PARENT, &hwpt_id, + IOMMU_HWPT_DATA_NONE, 0, 0)) + return -1; + + if (_test_cmd_viommu_alloc(self->fd, idev_id, hwpt_id, + IOMMU_VIOMMU_TYPE_SELFTEST, 0, &viommu_id)) + return -1; + return 0; }