ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ueventd: Fix creation of VFIO dev nodes" into main am: 998c3b4fbe am: fcd6f0fb11 am: 1fae39537b am: a87a4a1c73

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2664635

Change-Id: I0e06438a3553bec05622be60e7d71cd2d091de00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jakob Vukalović 2023-07-20 11:43:14 +00:00 • committed by Automerger Merge Worker
commit b4e0fbcef1
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
init/devices.cpp
View file

@ -568,6 +568,8 @@ void DeviceHandler::HandleUevent(const Uevent& uevent) {
return; return;
} else if (uevent.subsystem == "misc" && StartsWith(uevent.device_name, "dm-user/")) { } else if (uevent.subsystem == "misc" && StartsWith(uevent.device_name, "dm-user/")) {
devpath = "/dev/dm-user/" + uevent.device_name.substr(8); devpath = "/dev/dm-user/" + uevent.device_name.substr(8);
} else if (uevent.subsystem == "misc" && uevent.device_name == "vfio/vfio") {
devpath = "/dev/" + uevent.device_name;
} else { } else {
devpath = "/dev/" + Basename(uevent.path); devpath = "/dev/" + Basename(uevent.path);
} }

6
rootdir/ueventd.rc
View file

@ -23,6 +23,11 @@ subsystem sound
subsystem dma_heap subsystem dma_heap
devname uevent_devpath devname uevent_devpath
dirname /dev/dma_heap dirname /dev/dma_heap
subsystem vfio
devname uevent_devpath
dirname /dev/vfio
# ueventd can only set permissions on device nodes and their associated # ueventd can only set permissions on device nodes and their associated
# sysfs attributes, not on arbitrary paths. # sysfs attributes, not on arbitrary paths.
# #
@ -43,6 +48,7 @@ subsystem dma_heap
/dev/binder 0666 root root /dev/binder 0666 root root
/dev/hwbinder 0666 root root /dev/hwbinder 0666 root root
/dev/vndbinder 0666 root root /dev/vndbinder 0666 root root
/dev/vfio/* 0666 root root
/dev/pmsg0 0222 root log /dev/pmsg0 0222 root log
/dev/dma_heap/system 0444 system system /dev/dma_heap/system 0444 system system