flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-10 17:36:11 +00:00
Code Issues Releases Wiki Activity

gem_concurrent_blit: Fix the leak from the children.

Browse Source 
As the children use the parent's fd, the kernel only has a single filp
for everyone. Therefore we cannot rely on the process termination
reaping the buffers we allocate for the children.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68169
This commit is contained in:
Chris Wilson 2013-08-16 11:23:22 +01:00
parent 1ca607b458
commit 1b17cb9d04
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/gem_concurrent_blit.c
View File

@ -267,7 +267,6 @@ static void run_forked(struct access_mode *mode,
do_test do_test_func)
{
const int old_num_buffers = num_buffers;
int loop, i, nc;
pid_t children[16];
num_buffers /= ARRAY_SIZE(children);
@ -275,7 +274,7 @@ static void run_forked(struct access_mode *mode,
igt_fork_signal_helper();
for (nc = 0; nc < ARRAY_SIZE(children); nc++) {
for (int nc = 0; nc < ARRAY_SIZE(children); nc++) {
switch ((children[nc] = fork())) {
case -1: igt_assert(0);
default: break;
@ -284,17 +283,23 @@ static void run_forked(struct access_mode *mode,
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
drm_intel_bufmgr_gem_enable_reuse(bufmgr);
batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd));
for (i = 0; i < num_buffers; i++) {
for (int i = 0; i < num_buffers; i++) {
src[i] = mode->create_bo(bufmgr, i, width, height);
dst[i] = mode->create_bo(bufmgr, ~i, width, height);
}
dummy = mode->create_bo(bufmgr, 0, width, height);
for (loop = 0; loop < 10; loop++)
for (int loop = 0; loop < 10; loop++)
do_test_func(mode, src, dst, dummy);
/* as we borrow the fd, we need to reap our bo */
for (int i = 0; i < num_buffers; i++) {
drm_intel_bo_unreference(src[i]);
drm_intel_bo_unreference(dst[i]);
}
drm_intel_bo_unreference(dummy);
exit(0);
}
}
for (nc = 0; nc < ARRAY_SIZE(children); nc++) {
for (int nc = 0; nc < ARRAY_SIZE(children); nc++) {
int status = -1;
while (waitpid(children[nc], &status, 0) == -1 &&
errno == -EINTR)