packages/criu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!48 page-pipe:fix limiting a pipe size

Browse Source 
From: @euleroswander 
Reviewed-by: @hjx_gitff 
Signed-off-by: @hjx_gitff
This commit is contained in:
openeuler-ci-bot 2022-11-22 07:59:32 +00:00 committed by Gitee
commit b4184281ac
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
1000-backport-page-pipe-fix-limiting-a-pipe-size.patch Normal file
View File

@ -0,0 +1,36 @@
From 51533d98ac389711a704266a1a5d7afc9b267f2d Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 27 Apr 2022 06:51:47 +0300
Subject: [PATCH] page-pipe: fix limiting a pipe size
But actually, 5a92f100b88e probably has to be reverted as a whole.
PIPE_MAX_SIZE is the hard limit to avoid PAGE_ALLOC_COSTLY_ORDER
allocations in the kernel. But F_SETPIPE_SZ rounds up a requested pipe
size to a power-of-2 pages. It means that when we request PIPE_MAX_SIZE
that isn't a power-of-2 number, we actually request a pipe size greater
than PIPE_MAX_SIZE.
Fixes: 5a92f100b88e ("page-pipe: Resize up to PIPE_MAX_SIZE")
Signed-off-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: He Wenliang <hewenliang4@huawei.com>
---
criu/page-pipe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/criu/page-pipe.c b/criu/page-pipe.c
index 5a7e50bc1..54dc3ccc4 100644
--- a/criu/page-pipe.c
+++ b/criu/page-pipe.c
@@ -56,7 +56,7 @@ static inline int ppb_resize_pipe(struct page_pipe_buf *ppb)
if (new_size > PIPE_MAX_SIZE) {
if (ppb->pipe_size < PIPE_MAX_SIZE)
- ppb->pipe_size = PIPE_MAX_SIZE;
+ new_size = PIPE_MAX_SIZE;
else
return 1;
}
--
2.33.0

7
criu.spec
View File

@ -1,6 +1,6 @@
Name: criu
Version: 3.16.1
Release: 5
Release: 6
Provides: crtools = %{version}-%{release}
Obsoletes: crtools <= 1.0-2
Summary: A tool of Checkpoint/Restore in User-space
@ -33,6 +33,8 @@ Patch15: 0014-zdtm-add-rseq-transition-test-for-amd64.patch
Patch16: 0015-cr-dump-handle-rseq-flags-field.patch
Patch17: 0016-zdtm-add-rseq02-transition-test-with-NO_RESTART-CS-f.patch
Patch1000: 1000-backport-page-pipe-fix-limiting-a-pipe-size.patch
%description
Checkpoint/Restore in Userspace(CRIU),is a software tool for the linux operating system.
Using this tool,it is possible to freeze a running application (or part of it) and
@ -114,6 +116,9 @@ chmod 0755 %{buildroot}/run/%{name}/
%doc %{_mandir}/man1/{compel.1*,crit.1*,criu-ns.1*}
%changelog
* Tue Nov 22 2022 Hewenliang <hewenliang4@huawei.com> - 3.16.1-6
- page-pipe:fix-limiting a pipe size.
* Thu Nov 10 2022 caodongxia <caodongxia@h-partners.com> - 3.16.1-5
- Modify invalid source0