mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-06-15 14:33:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/session: decouple udev

Browse source
This commit is contained in:
illiliti 2026-05-23 09:00:59 +03:00
parent 68764dc6ac
commit 326bd749ee
5 changed files with 249 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

1
backend/session/meson.build
View file

@ -13,5 +13,6 @@ if not (udev.found() and libseat.found())
endif endif
wlr_files += files('session.c') wlr_files += files('session.c')
wlr_files += files('session_libudev.c')
wlr_deps += [udev, libseat] wlr_deps += [udev, libseat]
features += { 'session': true } features += { 'session': true }

222
backend/session/session.c
View file

@ -1,5 +1,4 @@
#include <assert.h> #include <assert.h>
#include <libudev.h>
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
@ -14,6 +13,7 @@
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86drmMode.h> #include <xf86drmMode.h>
#include <glob.h>
#include "backend/session/session.h" #include "backend/session/session.h"
#include "util/time.h" #include "util/time.h"
@ -146,99 +146,70 @@ static bool is_drm_card(const char *sysname) {
return true; return true;
} }
static void read_udev_change_event(struct wlr_device_change_event *event, static int handle_device_event(int fd, uint32_t mask, void *data) {
struct udev_device *udev_dev) {
const char *hotplug = udev_device_get_property_value(udev_dev, "HOTPLUG");
if (hotplug != NULL && strcmp(hotplug, "1") == 0) {
event->type = WLR_DEVICE_HOTPLUG;
struct wlr_device_hotplug_event *hotplug = &event->hotplug;
const char *connector =
udev_device_get_property_value(udev_dev, "CONNECTOR");
if (connector != NULL) {
hotplug->connector_id = strtoul(connector, NULL, 10);
}
const char *prop =
udev_device_get_property_value(udev_dev, "PROPERTY");
if (prop != NULL) {
hotplug->prop_id = strtoul(prop, NULL, 10);
}
return;
}
const char *lease = udev_device_get_property_value(udev_dev, "LEASE");
if (lease != NULL && strcmp(lease, "1") == 0) {
event->type = WLR_DEVICE_LEASE;
return;
}
}
static int handle_udev_event(int fd, uint32_t mask, void *data) {
struct wlr_session *session = data; struct wlr_session *session = data;
struct udev_device *udev_dev = udev_monitor_receive_device(session->mon); struct drm_event_content ev;
if (!udev_dev) { if (receive_drm_device(session->drm_handle, &ev) < 0) {
return 1;
}
wlr_log(WLR_DEBUG, "drm event for %s", ev.devnode);
if (!is_drm_card(ev.devnode)) {
return 1; return 1;
} }
const char *sysname = udev_device_get_sysname(udev_dev); const char *seat = get_device_seat(session->drm_handle, ev.devnode);
const char *devnode = udev_device_get_devnode(udev_dev);
const char *action = udev_device_get_action(udev_dev);
wlr_log(WLR_DEBUG, "udev event for %s (%s)", sysname, action);
if (!is_drm_card(sysname) || !action || !devnode) {
goto out;
}
const char *seat = udev_device_get_property_value(udev_dev, "ID_SEAT");
if (!seat) { if (!seat) {
seat = "seat0"; seat = "seat0";
} }
if (session->seat[0] != '\0' && strcmp(session->seat, seat) != 0) { if (session->seat[0] != '\0' && strcmp(session->seat, seat) != 0) {
goto out; return 1;
} }
dev_t devnum = udev_device_get_devnum(udev_dev); struct wlr_device *dev;
if (strcmp(action, "add") == 0) { switch (ev.type) {
struct wlr_device *dev; case DRM_EVENT_ACTION_ADD:
wl_list_for_each(dev, &session->devices, link) { wl_list_for_each(dev, &session->devices, link) {
if (dev->dev == devnum) { if (dev->dev == ev.devnum) {
wlr_log(WLR_DEBUG, "Skipping duplicate device %s", sysname); wlr_log(WLR_DEBUG, "Skipping duplicate device %s", ev.devnode);
goto out; return 1;
} }
} }
wlr_log(WLR_DEBUG, "DRM device %s added", sysname); wlr_log(WLR_DEBUG, "DRM device %s added", ev.devnode);
struct wlr_session_add_event event = { struct wlr_session_add_event event = {
.path = devnode, .path = ev.devnode,
}; };
wl_signal_emit_mutable(&session->events.add_drm_card, &event); wl_signal_emit_mutable(&session->events.add_drm_card, &event);
} else if (strcmp(action, "change") == 0) { break;
struct wlr_device *dev; case DRM_EVENT_ACTION_CHANGE:
wl_list_for_each(dev, &session->devices, link) { wl_list_for_each(dev, &session->devices, link) {
if (dev->dev == devnum) { if (dev->dev == ev.devnum) {
wlr_log(WLR_DEBUG, "DRM device %s changed", sysname); wlr_log(WLR_DEBUG, "DRM device %s changed", ev.devnode);
struct wlr_device_change_event event = {0}; struct wlr_device_change_event event = {0};
read_udev_change_event(&event, udev_dev); event.hotplug.connector_id = ev.conn_id;
event.hotplug.prop_id = ev.prop_id;
event.type = ev.has_lease ?
WLR_DEVICE_LEASE : WLR_DEVICE_HOTPLUG;
wl_signal_emit_mutable(&dev->events.change, &event); wl_signal_emit_mutable(&dev->events.change, &event);
break; break;
} }
} }
} else if (strcmp(action, "remove") == 0) { break;
struct wlr_device *dev; case DRM_EVENT_ACTION_REMOVE:
wl_list_for_each(dev, &session->devices, link) { wl_list_for_each(dev, &session->devices, link) {
if (dev->dev == devnum) { if (dev->dev == ev.devnum) {
wlr_log(WLR_DEBUG, "DRM device %s removed", sysname); wlr_log(WLR_DEBUG, "DRM device %s removed", ev.devnode);
wl_signal_emit_mutable(&dev->events.remove, NULL); wl_signal_emit_mutable(&dev->events.remove, NULL);
break; break;
} }
} }
break;
case DRM_EVENT_ACTION_NONE:
wlr_log(WLR_DEBUG, "Unknown device event");
break;
} }
out:
udev_device_unref(udev_dev);
return 1; return 1;
} }
@ -266,27 +237,17 @@ struct wlr_session *wlr_session_create(struct wl_event_loop *event_loop) {
goto error_open; goto error_open;
} }
session->udev = udev_new(); int fd = -1;
if (!session->udev) { session->drm_handle = monitor_drm_events(&fd);
wlr_log_errno(WLR_ERROR, "Failed to create udev context"); if (!session->drm_handle) {
wlr_log(WLR_ERROR, "Failed to create device monitor context");
goto error_session; goto error_session;
} }
session->mon = udev_monitor_new_from_netlink(session->udev, "udev"); session->drm_event = wl_event_loop_add_fd(event_loop, fd,
if (!session->mon) { WL_EVENT_READABLE, handle_device_event, session);
wlr_log_errno(WLR_ERROR, "Failed to create udev monitor"); if (!session->drm_event) {
goto error_udev; wlr_log_errno(WLR_ERROR, "Failed to create device event source");
}
udev_monitor_filter_add_match_subsystem_devtype(session->mon, "drm", NULL);
udev_monitor_enable_receiving(session->mon);
int fd = udev_monitor_get_fd(session->mon);
session->udev_event = wl_event_loop_add_fd(event_loop, fd,
WL_EVENT_READABLE, handle_udev_event, session);
if (!session->udev_event) {
wlr_log_errno(WLR_ERROR, "Failed to create udev event source");
goto error_mon; goto error_mon;
} }
@ -296,9 +257,7 @@ struct wlr_session *wlr_session_create(struct wl_event_loop *event_loop) {
return session; return session;
error_mon: error_mon:
udev_monitor_unref(session->mon); drm_event_monitor_free(session->drm_handle);
error_udev:
udev_unref(session->udev);
error_session: error_session:
libseat_session_finish(session); libseat_session_finish(session);
error_open: error_open:
@ -319,9 +278,8 @@ void wlr_session_destroy(struct wlr_session *session) {
wl_list_remove(&session->event_loop_destroy.link); wl_list_remove(&session->event_loop_destroy.link);
wl_event_source_remove(session->udev_event); wl_event_source_remove(session->drm_event);
udev_monitor_unref(session->mon); drm_event_monitor_free(session->drm_handle);
udev_unref(session->udev);
struct wlr_device *dev, *tmp_dev; struct wlr_device *dev, *tmp_dev;
wl_list_for_each_safe(dev, tmp_dev, &session->devices, link) { wl_list_for_each_safe(dev, tmp_dev, &session->devices, link) {
@ -443,25 +401,6 @@ static ssize_t explicit_find_gpus(struct wlr_session *session,
return i; return i;
} }
static struct udev_enumerate *enumerate_drm_cards(struct udev *udev) {
struct udev_enumerate *en = udev_enumerate_new(udev);
if (!en) {
wlr_log(WLR_ERROR, "udev_enumerate_new failed");
return NULL;
}
udev_enumerate_add_match_subsystem(en, "drm");
udev_enumerate_add_match_sysname(en, DRM_PRIMARY_MINOR_NAME "[0-9]*");
if (udev_enumerate_scan_devices(en) != 0) {
wlr_log(WLR_ERROR, "udev_enumerate_scan_devices failed");
udev_enumerate_unref(en);
return NULL;
}
return en;
}
struct find_gpus_add_handler { struct find_gpus_add_handler {
bool added; bool added;
struct wl_listener listener; struct wl_listener listener;
@ -481,14 +420,13 @@ ssize_t wlr_session_find_gpus(struct wlr_session *session,
return explicit_find_gpus(session, ret_len, ret, explicit); return explicit_find_gpus(session, ret_len, ret, explicit);
} }
struct udev_enumerate *en = enumerate_drm_cards(session->udev); static const char *node_glob = DRM_DIR_NAME "/" DRM_PRIMARY_MINOR_NAME "[0-9]*";
if (!en) { glob_t gl;
if (glob(node_glob, 0, NULL, &gl) != 0) {
return -1; return -1;
} }
if (gl.gl_pathc == 0) {
if (udev_enumerate_get_list_entry(en) == NULL) { globfree(&gl);
udev_enumerate_unref(en);
en = NULL;
wlr_log(WLR_INFO, "Waiting for a KMS device"); wlr_log(WLR_INFO, "Waiting for a KMS device");
struct find_gpus_add_handler handler = {0}; struct find_gpus_add_handler handler = {0};
@ -513,71 +451,39 @@ ssize_t wlr_session_find_gpus(struct wlr_session *session,
} }
wl_list_remove(&handler.listener.link); wl_list_remove(&handler.listener.link);
if (glob(node_glob, 0, NULL, &gl) != 0) {
en = enumerate_drm_cards(session->udev);
if (!en) {
return -1; return -1;
} }
} }
struct udev_list_entry *entry; size_t ret_num = 0;
size_t i = 0; for (size_t i = 0; i < gl.gl_pathc && ret_num < ret_len; i++) {
const char *devnode = gl.gl_pathv[i];
udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(en)) { const char *seat = get_device_seat(session->drm_handle, devnode);
if (i == ret_len) {
break;
}
const char *path = udev_list_entry_get_name(entry);
struct udev_device *dev = udev_device_new_from_syspath(session->udev, path);
if (!dev) {
continue;
}
const char *seat = udev_device_get_property_value(dev, "ID_SEAT");
if (!seat) { if (!seat) {
seat = "seat0"; seat = "seat0";
} }
if (session->seat[0] && strcmp(session->seat, seat) != 0) { if (session->seat[0] && strcmp(session->seat, seat) != 0) {
udev_device_unref(dev);
continue; continue;
} }
bool is_primary = false; bool is_primary = is_drm_device_primary(session->drm_handle, devnode);
const char *boot_display = udev_device_get_sysattr_value(dev, "boot_display");
if (boot_display && strcmp(boot_display, "1") == 0) {
is_primary = true;
} else {
// This is owned by 'dev', so we don't need to free it
struct udev_device *pci =
udev_device_get_parent_with_subsystem_devtype(dev, "pci", NULL);
if (pci) {
const char *id = udev_device_get_sysattr_value(pci, "boot_vga");
if (id && strcmp(id, "1") == 0) {
is_primary = true;
}
}
}
struct wlr_device *wlr_dev = struct wlr_device *wlr_dev =
session_open_if_kms(session, udev_device_get_devnode(dev)); session_open_if_kms(session, devnode);
udev_device_unref(dev);
if (!wlr_dev) { if (!wlr_dev) {
continue; continue;
} }
ret[i] = wlr_dev; ret[ret_num] = wlr_dev;
if (is_primary) { if (is_primary) {
struct wlr_device *tmp = ret[0]; struct wlr_device *tmp = ret[0];
ret[0] = ret[i]; ret[0] = ret[ret_num];
ret[i] = tmp; ret[ret_num] = tmp;
} }
++i; ++ret_num;
} }
udev_enumerate_unref(en); globfree(&gl);
return ret_num;
return i;
} }

147
backend/session/session_libudev.c Normal file
View file

@ -0,0 +1,147 @@
#include <stdio.h>
#include <stdlib.h>
#include <libudev.h>
#include <string.h>
#include <stdbool.h>
#include <assert.h>
#include <wlr/backend/session.h>
#include "backend/session/session.h"
struct drm_event_monitor {
struct udev *udev;
struct udev_monitor *mon;
};
struct drm_event_monitor *monitor_drm_events(int *fd) {
struct drm_event_monitor *ctx = calloc(1, sizeof(*ctx));
if (!ctx) {
return NULL;
}
ctx->udev = udev_new();
if (!ctx->udev) {
free(ctx);
return NULL;
}
ctx->mon = udev_monitor_new_from_netlink(ctx->udev, "udev");
if (!ctx->mon) {
udev_unref(ctx->udev);
free(ctx);
return NULL;
}
udev_monitor_filter_add_match_subsystem_devtype(ctx->mon, "drm", NULL);
udev_monitor_enable_receiving(ctx->mon);
*fd = udev_monitor_get_fd(ctx->mon);
return ctx;
}
void drm_event_monitor_free(struct drm_event_monitor *ctx) {
udev_monitor_unref(ctx->mon);
udev_unref(ctx->udev);
free(ctx);
}
static void populate_drm_event(struct drm_event_content *ev,
struct udev_device *dev) {
memset(ev, 0, sizeof(*ev));
const char *devnode = udev_device_get_devnode(dev);
if (devnode) {
int len = snprintf(ev->devnode, sizeof(ev->devnode), "%s", devnode);
assert((size_t)len < sizeof(ev->devnode));
}
ev->devnum = udev_device_get_devnum(dev);
const char *action = udev_device_get_action(dev);
if (strcmp(action, "add") == 0) {
ev->type = DRM_EVENT_ACTION_ADD;
} else if (strcmp(action, "change") == 0) {
ev->type = DRM_EVENT_ACTION_CHANGE;
} else if (strcmp(action, "remove") == 0) {
ev->type = DRM_EVENT_ACTION_REMOVE;
}
const char *hotplug = udev_device_get_property_value(dev, "HOTPLUG");
if (hotplug != NULL && strcmp(hotplug, "1") == 0) {
ev->has_lease = false;
const char *connector =
udev_device_get_property_value(dev, "CONNECTOR");
if (connector != NULL) {
ev->conn_id = strtoul(connector, NULL, 10);
}
const char *prop =
udev_device_get_property_value(dev, "PROPERTY");
if (prop != NULL) {
ev->prop_id = strtoul(prop, NULL, 10);
}
return;
}
const char *lease = udev_device_get_property_value(dev, "LEASE");
if (lease != NULL && strcmp(lease, "1") == 0) {
ev->has_lease = true;
}
}
int receive_drm_device(struct drm_event_monitor *ctx,
struct drm_event_content *ev) {
struct udev_device *dev = udev_monitor_receive_device(ctx->mon);
if (!dev) {
return -1;
}
populate_drm_event(ev, dev);
udev_device_unref(dev);
return 0;
}
static struct udev_device *get_udev_device_from_devnode(struct udev *udev,
const char *devnode) {
const char *sysname = strrchr(devnode, '/');
if (!sysname) {
return NULL;
}
sysname += 1;
struct udev_device *dev =
udev_device_new_from_subsystem_sysname(udev, "drm", sysname);
if (!dev) {
return NULL;
}
return dev;
}
// XXX: move it to libseat?
const char *get_device_seat(struct drm_event_monitor *ctx, const char *devnode) {
struct udev_device *dev = get_udev_device_from_devnode(ctx->udev, devnode);
if (!dev) {
return NULL;
}
const char *seat = udev_device_get_property_value(dev, "ID_SEAT");
udev_device_unref(dev);
return seat;
}
// XXX: use sysfs directly?
bool is_drm_device_primary(struct drm_event_monitor *ctx, const char *devnode) {
struct udev_device *dev = get_udev_device_from_devnode(ctx->udev, devnode);
if (!dev) {
return false;
}
const char *boot_display = udev_device_get_sysattr_value(dev, "boot_display");
if (boot_display && strcmp(boot_display, "1") == 0) {
udev_device_unref(dev);
return true;
}
// This is owned by 'dev', so we don't need to free it
struct udev_device *pci =
udev_device_get_parent_with_subsystem_devtype(dev, "pci", NULL);
if (!pci) {
udev_device_unref(dev);
return false;
}
const char *id = udev_device_get_sysattr_value(pci, "boot_vga");
bool primary = id && strcmp(id, "1") == 0;
udev_device_unref(dev);
return primary;
}

34
include/backend/session/session.h
View file

@ -2,6 +2,31 @@
#define BACKEND_SESSION_SESSION_H #define BACKEND_SESSION_SESSION_H
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h>
#include <sys/types.h>
#include <xf86drm.h>
// for some reason libdrm does not define MAX3, but has defs that depend on it
#define MAX3(a, b, c) ((a) > (b) && (a) > (c) ? (a) : \
(b) > (c) ? (b) : (c))
struct drm_event_monitor;
enum drm_event_action {
DRM_EVENT_ACTION_NONE,
DRM_EVENT_ACTION_ADD,
DRM_EVENT_ACTION_CHANGE,
DRM_EVENT_ACTION_REMOVE,
};
struct drm_event_content {
char devnode[DRM_NODE_NAME_MAX];
dev_t devnum;
enum drm_event_action type;
int16_t conn_id;
int16_t prop_id;
bool has_lease;
};
struct wl_display; struct wl_display;
struct wlr_session; struct wlr_session;
@ -17,4 +42,13 @@ void session_init(struct wlr_session *session);
struct wlr_device *session_open_if_kms(struct wlr_session *restrict session, struct wlr_device *session_open_if_kms(struct wlr_session *restrict session,
const char *restrict path); const char *restrict path);
struct drm_event_monitor *monitor_drm_events(int *fd);
void drm_event_monitor_free(struct drm_event_monitor *ctx);
int receive_drm_device(struct drm_event_monitor *ctx,
struct drm_event_content *ev);
const char *get_device_seat(struct drm_event_monitor *ctx, const char *devnode);
bool is_drm_device_primary(struct drm_event_monitor *ctx, const char *devnode);
#endif #endif

6
include/wlr/backend/session.h
View file

@ -6,6 +6,7 @@
#include <wayland-server-core.h> #include <wayland-server-core.h>
struct libseat; struct libseat;
struct drm_event_monitor;
/** /**
* An opened physical device. * An opened physical device.
@ -45,9 +46,8 @@ struct wlr_session {
char seat[256]; char seat[256];
struct udev *udev; struct drm_event_monitor *drm_handle;
struct udev_monitor *mon; struct wl_event_source *drm_event;
struct wl_event_source *udev_event;
struct libseat *seat_handle; struct libseat *seat_handle;
struct wl_event_source *libseat_event; struct wl_event_source *libseat_event;