forked from checkpoint-restore/criu
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
pipe: Fall back to write() on vmsplice() EPERM
vmsplice can be blocked via seccomp and currently is in Podman containers. Signed-off-by: Younes Manton <[email protected]>
- Loading branch information
Showing
1 changed file
with
12 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -148,6 +148,7 @@ int restore_pipe_data(int img_type, int pfd, u32 id, struct pipe_data_rst **hash | |
int ret; | ||
struct pipe_data_rst *pd; | ||
struct iovec iov; | ||
bool try_vmsplice = true; | ||
|
||
for (pd = hash[id & PIPE_DATA_HASH_MASK]; pd != NULL; pd = pd->next) | ||
if (pd->pde->pipe_id == id) | ||
|
@@ -179,7 +180,17 @@ int restore_pipe_data(int img_type, int pfd, u32 id, struct pipe_data_rst **hash | |
iov.iov_len = pd->pde->bytes; | ||
|
||
while (iov.iov_len > 0) { | ||
ret = vmsplice(pfd, &iov, 1, SPLICE_F_GIFT | SPLICE_F_NONBLOCK); | ||
if (try_vmsplice) { | ||
ret = vmsplice(pfd, &iov, 1, SPLICE_F_GIFT | SPLICE_F_NONBLOCK); | ||
if (ret < 0 && errno == EPERM) { | ||
pr_info("%#x: vmsplice() returned EPERM, falling back to write()\n", id); | ||
try_vmsplice = false; | ||
ret = write(pfd, iov.iov_base, iov.iov_len); | ||
} | ||
} | ||
Check warning on line 190 in criu/pipes.c GitHub Actions / build
|
||
else | ||
ret = write(pfd, iov.iov_base, iov.iov_len); | ||
|
||
if (ret < 0) { | ||
pr_perror("%#x: Error splicing data", id); | ||
return -1; | ||
|