[igt-dev] [PATCH] tests/xe/xe_query: Add subtest query-invalid-extension

[igt-dev] [PATCH] tests/xe/xe_query: Add subtest query-invalid-extension

[janga.rahul.kumar]

From: Janga Rahul Kumar <janga.rahul.kumar@intel.com>

Check query with invalid extension returns expected error code.

Signed-off-by: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
---
 tests/xe/xe_query.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/xe/xe_query.c b/tests/xe/xe_query.c
index 3f038225..6c35730c 100644
--- a/tests/xe/xe_query.c
+++ b/tests/xe/xe_query.c
@@ -435,6 +435,23 @@ test_query_invalid_size(int fd)
 	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), -1);
 }
 
+/**
+ * SUBTEST: query-invalid-extension
+ * Description: Check query with invalid extension returns expected error code.
+ */
+static void
+test_query_invalid_extension(int fd)
+{
+	struct drm_xe_device_query query = {
+		.extensions = -1,
+		.query = DRM_XE_DEVICE_QUERY_CONFIG,
+		.size = 0,
+		.data = 0,
+	};
+
+	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), -1);
+}
+
 igt_main
 {
 	int xe;
@@ -468,6 +485,9 @@ igt_main
 	igt_subtest("query-invalid-size")
 		test_query_invalid_size(xe);
 
+	igt_subtest("query-invalid-extension")
+		test_query_invalid_extension(xe);
+
 	igt_fixture {
 		xe_device_put(xe);
 		close(xe);
-- 
2.25.1

Re: [igt-dev] [PATCH] tests/xe/xe_query: Add subtest query-invalid-extension

[Zbigniew Kempczyński]

On Wed, Apr 26, 2023 at 12:10:03AM +0530, janga.rahul.kumar@intel.com wrote:
> From: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
> 
> Check query with invalid extension returns expected error code.
> 
> Signed-off-by: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
> ---
>  tests/xe/xe_query.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/tests/xe/xe_query.c b/tests/xe/xe_query.c
> index 3f038225..6c35730c 100644
> --- a/tests/xe/xe_query.c
> +++ b/tests/xe/xe_query.c
> @@ -435,6 +435,23 @@ test_query_invalid_size(int fd)
>  	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), -1);
>  }
>  
> +/**
> + * SUBTEST: query-invalid-extension
> + * Description: Check query with invalid extension returns expected error code.
> + */
> +static void
> +test_query_invalid_extension(int fd)
> +{
> +	struct drm_xe_device_query query = {
> +		.extensions = -1,
> +		.query = DRM_XE_DEVICE_QUERY_CONFIG,
> +		.size = 0,
> +		.data = 0,
> +	};
> +
> +	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), -1);
> +}
> +
>  igt_main
>  {
>  	int xe;
> @@ -468,6 +485,9 @@ igt_main
>  	igt_subtest("query-invalid-size")
>  		test_query_invalid_size(xe);
>  
> +	igt_subtest("query-invalid-extension")
> +		test_query_invalid_extension(xe);
> +

We need to start fixing those tests as they are not properly validating
uapi. See gem_mmap_offset@bad-extensions.

--
Zbigniew

>  	igt_fixture {
>  		xe_device_put(xe);
>  		close(xe);
> -- 
> 2.25.1
> 

Re: [igt-dev] [PATCH] tests/xe/xe_query: Add subtest query-invalid-extension

[Zbigniew Kempczyński]

On Wed, Apr 26, 2023 at 12:10:03AM +0530, janga.rahul.kumar@intel.com wrote:
> From: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
> 
> Check query with invalid extension returns expected error code.
> 
> Signed-off-by: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
> ---
>  tests/xe/xe_query.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/tests/xe/xe_query.c b/tests/xe/xe_query.c
> index 3f038225..6c35730c 100644
> --- a/tests/xe/xe_query.c
> +++ b/tests/xe/xe_query.c
> @@ -435,6 +435,23 @@ test_query_invalid_size(int fd)
>  	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), -1);
>  }
>  
> +/**
> + * SUBTEST: query-invalid-extension
> + * Description: Check query with invalid extension returns expected error code.
> + */
> +static void
> +test_query_invalid_extension(int fd)
> +{
> +	struct drm_xe_device_query query = {
> +		.extensions = -1,
> +		.query = DRM_XE_DEVICE_QUERY_CONFIG,
> +		.size = 0,
> +		.data = 0,
> +	};
> +
> +	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), -1);

I forget to comment this value, -1 is not valid error code we should
validate in this test.

--
Zbigniew

> +}
> +
>  igt_main
>  {
>  	int xe;
> @@ -468,6 +485,9 @@ igt_main
>  	igt_subtest("query-invalid-size")
>  		test_query_invalid_size(xe);
>  
> +	igt_subtest("query-invalid-extension")
> +		test_query_invalid_extension(xe);
> +
>  	igt_fixture {
>  		xe_device_put(xe);
>  		close(xe);
> -- 
> 2.25.1
> 

Re: [igt-dev] [PATCH] tests/xe/xe_query: Add subtest query-invalid-extension

[Kumar, Janga Rahul]

> -----Original Message-----
> From: Kempczynski, Zbigniew <zbigniew.kempczynski@intel.com>
> Sent: 26 April 2023 15:43
> To: Kumar, Janga Rahul <janga.rahul.kumar@intel.com>
> Cc: igt-dev@lists.freedesktop.org; Gandi, Ramadevi
> <ramadevi.gandi@intel.com>
> Subject: Re: [igt-dev] [PATCH] tests/xe/xe_query: Add subtest query-invalid-
> extension
> 
> On Wed, Apr 26, 2023 at 12:10:03AM +0530, janga.rahul.kumar@intel.com
> wrote:
> > From: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
> >
> > Check query with invalid extension returns expected error code.
> >
> > Signed-off-by: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
> > ---
> >  tests/xe/xe_query.c | 20 ++++++++++++++++++++
> >  1 file changed, 20 insertions(+)
> >
> > diff --git a/tests/xe/xe_query.c b/tests/xe/xe_query.c index
> > 3f038225..6c35730c 100644
> > --- a/tests/xe/xe_query.c
> > +++ b/tests/xe/xe_query.c
> > @@ -435,6 +435,23 @@ test_query_invalid_size(int fd)
> >  	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), -
> 1);
> > }
> >
> > +/**
> > + * SUBTEST: query-invalid-extension
> > + * Description: Check query with invalid extension returns expected error
> code.
> > + */
> > +static void
> > +test_query_invalid_extension(int fd)
> > +{
> > +	struct drm_xe_device_query query = {
> > +		.extensions = -1,
> > +		.query = DRM_XE_DEVICE_QUERY_CONFIG,
> > +		.size = 0,
> > +		.data = 0,
> > +	};
> > +
> > +	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), -
> 1);
> > +}
> > +
> >  igt_main
> >  {
> >  	int xe;
> > @@ -468,6 +485,9 @@ igt_main
> >  	igt_subtest("query-invalid-size")
> >  		test_query_invalid_size(xe);
> >
> > +	igt_subtest("query-invalid-extension")
> > +		test_query_invalid_extension(xe);
> > +
> 
> We need to start fixing those tests as they are not properly validating uapi. See
> gem_mmap_offset@bad-extensions.
I think the best way here is to use the do_ioctl_err(..) wrapper. It will help in checking the expecting error as well.

-   igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), -1);
+   do_ioctl_err(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query, EINVAL);
> 
> --
> Zbigniew
> 
> >  	igt_fixture {
> >  		xe_device_put(xe);
> >  		close(xe);
> > --
> > 2.25.1
> >

Re: [igt-dev] [PATCH] tests/xe/xe_query: Add subtest query-invalid-extension

[Zbigniew Kempczyński]

On Wed, Apr 26, 2023 at 08:58:41PM +0200, Kumar, Janga Rahul wrote:

<cut>

> > 
> > We need to start fixing those tests as they are not properly validating uapi. See
> > gem_mmap_offset@bad-extensions.
> I think the best way here is to use the do_ioctl_err(..) wrapper. It will help in checking the expecting error as well.
> 
> -   igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), -1);
> +   do_ioctl_err(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query, EINVAL);

Sure, we didn't use this broadly in i915 igt but looks good for me.

--
Zbigniew

> > 
> > --
> > Zbigniew
> > 
> > >  	igt_fixture {
> > >  		xe_device_put(xe);
> > >  		close(xe);
> > > --
> > > 2.25.1
> > >