| Message ID | 20170202090905.29028-22-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2 February 2017 at 09:08, Chris Wilson <chris@chris-wilson.co.uk> wrote: > The phys object is a rarely used device (only very old machines require > a chunk of physically contiguous pages for a few hardware interactions). > As such, it is not exercised by CI and to combat that we want to add a > test that exercises the phys object on all platforms. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > --- > drivers/gpu/drm/i915/i915_gem.c | 1 + > drivers/gpu/drm/i915/selftests/i915_gem_object.c | 120 +++++++++++++++++++++ > .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + > 3 files changed, 122 insertions(+) > create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_object.c > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index f35fda5d0abc..429c5e4350f7 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -4973,4 +4973,5 @@ i915_gem_object_get_dma_address(struct drm_i915_gem_object *obj, > #include "selftests/scatterlist.c" > #include "selftests/mock_gem_device.c" > #include "selftests/huge_gem_object.c" > +#include "selftests/i915_gem_object.c" > #endif > diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_object.c b/drivers/gpu/drm/i915/selftests/i915_gem_object.c > new file mode 100644 > index 000000000000..db8f631e4993 > --- /dev/null > +++ b/drivers/gpu/drm/i915/selftests/i915_gem_object.c > @@ -0,0 +1,120 @@ > +/* > + * Copyright © 2016 Intel Corporation > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > + * IN THE SOFTWARE. > + * > + */ > + > +#include "../i915_selftest.h" > + > +#include "mock_gem_device.h" > + > +static int igt_gem_object(void *arg) > +{ > + struct drm_i915_private *i915 = arg; > + struct drm_i915_gem_object *obj; > + int err = -ENOMEM; > + > + /* Basic test to ensure we can create an object */ > + > + obj = i915_gem_object_create(i915, PAGE_SIZE); > + if (IS_ERR(obj)) { > + err = PTR_ERR(obj); > + pr_err("i915_gem_object_create failed, err=%d\n", err); > + goto out; > + } > + > + err = 0; > + i915_gem_object_put(obj); > +out: > + return err; > +} > + > +static int igt_phys_object(void *arg) > +{ > + struct drm_i915_private *i915 = arg; > + struct drm_i915_gem_object *obj; > + int err = -ENOMEM; > + > + /* Create an object and bind it to a contiguous set of physical pages, > + * i.e. exercise the i915_gem_object_phys API. > + */ > + > + obj = i915_gem_object_create(i915, PAGE_SIZE); > + if (IS_ERR(obj)) { > + err = PTR_ERR(obj); > + pr_err("i915_gem_object_create failed, err=%d\n", err); > + goto out; > + } > + > + err = -EINVAL; > + mutex_lock(&i915->drm.struct_mutex); > + err = i915_gem_object_attach_phys(obj, PAGE_SIZE); > + mutex_unlock(&i915->drm.struct_mutex); > + if (err) { > + pr_err("i915_gem_object_attach_phys failed, err=%d\n", err); > + goto out_obj; > + } > + > + if (obj->ops != &i915_gem_phys_ops) { > + pr_err("i915_gem_object_attach_phys did not create a phys object\n"); > + goto out_obj; I'm guessing that you meant to return an error value, see below also. > + } > + > + if (!atomic_read(&obj->mm.pages_pin_count)) { > + pr_err("i915_gem_object_attach_phys did not pin its phys pages\n"); > + goto out_obj; > + } > + > + /* Make the object dirty so that put_pages must do copy back the data */ > + mutex_lock(&i915->drm.struct_mutex); > + err = i915_gem_object_set_to_gtt_domain(obj, true); > + mutex_unlock(&i915->drm.struct_mutex); > + if (err) { > + pr_err("i915_gem_object_set_to_gtt_domain failed with err=%d\n", > + err); > + goto out_obj; > + } > + > + err = 0; > +out_obj: > + i915_gem_object_put(obj); > +out: > + return err; > +} > + > +int i915_gem_object_mock_selftests(void) > +{ > + static const struct i915_subtest tests[] = { > + SUBTEST(igt_gem_object), > + SUBTEST(igt_phys_object), > + }; > + struct drm_i915_private *i915; > + int err; > + > + i915 = mock_gem_device(); > + if (!i915) > + return -ENOMEM; > + > + err = i915_subtests(tests, i915); > + > + drm_dev_unref(&i915->drm); > + return err; > +} > diff --git a/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h b/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h > index bda982404ad3..2ed94e3a71b7 100644 > --- a/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h > +++ b/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h > @@ -12,3 +12,4 @@ selftest(sanitycheck, i915_mock_sanitycheck) /* keep first (igt selfcheck) */ > selftest(scatterlist, scatterlist_mock_selftests) > selftest(breadcrumbs, intel_breadcrumbs_mock_selftests) > selftest(requests, i915_gem_request_mock_selftests) > +selftest(objects, i915_gem_object_mock_selftests) > -- > 2.11.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, Feb 02, 2017 at 01:10:57PM +0000, Matthew Auld wrote: > On 2 February 2017 at 09:08, Chris Wilson <chris@chris-wilson.co.uk> wrote: > > + err = -EINVAL; > > + mutex_lock(&i915->drm.struct_mutex); > > + err = i915_gem_object_attach_phys(obj, PAGE_SIZE); > > + mutex_unlock(&i915->drm.struct_mutex); > > + if (err) { > > + pr_err("i915_gem_object_attach_phys failed, err=%d\n", err); > > + goto out_obj; > > + } > > + > > + if (obj->ops != &i915_gem_phys_ops) { > > + pr_err("i915_gem_object_attach_phys did not create a phys object\n"); > > + goto out_obj; > I'm guessing that you meant to return an error value, see below also. Looks like I still thought I had the err = -EINVAL set. Good thing the purpose of the test was to trigger the oops! -Chris
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index f35fda5d0abc..429c5e4350f7 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4973,4 +4973,5 @@ i915_gem_object_get_dma_address(struct drm_i915_gem_object *obj, #include "selftests/scatterlist.c" #include "selftests/mock_gem_device.c" #include "selftests/huge_gem_object.c" +#include "selftests/i915_gem_object.c" #endif diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_object.c b/drivers/gpu/drm/i915/selftests/i915_gem_object.c new file mode 100644 index 000000000000..db8f631e4993 --- /dev/null +++ b/drivers/gpu/drm/i915/selftests/i915_gem_object.c @@ -0,0 +1,120 @@ +/* + * Copyright © 2016 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + */ + +#include "../i915_selftest.h" + +#include "mock_gem_device.h" + +static int igt_gem_object(void *arg) +{ + struct drm_i915_private *i915 = arg; + struct drm_i915_gem_object *obj; + int err = -ENOMEM; + + /* Basic test to ensure we can create an object */ + + obj = i915_gem_object_create(i915, PAGE_SIZE); + if (IS_ERR(obj)) { + err = PTR_ERR(obj); + pr_err("i915_gem_object_create failed, err=%d\n", err); + goto out; + } + + err = 0; + i915_gem_object_put(obj); +out: + return err; +} + +static int igt_phys_object(void *arg) +{ + struct drm_i915_private *i915 = arg; + struct drm_i915_gem_object *obj; + int err = -ENOMEM; + + /* Create an object and bind it to a contiguous set of physical pages, + * i.e. exercise the i915_gem_object_phys API. + */ + + obj = i915_gem_object_create(i915, PAGE_SIZE); + if (IS_ERR(obj)) { + err = PTR_ERR(obj); + pr_err("i915_gem_object_create failed, err=%d\n", err); + goto out; + } + + err = -EINVAL; + mutex_lock(&i915->drm.struct_mutex); + err = i915_gem_object_attach_phys(obj, PAGE_SIZE); + mutex_unlock(&i915->drm.struct_mutex); + if (err) { + pr_err("i915_gem_object_attach_phys failed, err=%d\n", err); + goto out_obj; + } + + if (obj->ops != &i915_gem_phys_ops) { + pr_err("i915_gem_object_attach_phys did not create a phys object\n"); + goto out_obj; + } + + if (!atomic_read(&obj->mm.pages_pin_count)) { + pr_err("i915_gem_object_attach_phys did not pin its phys pages\n"); + goto out_obj; + } + + /* Make the object dirty so that put_pages must do copy back the data */ + mutex_lock(&i915->drm.struct_mutex); + err = i915_gem_object_set_to_gtt_domain(obj, true); + mutex_unlock(&i915->drm.struct_mutex); + if (err) { + pr_err("i915_gem_object_set_to_gtt_domain failed with err=%d\n", + err); + goto out_obj; + } + + err = 0; +out_obj: + i915_gem_object_put(obj); +out: + return err; +} + +int i915_gem_object_mock_selftests(void) +{ + static const struct i915_subtest tests[] = { + SUBTEST(igt_gem_object), + SUBTEST(igt_phys_object), + }; + struct drm_i915_private *i915; + int err; + + i915 = mock_gem_device(); + if (!i915) + return -ENOMEM; + + err = i915_subtests(tests, i915); + + drm_dev_unref(&i915->drm); + return err; +} diff --git a/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h b/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h index bda982404ad3..2ed94e3a71b7 100644 --- a/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h +++ b/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h @@ -12,3 +12,4 @@ selftest(sanitycheck, i915_mock_sanitycheck) /* keep first (igt selfcheck) */ selftest(scatterlist, scatterlist_mock_selftests) selftest(breadcrumbs, intel_breadcrumbs_mock_selftests) selftest(requests, i915_gem_request_mock_selftests) +selftest(objects, i915_gem_object_mock_selftests)