Re: [igt-dev] [PATCH i-g-t v2 1/4] lib/i915/gem_mman: add mmap_offset support

Summers, Stuart
2019-11-19T16:23:11Z

[-- Attachment #1.1: Type: text/plain, Size: 10771 bytes --]

On Tue, 2019-11-19 at 17:02 +0100, Zbigniew Kempczyński wrote:
> From: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
>
> With introduction of LMEM concept new IOCTL call were implemented
> - gem_mmap_offset. This patch add support in IGT for it.
>
> Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
> Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
> Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> ---
> lib/i915/gem_mman.c | 178 ++++++++++++++++++++++++++++++++++------
> ----
> lib/i915/gem_mman.h | 39 +++++++++-
> 2 files changed, 177 insertions(+), 40 deletions(-)
>
> diff --git a/lib/i915/gem_mman.c b/lib/i915/gem_mman.c
> index 6256627b..920f9ca5 100644
> --- a/lib/i915/gem_mman.c
> +++ b/lib/i915/gem_mman.c
> @@ -40,6 +40,44 @@
> #define VG(x) do {} while (0)
> #endif
>
> +#define LOCAL_I915_PARAM_MMAP_OFFSET_VERSION 54
> +
> +static bool gem_has_mmap_offset(int fd)
> +{
> + int has_mmap_offset = 0;
> + struct drm_i915_getparam gp;
> +
> + memset(&gp, 0, sizeof(gp));
> + gp.param = LOCAL_I915_PARAM_MMAP_OFFSET_VERSION;
> + gp.value = &has_mmap_offset;
> + ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
> +
> + return has_mmap_offset > 0;
> +}
> +
> +void gem_require_mmap_offset(int i915)
> +{
> + igt_require(gem_has_mmap_offset(i915));
> +}
> +
> +static int gem_mmap_gtt_version(int fd)
> +{
> + struct drm_i915_getparam gp;
> + int gtt_version = -1;
> +
> + memset(&gp, 0, sizeof(gp));
> + gp.param = I915_PARAM_MMAP_GTT_VERSION;
> + gp.value = &gtt_version;
> + ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
> +
> + return gtt_version;
> +}
> +
> +bool gem_mmap_has_gtt(int fd)
> +{
> + return gem_mmap_gtt_version(fd) > 0;

Chris mentioned this in a patch I had posted over the weekend, but this
isn't going to properly support the legacy platforms which don't have
IOCTL versioning.

What if we pull has_gtt_mmap() in from tests/i915/gem_userptr_blits.c,
and make it a test we can use across the different tests that need it.
I did test this locally and it seems to work, although I haven't done a
full regression.

IMO this can also be separated out in a new patch, since it isn't
specifically required for the mmap_offset changes here.

Thanks,
Stuart

> +}
> +
> /**
> * __gem_mmap__gtt:
> * @fd: open i915 drm file descriptor
> @@ -101,46 +139,63 @@ int gem_munmap(void *ptr, uint64_t size)
> return ret;
> }
>
> -bool gem_mmap__has_wc(int fd)
> +bool __gem_mmap__has_wc(int fd)
> {
> - static int has_wc = -1;
> -
> - if (has_wc == -1) {
> - struct drm_i915_getparam gp;
> - int mmap_version = -1;
> - int gtt_version = -1;
> -
> - has_wc = 0;
> -
> - memset(&gp, 0, sizeof(gp));
> - gp.param = I915_PARAM_MMAP_GTT_VERSION;
> - gp.value = &gtt_version;
> - ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
> -
> - memset(&gp, 0, sizeof(gp));
> - gp.param = I915_PARAM_MMAP_VERSION;
> - gp.value = &mmap_version;
> - ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
> -
> - /* Do we have the new mmap_ioctl with DOMAIN_WC? */
> - if (mmap_version >= 1 && gtt_version >= 2) {
> - struct drm_i915_gem_mmap arg;
> -
> - /* Does this device support wc-mmaps ? */
> - memset(&arg, 0, sizeof(arg));
> - arg.handle = gem_create(fd, 4096);
> - arg.offset = 0;
> - arg.size = 4096;
> - arg.flags = I915_MMAP_WC;
> - has_wc = igt_ioctl(fd, DRM_IOCTL_I915_GEM_MMAP,
> &arg) == 0;
> - gem_close(fd, arg.handle);
> - }
> - errno = 0;
> + int has_wc = 0;
> +
> + struct drm_i915_getparam gp;
> + int mmap_version = -1;
> +
> + memset(&gp, 0, sizeof(gp));
> + gp.param = I915_PARAM_MMAP_VERSION;
> + gp.value = &mmap_version;
> + ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
> +
> + /* Do we have the mmap_ioctl with DOMAIN_WC? */
> + if (mmap_version >= 1 && gem_mmap_gtt_version(fd) >= 2) {
> + struct drm_i915_gem_mmap arg;
> +
> + /* Does this device support wc-mmaps ? */
> + memset(&arg, 0, sizeof(arg));
> + arg.handle = gem_create(fd, 4096);
> + arg.offset = 0;
> + arg.size = 4096;
> + arg.flags = I915_MMAP_WC;
> + has_wc = igt_ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &arg)
> == 0;
> + gem_close(fd, arg.handle);
> + }
> + errno = 0;
> +
> + return has_wc > 0;
> +}
> +
> +bool __gem_mmap_offset__has_wc(int fd)
> +{
> + int has_wc = 0;
> +
> + if (gem_has_mmap_offset(fd)) {
> + struct local_i915_gem_mmap_offset arg;
> +
> + /* Does this device support wc-mmaps ? */
> + memset(&arg, 0, sizeof(arg));
> + arg.handle = gem_create(fd, 4096);
> + arg.offset = 0;
> + arg.flags = LOCAL_I915_MMAP_OFFSET_WC;
> + has_wc = igt_ioctl(fd,
> LOCAL_IOCTL_I915_GEM_MMAP_OFFSET,
> + &arg) == 0;
> + gem_close(fd, arg.handle);
> }
>
> + errno = 0;
> +
> return has_wc > 0;
> }
>
> +bool gem_mmap__has_wc(int fd)
> +{
> + return __gem_mmap_offset__has_wc(fd) || __gem_mmap__has_wc(fd);
> +}
> +
> /**
> * __gem_mmap:
> * @fd: open i915 drm file descriptor
> @@ -157,8 +212,8 @@ bool gem_mmap__has_wc(int fd)
> *
> * Returns: A pointer to the created memory mapping, NULL on
> failure.
> */
> -static void
> -*__gem_mmap(int fd, uint32_t handle, uint64_t offset, uint64_t size,
> unsigned int prot, uint64_t flags)
> +void *__gem_mmap(int fd, uint32_t handle, uint64_t offset, uint64_t
> size,
> + unsigned int prot, uint64_t flags)
> {
> struct drm_i915_gem_mmap arg;
>
> @@ -177,6 +232,43 @@ static void
> return from_user_pointer(arg.addr_ptr);
> }
>
> +/**
> + * __gem_mmap_offset:
> + * @fd: open i915 drm file descriptor
> + * @handle: gem buffer object handle
> + * @offset: offset in the gem buffer of the mmap arena
> + * @size: size of the mmap arena
> + * @prot: memory protection bits as used by mmap()
> + * @flags: flags used to determine caching
> + *
> + * Similar to __gem_mmap but use MMAP_OFFSET IOCTL.
> + *
> + * Returns: A pointer to the created memory mapping, NULL on
> failure.
> + */
> +void *__gem_mmap_offset(int fd, uint32_t handle, uint64_t offset,
> uint64_t size,
> + unsigned int prot, uint64_t flags)
> +{
> + struct local_i915_gem_mmap_offset arg;
> + void *ptr;
> +
> + memset(&arg, 0, sizeof(arg));
> + arg.handle = handle;
> + arg.offset = offset;
> + arg.flags = flags;
> +
> + if (igt_ioctl(fd, LOCAL_IOCTL_I915_GEM_MMAP_OFFSET, &arg))
> + return NULL;
> +
> + ptr = mmap64(0, size, prot, MAP_SHARED, fd, arg.offset);
> +
> + if (ptr == MAP_FAILED)
> + ptr = NULL;
> + else
> + errno = 0;
> +
> + return ptr;
> +}
> +
> /**
> * __gem_mmap__wc:
> * @fd: open i915 drm file descriptor
> @@ -205,13 +297,17 @@ void *__gem_mmap__wc(int fd, uint32_t handle,
> uint64_t offset, uint64_t size, un
> * @size: size of the mmap arena
> * @prot: memory protection bits as used by mmap()
> *
> - * Like __gem_mmap__wc() except we assert on failure.
> + * Try to __gem_mmap_offset, then __gem_mmap__wc(). Assert on
> failure.
> *
> * Returns: A pointer to the created memory mapping
> */
> void *gem_mmap__wc(int fd, uint32_t handle, uint64_t offset,
> uint64_t size, unsigned prot)
> {
> - void *ptr = __gem_mmap__wc(fd, handle, offset, size, prot);
> + void *ptr = __gem_mmap_offset(fd, handle, offset, size, prot,
> + LOCAL_I915_MMAP_OFFSET_WC);
> + if (!ptr)
> + ptr = __gem_mmap__wc(fd, handle, offset, size, prot);
> +
> igt_assert(ptr);
> return ptr;
> }
> @@ -248,7 +344,11 @@ void *__gem_mmap__cpu(int fd, uint32_t handle,
> uint64_t offset, uint64_t size, u
> */
> void *gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset,
> uint64_t size, unsigned prot)
> {
> - void *ptr = __gem_mmap__cpu(fd, handle, offset, size, prot);
> + void *ptr = __gem_mmap_offset(fd, handle, offset, size, prot,
> + LOCAL_I915_MMAP_OFFSET_WB);
> + if (!ptr)
> + ptr = __gem_mmap__cpu(fd, handle, offset, size, prot);
> +
> igt_assert(ptr);
> return ptr;
> }
> diff --git a/lib/i915/gem_mman.h b/lib/i915/gem_mman.h
> index 096ff592..e4c954c6 100644
> --- a/lib/i915/gem_mman.h
> +++ b/lib/i915/gem_mman.h
> @@ -25,12 +25,45 @@
> #ifndef GEM_MMAN_H
> #define GEM_MMAN_H
>
> +#define LOCAL_I915_GEM_MMAP_OFFSET DRM_I915_GEM_MMAP_GTT
> +#define
> LOCAL_IOCTL_I915_GEM_MMAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE +
> \
> + LOCAL_I915_GEM_MMAP_OFFSET, struct local_i915_gem_mmap_offset)
> +
> +struct local_i915_gem_mmap_offset {
> + /** Handle for the object being mapped. */
> + __u32 handle;
> + __u32 pad;
> + /**
> + * Fake offset to use for subsequent mmap call
> + *
> + * This is a fixed-size type for 32/64 compatibility.
> + */
> + __u64 offset;
> + /**
> + * Flags for extended behaviour.
> + *
> + * It is mandatory that either one of the _WC/_WB flags
> + * should be passed here.
> + */
> + __u64 flags;
> +#define LOCAL_I915_MMAP_OFFSET_WC (1 << 0)
> +#define LOCAL_I915_MMAP_OFFSET_WB (1 << 1)
> +#define LOCAL_I915_MMAP_OFFSET_UC (1 << 2)
> +#define LOCAL_I915_MMAP_OFFSET_FLAGS \
> + (LOCAL_I915_MMAP_OFFSET_WC | LOCAL_I915_MMAP_OFFSET_WB |
> LOCAL_I915_MMAP_OFFSET_UC)
> +};
> +
> +void gem_require_mmap_offset(int i915);
> +bool gem_mmap_has_gtt(int fd);
> +
> void *gem_mmap__gtt(int fd, uint32_t handle, uint64_t size, unsigned
> prot);
> void *gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset,
> uint64_t size, unsigned prot);
>
> +bool __gem_mmap__has_wc(int fd);
> +bool __gem_mmap_offset__has_wc(int fd);
> bool gem_mmap__has_wc(int fd);
> void *gem_mmap__wc(int fd, uint32_t handle, uint64_t offset,
> uint64_t size, unsigned prot);
> -
> +void *gem_mmap_offset__wc(int fd, uint32_t handle, uint64_t offset,
> uint64_t size, unsigned prot);
> #ifndef I915_GEM_DOMAIN_WC
> #define I915_GEM_DOMAIN_WC 0x80
> #endif
> @@ -38,6 +71,10 @@ void *gem_mmap__wc(int fd, uint32_t handle,
> uint64_t offset, uint64_t size, unsi
> bool gem_has_mappable_ggtt(int i915);
> void gem_require_mappable_ggtt(int i915);
>
> +void *__gem_mmap(int fd, uint32_t handle, uint64_t offset, uint64_t
> size,
> + unsigned int prot, uint64_t flags);
> +void *__gem_mmap_offset(int fd, uint32_t handle, uint64_t offset,
> uint64_t size,
> + unsigned int prot, uint64_t flags);
> void *__gem_mmap__gtt(int fd, uint32_t handle, uint64_t size,
> unsigned prot);
> void *__gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset,
> uint64_t size, unsigned prot);
> void *__gem_mmap__wc(int fd, uint32_t handle, uint64_t offset,
> uint64_t size, unsigned prot);

[-- Attachment #1.2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 3270 bytes --]

[-- Attachment #2: Type: text/plain, Size: 153 bytes --]