[igt-dev] [PATCH i-g-t v2] tests/i915/gem_close_race: Adopt to use softpin

[Zbigniew Kempczyński]

On Thu, May 19, 2022 at 01:24:49PM +0200, Kamil Konieczny wrote:
> For newer gens there will be no relocations, so adopt test to
> run using soft-pinned addresses. Also while at this, refactor
> code to run on discrete DG2.
> 
> v2: refactor to run on DG2 and older gens (Zbigniew review)
> 
> Signed-off-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
> Cc: "Zbigniew Kempczyński" <zbigniew.kempczynski at intel.com>

LGTM,

Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>

--
Zbigniew

> ---
>  tests/i915/gem_close_race.c | 56 +++++++++++++++++++++++++++----------
>  1 file changed, 42 insertions(+), 14 deletions(-)
> 
> diff --git a/tests/i915/gem_close_race.c b/tests/i915/gem_close_race.c
> index ab444945..1cd5d309 100644
> --- a/tests/i915/gem_close_race.c
> +++ b/tests/i915/gem_close_race.c
> @@ -28,6 +28,7 @@
>  #include <pthread.h>
>  #include <unistd.h>
>  #include <signal.h>
> +#include <stdbool.h>
>  #include <stdlib.h>
>  #include <stdint.h>
>  #include <stdio.h>
> @@ -43,6 +44,7 @@
>  #include "drm.h"
>  #include "i915/gem.h"
>  #include "i915/gem_create.h"
> +#include "i915/gem_mman.h"
>  #include "igt.h"
>  
>  #define OBJECT_SIZE (256 * 1024)
> @@ -53,6 +55,9 @@
>  
>  static uint32_t devid;
>  static bool has_64bit_relocations;
> +static bool has_softpin;
> +static uint64_t exec_addr;
> +static uint64_t data_addr;
>  
>  #define sigev_notify_thread_id _sigev_un._tid
>  
> @@ -61,9 +66,9 @@ static void selfcopy(int fd, uint32_t ctx, uint32_t handle, int loops)
>  	struct drm_i915_gem_relocation_entry reloc[2];
>  	struct drm_i915_gem_exec_object2 gem_exec[2];
>  	struct drm_i915_gem_execbuffer2 execbuf;
> -	struct drm_i915_gem_pwrite gem_pwrite;
>  	struct drm_i915_gem_create create;
>  	uint32_t buf[16], *b = buf;
> +	int err;
>  
>  	memset(reloc, 0, sizeof(reloc));
>  
> @@ -79,9 +84,9 @@ static void selfcopy(int fd, uint32_t ctx, uint32_t handle, int loops)
>  	reloc[0].target_handle = handle;
>  	reloc[0].read_domains = I915_GEM_DOMAIN_RENDER;
>  	reloc[0].write_domain = I915_GEM_DOMAIN_RENDER;
> -	*b++ = 0;
> +	*b++ = data_addr;
>  	if (has_64bit_relocations)
> -		*b++ = 0;
> +		*b++ = CANONICAL(data_addr) >> 32;
>  
>  	*b++ = 512 << 16;
>  	*b++ = 4*1024;
> @@ -90,9 +95,9 @@ static void selfcopy(int fd, uint32_t ctx, uint32_t handle, int loops)
>  	reloc[1].target_handle = handle;
>  	reloc[1].read_domains = I915_GEM_DOMAIN_RENDER;
>  	reloc[1].write_domain = 0;
> -	*b++ = 0;
> +	*b++ = data_addr;
>  	if (has_64bit_relocations)
> -		*b++ = 0;
> +		*b++ = CANONICAL(data_addr) >> 32;
>  
>  	*b++ = MI_BATCH_BUFFER_END;
>  	*b++ = 0;
> @@ -105,8 +110,17 @@ static void selfcopy(int fd, uint32_t ctx, uint32_t handle, int loops)
>  	create.size = 4096;
>  	drmIoctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create);
>  	gem_exec[1].handle = create.handle;
> -	gem_exec[1].relocation_count = 2;
> -	gem_exec[1].relocs_ptr = to_user_pointer(reloc);
> +	if (has_softpin) {
> +		gem_exec[1].offset = CANONICAL(exec_addr);
> +		gem_exec[1].flags |= EXEC_OBJECT_PINNED | EXEC_OBJECT_SUPPORTS_48B_ADDRESS;
> +		execbuf.flags |= I915_EXEC_NO_RELOC;
> +		gem_exec[0].offset = CANONICAL(data_addr);
> +		gem_exec[0].flags |= EXEC_OBJECT_PINNED | EXEC_OBJECT_WRITE |
> +				     EXEC_OBJECT_SUPPORTS_48B_ADDRESS;
> +	} else {
> +		gem_exec[1].relocation_count = 2;
> +		gem_exec[1].relocs_ptr = to_user_pointer(reloc);
> +	}
>  
>  	memset(&execbuf, 0, sizeof(execbuf));
>  	execbuf.buffers_ptr = to_user_pointer(gem_exec);
> @@ -116,15 +130,22 @@ static void selfcopy(int fd, uint32_t ctx, uint32_t handle, int loops)
>  		execbuf.flags |= I915_EXEC_BLT;
>  	execbuf.rsvd1 = ctx;
>  
> -	memset(&gem_pwrite, 0, sizeof(gem_pwrite));
> -	gem_pwrite.handle = create.handle;
> -	gem_pwrite.offset = 0;
> -	gem_pwrite.size = sizeof(buf);
> -	gem_pwrite.data_ptr = to_user_pointer(buf);
> -	if (drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &gem_pwrite) == 0) {
> +	err = __gem_write(fd, create.handle, 0, buf, sizeof(buf));
> +	if (err == -EOPNOTSUPP) {
> +		void *ptr;
> +
> +		ptr = __gem_mmap__device_coherent(fd, create.handle, 0, sizeof(buf), PROT_WRITE);
> +		if (!ptr) {
> +			err = errno;
> +		} else {
> +			memcpy(ptr, buf, sizeof(buf));
> +			gem_munmap(ptr, sizeof(buf));
> +		}
> +	}
> +
> +	if (!err)
>  		while (loops-- && __gem_execbuf(fd, &execbuf) == 0)
>  			;
> -	}
>  
>  	drmIoctl(fd, DRM_IOCTL_GEM_CLOSE, &create.handle);
>  }
> @@ -256,6 +277,13 @@ igt_main
>  
>  		devid = intel_get_drm_devid(fd);
>  		has_64bit_relocations = intel_gen(devid) >= 8;
> +		has_softpin = !gem_has_relocations(fd);
> +		if (has_softpin) {
> +			exec_addr = gem_detect_safe_start_offset(fd);
> +			data_addr = gem_detect_safe_alignment(fd);
> +			exec_addr = max_t(exec_addr, exec_addr, data_addr);
> +			data_addr += exec_addr;
> +		}
>  
>  		igt_fork_hang_detector(fd);
>  		close(fd);
> -- 
> 2.34.1
>