From nobody Thu Dec 18 18:00:54 2025 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DA4A7710A for ; Tue, 30 Apr 2024 14:59:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714489181; cv=none; b=CE+lrI4oT7iHtVE+G8KTsy8cIZB9M4Ac6Yww4qVwH+UTPouVdIlEMJ5lXguXjHKq70BQ8lcTSMiBZ2V32rNWNJlbAHJwUaErccwgRxh8VKlHNcUwgsQVKqtEiPpeYWnV8Fc/wppBgJPP5kfrt04OMkZAvESOTFhU3FdizC3VHuw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714489181; c=relaxed/simple; bh=neT7HYgXLCtrbErknLj1hAcQ6/k/SrXq7wSzsrM+fa4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZJduiBZRSuuoYzOkq9Gw0HrT0hPh1XGT3QqXOXLk9YBlb6Z9tDdk7o9xHf660XWgcWiOP9lvFe8+JM/YlvusK3l0vOtNdovJC/2Or1A8Im2Gie3u/vFhz+v/cP1X5gxUvg1RI1WwtSk3De+0Q7HV2lSNIxmoOkbtgOmWyfABC5s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=bJQ83XYQ; arc=none smtp.client-ip=198.175.65.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="bJQ83XYQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714489180; x=1746025180; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=neT7HYgXLCtrbErknLj1hAcQ6/k/SrXq7wSzsrM+fa4=; b=bJQ83XYQqXey8wZuscOer/hjemMxxCzdvky0OrcaOVB+LQPDqrEtixwy n2Zt2Z/oJOCEXlVprNcmb11FbgRBfHyS6e6z1iArfGoBAS7Xu5GGy70QS ArJDjEwvcAJ5t646reYEwvSDYRLtlvK8hC70PS009lK7WAlQDFg57TZyK bEi6H9/+d9bxPfnB+DtWUtNRK1FtxeahaRd+DkH4J18rw3ty/Ull+/Gxt BgcxyCw9R+Nmereao9NL1hC9ffg0P0KS8eV9uNG/IRP45rvp9tRQKcHAQ aOF3s+l4wcjA9RQUb9VGHNzyC3YRHqaojd9C++7fjjsf2e3TsifmKz3Fv Q==; X-CSE-ConnectionGUID: 9LPHp1PMSOCWEu+SqcrToA== X-CSE-MsgGUID: vhSUWeznSX+gEIC5uMJHhw== X-IronPort-AV: E=McAfee;i="6600,9927,11060"; a="10059993" X-IronPort-AV: E=Sophos;i="6.07,242,1708416000"; d="scan'208";a="10059993" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2024 07:59:23 -0700 X-CSE-ConnectionGUID: U6iU6JpeTga/SAk13G013w== X-CSE-MsgGUID: VSS2H2M7Tj6k8GbYlU/rvA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,242,1708416000"; d="scan'208";a="31282256" Received: from unknown (HELO allen-box.sh.intel.com) ([10.239.159.127]) by orviesa004.jf.intel.com with ESMTP; 30 Apr 2024 07:59:19 -0700 From: Lu Baolu To: Jason Gunthorpe , Kevin Tian , Joerg Roedel , Will Deacon , Robin Murphy , Jean-Philippe Brucker , Nicolin Chen , Yi Liu , Jacob Pan , Joel Granados Cc: iommu@lists.linux.dev, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v5 9/9] iommufd/selftest: Add coverage for IOPF test Date: Tue, 30 Apr 2024 22:57:10 +0800 Message-Id: <20240430145710.68112-10-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240430145710.68112-1-baolu.lu@linux.intel.com> References: <20240430145710.68112-1-baolu.lu@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Extend the selftest tool to add coverage of testing IOPF handling. This would include the following tests: - Allocating and destroying an iommufd fault object. - Allocating and destroying an IOPF-capable HWPT. - Attaching/detaching/replacing an IOPF-capable HWPT on a device. - Triggering an IOPF on the mock device. - Retrieving and responding to the IOPF through the file interface. Signed-off-by: Lu Baolu --- tools/testing/selftests/iommu/iommufd_utils.h | 84 +++++++++++++++++-- tools/testing/selftests/iommu/iommufd.c | 18 ++++ .../selftests/iommu/iommufd_fail_nth.c | 2 +- 3 files changed, 98 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/= selftests/iommu/iommufd_utils.h index 8d2b46b2114d..7f33389e070c 100644 --- a/tools/testing/selftests/iommu/iommufd_utils.h +++ b/tools/testing/selftests/iommu/iommufd_utils.h @@ -153,7 +153,7 @@ static int _test_cmd_mock_domain_replace(int fd, __u32 = stdev_id, __u32 pt_id, EXPECT_ERRNO(_errno, _test_cmd_mock_domain_replace(self->fd, stdev_id, \ pt_id, NULL)) =20 -static int _test_cmd_hwpt_alloc(int fd, __u32 device_id, __u32 pt_id, +static int _test_cmd_hwpt_alloc(int fd, __u32 device_id, __u32 pt_id, __u3= 2 ft_id, __u32 flags, __u32 *hwpt_id, __u32 data_type, void *data, size_t data_len) { @@ -165,6 +165,7 @@ static int _test_cmd_hwpt_alloc(int fd, __u32 device_id= , __u32 pt_id, .data_type =3D data_type, .data_len =3D data_len, .data_uptr =3D (uint64_t)data, + .fault_id =3D ft_id, }; int ret; =20 @@ -177,24 +178,30 @@ static int _test_cmd_hwpt_alloc(int fd, __u32 device_= id, __u32 pt_id, } =20 #define test_cmd_hwpt_alloc(device_id, pt_id, flags, hwpt_id) = \ - ASSERT_EQ(0, _test_cmd_hwpt_alloc(self->fd, device_id, pt_id, flags, \ + ASSERT_EQ(0, _test_cmd_hwpt_alloc(self->fd, device_id, pt_id, 0, flags, = \ hwpt_id, IOMMU_HWPT_DATA_NONE, NULL, \ 0)) #define test_err_hwpt_alloc(_errno, device_id, pt_id, flags, hwpt_id) \ EXPECT_ERRNO(_errno, _test_cmd_hwpt_alloc( \ - self->fd, device_id, pt_id, flags, \ + self->fd, device_id, pt_id, 0, flags, \ hwpt_id, IOMMU_HWPT_DATA_NONE, NULL, 0)) =20 #define test_cmd_hwpt_alloc_nested(device_id, pt_id, flags, hwpt_id, = \ data_type, data, data_len) \ - ASSERT_EQ(0, _test_cmd_hwpt_alloc(self->fd, device_id, pt_id, flags, \ + ASSERT_EQ(0, _test_cmd_hwpt_alloc(self->fd, device_id, pt_id, 0, flags, \ hwpt_id, data_type, data, data_len)) #define test_err_hwpt_alloc_nested(_errno, device_id, pt_id, flags, hwpt_i= d, \ data_type, data, data_len) \ EXPECT_ERRNO(_errno, \ - _test_cmd_hwpt_alloc(self->fd, device_id, pt_id, flags, \ + _test_cmd_hwpt_alloc(self->fd, device_id, pt_id, 0, flags, \ hwpt_id, data_type, data, data_len)) =20 +#define test_cmd_hwpt_alloc_iopf(device_id, pt_id, fault_id, flags, hwpt_i= d, \ + data_type, data, data_len) \ + ASSERT_EQ(0, _test_cmd_hwpt_alloc(self->fd, device_id, pt_id, fault_id, \ + flags, hwpt_id, data_type, data, \ + data_len)) + #define test_cmd_hwpt_check_iotlb(hwpt_id, iotlb_id, expected) = \ ({ \ struct iommu_test_cmd test_cmd =3D { \ @@ -684,3 +691,70 @@ static int _test_cmd_get_hw_info(int fd, __u32 device_= id, void *data, =20 #define test_cmd_get_hw_capabilities(device_id, caps, mask) \ ASSERT_EQ(0, _test_cmd_get_hw_info(self->fd, device_id, NULL, 0, &caps)) + +static int _test_ioctl_fault_alloc(int fd, __u32 *fault_id, __u32 *fault_f= d) +{ + struct iommu_fault_alloc cmd =3D { + .size =3D sizeof(cmd), + }; + int ret; + + ret =3D ioctl(fd, IOMMU_FAULT_ALLOC, &cmd); + if (ret) + return ret; + *fault_id =3D cmd.out_fault_id; + *fault_fd =3D cmd.out_fault_fd; + return 0; +} + +#define test_ioctl_fault_alloc(fault_id, fault_fd) \ + ({ \ + ASSERT_EQ(0, _test_ioctl_fault_alloc(self->fd, fault_id, \ + fault_fd)); \ + ASSERT_NE(0, *(fault_id)); \ + ASSERT_NE(0, *(fault_fd)); \ + }) + +static int _test_cmd_trigger_iopf(int fd, __u32 device_id, __u32 fault_fd) +{ + struct iommu_test_cmd trigger_iopf_cmd =3D { + .size =3D sizeof(trigger_iopf_cmd), + .op =3D IOMMU_TEST_OP_TRIGGER_IOPF, + .trigger_iopf =3D { + .dev_id =3D device_id, + .pasid =3D 0x1, + .grpid =3D 0x2, + .perm =3D IOMMU_PGFAULT_PERM_READ | IOMMU_PGFAULT_PERM_WRITE, + .addr =3D 0xdeadbeaf, + }, + }; + struct iommu_hwpt_page_response response =3D { + .size =3D sizeof(struct iommu_hwpt_page_response), + .dev_id =3D device_id, + .pasid =3D 0x1, + .grpid =3D 0x2, + .code =3D 0, + }; + struct iommu_hwpt_pgfault fault =3D {}; + ssize_t bytes; + int ret; + + ret =3D ioctl(fd, _IOMMU_TEST_CMD(IOMMU_TEST_OP_TRIGGER_IOPF), &trigger_i= opf_cmd); + if (ret) + return ret; + + bytes =3D read(fault_fd, &fault, sizeof(fault)); + if (bytes <=3D 0) + return -EIO; + + response.cookie =3D fault.cookie; + + bytes =3D write(fault_fd, &response, sizeof(response)); + if (bytes <=3D 0) + return -EIO; + + return 0; +} + +#define test_cmd_trigger_iopf(device_id, fault_fd) \ + ASSERT_EQ(0, _test_cmd_trigger_iopf(self->fd, device_id, fault_fd)) diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selfte= sts/iommu/iommufd.c index edf1c99c9936..5b0169875a4d 100644 --- a/tools/testing/selftests/iommu/iommufd.c +++ b/tools/testing/selftests/iommu/iommufd.c @@ -279,6 +279,9 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested) uint32_t parent_hwpt_id =3D 0; uint32_t parent_hwpt_id_not_work =3D 0; uint32_t test_hwpt_id =3D 0; + uint32_t iopf_hwpt_id; + uint32_t fault_id; + uint32_t fault_fd; =20 if (self->device_id) { /* Negative tests */ @@ -326,6 +329,7 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested) sizeof(data)); =20 /* Allocate two nested hwpts sharing one common parent hwpt */ + test_ioctl_fault_alloc(&fault_id, &fault_fd); test_cmd_hwpt_alloc_nested(self->device_id, parent_hwpt_id, 0, &nested_hwpt_id[0], IOMMU_HWPT_DATA_SELFTEST, &data, @@ -334,6 +338,10 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested) &nested_hwpt_id[1], IOMMU_HWPT_DATA_SELFTEST, &data, sizeof(data)); + test_cmd_hwpt_alloc_iopf(self->device_id, parent_hwpt_id, fault_id, + IOMMU_HWPT_FAULT_ID_VALID, &iopf_hwpt_id, + IOMMU_HWPT_DATA_SELFTEST, &data, + sizeof(data)); test_cmd_hwpt_check_iotlb_all(nested_hwpt_id[0], IOMMU_TEST_IOTLB_DEFAULT); test_cmd_hwpt_check_iotlb_all(nested_hwpt_id[1], @@ -504,14 +512,24 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested) _test_ioctl_destroy(self->fd, nested_hwpt_id[1])); test_ioctl_destroy(nested_hwpt_id[0]); =20 + /* Switch from nested_hwpt_id[1] to iopf_hwpt_id */ + test_cmd_mock_domain_replace(self->stdev_id, iopf_hwpt_id); + EXPECT_ERRNO(EBUSY, + _test_ioctl_destroy(self->fd, iopf_hwpt_id)); + /* Trigger an IOPF on the device */ + test_cmd_trigger_iopf(self->device_id, fault_fd); + /* Detach from nested_hwpt_id[1] and destroy it */ test_cmd_mock_domain_replace(self->stdev_id, parent_hwpt_id); test_ioctl_destroy(nested_hwpt_id[1]); + test_ioctl_destroy(iopf_hwpt_id); =20 /* Detach from the parent hw_pagetable and destroy it */ test_cmd_mock_domain_replace(self->stdev_id, self->ioas_id); test_ioctl_destroy(parent_hwpt_id); test_ioctl_destroy(parent_hwpt_id_not_work); + close(fault_fd); + test_ioctl_destroy(fault_id); } else { test_err_hwpt_alloc(ENOENT, self->device_id, self->ioas_id, 0, &parent_hwpt_id); diff --git a/tools/testing/selftests/iommu/iommufd_fail_nth.c b/tools/testi= ng/selftests/iommu/iommufd_fail_nth.c index f590417cd67a..c5d5e69452b0 100644 --- a/tools/testing/selftests/iommu/iommufd_fail_nth.c +++ b/tools/testing/selftests/iommu/iommufd_fail_nth.c @@ -615,7 +615,7 @@ TEST_FAIL_NTH(basic_fail_nth, device) if (_test_cmd_get_hw_info(self->fd, idev_id, &info, sizeof(info), NULL)) return -1; =20 - if (_test_cmd_hwpt_alloc(self->fd, idev_id, ioas_id, 0, &hwpt_id, + if (_test_cmd_hwpt_alloc(self->fd, idev_id, ioas_id, 0, 0, &hwpt_id, IOMMU_HWPT_DATA_NONE, 0, 0)) return -1; =20 --=20 2.34.1