Commit 1abcfb02 authored by Michel Dänzer's avatar Michel Dänzer Committed by Dylan Baker

util: Change os_same_file_description return type from bool to int

This allows communicating that it wasn't possible to determine whether
the two file descriptors reference the same file description. When
that's the case, log a warning in the amdgpu winsys.

In turn, remove the corresponding debugging output from the fallback
os_same_file_description implementation. It depends on the caller if
false negatives are problematic or not.
Reviewed-by: Eric Engestrom's avatarEric Engestrom <eric@engestrom.ch>
Reviewed-by: default avatarMarek Olšák <marek.olsak@amd.com>
Tested-by: Marge Bot <mesa/mesa!3879>
Part-of: <mesa/mesa!3879>
(cherry picked from commit f5a89589)
parent 05ee6580
Pipeline #159105 passed with stages
in 24 minutes and 43 seconds
......@@ -39415,7 +39415,7 @@
"description": "util: Change os_same_file_description return type from bool to int",
"nominated": false,
"nomination_type": null,
"resolution": 4,
"resolution": 1,
"master_sha": null,
"because_sha": null
},
......@@ -31,6 +31,7 @@
#include "amdgpu_public.h"
#include "util/os_file.h"
#include "util/os_misc.h"
#include "util/u_cpu_detect.h"
#include "util/u_hash_table.h"
#include "util/hash_table.h"
......@@ -380,13 +381,25 @@ amdgpu_winsys_create(int fd, const struct pipe_screen_config *config,
simple_mtx_lock(&aws->sws_list_lock);
for (sws_iter = aws->sws_list; sws_iter; sws_iter = sws_iter->next) {
if (os_same_file_description(sws_iter->fd, ws->fd)) {
r = os_same_file_description(sws_iter->fd, ws->fd);
if (r == 0) {
close(ws->fd);
FREE(ws);
ws = sws_iter;
pipe_reference(NULL, &ws->reference);
simple_mtx_unlock(&aws->sws_list_lock);
goto unlock;
} else if (r < 0) {
static bool logged;
if (!logged) {
os_log_message("amdgpu: os_same_file_description couldn't "
"determine if two DRM fds reference the same "
"file description.\n"
"If they do, bad things may happen!\n");
logged = true;
}
}
}
simple_mtx_unlock(&aws->sws_list_lock);
......
......@@ -133,12 +133,16 @@ os_read_file(const char *filename)
return buf;
}
bool
int
os_same_file_description(int fd1, int fd2)
{
pid_t pid = getpid();
return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2) == 0;
/* Same file descriptor trivially implies same file description */
if (fd1 == fd2)
return 0;
return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2);
}
#else
......@@ -152,15 +156,15 @@ os_read_file(const char *filename)
return NULL;
}
bool
int
os_same_file_description(int fd1, int fd2)
{
/* Same file descriptor trivially implies same file description */
if (fd1 == fd2)
return true;
return 0;
debug_warn_once("Can't tell if different file descriptors reference the same"
" file description, false negatives might cause trouble!\n");
return false;
/* Otherwise we can't tell */
return -1;
}
#endif
......@@ -32,10 +32,14 @@ char *
os_read_file(const char *filename);
/*
* Returns true if the two file descriptors passed in can be determined to
* reference the same file description, false otherwise
* Try to determine if two file descriptors reference the same file description
*
* Return values:
* - 0: They reference the same file description
* - > 0: They do not reference the same file description
* - < 0: Unable to determine whether they reference the same file description
*/
bool
int
os_same_file_description(int fd1, int fd2);
#ifdef __cplusplus
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment