lkml.org 
[lkml]   [2023]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 17/17] iommufd/selftest: Add coverage for IOMMU_HWPT_INVALIDATE ioctl
    Date
    From: Nicolin Chen <nicolinc@nvidia.com>

    Add a mock_domain_cache_invalidate_user() and a corresponding struct
    iommu_hwpt_invalidate_selftest, to allow to test IOMMU_HWPT_INVALIDATE
    from user space, by using the new IOMMU_TEST_OP_MD_CHECK_IOTLB.

    Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
    Signed-off-by: Yi Liu <yi.l.liu@intel.com>
    ---
    drivers/iommu/iommufd/iommufd_test.h | 10 ++++++++++
    drivers/iommu/iommufd/selftest.c | 19 ++++++++++++++++++
    tools/testing/selftests/iommu/iommufd.c | 8 ++++++++
    tools/testing/selftests/iommu/iommufd_utils.h | 20 +++++++++++++++++++
    4 files changed, 57 insertions(+)

    diff --git a/drivers/iommu/iommufd/iommufd_test.h b/drivers/iommu/iommufd/iommufd_test.h
    index 93fcbb57b904..9768d0c9e347 100644
    --- a/drivers/iommu/iommufd/iommufd_test.h
    +++ b/drivers/iommu/iommufd/iommufd_test.h
    @@ -135,4 +135,14 @@ struct iommu_hwpt_selftest {
    __u64 test_config;
    };

    +/**
    + * struct iommu_hwpt_invalidate_selftest
    + *
    + * @flags: invalidate flags
    + */
    +struct iommu_hwpt_invalidate_selftest {
    +#define IOMMU_TEST_INVALIDATE_ALL (1ULL << 0)
    + __u64 flags;
    +};
    +
    #endif
    diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
    index 92c37716804e..5f3e1f2a24e7 100644
    --- a/drivers/iommu/iommufd/selftest.c
    +++ b/drivers/iommu/iommufd/selftest.c
    @@ -395,9 +395,28 @@ static const struct iommu_ops mock_ops = {
    },
    };

    +static int mock_domain_cache_invalidate_user(struct iommu_domain *domain,
    + void *user_data)
    +{
    + struct iommu_hwpt_invalidate_selftest *inv_info = user_data;
    + struct mock_iommu_domain *mock =
    + container_of(domain, struct mock_iommu_domain, domain);
    +
    + if (domain->type != IOMMU_DOMAIN_NESTED || !mock->parent)
    + return -EINVAL;
    +
    + if (inv_info->flags & IOMMU_TEST_INVALIDATE_ALL)
    + mock->iotlb = 0;
    +
    + return 0;
    +}
    +
    static struct iommu_domain_ops domain_nested_ops = {
    .free = mock_domain_free,
    .attach_dev = mock_domain_nop_attach,
    + .cache_invalidate_user = mock_domain_cache_invalidate_user,
    + .cache_invalidate_user_data_len =
    + sizeof(struct iommu_hwpt_invalidate_selftest),
    };

    static struct iommu_device mock_iommu_device = {
    diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selftests/iommu/iommufd.c
    index 942860365cb6..bf0082d88a38 100644
    --- a/tools/testing/selftests/iommu/iommufd.c
    +++ b/tools/testing/selftests/iommu/iommufd.c
    @@ -115,6 +115,7 @@ TEST_F(iommufd, cmd_length)
    TEST_LENGTH(iommu_destroy, IOMMU_DESTROY);
    TEST_LENGTH(iommu_hw_info, IOMMU_GET_HW_INFO);
    TEST_LENGTH(iommu_hwpt_alloc, IOMMU_HWPT_ALLOC);
    + TEST_LENGTH(iommu_hwpt_invalidate, IOMMU_HWPT_INVALIDATE);
    TEST_LENGTH(iommu_ioas_alloc, IOMMU_IOAS_ALLOC);
    TEST_LENGTH(iommu_ioas_iova_ranges, IOMMU_IOAS_IOVA_RANGES);
    TEST_LENGTH(iommu_ioas_allow_iovas, IOMMU_IOAS_ALLOW_IOVAS);
    @@ -323,6 +324,13 @@ TEST_F(iommufd_ioas, nested_hwpt_alloc)
    EXPECT_ERRNO(EBUSY,
    _test_ioctl_destroy(self->fd, parent_hwpt_id));

    + /* hwpt_invalidate only supports a user-managed hwpt (nested) */
    + test_err_cmd_hwpt_invalidate(EINVAL, parent_hwpt_id);
    + test_cmd_hwpt_invalidate(nested_hwpt_id[0]);
    + test_cmd_hwpt_check_iotlb(nested_hwpt_id[0], 0);
    + test_cmd_hwpt_invalidate(nested_hwpt_id[1]);
    + test_cmd_hwpt_check_iotlb(nested_hwpt_id[1], 0);
    +
    /* Attach device to nested_hwpt_id[0] that then will be busy */
    test_cmd_mock_domain_replace(self->stdev_id,
    nested_hwpt_id[0]);
    diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h
    index 5e75dfac65e9..9b3e5f36c4a3 100644
    --- a/tools/testing/selftests/iommu/iommufd_utils.h
    +++ b/tools/testing/selftests/iommu/iommufd_utils.h
    @@ -169,6 +169,26 @@ static int _test_cmd_hwpt_alloc_nested(int fd, __u32 device_id, __u32 parent_id,
    _test_cmd_hwpt_alloc_nested(self->fd, device_id, \
    parent_id, hwpt_id))

    +static int _test_cmd_hwpt_invalidate(int fd, __u32 hwpt_id)
    +{
    + struct iommu_hwpt_invalidate_selftest data = {
    + .flags = IOMMU_TEST_INVALIDATE_ALL,
    + };
    + struct iommu_hwpt_invalidate cmd = {
    + .size = sizeof(cmd),
    + .hwpt_id = hwpt_id,
    + .data_len = sizeof(data),
    + .data_uptr = (uint64_t)&data,
    + };
    +
    + return ioctl(fd, IOMMU_HWPT_INVALIDATE, &cmd);
    +}
    +
    +#define test_cmd_hwpt_invalidate(hwpt_id) \
    + ASSERT_EQ(0, _test_cmd_hwpt_invalidate(self->fd, hwpt_id))
    +#define test_err_cmd_hwpt_invalidate(_errno, hwpt_id) \
    + EXPECT_ERRNO(_errno, _test_cmd_hwpt_invalidate(self->fd, hwpt_id))
    +
    static int _test_cmd_access_replace_ioas(int fd, __u32 access_id,
    unsigned int ioas_id)
    {
    --
    2.34.1
    \
     
     \ /
      Last update: 2023-07-24 13:06    [W:4.110 / U:0.376 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site