c2f4201ed2
We want to wait for Xwayland to be ready before issuing it blocking requests, but relying on USR1 is a bit unsafe: - we can't ascertain the signal originated from Xwayland - if weston is started as PID1 (e.g. in its own container), then Xwayland will not send SIGUSR1 and X11 connections will be stuck forever: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1312 Creating a pipe and using -displayfd, even if we don't care about the display value itself, is safe and works for all cases Signed-off-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
246 lines
6.5 KiB
C
246 lines
6.5 KiB
C
/*
|
|
* Copyright © 2011 Intel Corporation
|
|
* Copyright © 2016 Giulio Camuffo
|
|
*
|
|
* 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 "config.h"
|
|
|
|
#include <signal.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <sys/socket.h>
|
|
|
|
#include <libweston/libweston.h>
|
|
#include "compositor/weston.h"
|
|
#include <libweston/xwayland-api.h>
|
|
#include "shared/helpers.h"
|
|
#include "shared/os-compatibility.h"
|
|
|
|
#ifdef HAVE_XWAYLAND_LISTENFD
|
|
# define LISTEN_STR "-listenfd"
|
|
#else
|
|
# define LISTEN_STR "-listen"
|
|
#endif
|
|
|
|
struct wet_xwayland {
|
|
struct weston_compositor *compositor;
|
|
const struct weston_xwayland_api *api;
|
|
struct weston_xwayland *xwayland;
|
|
struct wl_event_source *display_fd_source;
|
|
struct wl_client *client;
|
|
int wm_fd;
|
|
struct weston_process process;
|
|
};
|
|
|
|
static int
|
|
handle_display_fd(int fd, uint32_t mask, void *data)
|
|
{
|
|
struct wet_xwayland *wxw = data;
|
|
char buf[64];
|
|
ssize_t n;
|
|
|
|
/* xwayland exited before being ready, don't finish initialization,
|
|
* the process watcher will cleanup */
|
|
if (!(mask & WL_EVENT_READABLE))
|
|
goto out;
|
|
|
|
/* Xwayland writes to the pipe twice, so if we close it too early
|
|
* it's possible the second write will fail and Xwayland shuts down.
|
|
* Make sure we read until end of line marker to avoid this. */
|
|
n = read(fd, buf, sizeof buf);
|
|
if (n < 0 && errno != EAGAIN) {
|
|
weston_log("read from Xwayland display_fd failed: %s\n",
|
|
strerror(errno));
|
|
goto out;
|
|
}
|
|
/* Returning 1 here means recheck and call us again if required. */
|
|
if (n <= 0 || (n > 0 && buf[n - 1] != '\n'))
|
|
return 1;
|
|
|
|
wxw->api->xserver_loaded(wxw->xwayland, wxw->client, wxw->wm_fd);
|
|
|
|
out:
|
|
wl_event_source_remove(wxw->display_fd_source);
|
|
close(fd);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static pid_t
|
|
spawn_xserver(void *user_data, const char *display, int abstract_fd, int unix_fd)
|
|
{
|
|
struct wet_xwayland *wxw = user_data;
|
|
pid_t pid;
|
|
char s[12], abstract_fd_str[12], unix_fd_str[12], wm_fd_str[12];
|
|
char display_fd_str[12];
|
|
int sv[2], wm[2], fd, display_fd[2];
|
|
char *xserver = NULL;
|
|
struct weston_config *config = wet_get_config(wxw->compositor);
|
|
struct weston_config_section *section;
|
|
struct wl_event_loop *loop;
|
|
|
|
if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sv) < 0) {
|
|
weston_log("wl connection socketpair failed\n");
|
|
return 1;
|
|
}
|
|
|
|
if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, wm) < 0) {
|
|
weston_log("X wm connection socketpair failed\n");
|
|
return 1;
|
|
}
|
|
|
|
if (pipe(display_fd) < 0) {
|
|
weston_log("pipe creation for displayfd failed\n");
|
|
return 1;
|
|
}
|
|
|
|
if (os_fd_set_cloexec(display_fd[0]) != 0) {
|
|
weston_log("failed setting remaining end of displayfd as cloexec\n");
|
|
return 1;
|
|
}
|
|
|
|
pid = fork();
|
|
switch (pid) {
|
|
case 0:
|
|
/* SOCK_CLOEXEC closes both ends, so we need to unset
|
|
* the flag on the client fd. */
|
|
fd = dup(sv[1]);
|
|
if (fd < 0)
|
|
goto fail;
|
|
snprintf(s, sizeof s, "%d", fd);
|
|
setenv("WAYLAND_SOCKET", s, 1);
|
|
|
|
fd = dup(abstract_fd);
|
|
if (fd < 0)
|
|
goto fail;
|
|
snprintf(abstract_fd_str, sizeof abstract_fd_str, "%d", fd);
|
|
fd = dup(unix_fd);
|
|
if (fd < 0)
|
|
goto fail;
|
|
snprintf(unix_fd_str, sizeof unix_fd_str, "%d", fd);
|
|
fd = dup(wm[1]);
|
|
if (fd < 0)
|
|
goto fail;
|
|
snprintf(wm_fd_str, sizeof wm_fd_str, "%d", fd);
|
|
snprintf(display_fd_str, sizeof display_fd_str, "%d", display_fd[1]);
|
|
|
|
section = weston_config_get_section(config,
|
|
"xwayland", NULL, NULL);
|
|
weston_config_section_get_string(section, "path",
|
|
&xserver, XSERVER_PATH);
|
|
|
|
if (execl(xserver,
|
|
xserver,
|
|
display,
|
|
"-rootless",
|
|
LISTEN_STR, abstract_fd_str,
|
|
LISTEN_STR, unix_fd_str,
|
|
"-displayfd", display_fd_str,
|
|
"-wm", wm_fd_str,
|
|
"-terminate",
|
|
NULL) < 0)
|
|
weston_log("exec of '%s %s -rootless "
|
|
LISTEN_STR " %s " LISTEN_STR " %s "
|
|
"-wm %s -terminate' failed: %s\n",
|
|
xserver, display,
|
|
abstract_fd_str, unix_fd_str, wm_fd_str,
|
|
strerror(errno));
|
|
fail:
|
|
_exit(EXIT_FAILURE);
|
|
|
|
default:
|
|
close(sv[1]);
|
|
wxw->client = wl_client_create(wxw->compositor->wl_display, sv[0]);
|
|
|
|
close(wm[1]);
|
|
wxw->wm_fd = wm[0];
|
|
|
|
/* During initialization the X server will round trip
|
|
* and block on the wayland compositor, so avoid making
|
|
* blocking requests (like xcb_connect_to_fd) until
|
|
* it's done with that. */
|
|
close(display_fd[1]);
|
|
loop = wl_display_get_event_loop(wxw->compositor->wl_display);
|
|
wxw->display_fd_source =
|
|
wl_event_loop_add_fd(loop, display_fd[0], WL_EVENT_READABLE,
|
|
handle_display_fd, wxw);
|
|
|
|
wxw->process.pid = pid;
|
|
wet_watch_process(wxw->compositor, &wxw->process);
|
|
break;
|
|
|
|
case -1:
|
|
weston_log("Failed to fork to spawn xserver process\n");
|
|
break;
|
|
}
|
|
|
|
return pid;
|
|
}
|
|
|
|
static void
|
|
xserver_cleanup(struct weston_process *process, int status)
|
|
{
|
|
struct wet_xwayland *wxw =
|
|
container_of(process, struct wet_xwayland, process);
|
|
|
|
wxw->api->xserver_exited(wxw->xwayland, status);
|
|
wxw->client = NULL;
|
|
}
|
|
|
|
int
|
|
wet_load_xwayland(struct weston_compositor *comp)
|
|
{
|
|
const struct weston_xwayland_api *api;
|
|
struct weston_xwayland *xwayland;
|
|
struct wet_xwayland *wxw;
|
|
|
|
if (weston_compositor_load_xwayland(comp) < 0)
|
|
return -1;
|
|
|
|
api = weston_xwayland_get_api(comp);
|
|
if (!api) {
|
|
weston_log("Failed to get the xwayland module API.\n");
|
|
return -1;
|
|
}
|
|
|
|
xwayland = api->get(comp);
|
|
if (!xwayland) {
|
|
weston_log("Failed to get the xwayland object.\n");
|
|
return -1;
|
|
}
|
|
|
|
wxw = zalloc(sizeof *wxw);
|
|
if (!wxw)
|
|
return -1;
|
|
|
|
wxw->compositor = comp;
|
|
wxw->api = api;
|
|
wxw->xwayland = xwayland;
|
|
wxw->process.cleanup = xserver_cleanup;
|
|
if (api->listen(xwayland, wxw, spawn_xserver) < 0)
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|