From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E7C02DAFD6 for ; Thu, 10 Jul 2025 11:14:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752146078; cv=none; b=bGHjnRgMXZNdc7nbcwcRYZdvwwO+dQWbUbrM8YEUBZZBw3wc5+YlXRnMOCpv8eEI2rFMUrcpfKr7ttBR/YRbVDNMNnQ8Hk8FKsQXY+MNgsyXlnaxPQ7CMe4DfQdbqxntJ70pCIxIFFXfZ61sT28l3M7Fk5c5kCimHcgz8OLeuLk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752146078; c=relaxed/simple; bh=ZVMrkGCRz0vGzBuWsVUOSvsef7nfEi4IoGFuJQ8NY0Y=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=OWLk5koVMrbUBkqnfayREpIwOdqnYxjAqUpJzSBeiNuHhEP2rdsKo+Gay/LTcwGqpT4L4FQUwyg9d+edq4Rm5fa7h/yj5RAN07E9f8vFwXFdb+QGAMzu/+7W+L+c9S2xEYAWAV9vEoOj4WVWE27eEnGl+HIceqFMqUn19rdQZao= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=y7Mla/ii; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="y7Mla/ii" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-235e389599fso188525ad.0 for ; Thu, 10 Jul 2025 04:14:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752146075; x=1752750875; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=TgBpvBKNceadcIlK+jQ2H7nSb6VN21Y6ASF39ITBcCM=; b=y7Mla/iiZ9RpJ85SOqUc+fXDrcOK+lANDtMy1AAAOIuUewmrS9YiiWl+sQYAIhTHd/ MpNZWUWnxzrktK34jQnCQfMHWbDcg9R1y9dPUhf7zfGZYv9cnTcvu8p92LOZJCFnZg/K DnBumFlbNZFLpXgDBgEOe2+T6xIGMOqDl+mYnTxRrlu5wtsDszYPdDB0SM9U6xJy5kzJ ENvLjM8jsjwalUKkKTpDW/XdahiC/7B2us/E+OxBW843krp/uOv+rfqs4eMFf5kohf7b PQAzE7uPaWbVej4fICw4rtdgkCye5j5YoJ9FbASJyWKqkgXVDkjknkRGD3Ki46qn/ZEw jrWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752146075; x=1752750875; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TgBpvBKNceadcIlK+jQ2H7nSb6VN21Y6ASF39ITBcCM=; b=PXIH1iaZrds58O3oFpgMHoUW9DLmFvzTYA6zSpeaFHMM4fu7V9MQvr6OoKaT3ny//K Fr72KRVqX0x8vu8gwB56DrwDobXgJ/UL7hpOViZs3DjbXVk4iA8JTA86rRESjKvQ7cMy haA6vrR85GjjzE45hm23pxnlv7eS+7TIUS47WWCnbJO8wfrH3tNdMLTUzpM0lYF/453S Fg+Snd1Hk+vr81OzsA4HJRAnYw/vx49p4x+MuDu7KiFcPZjQFXwESdWUb5DtCzMibxzk 2tktS1QdgL4mTNxoYCs5hfKMSzNskCGCv6pxykNxxzl3kxD/KoKh2luZomKTgosQbrYg L9hQ== X-Forwarded-Encrypted: i=1; AJvYcCUWio+5erBJYAoDsOZzKAIjYOdJQVrOf4/yVqQtBawuPPyMUzQKPcmVNPqijh5/mhhHUCbC1JSJd3o=@vger.kernel.org X-Gm-Message-State: AOJu0YzrQAJU1AwAKgcgizWe9FSfYaCJbvqTIGgk42Ni6R/mTE3w40Qf iSxcZrpGYt2oU+t2CidrDCPNiBlh2C3IUEat5UXj5Jh1AuAxFCzArl2WxnC9xK9KxQ== X-Gm-Gg: ASbGncstoeciEy23QfkiZ4Hor7bOiVJHQF3qsoghdV5onNNNwIk+TDTt8XBCe7tbd4q fIXsODzzV7NRTqx+qis0Iy9Ch9PvNcP1PGLnktWdRCmmN7wYSstu0e4YdQTRvVMloIB8p4syjxg ANWhmZwFr3GXtHK4sg1PWwzaM5nFkDf1imnDIigy7Ltff6NydWzD9dRAvKy9Gr9MZx5drg8fveG 6+zBmIBKpJsDFrGl9fgaRIDkHxXM6qxi4rA30NrrnNRrpil1RmUTroURHpQ/fNoJFBZaGBePwb6 kAnjB4smCyDLxIE7f6Gti9b+/zY3sKgAy2a6wCZObWElni+a4e7W0ZllnoWBhfAn6uVX2MYfkcW OH9wkuUbpVonHgyczvfJt X-Google-Smtp-Source: AGHT+IFecBQHKG/ADcdq4eQ6HjOLMsTP4bdCQ53xMQ7WEkYQDG2G5iyvFIgwZFKNsIRqwMRxh8GaYQ== X-Received: by 2002:a17:903:3b8e:b0:234:c37:85a with SMTP id d9443c01a7336-23de38106e0mr3159625ad.24.1752146074745; Thu, 10 Jul 2025 04:14:34 -0700 (PDT) Received: from google.com (232.98.126.34.bc.googleusercontent.com. [34.126.98.232]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23de4366698sm18961295ad.246.2025.07.10.04.14.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 04:14:34 -0700 (PDT) Date: Thu, 10 Jul 2025 11:14:25 +0000 From: Pranjal Shrivastava To: Nicolin Chen Cc: jgg@nvidia.com, kevin.tian@intel.com, corbet@lwn.net, bagasdotme@gmail.com, will@kernel.org, robin.murphy@arm.com, joro@8bytes.org, thierry.reding@gmail.com, vdumpa@nvidia.com, jonathanh@nvidia.com, shuah@kernel.org, jsnitsel@redhat.com, nathan@kernel.org, peterz@infradead.org, yi.l.liu@intel.com, mshavit@google.com, zhangzekun11@huawei.com, iommu@lists.linux.dev, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, linux-kselftest@vger.kernel.org, patches@lists.linux.dev, mochs@nvidia.com, alok.a.tiwari@oracle.com, vasant.hegde@amd.com, dwmw2@infradead.org, baolu.lu@linux.intel.com Subject: Re: [PATCH v9 18/29] iommufd/selftest: Add coverage for the new mmap interface Message-ID: References: Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Wed, Jul 09, 2025 at 10:59:10PM -0700, Nicolin Chen wrote: > Extend the loopback test to a new mmap page. > > Signed-off-by: Nicolin Chen Reviewed-by: Pranjal Shrivastava > --- > drivers/iommu/iommufd/iommufd_test.h | 4 +++ > tools/testing/selftests/iommu/iommufd_utils.h | 4 +++ > drivers/iommu/iommufd/selftest.c | 33 ++++++++++++++++++- > tools/testing/selftests/iommu/iommufd.c | 19 +++++++++++ > 4 files changed, 59 insertions(+), 1 deletion(-) > > diff --git a/drivers/iommu/iommufd/iommufd_test.h b/drivers/iommu/iommufd/iommufd_test.h > index 51cd744a354f..8fc618b2bcf9 100644 > --- a/drivers/iommu/iommufd/iommufd_test.h > +++ b/drivers/iommu/iommufd/iommufd_test.h > @@ -232,12 +232,16 @@ struct iommu_hwpt_invalidate_selftest { > * (IOMMU_VIOMMU_TYPE_SELFTEST) > * @in_data: Input random data from user space > * @out_data: Output data (matching @in_data) to user space > + * @out_mmap_offset: The offset argument for mmap syscall > + * @out_mmap_length: The length argument for mmap syscall > * > * Simply set @out_data=@in_data for a loopback test > */ > struct iommu_viommu_selftest { > __u32 in_data; > __u32 out_data; > + __aligned_u64 out_mmap_offset; > + __aligned_u64 out_mmap_length; > }; > > /* Should not be equal to any defined value in enum iommu_viommu_invalidate_data_type */ > diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h > index 9a556f99d992..4a1b2bade018 100644 > --- a/tools/testing/selftests/iommu/iommufd_utils.h > +++ b/tools/testing/selftests/iommu/iommufd_utils.h > @@ -56,6 +56,10 @@ static unsigned long PAGE_SIZE; > #define offsetofend(TYPE, MEMBER) \ > (offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER)) > > +#define test_err_mmap(_errno, length, offset) \ > + EXPECT_ERRNO(_errno, (long)mmap(NULL, length, PROT_READ | PROT_WRITE, \ > + MAP_SHARED, self->fd, offset)) > + > static inline void *memfd_mmap(size_t length, int prot, int flags, int *mfd_p) > { > int mfd_flags = (flags & MAP_HUGETLB) ? MFD_HUGETLB : 0; > diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c > index 2189e9b119ee..8b2c44b32530 100644 > --- a/drivers/iommu/iommufd/selftest.c > +++ b/drivers/iommu/iommufd/selftest.c > @@ -152,6 +152,9 @@ struct mock_viommu { > struct mock_iommu_domain *s2_parent; > struct mock_hw_queue *hw_queue[IOMMU_TEST_HW_QUEUE_MAX]; > struct mutex queue_mutex; > + > + unsigned long mmap_offset; > + u32 *page; /* Mmap page to test u32 type of in_data */ > }; > > static inline struct mock_viommu *to_mock_viommu(struct iommufd_viommu *viommu) > @@ -689,6 +692,10 @@ static void mock_viommu_destroy(struct iommufd_viommu *viommu) > > if (refcount_dec_and_test(&mock_iommu->users)) > complete(&mock_iommu->complete); > + if (mock_viommu->mmap_offset) > + iommufd_viommu_destroy_mmap(&mock_viommu->core, > + mock_viommu->mmap_offset); > + free_page((unsigned long)mock_viommu->page); > mutex_destroy(&mock_viommu->queue_mutex); > > /* iommufd core frees mock_viommu and viommu */ > @@ -887,11 +894,28 @@ static int mock_viommu_init(struct iommufd_viommu *viommu, > if (rc) > return rc; > > + /* Allocate two pages */ > + mock_viommu->page = > + (u32 *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 1); > + if (!mock_viommu->page) > + return -ENOMEM; > + > + rc = iommufd_viommu_alloc_mmap(&mock_viommu->core, > + __pa(mock_viommu->page), > + PAGE_SIZE * 2, > + &mock_viommu->mmap_offset); > + if (rc) > + goto err_free_page; > + > + /* For loopback tests on both the page and out_data */ > + *mock_viommu->page = data.in_data; > data.out_data = data.in_data; > + data.out_mmap_length = PAGE_SIZE * 2; > + data.out_mmap_offset = mock_viommu->mmap_offset; > rc = iommu_copy_struct_to_user( > user_data, &data, IOMMU_VIOMMU_TYPE_SELFTEST, out_data); > if (rc) > - return rc; > + goto err_destroy_mmap; > } > > refcount_inc(&mock_iommu->users); > @@ -900,6 +924,13 @@ static int mock_viommu_init(struct iommufd_viommu *viommu, > > viommu->ops = &mock_viommu_ops; > return 0; > + > +err_destroy_mmap: > + iommufd_viommu_destroy_mmap(&mock_viommu->core, > + mock_viommu->mmap_offset); > +err_free_page: > + free_page((unsigned long)mock_viommu->page); > + return rc; > } > > static const struct iommu_ops mock_ops = { > diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selftests/iommu/iommufd.c > index 73426de77675..0b21c095ca5e 100644 > --- a/tools/testing/selftests/iommu/iommufd.c > +++ b/tools/testing/selftests/iommu/iommufd.c > @@ -2799,6 +2799,7 @@ TEST_F(iommufd_viommu, viommu_alloc_with_data) > struct iommu_viommu_selftest data = { > .in_data = 0xbeef, > }; > + uint32_t *test; > > if (!self->device_id) > SKIP(return, "Skipping test for variant no_viommu"); > @@ -2807,6 +2808,24 @@ TEST_F(iommufd_viommu, viommu_alloc_with_data) > IOMMU_VIOMMU_TYPE_SELFTEST, &data, sizeof(data), > &self->viommu_id); > ASSERT_EQ(data.out_data, data.in_data); > + > + /* Negative mmap tests -- offset and length cannot be changed */ > + test_err_mmap(ENXIO, data.out_mmap_length, > + data.out_mmap_offset + PAGE_SIZE); > + test_err_mmap(ENXIO, data.out_mmap_length, > + data.out_mmap_offset + PAGE_SIZE * 2); > + test_err_mmap(ENXIO, data.out_mmap_length / 2, data.out_mmap_offset); > + test_err_mmap(ENXIO, data.out_mmap_length * 2, data.out_mmap_offset); > + > + /* Now do a correct mmap for a loopback test */ > + test = mmap(NULL, data.out_mmap_length, PROT_READ | PROT_WRITE, > + MAP_SHARED, self->fd, data.out_mmap_offset); > + ASSERT_NE(MAP_FAILED, test); > + ASSERT_EQ(data.in_data, *test); > + > + /* The owner of the mmap region should be blocked */ > + EXPECT_ERRNO(EBUSY, _test_ioctl_destroy(self->fd, self->viommu_id)); > + munmap(test, data.out_mmap_length); > } > > TEST_F(iommufd_viommu, vdevice_alloc) > -- > 2.43.0 >