Open witaway opened 6 months ago
I hope this works as expected. It took me a while to figure out how everything works here. 😅
Also please check #630. I've coded the second more simple version of the same optimization with the same general approach. It has it's own advantages :)
Issue #384. I'll need some help from the bubblewrap maintainers to land this change. Please, review this. I'm not completely sure does it break something or not. But seems like it's okay
I ran the tests that already exist in the project, and they passed. I also launched various software from flatpak. I replaced the system bwrap with the ones I built, with and without algorithm changes. In both, I output the contents of mountinfo at the very end of
setup_newroot()
execution. The list of mount points and their flags seem to be exactly the same on the data I've tried.It improves the complexity to O(N log N). I also have tried to measure performance difference on some Flatpak software:
For example,
flatpak run com.microsoft.Edge
without optimization and with optimization (the execution time ofsetup_newroot
, excluding the launch of the application itself)A test where I pass bwrap 2000 "--bind" flags:
bwrap --dev-bind / / --bind /usr /tmp/1 --bind /usr /tmp/2 ... --bind /usr /tmp/2000 /bin/true
Below I'll describe how algorithm basically works:
First, our problem isn't interactive type, because we have all
bind
operations and their order in arguments. The algorithm use it. Instead of rechecking/proc/self/mountinfo
before every--bind
operation we:More about point 3. After all the mount operations completed, we call
bind_mount_fixup()
function to remount all the mount points with correct flags. It does:/proc/self/mountinfo
mountinfo
, requests correct flags from graph and remounts mount points with them if neededImportant notes:
When we collect mount operations, we also add to the list all mount's of
proc
,dev
,mqueue
,tmp
. That's because we will anyway collect them from mount info to the graph and remount. If we wont add them to list, we will popagate unneeded flags. So we should avoid that.When we bind file we create temp file as before. In older version we delete them right after they become unneeded. After changes we save all paths of those temp files and
unlink()
all of them later, right after we performedbind_mount_fixup()
. That's because if we delete them, their soft links becomes incorrect and this breakretrieve_kernel_case()
function (used in fixup). Because under the hood it callsreadlink()
. Read this.Below is more context about lazy propagation of flags:
If we propagate flags naively with DFS algorithm we'll still have O(N^2) complexity. That's why the main part of algorithm is lazy propagation on the graph.
After tree of mount points is built (step 2):
Note: Right now segment tree implementation is not optimal! May be replaced with more optimized and and designed for this task data structure.