@@ -556,9 +556,12 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested)
TEST_F(iommufd_ioas, viommu_default)
{
+ struct iommu_hwpt_selftest data = {
+ .iotlb = IOMMU_TEST_IOTLB_DEFAULT,
+ };
+ uint32_t nested_hwpt_id = 0, hwpt_id = 0;
uint32_t dev_id = self->device_id;
uint32_t viommu_id = 0;
- uint32_t hwpt_id = 0;
if (dev_id) {
/* Negative test -- invalid hwpt */
@@ -575,17 +578,37 @@ TEST_F(iommufd_ioas, viommu_default)
test_cmd_hwpt_alloc(dev_id, self->ioas_id,
IOMMU_HWPT_ALLOC_NEST_PARENT,
&hwpt_id);
+ test_cmd_mock_domain_replace(self->stdev_id, hwpt_id);
+
/* Negative test -- unsupported viommu type */
test_err_viommu_alloc(EOPNOTSUPP, dev_id, hwpt_id,
0xdead, &viommu_id);
- /* Allocate a default type of viommu */
+
+ /* Allocate a default type of viommu and a nested hwpt on top */
test_cmd_viommu_alloc(dev_id, hwpt_id,
IOMMU_VIOMMU_TYPE_DEFAULT, &viommu_id);
+ test_cmd_hwpt_alloc_nested(self->device_id, viommu_id, 0,
+ &nested_hwpt_id,
+ IOMMU_HWPT_DATA_SELFTEST, &data,
+ sizeof(data));
+ test_cmd_mock_domain_replace(self->stdev_id, nested_hwpt_id);
+
+ /* Set vdev_id to 0x99, unset it, and set to 0x88 */
+ test_cmd_viommu_set_vdev_id(viommu_id, dev_id, 0x99);
+ test_err_viommu_set_vdev_id(EEXIST, viommu_id, dev_id, 0x99);
+ test_err_viommu_unset_vdev_id(EINVAL, viommu_id, dev_id, 0x88);
+ test_cmd_viommu_unset_vdev_id(viommu_id, dev_id, 0x99);
+ test_cmd_viommu_set_vdev_id(viommu_id, dev_id, 0x88);
+
+ test_cmd_mock_domain_replace(self->stdev_id, hwpt_id);
+ test_ioctl_destroy(nested_hwpt_id);
+ test_cmd_mock_domain_replace(self->stdev_id, self->ioas_id);
test_ioctl_destroy(viommu_id);
test_ioctl_destroy(hwpt_id);
} else {
test_err_viommu_alloc(ENOENT, dev_id, hwpt_id,
IOMMU_VIOMMU_TYPE_DEFAULT, &viommu_id);
+ test_err_viommu_set_vdev_id(ENOENT, viommu_id, dev_id, 0x99);
}
}
@@ -790,3 +790,45 @@ static int _test_cmd_viommu_alloc(int fd, __u32 device_id, __u32 hwpt_id,
EXPECT_ERRNO(_errno, _test_cmd_viommu_alloc(self->fd, device_id, \
hwpt_id, type, 0, \
viommu_id))
+
+static int _test_cmd_viommu_set_vdev_id(int fd, __u32 viommu_id,
+ __u32 idev_id, __u64 vdev_id)
+{
+ struct iommu_viommu_set_vdev_id cmd = {
+ .size = sizeof(cmd),
+ .dev_id = idev_id,
+ .viommu_id = viommu_id,
+ .vdev_id = vdev_id,
+ };
+
+ return ioctl(fd, IOMMU_VIOMMU_SET_VDEV_ID, &cmd);
+}
+
+#define test_cmd_viommu_set_vdev_id(viommu_id, idev_id, vdev_id) \
+ ASSERT_EQ(0, _test_cmd_viommu_set_vdev_id(self->fd, viommu_id, \
+ idev_id, vdev_id))
+#define test_err_viommu_set_vdev_id(_errno, viommu_id, idev_id, vdev_id) \
+ EXPECT_ERRNO(_errno, \
+ _test_cmd_viommu_set_vdev_id(self->fd, viommu_id, \
+ idev_id, vdev_id))
+
+static int _test_cmd_viommu_unset_vdev_id(int fd, __u32 viommu_id,
+ __u32 idev_id, __u64 vdev_id)
+{
+ struct iommu_viommu_unset_vdev_id cmd = {
+ .size = sizeof(cmd),
+ .dev_id = idev_id,
+ .viommu_id = viommu_id,
+ .vdev_id = vdev_id,
+ };
+
+ return ioctl(fd, IOMMU_VIOMMU_UNSET_VDEV_ID, &cmd);
+}
+
+#define test_cmd_viommu_unset_vdev_id(viommu_id, idev_id, vdev_id) \
+ ASSERT_EQ(0, _test_cmd_viommu_unset_vdev_id(self->fd, viommu_id, \
+ idev_id, vdev_id))
+#define test_err_viommu_unset_vdev_id(_errno, viommu_id, idev_id, vdev_id) \
+ EXPECT_ERRNO(_errno, \
+ _test_cmd_viommu_unset_vdev_id(self->fd, viommu_id, \
+ idev_id, vdev_id))
A core-managed VIOMMU maintains an xarray to store a list of virtual ids to mock_devs. Add test cases to cover the new IOMMU_VIOMMU_SET/UNSET_VDEV_ID ioctls. Signed-off-by: Nicolin Chen <nicolinc@nvidia.com> --- tools/testing/selftests/iommu/iommufd.c | 27 +++++++++++- tools/testing/selftests/iommu/iommufd_utils.h | 42 +++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-)