[igt-dev] [PATCH 7/7] amdgpu/tests: PCI unplug 4 tests for different scenario.

vitaly.prosyak at amd.com vitaly.prosyak at amd.com
Tue Oct 18 03:00:55 UTC 2022


From: Vitaly Prosyak <vitaly.prosyak at amd.com>

1. A simple test with basic unplug and rescan.
2. Test with command submission using a worker thread
3. Test with an exported buffer object
4. Test with an exported fence to another device.
   More then tow GPUs are required.

Signed-off-by: Vitaly Prosyak <vitaly.prosyak at amd.com>
---
 lib/amdgpu/amd_pci_unplug.c   | 532 ++++++++++++++++++++++++++++++++++
 lib/amdgpu/amd_pci_unplug.h   |  65 +++++
 lib/amdgpu/xalloc.h           |  57 ++++
 lib/meson.build               |   4 +-
 tests/amdgpu/amd_pci_unplug.c |  58 ++++
 tests/amdgpu/meson.build      |   1 +
 6 files changed, 716 insertions(+), 1 deletion(-)
 create mode 100644 lib/amdgpu/amd_pci_unplug.c
 create mode 100644 lib/amdgpu/amd_pci_unplug.h
 create mode 100644 lib/amdgpu/xalloc.h
 create mode 100644 tests/amdgpu/amd_pci_unplug.c

diff --git a/lib/amdgpu/amd_pci_unplug.c b/lib/amdgpu/amd_pci_unplug.c
new file mode 100644
index 000000000..bc77e8eec
--- /dev/null
+++ b/lib/amdgpu/amd_pci_unplug.c
@@ -0,0 +1,532 @@
+/*
+ * Copyright 2022 Advanced Micro Devices, Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 <linux/limits.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <pthread.h>
+#include <sys/sysmacros.h>
+#include <amdgpu.h>
+#include <amdgpu_drm.h>
+#include "amd_PM4.h"
+#include "amd_pci_unplug.h"
+#include "amd_memory.h"
+#include "igt.h"
+#include "xalloc.h"
+#include "amd_ip_blocks.h"
+
+static int
+amdgpu_open_devices(bool open_render_node, int  max_cards_supported, int drm_amdgpu_fds[])
+{
+	drmDevicePtr devices[MAX_CARDS_SUPPORTED];
+	int i;
+	int drm_node;
+	int amd_index = 0;
+	int drm_count;
+	int fd;
+	drmVersionPtr version;
+
+	for (i = 0; i < max_cards_supported && i < MAX_CARDS_SUPPORTED; i++)
+		drm_amdgpu_fds[i] = -1;
+
+	drm_count = drmGetDevices2(0, devices, MAX_CARDS_SUPPORTED);
+
+	if (drm_count < 0) {
+		fprintf(stderr, "drmGetDevices2() returned an error %d\n", drm_count);
+		return 0;
+	}
+
+	for (i = 0; i < drm_count; i++) {
+		/* If this is not PCI device, skip*/
+		if (devices[i]->bustype != DRM_BUS_PCI)
+			continue;
+
+		/* If this is not AMD GPU vender ID, skip*/
+		if (devices[i]->deviceinfo.pci->vendor_id != 0x1002)
+			continue;
+
+		if (open_render_node)
+			drm_node = DRM_NODE_RENDER;
+		else
+			drm_node = DRM_NODE_PRIMARY;
+
+		fd = -1;
+		if (devices[i]->available_nodes & 1 << drm_node)
+			fd = open(
+				devices[i]->nodes[drm_node],
+				O_RDWR | O_CLOEXEC);
+
+		/* This node is not available. */
+		if (fd < 0) continue;
+
+		version = drmGetVersion(fd);
+		if (!version) {
+			fprintf(stderr, "Warning: Cannot get version for %s." "Error is %s\n",
+				devices[i]->nodes[drm_node], strerror(errno));
+			close(fd);
+			continue;
+		}
+
+		if (strcmp(version->name, "amdgpu")) {
+			/* This is not AMDGPU driver, skip.*/
+			drmFreeVersion(version);
+			close(fd);
+			continue;
+		}
+
+		drmFreeVersion(version);
+
+		drm_amdgpu_fds[amd_index] = fd;
+		amd_index++;
+	}
+
+	drmFreeDevices(devices, drm_count);
+	return amd_index;
+}
+static bool
+amdgpu_node_is_drm(int maj, int min)
+{
+	char path[64];
+	struct stat sbuf;
+
+	snprintf(path, sizeof(path), "/sys/dev/char/%d:%d/device/drm", maj, min);
+	return stat(path, &sbuf) == 0;
+}
+
+static char *
+amdgpu_get_device_from_fd(int fd)
+{
+	struct stat sbuf;
+	char path[PATH_MAX + 1];
+	unsigned int maj, min;
+
+	if (fstat(fd, &sbuf))
+		return NULL;
+
+	maj = major(sbuf.st_rdev);
+	min = minor(sbuf.st_rdev);
+
+	if (!amdgpu_node_is_drm(maj, min) || !S_ISCHR(sbuf.st_mode))
+		return NULL;
+
+	snprintf(path, sizeof(path), "/sys/dev/char/%d:%d/device", maj, min);
+	return strdup(path);
+}
+
+static int
+amdgpu_hotunplug_trigger(const char *pathname)
+{
+	int len;
+	int fd= -1;
+
+	fd = open(pathname, O_WRONLY);
+	if (fd <= 0 )
+		goto release;
+
+	len = write(fd, "1", 1);
+
+	close(fd);
+
+release:
+	return len;
+}
+
+static bool
+amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup *setup,
+							struct amd_pci_unplug *unplug)
+{
+	char *tmp_str = NULL;
+	bool ret = false;
+	int r;
+	uint32_t  major_version, minor_version;
+
+	unplug->num_devices = amdgpu_open_devices(render_mode, MAX_CARDS_SUPPORTED,
+											  unplug->drm_amdgpu_fds);
+	if (unplug->num_devices == 0 )
+		goto release;
+
+	if (setup->open_device && setup->open_device2 && unplug->num_devices < 2) {
+		/*Not enough board for the test*/
+		fprintf(stderr, "More than 1 GPU is required for this test\n");
+		goto release;
+	}
+
+	tmp_str = amdgpu_get_device_from_fd(unplug->drm_amdgpu_fds[0]);
+	abort_oom_if_null(tmp_str);
+	unplug->sysfs_remove = realloc(tmp_str, strlen(tmp_str) * 2);
+	abort_oom_if_null(unplug->sysfs_remove );
+	strcat(unplug->sysfs_remove, "/remove");
+
+	r = amdgpu_device_initialize(unplug->drm_amdgpu_fds[0], &major_version,
+									 &minor_version, &unplug->device_handle);
+	if (r != 0)
+		goto release;
+
+	if (minor_version < setup->minor_version_req)
+		goto release;
+
+	if (!setup->open_device) {
+			/* device handle is not always required for test */
+			/* but for drm version is required always */
+		amdgpu_device_deinitialize(unplug->device_handle);
+		unplug->device_handle = NULL;
+	}
+		/* TODO launch another process */
+	if (setup->open_device2) {
+		r = amdgpu_device_initialize(unplug->drm_amdgpu_fds[1], &major_version,
+						   &minor_version, &unplug->device_handle2);
+		if (r != 0)
+			goto release;
+		if (minor_version < setup->minor_version_req)
+			goto release;
+	}
+	ret = true;
+release:
+	return ret;
+}
+
+static void
+amdgpu_hotunplug_teardown_test(struct amd_pci_unplug *unplug)
+{
+	int i;
+	if (unplug->device_handle) {
+		amdgpu_device_deinitialize(unplug->device_handle);
+		unplug->device_handle = NULL;
+	}
+	if (unplug->device_handle2) {
+		amdgpu_device_deinitialize(unplug->device_handle2);
+		unplug->device_handle2 = NULL;
+	}
+	for (i = 0; i < unplug->num_devices; i++) {
+		if (unplug->drm_amdgpu_fds[i] >= 0 ) {
+			close(unplug->drm_amdgpu_fds[i]);
+			unplug->drm_amdgpu_fds[i] = -1;
+		}
+	}
+	if (unplug->sysfs_remove) {
+		free(unplug->sysfs_remove);
+		unplug->sysfs_remove = NULL;
+	}
+}
+
+static int
+amdgpu_hotunplug_remove(struct amd_pci_unplug *unplug)
+{
+	int r = amdgpu_hotunplug_trigger(unplug->sysfs_remove);
+	return r;
+}
+
+static int
+amdgpu_hotunplug_rescan(void)
+{
+	int r = amdgpu_hotunplug_trigger("/sys/bus/pci/rescan");
+	return r;
+}
+
+static int
+amdgpu_cs_sync(amdgpu_context_handle context, unsigned int ip_type,	int ring,
+				unsigned int seqno)
+{
+	struct amdgpu_cs_fence fence = {
+		.context = context,
+		.ip_type = ip_type,
+		.ring = ring,
+		.fence = seqno,
+	};
+	uint32_t expired;
+	int ret;
+
+	ret = amdgpu_cs_query_fence_status(&fence,
+					   AMDGPU_TIMEOUT_INFINITE,
+					   0, &expired);
+	return ret;
+}
+
+static void *
+amdgpu_nop_cs(void *handle)
+{
+	amdgpu_bo_handle ib_result_handle;
+	void *ib_result_cpu;
+	uint64_t ib_result_mc_address;
+	int r;
+	amdgpu_bo_list_handle bo_list;
+	amdgpu_va_handle va_handle;
+	amdgpu_context_handle context;
+	struct amdgpu_cs_request ibs_request;
+	struct amdgpu_cs_ib_info ib_info;
+	int bo_cmd_size = 4096;
+	struct amd_pci_unplug * unplug = handle;
+	amdgpu_device_handle device_handle = unplug->device_handle;
+
+	struct amdgpu_cmd_base * base_cmd = get_cmd_base();
+	r = amdgpu_cs_ctx_create(device_handle, &context);
+	igt_assert_eq(r, 0);
+
+	r = amdgpu_bo_alloc_and_map(device_handle, bo_cmd_size, 4096,
+				    AMDGPU_GEM_DOMAIN_GTT, 0,
+				    &ib_result_handle, &ib_result_cpu,
+				    &ib_result_mc_address, &va_handle);
+	igt_assert_eq(r, 0);
+
+	memset(ib_result_cpu, 0, bo_cmd_size);
+	base_cmd->attach_buf(base_cmd, ib_result_cpu, bo_cmd_size);
+	base_cmd->emit_repeat(base_cmd, GFX_COMPUTE_NOP , 16);
+
+	r = amdgpu_bo_list_create(device_handle, 1, &ib_result_handle, NULL, &bo_list);
+	igt_assert_eq(r, 0);
+
+	memset(&ib_info, 0, sizeof(struct amdgpu_cs_ib_info));
+	ib_info.ib_mc_address = ib_result_mc_address;
+	ib_info.size = base_cmd->cdw;
+
+	memset(&ibs_request, 0, sizeof(struct amdgpu_cs_request));
+	ibs_request.ip_type = AMDGPU_HW_IP_GFX;
+	ibs_request.ring = 0;
+	ibs_request.number_of_ibs = 1;
+	ibs_request.ibs = &ib_info;
+	ibs_request.resources = bo_list;
+
+	while (unplug->do_cs)
+		amdgpu_cs_submit(context, 0, &ibs_request, 1);
+
+	amdgpu_cs_sync(context, AMDGPU_HW_IP_GFX, 0, ibs_request.seq_no);
+	amdgpu_bo_list_destroy(bo_list);
+	amdgpu_bo_unmap_and_free(ib_result_handle, va_handle, ib_result_mc_address,
+							4096);
+
+	amdgpu_cs_ctx_free(context);
+	free_cmd_base(base_cmd);
+
+	return NULL;
+}
+
+static pthread_t*
+amdgpu_create_cs_thread(struct amd_pci_unplug * unplug)
+{
+	int r;
+	pthread_t *thread = malloc(sizeof(*thread));
+	if (!thread)
+		return NULL;
+
+	unplug->do_cs = true;
+
+	r = pthread_create(thread, NULL, &amdgpu_nop_cs, unplug);
+	igt_assert_eq(r, 0);
+
+	/* Give thread enough time to start*/
+	usleep(1000000);
+	return thread;
+}
+
+static void
+amdgpu_wait_cs_thread(struct amd_pci_unplug * unplug, pthread_t *thread)
+{
+	unplug->do_cs = false;
+
+	pthread_join(*thread, NULL);
+	free(thread);
+}
+
+static void
+amdgpu_hotunplug_test(bool render_mode, const struct amd_pci_unplug_setup *setup,
+					  struct amd_pci_unplug * unplug,  bool with_cs)
+{
+	int r;
+	pthread_t *thread = NULL;
+
+	r = amdgpu_hotunplug_setup_test(render_mode, setup, unplug);
+	igt_assert_eq(r , 1);
+
+	if (with_cs)
+		thread = amdgpu_create_cs_thread(unplug);
+
+	r = amdgpu_hotunplug_remove(unplug);
+	igt_assert_eq(r > 0, 1);
+
+	if (with_cs)
+		amdgpu_wait_cs_thread(unplug, thread);
+
+	amdgpu_hotunplug_teardown_test(unplug);
+
+	r = amdgpu_hotunplug_rescan();
+	igt_assert_eq(r > 0, 1);
+}
+
+void
+amdgpu_hotunplug_simple(struct amd_pci_unplug_setup *setup,
+						struct amd_pci_unplug *unplug)
+{
+	memset(unplug, 0, sizeof(*unplug));
+	amdgpu_hotunplug_test(true, setup, unplug, false);
+}
+
+ void
+ amdgpu_hotunplug_with_cs(struct amd_pci_unplug_setup *setup,
+ 						 struct amd_pci_unplug *unplug)
+{
+	memset(unplug, 0, sizeof(*unplug));
+	setup->open_device = true;
+	amdgpu_hotunplug_test(true, setup, unplug, true);
+}
+
+void
+amdgpu_hotunplug_with_exported_bo(struct amd_pci_unplug_setup *setup,
+								  struct amd_pci_unplug *unplug)
+{
+	int r;
+	uint32_t dma_buf_fd;
+	unsigned int *ptr;
+	amdgpu_bo_handle bo_handle;
+
+	struct amdgpu_bo_alloc_request request = {
+		.alloc_size = 4096,
+		.phys_alignment = 4096,
+		.preferred_heap = AMDGPU_GEM_DOMAIN_GTT,
+		.flags = 0,
+	};
+	memset(unplug, 0, sizeof(*unplug));
+	setup->open_device = true;
+
+	r = amdgpu_hotunplug_setup_test(true, setup, unplug);
+	igt_assert_eq(r , 1);
+
+	r = amdgpu_bo_alloc(unplug->device_handle, &request, &bo_handle);
+	igt_assert_eq(r, 0);
+
+	r = amdgpu_bo_export(bo_handle, amdgpu_bo_handle_type_dma_buf_fd, &dma_buf_fd);
+	igt_assert_eq(r, 0);
+
+	ptr = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, dma_buf_fd, 0);
+
+	r = amdgpu_hotunplug_remove(unplug);
+	igt_assert_eq(r > 0, 1);
+
+	amdgpu_bo_free(bo_handle);
+
+	amdgpu_hotunplug_teardown_test(unplug);
+
+	*ptr = 0xdeafbeef;
+
+	munmap(ptr, 4096);
+	close (dma_buf_fd);
+
+	r = amdgpu_hotunplug_rescan();
+	igt_assert_eq(r > 0, 1);
+}
+
+void
+amdgpu_hotunplug_with_exported_fence(struct amd_pci_unplug_setup *setup,
+									 struct amd_pci_unplug *unplug)
+{
+	amdgpu_bo_handle ib_result_handle;
+	void *ib_result_cpu;
+	uint64_t ib_result_mc_address;
+	uint32_t sync_obj_handle, sync_obj_handle2;
+	int r;
+	amdgpu_bo_list_handle bo_list;
+	amdgpu_va_handle va_handle;
+	amdgpu_context_handle context;
+	struct amdgpu_cs_request ibs_request;
+	struct amdgpu_cs_ib_info ib_info;
+	struct amdgpu_cs_fence fence_status = {0};
+	int shared_fd;
+	int bo_cmd_size = 4096;
+	struct amdgpu_cmd_base * base_cmd = get_cmd_base();
+
+	memset(unplug, 0, sizeof(*unplug));
+	setup->open_device = true;
+	setup->open_device2 = true;
+
+
+	r = amdgpu_hotunplug_setup_test(true, setup, unplug);
+	igt_assert_eq(r , 1);
+
+	r = amdgpu_cs_ctx_create(unplug->device_handle, &context);
+	igt_assert_eq(r, 0);
+
+	r = amdgpu_bo_alloc_and_map(unplug->device_handle, bo_cmd_size, 4096,
+				    AMDGPU_GEM_DOMAIN_GTT, 0,
+				    &ib_result_handle, &ib_result_cpu,
+				    &ib_result_mc_address, &va_handle);
+	igt_assert_eq(r, 0);
+	memset(ib_result_cpu, 0, bo_cmd_size);
+	base_cmd->attach_buf(base_cmd, ib_result_cpu, bo_cmd_size);
+	base_cmd->emit_repeat(base_cmd, GFX_COMPUTE_NOP , 16);
+
+	r = amdgpu_bo_list_create(unplug->device_handle, 1, &ib_result_handle, NULL,
+							  &bo_list);
+	igt_assert_eq(r, 0);
+
+	memset(&ib_info, 0, sizeof(struct amdgpu_cs_ib_info));
+	ib_info.ib_mc_address = ib_result_mc_address;
+	ib_info.size = base_cmd->cdw;
+
+	memset(&ibs_request, 0, sizeof(struct amdgpu_cs_request));
+	ibs_request.ip_type = AMDGPU_HW_IP_GFX;
+	ibs_request.ring = 0;
+	ibs_request.number_of_ibs = 1;
+	ibs_request.ibs = &ib_info;
+	ibs_request.resources = bo_list;
+
+	r = amdgpu_cs_submit(context, 0, &ibs_request, 1);
+	igt_assert_eq(r, 0);
+
+	fence_status.context = context;
+	fence_status.ip_type = AMDGPU_HW_IP_GFX;
+	fence_status.ip_instance = 0;
+	fence_status.fence = ibs_request.seq_no;
+
+	amdgpu_cs_fence_to_handle(unplug->device_handle, &fence_status,
+						AMDGPU_FENCE_TO_HANDLE_GET_SYNCOBJ, &sync_obj_handle);
+	igt_assert_eq(r, 0);
+
+	r = amdgpu_cs_export_syncobj(unplug->device_handle, sync_obj_handle, &shared_fd);
+	igt_assert_eq(r, 0);
+
+	r = amdgpu_cs_import_syncobj(unplug->device_handle2, shared_fd, &sync_obj_handle2);
+	igt_assert_eq(r, 0);
+
+	r = amdgpu_cs_destroy_syncobj(unplug->device_handle, sync_obj_handle);
+	igt_assert_eq(r, 0);
+
+	amdgpu_bo_list_destroy(bo_list);
+	amdgpu_bo_unmap_and_free(ib_result_handle, va_handle, ib_result_mc_address,
+							 4096);
+
+	amdgpu_cs_ctx_free(context);
+
+	r = amdgpu_hotunplug_remove(unplug);
+	igt_assert_eq(r > 0, 1);
+
+	r = amdgpu_cs_syncobj_wait(unplug->device_handle2, &sync_obj_handle2, 1, 100000000, 0, NULL);
+	igt_assert_eq(r, 0);
+
+	r = amdgpu_cs_destroy_syncobj(unplug->device_handle2, sync_obj_handle2);
+	igt_assert_eq(r, 0);
+
+	amdgpu_hotunplug_teardown_test(unplug);
+
+	r = amdgpu_hotunplug_rescan();
+	igt_assert_eq(r > 0, 1);
+	free_cmd_base(base_cmd);
+}
diff --git a/lib/amdgpu/amd_pci_unplug.h b/lib/amdgpu/amd_pci_unplug.h
new file mode 100644
index 000000000..4b7a176e8
--- /dev/null
+++ b/lib/amdgpu/amd_pci_unplug.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2022 Advanced Micro Devices, Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
+ *
+ */
+#ifndef AMD_PCI_UNPLUG_H
+#define AMD_PCI_UNPLUG_H
+
+#include <amdgpu.h>
+#include <amdgpu_drm.h>
+
+#define MAX_CARDS_SUPPORTED 4
+
+struct amd_pci_unplug_setup {
+	uint32_t  major_version_req;
+	uint32_t  minor_version_req;
+	bool open_device;
+	bool open_device2;
+};
+
+struct amd_pci_unplug {
+	char *sysfs_remove ;
+	int drm_amdgpu_fds[MAX_CARDS_SUPPORTED];
+	int num_devices;
+	amdgpu_device_handle device_handle;
+	amdgpu_device_handle device_handle2;
+	volatile bool do_cs;
+};
+
+void
+amdgpu_hotunplug_simple(struct amd_pci_unplug_setup *setup,
+						struct amd_pci_unplug *unplug);
+
+void
+amdgpu_hotunplug_with_cs(struct amd_pci_unplug_setup *setup,
+						 struct amd_pci_unplug *unplug);
+
+void
+amdgpu_hotunplug_with_exported_bo(struct amd_pci_unplug_setup *setup,
+								  struct amd_pci_unplug *unplug);
+
+void
+amdgpu_hotunplug_with_exported_fence(struct amd_pci_unplug_setup *setup,
+									 struct amd_pci_unplug *unplug);
+
+
+#endif
diff --git a/lib/amdgpu/xalloc.h b/lib/amdgpu/xalloc.h
new file mode 100644
index 000000000..840b065f6
--- /dev/null
+++ b/lib/amdgpu/xalloc.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2008 Kristian Høgsberg
+ * Copyright 2022 Collabora, Ltd.
+ *
+ * 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.
+ */
+
+#ifndef WESTON_XALLOC_H
+#define WESTON_XALLOC_H
+
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+static inline void *
+abort_oom_if_null(void *p)
+{
+	static const char oommsg[] = ": out of memory\n";
+	size_t written __attribute__((unused));
+
+	if (p)
+		return p;
+
+	written = write(STDERR_FILENO, program_invocation_short_name,
+		        strlen(program_invocation_short_name));
+	written = write(STDERR_FILENO, oommsg, strlen(oommsg));
+
+	abort();
+}
+
+#define xmalloc(s) (abort_oom_if_null(malloc(s)))
+#define xzalloc(s) (abort_oom_if_null(calloc(1, s)))
+#define xcalloc(n, s) (abort_oom_if_null(calloc(n, s)))
+#define xstrdup(s) (abort_oom_if_null(strdup(s)))
+#define xrealloc(p, s) (abort_oom_if_null(realloc(p, s)))
+
+#endif /* WESTON_XALLOC_H */
diff --git a/lib/meson.build b/lib/meson.build
index 47f9fdab4..590ac2bcc 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -139,7 +139,9 @@ if libdrm_amdgpu.found()
 		'amdgpu/amd_gfx_v9_0.c',
 		'amdgpu/amd_dispatch_helpers.c',
 		'amdgpu/amd_dispatch.c',
-		'amdgpu/amd_deadlock_helpers.c'
+		'amdgpu/amd_deadlock_helpers.c',
+		'amdgpu/amd_pci_unplug.c',
+		'amdgpu/xalloc.h'
 	]
 endif
 
diff --git a/tests/amdgpu/amd_pci_unplug.c b/tests/amdgpu/amd_pci_unplug.c
new file mode 100644
index 000000000..7164ee50b
--- /dev/null
+++ b/tests/amdgpu/amd_pci_unplug.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2017 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 "igt.h"
+#include "drmtest.h"
+
+#include <amdgpu.h>
+#include <amdgpu_drm.h>
+#include "lib/amdgpu/amd_PM4.h"
+#include "lib/amdgpu/amd_pci_unplug.h"
+#include "lib/amdgpu/amd_ip_blocks.h"
+
+
+igt_main
+{
+
+	struct amd_pci_unplug_setup setup = {0};
+	struct amd_pci_unplug unplug = {0};
+
+	igt_fixture {
+		setup.minor_version_req = 46;
+	}
+
+	igt_subtest("amdgpu_hotunplug_simple")
+		amdgpu_hotunplug_simple(&setup, &unplug);
+
+	igt_subtest("amdgpu_hotunplug_with_cs")
+		amdgpu_hotunplug_with_cs(&setup, &unplug);
+
+		/*TODO about second GPU*/
+	igt_subtest("amdgpu_hotunplug_with_exported_bo")
+		amdgpu_hotunplug_with_exported_bo(&setup, &unplug);
+
+	igt_subtest("amdgpu_hotunplug_with_exported_fence")
+		amdgpu_hotunplug_with_exported_fence(&setup, &unplug);
+
+	igt_fixture { }
+}
diff --git a/tests/amdgpu/meson.build b/tests/amdgpu/meson.build
index 36b83ab1c..48b916925 100644
--- a/tests/amdgpu/meson.build
+++ b/tests/amdgpu/meson.build
@@ -7,6 +7,7 @@ if libdrm_amdgpu.found()
 			  'amd_basic',
 			  'amd_bypass',
 			  'amd_deadlock',
+			  'amd_pci_unplug',
 			  'amd_color',
 			  'amd_cs_nop',
 			  'amd_hotplug',
-- 
2.25.1



More information about the igt-dev mailing list