[igt-dev] [PATCH i-g-t v5 2/4] lib/i915/gem_mman: add mmap_offset support
Chris Wilson
chris at chris-wilson.co.uk
Fri Nov 22 08:59:10 UTC 2019
Quoting Zbigniew Kempczyński (2019-11-22 08:13:55)
> From: Lukasz Kalamarz <lukasz.kalamarz at 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 at intel.com>
> Signed-off-by: Antonio Argenziano <antonio.argenziano at intel.com>
> Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Vanshidhar Konda <vanshidhar.r.konda at intel.com>
> ---
> lib/i915/gem_mman.c | 225 ++++++++++++++++++++++++++++++++++++--------
> lib/i915/gem_mman.h | 18 +++-
> 2 files changed, 203 insertions(+), 40 deletions(-)
>
> diff --git a/lib/i915/gem_mman.c b/lib/i915/gem_mman.c
> index 6256627b..8d6db0d1 100644
> --- a/lib/i915/gem_mman.c
> +++ b/lib/i915/gem_mman.c
> @@ -40,6 +40,33 @@
> #define VG(x) do {} while (0)
> #endif
>
> +#define LOCAL_I915_PARAM_MMAP_OFFSET_VERSION 54
Leftover.
> +
> +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 = >t_version;
> + ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
> +
> + return gtt_version;
> +}
> +
> +static bool gem_has_mmap_offset(int fd)
> +{
> + int gtt_version = gem_mmap_gtt_version(fd);
> +
> + return gtt_version >= 4;
> +}
> +
> +void gem_require_mmap_offset(int i915)
> +{
> + igt_require(gem_has_mmap_offset(i915));
> +}
> +
> /**
> * __gem_mmap__gtt:
> * @fd: open i915 drm file descriptor
> @@ -101,46 +128,60 @@ 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 = >t_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;
> + 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,11 +198,13 @@ 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;
>
> + igt_assert(offset == 0);
> +
> memset(&arg, 0, sizeof(arg));
> arg.handle = handle;
> arg.offset = offset;
> @@ -177,6 +220,47 @@ 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
> + *
> + * Mmap the gem buffer memory on offset returned in GEM_MMAP_OFFSET ioctl.
> + * Offset argument passed in function call must be 0. In the future
> + * when driver will allow slice mapping of buffer object this restriction
> + * will be removed.
> + *
> + * 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;
> +
> + igt_assert(offset == 0);
> +
> + memset(&arg, 0, sizeof(arg));
> + arg.handle = handle;
> + 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);
I am tempted to say arg.offset + offset, but that is premature until an
actual slice API is decided upon.
> +
> + if (ptr == MAP_FAILED)
> + ptr = NULL;
> + else
> + errno = 0;
> +
> + return ptr;
> +}
> +
> /**
> * __gem_mmap__wc:
> * @fd: open i915 drm file descriptor
> @@ -194,7 +278,12 @@ static void
> */
> void *__gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot)
> {
> - return __gem_mmap(fd, handle, offset, size, prot, I915_MMAP_WC);
> + void *ptr = __gem_mmap_offset(fd, handle, offset, size, prot,
> + LOCAL_I915_MMAP_OFFSET_WC);
> + if (!ptr)
> + ptr = __gem_mmap(fd, handle, offset, size, prot, I915_MMAP_WC);
> +
> + return ptr;
> }
>
> /**
> @@ -205,14 +294,68 @@ 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__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);
> +
> + igt_assert(ptr);
> + return ptr;
> +}
> +
> +/**
> + * __gem_mmap__device_coherent:
> + * @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()
> + *
> + * Returns: A pointer to a block of linear device memory mapped into the
> + * process with WC semantics. When no WC is available try to mmap using GGTT.
> + */
> +void *__gem_mmap__device_coherent(int fd, uint32_t handle, uint64_t offset,
> + uint64_t size, unsigned 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);
> +
> + if (!ptr)
> + ptr = __gem_mmap__gtt(fd, handle, size, prot);
> +
> + return ptr;
> +}
> +
> +/**
> + * gem_mmap__device_coherent:
> + * @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()
> + *
> + * Call __gem_mmap__device__coherent(), asserts on fail.
> + * Offset argument passed in function call must be 0. In the future
> + * when driver will allow slice mapping of buffer object this restriction
> + * will be removed.
> + *
> + * Returns: A pointer to the created memory mapping.
> + */
> +void *gem_mmap__device_coherent(int fd, uint32_t handle, uint64_t offset,
> + uint64_t size, unsigned prot)
> +{
> + void *ptr;
> +
> + igt_assert(offset == 0);
> +
> + ptr = gem_mmap__device_coherent(fd, handle, offset, size, prot);
> igt_assert(ptr);
> +
> return ptr;
> }
>
> @@ -248,7 +391,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..fe1299c0 100644
> --- a/lib/i915/gem_mman.h
> +++ b/lib/i915/gem_mman.h
> @@ -25,12 +25,22 @@
> #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)
> +
> +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__device_coherent(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,9 +48,15 @@ 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);
> +void *__gem_mmap__device_coherent(int fd, uint32_t handle, uint64_t offset,
> + uint64_t size, unsigned prot);
This looks to be a reasonable step forward that should at least cover us
for the transition period.
local_* notwithstanding,
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris
More information about the igt-dev
mailing list