diff --git a/0001-criu-8-add-external-net-option.patch b/0001-criu-8-add-external-net-option.patch index 06c8ed8..19264ed 100644 --- a/0001-criu-8-add-external-net-option.patch +++ b/0001-criu-8-add-external-net-option.patch @@ -1,7 +1,7 @@ -From 8017afbbd530d11b54e8e54ac1bc6a47f9c20ba7 Mon Sep 17 00:00:00 2001 +From 0bb7f1fc1ced67396866a913d39bc61a3bedbed5 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Mon, 20 Sep 2021 13:50:08 +0100 -Subject: [PATCH 001/245] criu(8): add --external net option +Subject: [PATCH 001/249] criu(8): add --external net option Support for external net namespaces has been introduced with commit c2b21fbf (criu: add support for external net namespaces). diff --git a/0002-criu-files-Don-t-cache-fd-ids-for-device-files.patch b/0002-criu-files-Don-t-cache-fd-ids-for-device-files.patch deleted file mode 100644 index 8ff9ebe..0000000 --- a/0002-criu-files-Don-t-cache-fd-ids-for-device-files.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9036f17569638f038edfb6c30454e2fbe3707d69 Mon Sep 17 00:00:00 2001 -From: Rajneesh Bhardwaj -Date: Tue, 27 Apr 2021 19:08:57 -0400 -Subject: [PATCH 002/245] criu/files: Don't cache fd ids for device files - -Restore operation fails when we perform CR operation of multiple -independent proceses that have device files because criu caches -the ids for the device files with same mnt_ids, inode pair. This -change ensures that even in case of a cached id found for a device, a -unique subid is generated and returned which is used for dumping. - -Suggested-by: Andrei Vagin -Signed-off-by: Rajneesh Bhardwaj ---- - criu/file-ids.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/criu/file-ids.c b/criu/file-ids.c -index 1b9d68888..772bd92cf 100644 ---- a/criu/file-ids.c -+++ b/criu/file-ids.c -@@ -77,8 +77,14 @@ int fd_id_generate_special(struct fd_parms *p, u32 *id) - - fi = fd_id_cache_lookup(p); - if (fi) { -- *id = fi->id; -- return 0; -+ if (p->stat.st_mode & (S_IFCHR | S_IFBLK)) { -+ /* Don't cache the id for mapped devices */ -+ *id = fd_tree.subid++; -+ return 1; -+ } else { -+ *id = fi->id; -+ return 0; -+ } - } - } - --- -2.35.1 - diff --git a/0003-tcp-Skip-restoring-TCP-state-when-dumping-with-tcp-c.patch b/0002-tcp-Skip-restoring-TCP-state-when-dumping-with-tcp-c.patch similarity index 91% rename from 0003-tcp-Skip-restoring-TCP-state-when-dumping-with-tcp-c.patch rename to 0002-tcp-Skip-restoring-TCP-state-when-dumping-with-tcp-c.patch index e2f4fd1..62a8554 100644 --- a/0003-tcp-Skip-restoring-TCP-state-when-dumping-with-tcp-c.patch +++ b/0002-tcp-Skip-restoring-TCP-state-when-dumping-with-tcp-c.patch @@ -1,7 +1,7 @@ -From da9608458d9130e906387f9da8432998e5a503cd Mon Sep 17 00:00:00 2001 +From 135c3df15c4b4d968b00ced7cd88133bbdb8962a Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Thu, 12 Aug 2021 11:05:09 +0000 -Subject: [PATCH 003/245] tcp: Skip restoring TCP state when dumping with +Subject: [PATCH 002/249] tcp: Skip restoring TCP state when dumping with --tcp-close Since commit e42f5e0 ("tcp: allow to specify --tcp-close on dump"), diff --git a/0004-zdtm-Dumping-restoring-with-tcp-close-on-TCP_CLOSE-s.patch b/0003-zdtm-Dumping-restoring-with-tcp-close-on-TCP_CLOSE-s.patch similarity index 95% rename from 0004-zdtm-Dumping-restoring-with-tcp-close-on-TCP_CLOSE-s.patch rename to 0003-zdtm-Dumping-restoring-with-tcp-close-on-TCP_CLOSE-s.patch index 524cfa3..b01b2f5 100644 --- a/0004-zdtm-Dumping-restoring-with-tcp-close-on-TCP_CLOSE-s.patch +++ b/0003-zdtm-Dumping-restoring-with-tcp-close-on-TCP_CLOSE-s.patch @@ -1,7 +1,7 @@ -From 67b6cb52a89947ee3c09f9617b0f303725bfbd8c Mon Sep 17 00:00:00 2001 +From acaf5a96370541678c33a91489df069c55084aff Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Mon, 20 Sep 2021 20:57:03 +0700 -Subject: [PATCH 004/245] zdtm: Dumping/restoring with --tcp-close on TCP_CLOSE +Subject: [PATCH 003/249] zdtm: Dumping/restoring with --tcp-close on TCP_CLOSE socket Signed-off-by: Bui Quang Minh diff --git a/0005-criu-8-Add-more-detailed-description-about-tcp-close.patch b/0004-criu-8-Add-more-detailed-description-about-tcp-close.patch similarity index 89% rename from 0005-criu-8-Add-more-detailed-description-about-tcp-close.patch rename to 0004-criu-8-Add-more-detailed-description-about-tcp-close.patch index d495563..43d857b 100644 --- a/0005-criu-8-Add-more-detailed-description-about-tcp-close.patch +++ b/0004-criu-8-Add-more-detailed-description-about-tcp-close.patch @@ -1,7 +1,7 @@ -From 910f52c00474036412561fb45fc89d2e04e860d0 Mon Sep 17 00:00:00 2001 +From 58c3e33e8227bdf2105dcca18a57a7a8bf3ddd1a Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Mon, 4 Oct 2021 20:38:34 +0700 -Subject: [PATCH 005/245] criu(8): Add more detailed description about +Subject: [PATCH 004/249] criu(8): Add more detailed description about --tcp-close dump option The expected behavior of --tcp-close option when dumpping is to close diff --git a/0006-Add-support-for-python3-in-criu-coredump.patch b/0005-Add-support-for-python3-in-criu-coredump.patch similarity index 98% rename from 0006-Add-support-for-python3-in-criu-coredump.patch rename to 0005-Add-support-for-python3-in-criu-coredump.patch index 4c3097d..16b34a6 100644 --- a/0006-Add-support-for-python3-in-criu-coredump.patch +++ b/0005-Add-support-for-python3-in-criu-coredump.patch @@ -1,7 +1,7 @@ -From 0246feb3ca20256ca3be8e94ebf8b30f75a26e3e Mon Sep 17 00:00:00 2001 +From e37aed0ca94e88f503499ddd828241d5b16122e7 Mon Sep 17 00:00:00 2001 From: Andrey Vyazovtsev Date: Thu, 26 Aug 2021 22:22:33 +0300 -Subject: [PATCH 006/245] Add support for python3 in criu-coredump +Subject: [PATCH 005/249] Add support for python3 in criu-coredump Resolve the following python3 portability issues: diff --git a/0007-Add-new-files-for-running-criu-coredump-via-python-2.patch b/0006-Add-new-files-for-running-criu-coredump-via-python-2.patch similarity index 94% rename from 0007-Add-new-files-for-running-criu-coredump-via-python-2.patch rename to 0006-Add-new-files-for-running-criu-coredump-via-python-2.patch index ddb3d5a..574691e 100644 --- a/0007-Add-new-files-for-running-criu-coredump-via-python-2.patch +++ b/0006-Add-new-files-for-running-criu-coredump-via-python-2.patch @@ -1,7 +1,7 @@ -From fe7504f824e0e59f182b3e2eaffa4514c7bdbae1 Mon Sep 17 00:00:00 2001 +From 3a7deb046e713421ee302aac9f726aefeecf60a4 Mon Sep 17 00:00:00 2001 From: AndreyVV-100 Date: Fri, 23 Jul 2021 12:48:03 +0300 -Subject: [PATCH 007/245] Add new files for running criu-coredump via python 2 +Subject: [PATCH 006/249] Add new files for running criu-coredump via python 2 or 3 Previous commit added support for python3 in criu-coredump. For convenience, diff --git a/0008-coredump-remove-unused-import.patch b/0007-coredump-remove-unused-import.patch similarity index 88% rename from 0008-coredump-remove-unused-import.patch rename to 0007-coredump-remove-unused-import.patch index dfc68d3..ae23443 100644 --- a/0008-coredump-remove-unused-import.patch +++ b/0007-coredump-remove-unused-import.patch @@ -1,7 +1,7 @@ -From db8634929bdb48268f3744aa2acb19fafec00be3 Mon Sep 17 00:00:00 2001 +From 08984ba43fee2b7a872a067cfa7ed9e86059ca9d Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 5 Sep 2021 21:31:12 +0100 -Subject: [PATCH 008/245] coredump: remove unused import +Subject: [PATCH 007/249] coredump: remove unused import Signed-off-by: Radostin Stoyanov --- diff --git a/0009-coredump-sort-imports.patch b/0008-coredump-sort-imports.patch similarity index 85% rename from 0009-coredump-sort-imports.patch rename to 0008-coredump-sort-imports.patch index 6a57eb0..a942fdb 100644 --- a/0009-coredump-sort-imports.patch +++ b/0008-coredump-sort-imports.patch @@ -1,7 +1,7 @@ -From df099bc26bf56bca463ec5e914516b17a4426ae9 Mon Sep 17 00:00:00 2001 +From 93c8beedcee85b7333a4b9137dad606bec5f3f66 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 5 Sep 2021 21:32:17 +0100 -Subject: [PATCH 009/245] coredump: sort imports +Subject: [PATCH 008/249] coredump: sort imports Signed-off-by: Radostin Stoyanov --- diff --git a/0010-coredump-convert-indentation-to-spaces.patch b/0009-coredump-convert-indentation-to-spaces.patch similarity index 96% rename from 0010-coredump-convert-indentation-to-spaces.patch rename to 0009-coredump-convert-indentation-to-spaces.patch index 9e63a32..0044593 100644 --- a/0010-coredump-convert-indentation-to-spaces.patch +++ b/0009-coredump-convert-indentation-to-spaces.patch @@ -1,7 +1,7 @@ -From 5ddabab892cf628be052d29d395adc9b597345df Mon Sep 17 00:00:00 2001 +From e945c416d6ddba23642defa66c047102c545526b Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 5 Sep 2021 21:34:00 +0100 -Subject: [PATCH 010/245] coredump: convert indentation to spaces +Subject: [PATCH 009/249] coredump: convert indentation to spaces Signed-off-by: Radostin Stoyanov --- diff --git a/0011-python-replace-equality-with-identity-test.patch b/0010-python-replace-equality-with-identity-test.patch similarity index 96% rename from 0011-python-replace-equality-with-identity-test.patch rename to 0010-python-replace-equality-with-identity-test.patch index e7cb5c2..f583eab 100644 --- a/0011-python-replace-equality-with-identity-test.patch +++ b/0010-python-replace-equality-with-identity-test.patch @@ -1,7 +1,7 @@ -From e111b6e6dd9979ae575b97b14080e93643add683 Mon Sep 17 00:00:00 2001 +From 162e2c214bb7480f583c202cf2145c65027e4400 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 5 Sep 2021 21:36:10 +0100 -Subject: [PATCH 011/245] python: replace equality with identity test +Subject: [PATCH 010/249] python: replace equality with identity test PEP8 recommends for comparisons to singletons like None to always be done with 'is' or 'is not', never the equality operators. diff --git a/0012-coredump-drop-unused-variable.patch b/0011-coredump-drop-unused-variable.patch similarity index 85% rename from 0012-coredump-drop-unused-variable.patch rename to 0011-coredump-drop-unused-variable.patch index 62d97fe..fb34cb0 100644 --- a/0012-coredump-drop-unused-variable.patch +++ b/0011-coredump-drop-unused-variable.patch @@ -1,7 +1,7 @@ -From cf5c2292a240fc36e424fad914e1839d05da5e01 Mon Sep 17 00:00:00 2001 +From f9f591b867abc61b414b4bee84ac683860c89ae6 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 5 Sep 2021 21:38:06 +0100 -Subject: [PATCH 012/245] coredump: drop unused variable +Subject: [PATCH 011/249] coredump: drop unused variable Signed-off-by: Radostin Stoyanov --- diff --git a/0013-coredump-drop-exec-permission.patch b/0012-coredump-drop-exec-permission.patch similarity index 80% rename from 0013-coredump-drop-exec-permission.patch rename to 0012-coredump-drop-exec-permission.patch index 1b10a3e..029b785 100644 --- a/0013-coredump-drop-exec-permission.patch +++ b/0012-coredump-drop-exec-permission.patch @@ -1,7 +1,7 @@ -From 0f3b2a370d1180e339575d6b86ef46f0bf93edb4 Mon Sep 17 00:00:00 2001 +From dc6d38708b54aafad660c01112a4ea0f301c5c07 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 5 Sep 2021 21:42:46 +0100 -Subject: [PATCH 013/245] coredump: drop exec permission +Subject: [PATCH 012/249] coredump: drop exec permission The shebang line in this file was removed in a previous commit and the file should be non-executable. diff --git a/0014-coredump-lint-fix-for-block-comments.patch b/0013-coredump-lint-fix-for-block-comments.patch similarity index 99% rename from 0014-coredump-lint-fix-for-block-comments.patch rename to 0013-coredump-lint-fix-for-block-comments.patch index 9106226..8d0f6fa 100644 --- a/0014-coredump-lint-fix-for-block-comments.patch +++ b/0013-coredump-lint-fix-for-block-comments.patch @@ -1,7 +1,7 @@ -From b593b4cc141c9e7ac104530755d071274f38f1b1 Mon Sep 17 00:00:00 2001 +From ccb2c41bbabaeaa0cec6d31bb0a862a8724568f0 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 5 Sep 2021 21:53:06 +0100 -Subject: [PATCH 014/245] coredump: lint fix for block comments +Subject: [PATCH 013/249] coredump: lint fix for block comments Block comment should start with '# ' https://www.flake8rules.com/rules/E265.html diff --git a/0015-coredump-fix-missing-whitespace-around-operator.patch b/0014-coredump-fix-missing-whitespace-around-operator.patch similarity index 86% rename from 0015-coredump-fix-missing-whitespace-around-operator.patch rename to 0014-coredump-fix-missing-whitespace-around-operator.patch index d729249..a78370f 100644 --- a/0015-coredump-fix-missing-whitespace-around-operator.patch +++ b/0014-coredump-fix-missing-whitespace-around-operator.patch @@ -1,7 +1,7 @@ -From 1074ea5b55fadc6b189a81c792e1c30bfaa86d8b Mon Sep 17 00:00:00 2001 +From dca95ec84857a23e142bbed9016da09c50868014 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 5 Sep 2021 22:37:26 +0100 -Subject: [PATCH 015/245] coredump: fix missing whitespace around operator +Subject: [PATCH 014/249] coredump: fix missing whitespace around operator Missing whitespace around arithmetic operator https://www.flake8rules.com/rules/E226.html diff --git a/0016-coredump-fix-too-many-blank-lines.patch b/0015-coredump-fix-too-many-blank-lines.patch similarity index 85% rename from 0016-coredump-fix-too-many-blank-lines.patch rename to 0015-coredump-fix-too-many-blank-lines.patch index c7cfa24..254f642 100644 --- a/0016-coredump-fix-too-many-blank-lines.patch +++ b/0015-coredump-fix-too-many-blank-lines.patch @@ -1,7 +1,7 @@ -From b2903a63004600399d5982ce0b36f203702001d7 Mon Sep 17 00:00:00 2001 +From 3495005412dcfe1a897bc52d24a299b098a6eac1 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 5 Sep 2021 22:39:50 +0100 -Subject: [PATCH 016/245] coredump: fix too many blank lines +Subject: [PATCH 015/249] coredump: fix too many blank lines https://www.flake8rules.com/rules/E303.html diff --git a/0017-coredump-fix-comparison-to-true.patch b/0016-coredump-fix-comparison-to-true.patch similarity index 88% rename from 0017-coredump-fix-comparison-to-true.patch rename to 0016-coredump-fix-comparison-to-true.patch index 7be6690..592da3f 100644 --- a/0017-coredump-fix-comparison-to-true.patch +++ b/0016-coredump-fix-comparison-to-true.patch @@ -1,7 +1,7 @@ -From b37e0a33b23dbe789f178aca614458637598c506 Mon Sep 17 00:00:00 2001 +From da13809e3122ffde0c3657facb978ba7b54bf3a5 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 5 Sep 2021 22:42:19 +0100 -Subject: [PATCH 017/245] coredump: fix comparison to true +Subject: [PATCH 016/249] coredump: fix comparison to true Comparison to true should be 'if cond is true:' or 'if cond:' https://www.flake8rules.com/rules/E712.html diff --git a/0018-coredump-lint-fix-visually-indented-line.patch b/0017-coredump-lint-fix-visually-indented-line.patch similarity index 94% rename from 0018-coredump-lint-fix-visually-indented-line.patch rename to 0017-coredump-lint-fix-visually-indented-line.patch index 23b9600..d90cf62 100644 --- a/0018-coredump-lint-fix-visually-indented-line.patch +++ b/0017-coredump-lint-fix-visually-indented-line.patch @@ -1,7 +1,7 @@ -From e0d45309559dc198619ad8f62d699f601f04dbca Mon Sep 17 00:00:00 2001 +From c9c55b3b33dc7e4295e68e816001216b7568c19e Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 5 Sep 2021 22:47:59 +0100 -Subject: [PATCH 018/245] coredump: lint fix visually indented line +Subject: [PATCH 017/249] coredump: lint fix visually indented line Continuation line over-indented for visual indent https://www.flake8rules.com/rules/E127.html diff --git a/0019-test-coredump-fix-shellcheck-errors.patch b/0018-test-coredump-fix-shellcheck-errors.patch similarity index 90% rename from 0019-test-coredump-fix-shellcheck-errors.patch rename to 0018-test-coredump-fix-shellcheck-errors.patch index 4ecff6d..26aaa99 100644 --- a/0019-test-coredump-fix-shellcheck-errors.patch +++ b/0018-test-coredump-fix-shellcheck-errors.patch @@ -1,7 +1,7 @@ -From 599d77b4650a7ce14370ac69fbc825a71e540da4 Mon Sep 17 00:00:00 2001 +From 23644721afc34abb4a2d08c7dd7f83d5780a61ba Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Mon, 6 Sep 2021 00:20:58 +0100 -Subject: [PATCH 019/245] test/coredump: fix shellcheck errors +Subject: [PATCH 018/249] test/coredump: fix shellcheck errors ShellCheck reports the following problems: diff --git a/0020-make-enable-lint-for-coredump.patch b/0019-make-enable-lint-for-coredump.patch similarity index 88% rename from 0020-make-enable-lint-for-coredump.patch rename to 0019-make-enable-lint-for-coredump.patch index 17c7e8d..2484c08 100644 --- a/0020-make-enable-lint-for-coredump.patch +++ b/0019-make-enable-lint-for-coredump.patch @@ -1,7 +1,7 @@ -From 5dc9cc7abb2ba750dc09af0c9983723ac6c03c8d Mon Sep 17 00:00:00 2001 +From 7bf49f15f48be6ae0cc6adddc17322f7d2e94e3b Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 5 Sep 2021 22:55:24 +0100 -Subject: [PATCH 020/245] make: enable lint for coredump +Subject: [PATCH 019/249] make: enable lint for coredump Signed-off-by: Radostin Stoyanov --- diff --git a/0021-ci-enable-coredump-tests.patch b/0020-ci-enable-coredump-tests.patch similarity index 90% rename from 0021-ci-enable-coredump-tests.patch rename to 0020-ci-enable-coredump-tests.patch index 6bda688..a6ebe98 100644 --- a/0021-ci-enable-coredump-tests.patch +++ b/0020-ci-enable-coredump-tests.patch @@ -1,7 +1,7 @@ -From 37301a8a6ef9ecb1efe3f8086cd1ca6bd7fe4b70 Mon Sep 17 00:00:00 2001 +From 50311543e8d3567ebd15085cdb4ea3b149d1e90c Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 5 Sep 2021 23:06:56 +0100 -Subject: [PATCH 021/245] ci: enable coredump tests +Subject: [PATCH 020/249] ci: enable coredump tests Signed-off-by: Radostin Stoyanov --- diff --git a/0022-pie-restorer-remove-excess-hash-printf-specifier.patch b/0021-pie-restorer-remove-excess-hash-printf-specifier.patch similarity index 91% rename from 0022-pie-restorer-remove-excess-hash-printf-specifier.patch rename to 0021-pie-restorer-remove-excess-hash-printf-specifier.patch index 37acf25..9dc7236 100644 --- a/0022-pie-restorer-remove-excess-hash-printf-specifier.patch +++ b/0021-pie-restorer-remove-excess-hash-printf-specifier.patch @@ -1,7 +1,7 @@ -From 817bbf40251e54cc1441250a16e192f7f18a80b6 Mon Sep 17 00:00:00 2001 +From a8956a7579f094de1401b6486501d6d553754b81 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 21 Oct 2021 11:47:01 +0300 -Subject: [PATCH 022/245] pie/restorer: remove excess hash printf specifier +Subject: [PATCH 021/249] pie/restorer: remove excess hash printf specifier We use here "%#x" printf specifier in pie code, but sbuf_printf core pie printing function knows nothing about '#' specifier. More over simple diff --git a/0023-tty-fix-the-null-pointer-of-get_tty_driver.patch b/0022-tty-fix-the-null-pointer-of-get_tty_driver.patch similarity index 87% rename from 0023-tty-fix-the-null-pointer-of-get_tty_driver.patch rename to 0022-tty-fix-the-null-pointer-of-get_tty_driver.patch index 9a18f06..fd2c849 100644 --- a/0023-tty-fix-the-null-pointer-of-get_tty_driver.patch +++ b/0022-tty-fix-the-null-pointer-of-get_tty_driver.patch @@ -1,7 +1,7 @@ -From 47be9b1891006453ad9ae87960677300822be8b0 Mon Sep 17 00:00:00 2001 +From add9597c6c6ed74c643e0784c171eb0ca8deab53 Mon Sep 17 00:00:00 2001 From: "fu.lin" Date: Fri, 17 Sep 2021 17:16:48 +0800 -Subject: [PATCH 023/245] tty: fix the null pointer of get_tty_driver +Subject: [PATCH 022/249] tty: fix the null pointer of get_tty_driver v2: split error checking from index variable initialization v3: use PRIx64 for printing dev_t diff --git a/0024-util-use-nftw-in-rmrf-helper.patch b/0023-util-use-nftw-in-rmrf-helper.patch similarity index 96% rename from 0024-util-use-nftw-in-rmrf-helper.patch rename to 0023-util-use-nftw-in-rmrf-helper.patch index a335492..7a2f6a7 100644 --- a/0024-util-use-nftw-in-rmrf-helper.patch +++ b/0023-util-use-nftw-in-rmrf-helper.patch @@ -1,7 +1,7 @@ -From 10fa87c08c22d7d7ddca1fbd1c2704f96c079639 Mon Sep 17 00:00:00 2001 +From 889fde47e57226278767be69768b733eeb84f15c Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 22 Oct 2021 17:56:37 +0300 -Subject: [PATCH 024/245] util: use nftw in rmrf helper +Subject: [PATCH 023/249] util: use nftw in rmrf helper This simplifies the code by removing excess recursion and reusing standard function to walk over file-tree instead of opencoding it. diff --git a/0025-criu-ns-make-pidns-init-first-do-setsid.patch b/0024-criu-ns-make-pidns-init-first-do-setsid.patch similarity index 88% rename from 0025-criu-ns-make-pidns-init-first-do-setsid.patch rename to 0024-criu-ns-make-pidns-init-first-do-setsid.patch index 485e34a..90bc189 100644 --- a/0025-criu-ns-make-pidns-init-first-do-setsid.patch +++ b/0024-criu-ns-make-pidns-init-first-do-setsid.patch @@ -1,7 +1,7 @@ -From 08baf25effeb30d59f98e2eae07acee71ce22b1c Mon Sep 17 00:00:00 2001 +From 06a4400fc7b96e7abbeda7f79ee52daa61fe0223 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Mon, 18 Oct 2021 18:43:14 +0300 -Subject: [PATCH 025/245] criu-ns: make pidns init first do setsid +Subject: [PATCH 024/249] criu-ns: make pidns init first do setsid We see that on criu-ns dump/restore/dump of the process which initially was not a session leader (with --shell-job option) we see sid == 0 for diff --git a/0026-net-optimize-restore_rule-to-not-open-the-CR_FD_RULE.patch b/0025-net-optimize-restore_rule-to-not-open-the-CR_FD_RULE.patch similarity index 95% rename from 0026-net-optimize-restore_rule-to-not-open-the-CR_FD_RULE.patch rename to 0025-net-optimize-restore_rule-to-not-open-the-CR_FD_RULE.patch index 62ae705..0547fde 100644 --- a/0026-net-optimize-restore_rule-to-not-open-the-CR_FD_RULE.patch +++ b/0025-net-optimize-restore_rule-to-not-open-the-CR_FD_RULE.patch @@ -1,7 +1,7 @@ -From 87d8857fa7fdaed252f52782eb4f65b4ab990536 Mon Sep 17 00:00:00 2001 +From 2cdae896f304afae1d2b96dd00f2a599266765be Mon Sep 17 00:00:00 2001 From: Nicolas Viennot Date: Thu, 28 Oct 2021 21:05:57 +0000 -Subject: [PATCH 026/245] net: optimize restore_rule() to not open the +Subject: [PATCH 025/249] net: optimize restore_rule() to not open the CR_FD_RULE image file twice Previously, `open_image(CR_FD_RULE, O_RSTR, pid)` was called twice. diff --git a/0027-ci-replace-deprecated-codecov-bash-uploader.patch b/0026-ci-replace-deprecated-codecov-bash-uploader.patch similarity index 91% rename from 0027-ci-replace-deprecated-codecov-bash-uploader.patch rename to 0026-ci-replace-deprecated-codecov-bash-uploader.patch index a958d9f..c845f54 100644 --- a/0027-ci-replace-deprecated-codecov-bash-uploader.patch +++ b/0026-ci-replace-deprecated-codecov-bash-uploader.patch @@ -1,7 +1,7 @@ -From dfa69352b7115aa65a735a43b5d5cdd95511eed6 Mon Sep 17 00:00:00 2001 +From 175fb94e620f9e33358e92bec0262e0586ec554a Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 27 Oct 2021 07:27:22 +0000 -Subject: [PATCH 027/245] ci: replace deprecated codecov bash uploader +Subject: [PATCH 026/249] ci: replace deprecated codecov bash uploader Replace deprecated codecov bash uploader with new version: diff --git a/0028-ci-fix-userfaultfd-test-failures.patch b/0027-ci-fix-userfaultfd-test-failures.patch similarity index 90% rename from 0028-ci-fix-userfaultfd-test-failures.patch rename to 0027-ci-fix-userfaultfd-test-failures.patch index f6ba568..ca61f9b 100644 --- a/0028-ci-fix-userfaultfd-test-failures.patch +++ b/0027-ci-fix-userfaultfd-test-failures.patch @@ -1,7 +1,7 @@ -From 5c4c99dc3d477408e5bd249e03254ca4a3bafb87 Mon Sep 17 00:00:00 2001 +From a78590464010d9de5c794b4fc12aea8c5a0b46a1 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 4 Nov 2021 09:10:38 +0000 -Subject: [PATCH 028/245] ci: fix userfaultfd test failures +Subject: [PATCH 027/249] ci: fix userfaultfd test failures Newer kernels (5.11) require echo 1 > /proc/sys/vm/unprivileged_userfaultfd diff --git a/0029-ci-use-Fedora-34-for-lint-CI-runs.patch b/0028-ci-use-Fedora-34-for-lint-CI-runs.patch similarity index 87% rename from 0029-ci-use-Fedora-34-for-lint-CI-runs.patch rename to 0028-ci-use-Fedora-34-for-lint-CI-runs.patch index a1aa182..89e550c 100644 --- a/0029-ci-use-Fedora-34-for-lint-CI-runs.patch +++ b/0028-ci-use-Fedora-34-for-lint-CI-runs.patch @@ -1,7 +1,7 @@ -From 3bc19101b9458cb920b79492063be1b71312f0a5 Mon Sep 17 00:00:00 2001 +From 20c65ae87263315214c48a636dc20b4dbac03215 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 4 Nov 2021 09:18:31 +0000 -Subject: [PATCH 029/245] ci: use Fedora 34 for lint CI runs +Subject: [PATCH 028/249] ci: use Fedora 34 for lint CI runs Fedora 35 comes with clang 13 which provides different results for clang-format than clang 12 in Fedora 34. diff --git a/0030-tests-improve-the-image-streamer-process-control.patch b/0029-tests-improve-the-image-streamer-process-control.patch similarity index 97% rename from 0030-tests-improve-the-image-streamer-process-control.patch rename to 0029-tests-improve-the-image-streamer-process-control.patch index 1ec3da6..3155588 100644 --- a/0030-tests-improve-the-image-streamer-process-control.patch +++ b/0029-tests-improve-the-image-streamer-process-control.patch @@ -1,7 +1,7 @@ -From 3b1a22da26051f157aaf3272bb4bb78a545920c2 Mon Sep 17 00:00:00 2001 +From ef7f435bccd1a60230a66271723590656e0917b1 Mon Sep 17 00:00:00 2001 From: Nicolas Viennot Date: Fri, 29 Oct 2021 02:49:31 +0000 -Subject: [PATCH 030/245] tests: improve the image streamer process control +Subject: [PATCH 029/249] tests: improve the image streamer process control When exceptions are raised during testing, the image streamer process should be terminated as opposed to being left hanging. diff --git a/0031-sockets-don-t-call-sk_setbufs-asyncronously.patch b/0030-sockets-don-t-call-sk_setbufs-asyncronously.patch similarity index 90% rename from 0031-sockets-don-t-call-sk_setbufs-asyncronously.patch rename to 0030-sockets-don-t-call-sk_setbufs-asyncronously.patch index 4733fae..5d80afe 100644 --- a/0031-sockets-don-t-call-sk_setbufs-asyncronously.patch +++ b/0030-sockets-don-t-call-sk_setbufs-asyncronously.patch @@ -1,7 +1,7 @@ -From 654c2ee79dae4429287d5ea458952759a7a4632e Mon Sep 17 00:00:00 2001 +From 04464397f1d2bf43265ed70bba029bfa57d20092 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 29 Jul 2021 14:21:37 +0300 -Subject: [PATCH 031/245] sockets: don't call sk_setbufs asyncronously +Subject: [PATCH 030/249] sockets: don't call sk_setbufs asyncronously We want to also c/r socket buf locks (SO_BUF_LOCKS) which are also implicitly set by setsockopt(SO_{SND,RCV}BUF*), so we need to order diff --git a/0032-kerndat-check-for-set-getsockopt-SO_BUF_LOCK-availab.patch b/0031-kerndat-check-for-set-getsockopt-SO_BUF_LOCK-availab.patch similarity index 96% rename from 0032-kerndat-check-for-set-getsockopt-SO_BUF_LOCK-availab.patch rename to 0031-kerndat-check-for-set-getsockopt-SO_BUF_LOCK-availab.patch index 27136e7..6d4dd07 100644 --- a/0032-kerndat-check-for-set-getsockopt-SO_BUF_LOCK-availab.patch +++ b/0031-kerndat-check-for-set-getsockopt-SO_BUF_LOCK-availab.patch @@ -1,7 +1,7 @@ -From c030e495ed3b5e59acd8c7bdcad8baea1697b909 Mon Sep 17 00:00:00 2001 +From 5dc443bcd848877677b858e1aa21e0c929f19541 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 29 Jul 2021 14:57:17 +0300 -Subject: [PATCH 032/245] kerndat: check for set/getsockopt SO_BUF_LOCK +Subject: [PATCH 031/249] kerndat: check for set/getsockopt SO_BUF_LOCK availability This is a new kernel feature to let criu restore sockets with kernel diff --git a/0033-sockets-c-r-bufer-size-locks.patch b/0032-sockets-c-r-bufer-size-locks.patch similarity index 95% rename from 0033-sockets-c-r-bufer-size-locks.patch rename to 0032-sockets-c-r-bufer-size-locks.patch index fb89c78..40e34c9 100644 --- a/0033-sockets-c-r-bufer-size-locks.patch +++ b/0032-sockets-c-r-bufer-size-locks.patch @@ -1,7 +1,7 @@ -From 5aea67fc45f4cf986f396c4f99e5317b9ba08ef6 Mon Sep 17 00:00:00 2001 +From ab926314464645eda33d6ccb505e673d9db01296 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 29 Jul 2021 11:27:13 +0300 -Subject: [PATCH 033/245] sockets: c/r bufer size locks +Subject: [PATCH 032/249] sockets: c/r bufer size locks When one sets socket buffer sizes with setsockopt(SO_{SND,RCV}BUF*), kernel sets coresponding SOCK_SNDBUF_LOCK or SOCK_RCVBUF_LOCK flags on diff --git a/0034-zdtm-add-test-for-socket-buffer-size-locks.patch b/0033-zdtm-add-test-for-socket-buffer-size-locks.patch similarity index 95% rename from 0034-zdtm-add-test-for-socket-buffer-size-locks.patch rename to 0033-zdtm-add-test-for-socket-buffer-size-locks.patch index 95c2fe2..a64f826 100644 --- a/0034-zdtm-add-test-for-socket-buffer-size-locks.patch +++ b/0033-zdtm-add-test-for-socket-buffer-size-locks.patch @@ -1,7 +1,7 @@ -From 16ba0ca25d5e3ee030c4a78fbacd1ad9e1a8a6e0 Mon Sep 17 00:00:00 2001 +From b9ef6d19297e0cea7d697513ee685ae13014cdec Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 29 Jul 2021 16:16:12 +0300 -Subject: [PATCH 034/245] zdtm: add test for socket buffer size locks +Subject: [PATCH 033/249] zdtm: add test for socket buffer size locks Just set all possible values 0-3 and chack if it persists. diff --git a/0035-zdtm-make-sock_opts02-also-check-lock-change-by-SO_-.patch b/0034-zdtm-make-sock_opts02-also-check-lock-change-by-SO_-.patch similarity index 95% rename from 0035-zdtm-make-sock_opts02-also-check-lock-change-by-SO_-.patch rename to 0034-zdtm-make-sock_opts02-also-check-lock-change-by-SO_-.patch index 17807ce..8cfea59 100644 --- a/0035-zdtm-make-sock_opts02-also-check-lock-change-by-SO_-.patch +++ b/0034-zdtm-make-sock_opts02-also-check-lock-change-by-SO_-.patch @@ -1,7 +1,7 @@ -From 7168eac9043df54efba6a892ae4e1578ebb9c5c8 Mon Sep 17 00:00:00 2001 +From e6d511315f175d80bb6b1adb9bfc68debb46ffc3 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 3 Aug 2021 13:05:32 +0300 -Subject: [PATCH 035/245] zdtm: make sock_opts02 also check lock change by +Subject: [PATCH 034/249] zdtm: make sock_opts02 also check lock change by SO_*BUF* Reviewed-by: Alexander Mikhalitsyn diff --git a/0036-clang-format-enable-AlignTrailingComments.patch b/0035-clang-format-enable-AlignTrailingComments.patch similarity index 98% rename from 0036-clang-format-enable-AlignTrailingComments.patch rename to 0035-clang-format-enable-AlignTrailingComments.patch index 1c278d1..8838372 100644 --- a/0036-clang-format-enable-AlignTrailingComments.patch +++ b/0035-clang-format-enable-AlignTrailingComments.patch @@ -1,7 +1,7 @@ -From 0b5a590b0522207411d0439f958b1a8fcfbd4cba Mon Sep 17 00:00:00 2001 +From 8ea9c9fc7360f9c5250632d0818f68af0de73992 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 28 Oct 2021 17:15:52 +0300 -Subject: [PATCH 036/245] clang-format: enable AlignTrailingComments +Subject: [PATCH 035/249] clang-format: enable AlignTrailingComments Code becomes much more human-readable after enabling it. diff --git a/0037-clang-format-do-several-manual-comment-fixups.patch b/0036-clang-format-do-several-manual-comment-fixups.patch similarity index 97% rename from 0037-clang-format-do-several-manual-comment-fixups.patch rename to 0036-clang-format-do-several-manual-comment-fixups.patch index e6d45ef..622bb25 100644 --- a/0037-clang-format-do-several-manual-comment-fixups.patch +++ b/0036-clang-format-do-several-manual-comment-fixups.patch @@ -1,7 +1,7 @@ -From ffa271086ac15e18203d64611afff81b4c9d2ab3 Mon Sep 17 00:00:00 2001 +From 54b25b72065f17594216642bcf8a3267a0a0a489 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 28 Oct 2021 17:17:44 +0300 -Subject: [PATCH 037/245] clang-format: do several manual comment fixups +Subject: [PATCH 036/249] clang-format: do several manual comment fixups Automatic AlignTrailingComments fails to make those comments look right, so let's do it manually, so that they both satisfy AlignTrailingComments diff --git a/0038-clang-format-do-automatic-comment-fixups.patch b/0037-clang-format-do-automatic-comment-fixups.patch similarity index 99% rename from 0038-clang-format-do-automatic-comment-fixups.patch rename to 0037-clang-format-do-automatic-comment-fixups.patch index 81e4774..1eaa294 100644 --- a/0038-clang-format-do-automatic-comment-fixups.patch +++ b/0037-clang-format-do-automatic-comment-fixups.patch @@ -1,7 +1,7 @@ -From 913b7e1987c76e61c8fa2eda8e37fbf4cac4855e Mon Sep 17 00:00:00 2001 +From 901042439368aef3513407abcf2f91780fb609a4 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 28 Oct 2021 18:10:14 +0300 -Subject: [PATCH 038/245] clang-format: do automatic comment fixups +Subject: [PATCH 037/249] clang-format: do automatic comment fixups Result of `make indent` after enabling AlignTrailingComments. diff --git a/0039-cr-dump-fail-dumping-when-zombie-process-with-sid-0.patch b/0038-cr-dump-fail-dumping-when-zombie-process-with-sid-0.patch similarity index 87% rename from 0039-cr-dump-fail-dumping-when-zombie-process-with-sid-0.patch rename to 0038-cr-dump-fail-dumping-when-zombie-process-with-sid-0.patch index 9e6aeac..af595c8 100644 --- a/0039-cr-dump-fail-dumping-when-zombie-process-with-sid-0.patch +++ b/0038-cr-dump-fail-dumping-when-zombie-process-with-sid-0.patch @@ -1,7 +1,7 @@ -From c26f1f39b4371605ebf0ae5c5dacbdb2ad142ccd Mon Sep 17 00:00:00 2001 +From 906549c2de213e25ef6795025604a59609033f9d Mon Sep 17 00:00:00 2001 From: Liu Hua Date: Mon, 1 Nov 2021 20:50:58 +0800 -Subject: [PATCH 039/245] cr-dump: fail dumping when zombie process with sid 0 +Subject: [PATCH 038/249] cr-dump: fail dumping when zombie process with sid 0 A zombie process with 0 sid has a session leader in outer pidns and has ignored SIGHUP. Criu has no idea diff --git a/0040-clang-format-make-x86_ins_capability_mask-human-read.patch b/0039-clang-format-make-x86_ins_capability_mask-human-read.patch similarity index 98% rename from 0040-clang-format-make-x86_ins_capability_mask-human-read.patch rename to 0039-clang-format-make-x86_ins_capability_mask-human-read.patch index da73336..ea63b56 100644 --- a/0040-clang-format-make-x86_ins_capability_mask-human-read.patch +++ b/0039-clang-format-make-x86_ins_capability_mask-human-read.patch @@ -1,7 +1,7 @@ -From baed4b2d5783c9670a29292a228b4b491a20f2f2 Mon Sep 17 00:00:00 2001 +From e15962cc0cf487a85c4c30a2df0c4fd6dabe66de Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 29 Oct 2021 10:35:28 +0300 -Subject: [PATCH 040/245] clang-format: make x86_ins_capability_mask +Subject: [PATCH 039/249] clang-format: make x86_ins_capability_mask human-readable There is no option in clang not to merge as much binary operands as it diff --git a/0041-ci-disable-socket-raw-test-on-centos8.patch b/0040-ci-disable-socket-raw-test-on-centos8.patch similarity index 91% rename from 0041-ci-disable-socket-raw-test-on-centos8.patch rename to 0040-ci-disable-socket-raw-test-on-centos8.patch index ec3b008..b014a8f 100644 --- a/0041-ci-disable-socket-raw-test-on-centos8.patch +++ b/0040-ci-disable-socket-raw-test-on-centos8.patch @@ -1,7 +1,7 @@ -From 223d0ca7aa2de6cbde1ffe6b3f453352e2eb7c8c Mon Sep 17 00:00:00 2001 +From feb6788016c7de1998d00f54887f00b04fa47830 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 19 Nov 2021 10:08:37 +0300 -Subject: [PATCH 041/245] ci: disable socket-raw test on centos8 +Subject: [PATCH 040/249] ci: disable socket-raw test on centos8 We see error in centos8 ci on restore of socket-raw test: diff --git a/0042-zdtm.py-make-tests-with-link_remap-exclusive.patch b/0041-zdtm.py-make-tests-with-link_remap-exclusive.patch similarity index 94% rename from 0042-zdtm.py-make-tests-with-link_remap-exclusive.patch rename to 0041-zdtm.py-make-tests-with-link_remap-exclusive.patch index 8c290d5..3439e3c 100644 --- a/0042-zdtm.py-make-tests-with-link_remap-exclusive.patch +++ b/0041-zdtm.py-make-tests-with-link_remap-exclusive.patch @@ -1,7 +1,7 @@ -From 4210c29859bd25ded46a83e586ae956d98c79971 Mon Sep 17 00:00:00 2001 +From e41b2b10e637920665cf590bc170407d414ecf32 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 3 Nov 2021 18:34:11 +0300 -Subject: [PATCH 042/245] zdtm.py: make tests with --link_remap exclusive +Subject: [PATCH 041/249] zdtm.py: make tests with --link_remap exclusive We see that tests mntns_ghost01 and unlink_fstat03 can run simultaneousely and thus the former sees leftover link_remap.* files in diff --git a/0043-tests-improve-the-deterministic-behavior-of-the-test.patch b/0042-tests-improve-the-deterministic-behavior-of-the-test.patch similarity index 96% rename from 0043-tests-improve-the-deterministic-behavior-of-the-test.patch rename to 0042-tests-improve-the-deterministic-behavior-of-the-test.patch index 52a0386..f6c8e9b 100644 --- a/0043-tests-improve-the-deterministic-behavior-of-the-test.patch +++ b/0042-tests-improve-the-deterministic-behavior-of-the-test.patch @@ -1,7 +1,7 @@ -From 6e835673838d54caca7fd039598ef3c4afecfbc6 Mon Sep 17 00:00:00 2001 +From 038d59609716bac5b343dd03e4361ded84d48519 Mon Sep 17 00:00:00 2001 From: Nicolas Viennot Date: Fri, 29 Oct 2021 03:01:14 +0000 -Subject: [PATCH 043/245] tests: improve the deterministic behavior of the test +Subject: [PATCH 042/249] tests: improve the deterministic behavior of the test suite Various I/O objects are unclosed when the object falls out of scope. diff --git a/0044-clang-format-zdtm-fix-clang-complains-about-strange-.patch b/0043-clang-format-zdtm-fix-clang-complains-about-strange-.patch similarity index 95% rename from 0044-clang-format-zdtm-fix-clang-complains-about-strange-.patch rename to 0043-clang-format-zdtm-fix-clang-complains-about-strange-.patch index de7040c..5deabf6 100644 --- a/0044-clang-format-zdtm-fix-clang-complains-about-strange-.patch +++ b/0043-clang-format-zdtm-fix-clang-complains-about-strange-.patch @@ -1,7 +1,7 @@ -From ecbcbce3f0e2fb6af3d33700352eb626edb63783 Mon Sep 17 00:00:00 2001 +From 25c642cb7840033673f36a270074d7a47b0bbd76 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 23 Nov 2021 15:06:03 +0300 -Subject: [PATCH 044/245] clang-format/zdtm: fix clang complains about strange +Subject: [PATCH 043/249] clang-format/zdtm: fix clang complains about strange elseifs Clang-format v13 on my Fedora 35 complains about these hunks, more over diff --git a/0045-seize-restore-cgroup-freezer-to-right-state.patch b/0044-seize-restore-cgroup-freezer-to-right-state.patch similarity index 94% rename from 0045-seize-restore-cgroup-freezer-to-right-state.patch rename to 0044-seize-restore-cgroup-freezer-to-right-state.patch index 7450269..56b5099 100644 --- a/0045-seize-restore-cgroup-freezer-to-right-state.patch +++ b/0044-seize-restore-cgroup-freezer-to-right-state.patch @@ -1,7 +1,7 @@ -From b7b727c7a97083f17ee12a5690c60e44b4abb52c Mon Sep 17 00:00:00 2001 +From f1115a8e679c56269e363a609e1b86bc3052963a Mon Sep 17 00:00:00 2001 From: Liu Hua Date: Fri, 5 Nov 2021 17:08:51 +0800 -Subject: [PATCH 045/245] seize: restore cgroup freezer to right state +Subject: [PATCH 044/249] seize: restore cgroup freezer to right state The new freezer_state is a complete equivalent of old freezer_thawed except for the initial value. If old freezer_thawed was not initialized diff --git a/0046-ci-Use-latest-Fedora-for-lint-ci-runs-again.patch b/0045-ci-Use-latest-Fedora-for-lint-ci-runs-again.patch similarity index 88% rename from 0046-ci-Use-latest-Fedora-for-lint-ci-runs-again.patch rename to 0045-ci-Use-latest-Fedora-for-lint-ci-runs-again.patch index 440de7c..e1799a6 100644 --- a/0046-ci-Use-latest-Fedora-for-lint-ci-runs-again.patch +++ b/0045-ci-Use-latest-Fedora-for-lint-ci-runs-again.patch @@ -1,7 +1,7 @@ -From 985c6c5f10872bade13f7085bd0eaeaef1ea648a Mon Sep 17 00:00:00 2001 +From ba0ead357350d413d84fde5d2a35e445aa1aa964 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 24 Nov 2021 11:37:58 +0300 -Subject: [PATCH 046/245] ci: Use latest Fedora for lint ci runs again +Subject: [PATCH 045/249] ci: Use latest Fedora for lint ci runs again Now when we fixed clang-format complains in zdtm, let's switch to lates clang-format available. This is effectively a revert of commit 07a2f0265 diff --git a/0047-crtools-ignore-SIGPIPE-in-swrk-mode.patch b/0046-crtools-ignore-SIGPIPE-in-swrk-mode.patch similarity index 94% rename from 0047-crtools-ignore-SIGPIPE-in-swrk-mode.patch rename to 0046-crtools-ignore-SIGPIPE-in-swrk-mode.patch index 8d3d112..f67400b 100644 --- a/0047-crtools-ignore-SIGPIPE-in-swrk-mode.patch +++ b/0046-crtools-ignore-SIGPIPE-in-swrk-mode.patch @@ -1,7 +1,7 @@ -From 9c9eb25ff627f6a7ec272269983041b0594c2779 Mon Sep 17 00:00:00 2001 +From 49e0e77e5ca95fbdc0cd419982c0ef07772db04e Mon Sep 17 00:00:00 2001 From: Liu Hua Date: Thu, 4 Nov 2021 10:04:22 +0800 -Subject: [PATCH 047/245] crtools: ignore SIGPIPE in swrk mode +Subject: [PATCH 046/249] crtools: ignore SIGPIPE in swrk mode Criu ignores SIGPIPE in most cases except swrk mode. And in the following situtation criu get killed by SIGPIPE and have no chance diff --git a/0048-ci-switch-to-centos-stream-8.patch b/0047-ci-switch-to-centos-stream-8.patch similarity index 84% rename from 0048-ci-switch-to-centos-stream-8.patch rename to 0047-ci-switch-to-centos-stream-8.patch index 758944d..c900a38 100644 --- a/0048-ci-switch-to-centos-stream-8.patch +++ b/0047-ci-switch-to-centos-stream-8.patch @@ -1,7 +1,7 @@ -From c80d6aab7f205be069e2b46dbd8abc3ca910d336 Mon Sep 17 00:00:00 2001 +From 17e98a26b7d6b71613b8231d53ef33b61292c143 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 24 Nov 2021 16:13:01 +0000 -Subject: [PATCH 048/245] ci: switch to centos-stream-8 +Subject: [PATCH 047/249] ci: switch to centos-stream-8 CentOS 8 goes EOL at the end of 2021. This switches our CentOS 8 based tests to CentOS Stream 8 which should be supported until 2024. diff --git a/0049-check-cleanup-child-processes.patch b/0048-check-cleanup-child-processes.patch similarity index 93% rename from 0049-check-cleanup-child-processes.patch rename to 0048-check-cleanup-child-processes.patch index 100b2d5..9fe5f0d 100644 --- a/0049-check-cleanup-child-processes.patch +++ b/0048-check-cleanup-child-processes.patch @@ -1,7 +1,7 @@ -From 75efde9dfaace269db69465e838aab58124a66b6 Mon Sep 17 00:00:00 2001 +From aa6fb0bacd5cd9599a6e83b9c19cc10c679a03bf Mon Sep 17 00:00:00 2001 From: Nicolas Viennot Date: Fri, 19 Nov 2021 20:58:13 +0000 -Subject: [PATCH 049/245] check: cleanup child processes +Subject: [PATCH 048/249] check: cleanup child processes Always wait() for forked child processes. It avoid zombie processes in containers that don't have an init process reaping orphans. diff --git a/0050-files-reg-fix-error-handling-in-open_path.patch b/0049-files-reg-fix-error-handling-in-open_path.patch similarity index 97% rename from 0050-files-reg-fix-error-handling-in-open_path.patch rename to 0049-files-reg-fix-error-handling-in-open_path.patch index f2e6b81..3f90c21 100644 --- a/0050-files-reg-fix-error-handling-in-open_path.patch +++ b/0049-files-reg-fix-error-handling-in-open_path.patch @@ -1,7 +1,7 @@ -From cfd4d1fb786306658336d98b02d421b2ec925d4c Mon Sep 17 00:00:00 2001 +From bbc3f37710c5cf1cac507337a536c5523123b2a9 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 13 Feb 2020 10:43:14 +0300 -Subject: [PATCH 050/245] files-reg: fix error handling in open_path +Subject: [PATCH 049/249] files-reg: fix error handling in open_path 1) On error paths need to close fd and unlock mutex. 2) Make rfi_remap return special return code to identify EEXIST from diff --git a/0051-files-reg-fix-error-handling-of-rm_parent_dirs.patch b/0050-files-reg-fix-error-handling-of-rm_parent_dirs.patch similarity index 95% rename from 0051-files-reg-fix-error-handling-of-rm_parent_dirs.patch rename to 0050-files-reg-fix-error-handling-of-rm_parent_dirs.patch index 134d0a0..859815a 100644 --- a/0051-files-reg-fix-error-handling-of-rm_parent_dirs.patch +++ b/0050-files-reg-fix-error-handling-of-rm_parent_dirs.patch @@ -1,7 +1,7 @@ -From f9aced49154576d73810a8d12e7847d44e6b63fc Mon Sep 17 00:00:00 2001 +From e655a0ac8421325f2de8fbe4f6855b06cd2faace Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 13 Feb 2020 13:03:12 +0300 -Subject: [PATCH 051/245] files-reg: fix error handling of rm_parent_dirs +Subject: [PATCH 050/249] files-reg: fix error handling of rm_parent_dirs If unlinkat fails it means that fs is in "corrupted" state - spoiled with non-unlinked auxiliary directories. diff --git a/0052-ghost-mount-allocate-remounted_rw-in-shmem-to-get-in.patch b/0051-ghost-mount-allocate-remounted_rw-in-shmem-to-get-in.patch similarity index 97% rename from 0052-ghost-mount-allocate-remounted_rw-in-shmem-to-get-in.patch rename to 0051-ghost-mount-allocate-remounted_rw-in-shmem-to-get-in.patch index d785b20..f9472f8 100644 --- a/0052-ghost-mount-allocate-remounted_rw-in-shmem-to-get-in.patch +++ b/0051-ghost-mount-allocate-remounted_rw-in-shmem-to-get-in.patch @@ -1,7 +1,7 @@ -From 2eac9738a4244c007252d0537a46e9443e957210 Mon Sep 17 00:00:00 2001 +From 67b257d852572d38375453671ae038312ed94cba Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 13 Feb 2020 18:28:15 +0300 -Subject: [PATCH 052/245] ghost/mount: allocate remounted_rw in shmem to get +Subject: [PATCH 051/249] ghost/mount: allocate remounted_rw in shmem to get info from other processes Previousely remounted_rw was not shared between all processes on diff --git a/0053-files-reg-temporary-remount-writable-the-mount-we-do.patch b/0052-files-reg-temporary-remount-writable-the-mount-we-do.patch similarity index 90% rename from 0053-files-reg-temporary-remount-writable-the-mount-we-do.patch rename to 0052-files-reg-temporary-remount-writable-the-mount-we-do.patch index 4f3aad4..a08c17e 100644 --- a/0053-files-reg-temporary-remount-writable-the-mount-we-do.patch +++ b/0052-files-reg-temporary-remount-writable-the-mount-we-do.patch @@ -1,7 +1,7 @@ -From e7f694d31fe3f94398d62c786c87391f1ff59a11 Mon Sep 17 00:00:00 2001 +From 44aa8a5a75529bb4b256bcbdf490da5b730c5c5f Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 13 Feb 2020 18:26:52 +0300 -Subject: [PATCH 053/245] files-reg: temporary remount writable the mount we do +Subject: [PATCH 052/249] files-reg: temporary remount writable the mount we do unlink on Previousely I din't mention this case because we had bad error handling diff --git a/0054-zdtm-add-ro-mount-check-after-c-r-to-mntns_ghost01.patch b/0053-zdtm-add-ro-mount-check-after-c-r-to-mntns_ghost01.patch similarity index 91% rename from 0054-zdtm-add-ro-mount-check-after-c-r-to-mntns_ghost01.patch rename to 0053-zdtm-add-ro-mount-check-after-c-r-to-mntns_ghost01.patch index 52699c5..797e987 100644 --- a/0054-zdtm-add-ro-mount-check-after-c-r-to-mntns_ghost01.patch +++ b/0053-zdtm-add-ro-mount-check-after-c-r-to-mntns_ghost01.patch @@ -1,7 +1,7 @@ -From 5e50667eaef07435f731861e701edb41e7f4b3b3 Mon Sep 17 00:00:00 2001 +From 0fc0b2d996e0cba450155727239df8aaf31c26f1 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 30 Nov 2021 19:03:29 +0300 -Subject: [PATCH 054/245] zdtm: add ro-mount check after c/r to mntns_ghost01 +Subject: [PATCH 053/249] zdtm: add ro-mount check after c/r to mntns_ghost01 This is a test for "ghost/mount: allocate remounted_rw in shmem to get info from other processes" patch, without the patch test fails with: diff --git a/0055-clang-format-disable-wrong-struct-pointer-declaratio.patch b/0054-clang-format-disable-wrong-struct-pointer-declaratio.patch similarity index 95% rename from 0055-clang-format-disable-wrong-struct-pointer-declaratio.patch rename to 0054-clang-format-disable-wrong-struct-pointer-declaratio.patch index 1b22005..4ff12da 100644 --- a/0055-clang-format-disable-wrong-struct-pointer-declaratio.patch +++ b/0054-clang-format-disable-wrong-struct-pointer-declaratio.patch @@ -1,7 +1,7 @@ -From 6f4ddeb5201f7e0f6c330ed56e221c3c51627c19 Mon Sep 17 00:00:00 2001 +From 4e24f113c007f81904d6f46b336ed94634555657 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 25 Nov 2021 16:51:55 +0300 -Subject: [PATCH 055/245] clang-format: disable wrong struct pointer +Subject: [PATCH 054/249] clang-format: disable wrong struct pointer declaration format When we declare struct and at the same time declare variable pointer of diff --git a/0056-ci-Run-cross-compile-on-debian-stable.patch b/0055-ci-Run-cross-compile-on-debian-stable.patch similarity index 98% rename from 0056-ci-Run-cross-compile-on-debian-stable.patch rename to 0055-ci-Run-cross-compile-on-debian-stable.patch index 0b9dae6..ad597d1 100644 --- a/0056-ci-Run-cross-compile-on-debian-stable.patch +++ b/0055-ci-Run-cross-compile-on-debian-stable.patch @@ -1,7 +1,7 @@ -From ac3cebb2f0164a56f6e3941b82570ceb7f18985c Mon Sep 17 00:00:00 2001 +From 3dd5cec57d2835e00e69a69f24fa60303216dbda Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sat, 4 Dec 2021 16:18:26 +0000 -Subject: [PATCH 056/245] ci: Run cross compile on debian stable +Subject: [PATCH 055/249] ci: Run cross compile on debian stable The current debian stable release is Bullseye, not Buster. However, we can use the 'stable' release instead. This would allow the CI to diff --git a/0057-ci-Run-cross-compile-with-debian-testing.patch b/0056-ci-Run-cross-compile-with-debian-testing.patch similarity index 98% rename from 0057-ci-Run-cross-compile-with-debian-testing.patch rename to 0056-ci-Run-cross-compile-with-debian-testing.patch index 1f1bc76..2fd6f74 100644 --- a/0057-ci-Run-cross-compile-with-debian-testing.patch +++ b/0056-ci-Run-cross-compile-with-debian-testing.patch @@ -1,7 +1,7 @@ -From 1f497887c18e123925a759cc4079009c5a0224da Mon Sep 17 00:00:00 2001 +From 28936552df6c83266aa9e8900b5cd92f0aa3a1f7 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sat, 4 Dec 2021 16:31:34 +0000 -Subject: [PATCH 057/245] ci: Run cross compile with debian testing +Subject: [PATCH 056/249] ci: Run cross compile with debian testing Debian testing has newer compiler version and running cross compilation tests would allow us to catch any compilation diff --git a/0058-make-Explicitly-enable-FPU-on-ARMv7-builds.patch b/0057-make-Explicitly-enable-FPU-on-ARMv7-builds.patch similarity index 92% rename from 0058-make-Explicitly-enable-FPU-on-ARMv7-builds.patch rename to 0057-make-Explicitly-enable-FPU-on-ARMv7-builds.patch index 596aff9..9c1f8ac 100644 --- a/0058-make-Explicitly-enable-FPU-on-ARMv7-builds.patch +++ b/0057-make-Explicitly-enable-FPU-on-ARMv7-builds.patch @@ -1,7 +1,7 @@ -From 0e25a6d2bb43abb2cab4716169dfa34a0c005f4c Mon Sep 17 00:00:00 2001 +From 205ba95597c1f538776e4ed6838f7e082178f5fe Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso Date: Sat, 4 Dec 2021 16:59:51 +0000 -Subject: [PATCH 058/245] make: Explicitly enable FPU on ARMv7 builds +Subject: [PATCH 057/249] make: Explicitly enable FPU on ARMv7 builds Starting with gcc-11, Debian's armhf compiler no longer builds with a default -mfpu= option. Instead it enables the FPU via an extension diff --git a/0059-ci-disable-broken-tests-until-fixed.patch b/0058-ci-disable-broken-tests-until-fixed.patch similarity index 95% rename from 0059-ci-disable-broken-tests-until-fixed.patch rename to 0058-ci-disable-broken-tests-until-fixed.patch index 609ee65..3af4a03 100644 --- a/0059-ci-disable-broken-tests-until-fixed.patch +++ b/0058-ci-disable-broken-tests-until-fixed.patch @@ -1,7 +1,7 @@ -From b7c9aa86039a8179e956de31965a3ffd468135da Mon Sep 17 00:00:00 2001 +From d3a8330e09361582888d72a082d5e6fa02f4b9cc Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 3 Dec 2021 16:48:36 +0000 -Subject: [PATCH 059/245] ci: disable broken tests until fixed +Subject: [PATCH 058/249] ci: disable broken tests until fixed Broken tests are being tracked at diff --git a/0060-test-do-not-use-keep-going-for-single-zdtm-tests.patch b/0059-test-do-not-use-keep-going-for-single-zdtm-tests.patch similarity index 97% rename from 0060-test-do-not-use-keep-going-for-single-zdtm-tests.patch rename to 0059-test-do-not-use-keep-going-for-single-zdtm-tests.patch index 51e2ffa..ead2fbf 100644 --- a/0060-test-do-not-use-keep-going-for-single-zdtm-tests.patch +++ b/0059-test-do-not-use-keep-going-for-single-zdtm-tests.patch @@ -1,7 +1,7 @@ -From f64eb15e2380185fcf3c01dc6630acbe6c3053f6 Mon Sep 17 00:00:00 2001 +From 448c0bdf19285cb7a7fad2872e3f5462ffdeb996 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sun, 5 Dec 2021 16:45:20 +0000 -Subject: [PATCH 060/245] test: do not use --keep-going for single zdtm tests +Subject: [PATCH 059/249] test: do not use --keep-going for single zdtm tests Looking at CI logs there are often messages like: diff --git a/0061-files-reg-try-dump_ghost_remap-if-link-remap-failed-.patch b/0060-files-reg-try-dump_ghost_remap-if-link-remap-failed-.patch similarity index 97% rename from 0061-files-reg-try-dump_ghost_remap-if-link-remap-failed-.patch rename to 0060-files-reg-try-dump_ghost_remap-if-link-remap-failed-.patch index 643a16c..9f5b630 100644 --- a/0061-files-reg-try-dump_ghost_remap-if-link-remap-failed-.patch +++ b/0060-files-reg-try-dump_ghost_remap-if-link-remap-failed-.patch @@ -1,7 +1,7 @@ -From 3cf39aafb1dcdbcd3c39411a2c6834858860716c Mon Sep 17 00:00:00 2001 +From 6e5fd46d6a30b488ab7f17f0069c598e1f59cdbb Mon Sep 17 00:00:00 2001 From: ianlang Date: Fri, 3 Dec 2021 15:15:30 +0800 -Subject: [PATCH 061/245] files-reg: try dump_ghost_remap if link-remap failed +Subject: [PATCH 060/249] files-reg: try dump_ghost_remap if link-remap failed with error ENOENT An issue with dumping deleted reg files in overlayfs: diff --git a/0062-util-make-page-server-IPv6-safe.patch b/0061-util-make-page-server-IPv6-safe.patch similarity index 93% rename from 0062-util-make-page-server-IPv6-safe.patch rename to 0061-util-make-page-server-IPv6-safe.patch index c6b92fb..cb06f7a 100644 --- a/0062-util-make-page-server-IPv6-safe.patch +++ b/0061-util-make-page-server-IPv6-safe.patch @@ -1,7 +1,7 @@ -From 047d277ff49bfbe3ff7baaedb9b7e37faadd6341 Mon Sep 17 00:00:00 2001 +From a006788dfab8a971218450923a59209c52f4eb88 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 7 Dec 2021 09:10:14 +0000 -Subject: [PATCH 062/245] util: make page-server IPv6 safe +Subject: [PATCH 061/249] util: make page-server IPv6 safe The function run_tcp_server() was the last place CRIU was still using the IPv4 only function inet_ntoa(). It was only used during a print, so diff --git a/0063-sk-unix-Fix-TCP_ESTABLISHED-checks-in-unix-sockets.patch b/0062-sk-unix-Fix-TCP_ESTABLISHED-checks-in-unix-sockets.patch similarity index 92% rename from 0063-sk-unix-Fix-TCP_ESTABLISHED-checks-in-unix-sockets.patch rename to 0062-sk-unix-Fix-TCP_ESTABLISHED-checks-in-unix-sockets.patch index 6d6e2be..2149781 100644 --- a/0063-sk-unix-Fix-TCP_ESTABLISHED-checks-in-unix-sockets.patch +++ b/0062-sk-unix-Fix-TCP_ESTABLISHED-checks-in-unix-sockets.patch @@ -1,7 +1,7 @@ -From 1470c8037319d2a59eb557ed55175df6abe23eaa Mon Sep 17 00:00:00 2001 +From b6f9c443a78efb50225c2fabd224cea6c71d1c49 Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Thu, 2 Dec 2021 23:01:33 +0700 -Subject: [PATCH 063/245] sk-unix: Fix TCP_ESTABLISHED checks in unix sockets +Subject: [PATCH 062/249] sk-unix: Fix TCP_ESTABLISHED checks in unix sockets Since commit 83301b5367a98 ("af_unix: Set TCP_ESTABLISHED for datagram sockets too") in Linux kernel, SOCK_DGRAM unix sockets can have TCP_ESTABLISHED state diff --git a/0064-ci-Enable-disabled-unix-socket-related-tests.patch b/0063-ci-Enable-disabled-unix-socket-related-tests.patch similarity index 92% rename from 0064-ci-Enable-disabled-unix-socket-related-tests.patch rename to 0063-ci-Enable-disabled-unix-socket-related-tests.patch index 06e9515..e4d66c4 100644 --- a/0064-ci-Enable-disabled-unix-socket-related-tests.patch +++ b/0063-ci-Enable-disabled-unix-socket-related-tests.patch @@ -1,7 +1,7 @@ -From 677a6adba8234c5626fb9595fd32de61ae2b71bc Mon Sep 17 00:00:00 2001 +From c3e4e68b3cab075415f5e500cb884a2e25a434b9 Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Tue, 7 Dec 2021 23:40:12 +0700 -Subject: [PATCH 064/245] ci: Enable disabled unix socket related tests +Subject: [PATCH 063/249] ci: Enable disabled unix socket related tests As the unix socket broken tests have been fixed in the pull request diff --git a/0065-ci-install-procps-in-Alpine.patch b/0064-ci-install-procps-in-Alpine.patch similarity index 85% rename from 0065-ci-install-procps-in-Alpine.patch rename to 0064-ci-install-procps-in-Alpine.patch index 499068e..50cd85a 100644 --- a/0065-ci-install-procps-in-Alpine.patch +++ b/0064-ci-install-procps-in-Alpine.patch @@ -1,7 +1,7 @@ -From 1ec95e91a54670cb30308700bd29085e86668eb0 Mon Sep 17 00:00:00 2001 +From a352d973e7901db8d46322e1cb7fdae5bf920967 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Fri, 10 Dec 2021 15:35:29 +0000 -Subject: [PATCH 065/245] ci: install procps in Alpine +Subject: [PATCH 064/249] ci: install procps in Alpine The version of ps in Alpine image by default is very limited. It is based on the one from busybox and doesn't support options diff --git a/0066-test-another-try-to-correctly-fix-the-kernel-version.patch b/0065-test-another-try-to-correctly-fix-the-kernel-version.patch similarity index 88% rename from 0066-test-another-try-to-correctly-fix-the-kernel-version.patch rename to 0065-test-another-try-to-correctly-fix-the-kernel-version.patch index a24b3a8..3d714df 100644 --- a/0066-test-another-try-to-correctly-fix-the-kernel-version.patch +++ b/0065-test-another-try-to-correctly-fix-the-kernel-version.patch @@ -1,7 +1,7 @@ -From 3b2d70bd75dbd2de8887b00d5e6e4e5a5bbda850 Mon Sep 17 00:00:00 2001 +From 564eaa77e6c780f7dd8195f053a1928447e87b9c Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 3 Dec 2021 16:59:56 +0000 -Subject: [PATCH 066/245] test: another try to correctly fix the kernel version +Subject: [PATCH 065/249] test: another try to correctly fix the kernel version We try to disable time namespace based testing for kernels older than 5.11. But we fail to come up with the correct if condition. diff --git a/0067-x86-compel-fault-inject-bound-xsave-features-set.patch b/0066-x86-compel-fault-inject-bound-xsave-features-set.patch similarity index 95% rename from 0067-x86-compel-fault-inject-bound-xsave-features-set.patch rename to 0066-x86-compel-fault-inject-bound-xsave-features-set.patch index f0f64f4..30af35b 100644 --- a/0067-x86-compel-fault-inject-bound-xsave-features-set.patch +++ b/0066-x86-compel-fault-inject-bound-xsave-features-set.patch @@ -1,7 +1,7 @@ -From 648babc34a25899a0d29f989d1cdcfb2191a872a Mon Sep 17 00:00:00 2001 +From 41bf30f94b72172e807e4b1ebdc6e7df076b3e75 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Mon, 13 Dec 2021 15:19:50 +0300 -Subject: [PATCH 067/245] x86/compel/fault-inject: bound xsave features set +Subject: [PATCH 066/249] x86/compel/fault-inject: bound xsave features set Since e2e8be37 ("x86/compel/fault-inject: Add a fault-injection for corrupting extended regset") diff --git a/0068-x86-compel-fault-inject-print-the-initial-seed.patch b/0067-x86-compel-fault-inject-print-the-initial-seed.patch similarity index 91% rename from 0068-x86-compel-fault-inject-print-the-initial-seed.patch rename to 0067-x86-compel-fault-inject-print-the-initial-seed.patch index 523b21d..87a09e1 100644 --- a/0068-x86-compel-fault-inject-print-the-initial-seed.patch +++ b/0067-x86-compel-fault-inject-print-the-initial-seed.patch @@ -1,7 +1,7 @@ -From 2d5a6e074dd245c44e7bcea37d43f69eddbf4c02 Mon Sep 17 00:00:00 2001 +From eb100eb39cb32d7a559168267a11f5ac9db9c154 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Mon, 13 Dec 2021 15:32:00 +0300 -Subject: [PATCH 068/245] x86/compel/fault-inject: print the initial seed +Subject: [PATCH 067/249] x86/compel/fault-inject: print the initial seed Fixes: e2e8be37 ("x86/compel/fault-inject: Add a fault-injection for corrupting extended regset") diff --git a/0069-ci-enable-x86-xsave-fault-injection-tests-back.patch b/0068-ci-enable-x86-xsave-fault-injection-tests-back.patch similarity index 90% rename from 0069-ci-enable-x86-xsave-fault-injection-tests-back.patch rename to 0068-ci-enable-x86-xsave-fault-injection-tests-back.patch index bf26e5b..fb30d03 100644 --- a/0069-ci-enable-x86-xsave-fault-injection-tests-back.patch +++ b/0068-ci-enable-x86-xsave-fault-injection-tests-back.patch @@ -1,7 +1,7 @@ -From 6b22a374016fa980d088e1d93f6330bdfa689433 Mon Sep 17 00:00:00 2001 +From 52cd18643245eb0dfe4cc9d8b21f89e1c8f30d35 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Mon, 13 Dec 2021 15:46:47 +0300 -Subject: [PATCH 069/245] ci: enable x86 xsave fault injection tests back +Subject: [PATCH 068/249] ci: enable x86 xsave fault injection tests back Signed-off-by: Alexander Mikhalitsyn --- diff --git a/0070-Add-documentation-for-timeout-option.patch b/0069-Add-documentation-for-timeout-option.patch similarity index 93% rename from 0070-Add-documentation-for-timeout-option.patch rename to 0069-Add-documentation-for-timeout-option.patch index a5b491f..bd3bab8 100644 --- a/0070-Add-documentation-for-timeout-option.patch +++ b/0069-Add-documentation-for-timeout-option.patch @@ -1,7 +1,7 @@ -From 11c6077ebb5e57569844818f104514fa1ba60af1 Mon Sep 17 00:00:00 2001 +From ce3e913a89f979e7d3787dff58351b7ba915bc01 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Tue, 14 Dec 2021 12:54:19 +0000 -Subject: [PATCH 070/245] Add documentation for --timeout option +Subject: [PATCH 069/249] Add documentation for --timeout option The --timeout option was introduced in [1] to prevent criu dump from being able to hang indefinitely and allow users to adjust the time limit diff --git a/0071-usernsd-UNS_FDOUT-should-not-require-an-input-descri.patch b/0070-usernsd-UNS_FDOUT-should-not-require-an-input-descri.patch similarity index 86% rename from 0071-usernsd-UNS_FDOUT-should-not-require-an-input-descri.patch rename to 0070-usernsd-UNS_FDOUT-should-not-require-an-input-descri.patch index 44e3606..1259547 100644 --- a/0071-usernsd-UNS_FDOUT-should-not-require-an-input-descri.patch +++ b/0070-usernsd-UNS_FDOUT-should-not-require-an-input-descri.patch @@ -1,7 +1,7 @@ -From 0c452fee7e3abb8e117bd390610f39b95069dc1b Mon Sep 17 00:00:00 2001 +From d83fe7440c3bce204018bf9167f67bac48118c2a Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Tue, 14 Dec 2021 08:19:16 -0800 -Subject: [PATCH 071/245] usernsd: UNS_FDOUT should not require an input +Subject: [PATCH 070/249] usernsd: UNS_FDOUT should not require an input descriptor UNS_FDOUT means only that a userns call will return a file descriptor. diff --git a/0072-libcriu-add-setting-lsm-mount-context-to-libcriu.patch b/0071-libcriu-add-setting-lsm-mount-context-to-libcriu.patch similarity index 94% rename from 0072-libcriu-add-setting-lsm-mount-context-to-libcriu.patch rename to 0071-libcriu-add-setting-lsm-mount-context-to-libcriu.patch index 1e39440..e52b8f1 100644 --- a/0072-libcriu-add-setting-lsm-mount-context-to-libcriu.patch +++ b/0071-libcriu-add-setting-lsm-mount-context-to-libcriu.patch @@ -1,7 +1,7 @@ -From b38e38b2872fcf3d00d3861d0f04a55b28c01ac4 Mon Sep 17 00:00:00 2001 +From bee106f22237800350009d4875be5361c02108c0 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 1 Dec 2021 11:08:53 +0000 -Subject: [PATCH 072/245] libcriu: add setting lsm-mount-context to libcriu +Subject: [PATCH 071/249] libcriu: add setting lsm-mount-context to libcriu Signed-off-by: Adrian Reber --- diff --git a/0073-ci-use-unstable-release-for-cross-compile.patch b/0072-ci-use-unstable-release-for-cross-compile.patch similarity index 98% rename from 0073-ci-use-unstable-release-for-cross-compile.patch rename to 0072-ci-use-unstable-release-for-cross-compile.patch index 7404f2a..16b9aa3 100644 --- a/0073-ci-use-unstable-release-for-cross-compile.patch +++ b/0072-ci-use-unstable-release-for-cross-compile.patch @@ -1,7 +1,7 @@ -From 031db58a9e9439c49d93f8424b361f3618fb688d Mon Sep 17 00:00:00 2001 +From 564f6313cb85a64460a30123b07197dd98224c32 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sat, 18 Dec 2021 17:25:17 +0000 -Subject: [PATCH 073/245] ci: use unstable release for cross-compile +Subject: [PATCH 072/249] ci: use unstable release for cross-compile We added cross-compile tests with testing debian release to be able to replicate the error reported in #1653, however, installing build diff --git a/0074-ci-disable-glibc-rseq-support.patch b/0073-ci-disable-glibc-rseq-support.patch similarity index 94% rename from 0074-ci-disable-glibc-rseq-support.patch rename to 0073-ci-disable-glibc-rseq-support.patch index 61e1e77..2a1bfd7 100644 --- a/0074-ci-disable-glibc-rseq-support.patch +++ b/0073-ci-disable-glibc-rseq-support.patch @@ -1,7 +1,7 @@ -From 595b1caf66a8fb61488c98fad4952fbfb3c12aba Mon Sep 17 00:00:00 2001 +From 95e6bc3e53bec3c4f00b7e4ddfab5cf904780dbc Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Fri, 17 Dec 2021 03:01:49 +0000 -Subject: [PATCH 074/245] ci: disable glibc rseq support +Subject: [PATCH 073/249] ci: disable glibc rseq support This patch sets the glibc.pthread.rseq tunable [1] to disable rseq support in glibc as a temporary solution for the problem described in diff --git a/0075-libcriu-add-single-pre-dump-support.patch b/0074-libcriu-add-single-pre-dump-support.patch similarity index 97% rename from 0075-libcriu-add-single-pre-dump-support.patch rename to 0074-libcriu-add-single-pre-dump-support.patch index 3863297..951fe22 100644 --- a/0075-libcriu-add-single-pre-dump-support.patch +++ b/0074-libcriu-add-single-pre-dump-support.patch @@ -1,7 +1,7 @@ -From 9edcc3be3052028de05221edfd18d4b9fb245761 Mon Sep 17 00:00:00 2001 +From 7728a658b207bfa2b4910de7d9781bca993be8dd Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 3 Dec 2021 14:32:33 +0000 -Subject: [PATCH 075/245] libcriu: add single pre-dump support +Subject: [PATCH 074/249] libcriu: add single pre-dump support In contrast to the CLI it is not possible to do a single pre-dump via RPC and thus libcriu. In cr-service.c pre-dump always goes into a diff --git a/0076-tests-added-test-for-single-pre-dump-support.patch b/0075-tests-added-test-for-single-pre-dump-support.patch similarity index 97% rename from 0076-tests-added-test-for-single-pre-dump-support.patch rename to 0075-tests-added-test-for-single-pre-dump-support.patch index 9dc08d2..6a6d2e1 100644 --- a/0076-tests-added-test-for-single-pre-dump-support.patch +++ b/0075-tests-added-test-for-single-pre-dump-support.patch @@ -1,7 +1,7 @@ -From 0f5b3f1a3e005e50a294bd0601a6e3c99539a1cf Mon Sep 17 00:00:00 2001 +From e9452713606cfdbc9e41c28cde674dcaeaded23a Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 14 Dec 2021 13:09:19 +0000 -Subject: [PATCH 076/245] tests: added test for single pre-dump support +Subject: [PATCH 075/249] tests: added test for single pre-dump support Signed-off-by: Adrian Reber --- diff --git a/0077-zdtm.py-clean-up-MAKEFLAGS-env-variable-before-runni.patch b/0076-zdtm.py-clean-up-MAKEFLAGS-env-variable-before-runni.patch similarity index 93% rename from 0077-zdtm.py-clean-up-MAKEFLAGS-env-variable-before-runni.patch rename to 0076-zdtm.py-clean-up-MAKEFLAGS-env-variable-before-runni.patch index e7dbbe1..3e41efa 100644 --- a/0077-zdtm.py-clean-up-MAKEFLAGS-env-variable-before-runni.patch +++ b/0076-zdtm.py-clean-up-MAKEFLAGS-env-variable-before-runni.patch @@ -1,7 +1,7 @@ -From bfd24ce3b3f0c1e86001b55492a487db2f75b72d Mon Sep 17 00:00:00 2001 +From f495ba8e621ca3e4875c81f7b4dca0f3e9b79912 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Sat, 18 Dec 2021 10:40:11 +0300 -Subject: [PATCH 077/245] zdtm.py: clean up MAKEFLAGS env variable before +Subject: [PATCH 076/249] zdtm.py: clean up MAKEFLAGS env variable before running make instance In most cases we run tests as: diff --git a/0078-zdtm-zdtm_ct-fix-compilation-error-with-strict-proto.patch b/0077-zdtm-zdtm_ct-fix-compilation-error-with-strict-proto.patch similarity index 86% rename from 0078-zdtm-zdtm_ct-fix-compilation-error-with-strict-proto.patch rename to 0077-zdtm-zdtm_ct-fix-compilation-error-with-strict-proto.patch index 6ca59d9..dc74fb7 100644 --- a/0078-zdtm-zdtm_ct-fix-compilation-error-with-strict-proto.patch +++ b/0077-zdtm-zdtm_ct-fix-compilation-error-with-strict-proto.patch @@ -1,7 +1,7 @@ -From cf3e1067f3639426defccf7b322da1eb7a05ca21 Mon Sep 17 00:00:00 2001 +From d1c2c801af398dbf95fc693cf3baa3f24a8741ec Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Sat, 18 Dec 2021 11:03:53 +0300 -Subject: [PATCH 078/245] zdtm: zdtm_ct fix compilation error with +Subject: [PATCH 077/249] zdtm: zdtm_ct fix compilation error with strict-prototypes on MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/0079-zdtm-remove-mntns-deleted-dst-test-leftover-from-git.patch b/0078-zdtm-remove-mntns-deleted-dst-test-leftover-from-git.patch similarity index 82% rename from 0079-zdtm-remove-mntns-deleted-dst-test-leftover-from-git.patch rename to 0078-zdtm-remove-mntns-deleted-dst-test-leftover-from-git.patch index 1182267..358d5fd 100644 --- a/0079-zdtm-remove-mntns-deleted-dst-test-leftover-from-git.patch +++ b/0078-zdtm-remove-mntns-deleted-dst-test-leftover-from-git.patch @@ -1,7 +1,7 @@ -From 077c823160b35e94fd6e68d993c4abefecbb2083 Mon Sep 17 00:00:00 2001 +From cbc53fdb2d10f56c74abeff6b1ecb8374b38b84b Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 17 Dec 2021 15:33:55 +0300 -Subject: [PATCH 079/245] zdtm: remove mntns-deleted-dst test leftover from git +Subject: [PATCH 078/249] zdtm: remove mntns-deleted-dst test leftover from git Looks like in commit [1] we've non-intentionally added this tmp file to git, let's remove it. diff --git a/0080-crtools-remove-excess-always-true-condition.patch b/0079-crtools-remove-excess-always-true-condition.patch similarity index 85% rename from 0080-crtools-remove-excess-always-true-condition.patch rename to 0079-crtools-remove-excess-always-true-condition.patch index 6adf370..ef4692f 100644 --- a/0080-crtools-remove-excess-always-true-condition.patch +++ b/0079-crtools-remove-excess-always-true-condition.patch @@ -1,7 +1,7 @@ -From 3f3cad68232130c52c528b6eb977fdd379fcded6 Mon Sep 17 00:00:00 2001 +From cf7485318cdcdb47e912ca7d53ab8965d5518b63 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 10 Dec 2021 15:34:19 +0300 -Subject: [PATCH 080/245] crtools: remove excess always true condition +Subject: [PATCH 079/249] crtools: remove excess always true condition Several lines above if (optind >= argc) we go to usage label and fail, thus we don't need to check (optind < argc) here as it is always true. diff --git a/0081-crtools-rpc-export-current-criu-mode-to-opts.mode.patch b/0080-crtools-rpc-export-current-criu-mode-to-opts.mode.patch similarity index 98% rename from 0081-crtools-rpc-export-current-criu-mode-to-opts.mode.patch rename to 0080-crtools-rpc-export-current-criu-mode-to-opts.mode.patch index 04b7d71..7c27a7d 100644 --- a/0081-crtools-rpc-export-current-criu-mode-to-opts.mode.patch +++ b/0080-crtools-rpc-export-current-criu-mode-to-opts.mode.patch @@ -1,7 +1,7 @@ -From fe0929766ede95a4f5cc07ec28c288f2d2699448 Mon Sep 17 00:00:00 2001 +From 3adaf3c4434995ce81530a336469ec792c62cc1b Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 10 Dec 2021 12:13:06 +0300 -Subject: [PATCH 081/245] crtools/rpc: export current criu mode to opts.mode +Subject: [PATCH 080/249] crtools/rpc: export current criu mode to opts.mode We have multiple options which are valid only on restore or only on dump or in any other specific criu mode, so it would be useful to have info diff --git a/0082-crtools-use-new-opts.mode-in-image_dir_mode.patch b/0081-crtools-use-new-opts.mode-in-image_dir_mode.patch similarity index 90% rename from 0082-crtools-use-new-opts.mode-in-image_dir_mode.patch rename to 0081-crtools-use-new-opts.mode-in-image_dir_mode.patch index 116deaf..d58ae92 100644 --- a/0082-crtools-use-new-opts.mode-in-image_dir_mode.patch +++ b/0081-crtools-use-new-opts.mode-in-image_dir_mode.patch @@ -1,7 +1,7 @@ -From bec81335ad40077e8194c3bf7b9c9fa31098046f Mon Sep 17 00:00:00 2001 +From 02e3280066d2d44a520d1ef4dd7128e80182c66b Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 15 Dec 2021 10:49:42 +0300 -Subject: [PATCH 082/245] crtools: use new opts.mode in image_dir_mode +Subject: [PATCH 081/249] crtools: use new opts.mode in image_dir_mode Also while on it there is no "cpuinfo restore", let's remove it. diff --git a/0083-crtools-check-that-cpuinfo-command-has-sub-command.patch b/0082-crtools-check-that-cpuinfo-command-has-sub-command.patch similarity index 86% rename from 0083-crtools-check-that-cpuinfo-command-has-sub-command.patch rename to 0082-crtools-check-that-cpuinfo-command-has-sub-command.patch index 8539a1a..6dba131 100644 --- a/0083-crtools-check-that-cpuinfo-command-has-sub-command.patch +++ b/0082-crtools-check-that-cpuinfo-command-has-sub-command.patch @@ -1,7 +1,7 @@ -From ab85c0944536729aa49b27ca80d14fe9eb5ce66e Mon Sep 17 00:00:00 2001 +From 37b42d0edbba16460c6190f7e7dd42f6fef7e299 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 16 Dec 2021 18:05:01 +0300 -Subject: [PATCH 083/245] crtools: check that cpuinfo command has sub-command +Subject: [PATCH 082/249] crtools: check that cpuinfo command has sub-command This fixes segfault on empty sub-command for cpuinfo. diff --git a/0084-sk-unix-Add-support-for-SOCK_SEQPACKET-unix-sockets.patch b/0083-sk-unix-Add-support-for-SOCK_SEQPACKET-unix-sockets.patch similarity index 93% rename from 0084-sk-unix-Add-support-for-SOCK_SEQPACKET-unix-sockets.patch rename to 0083-sk-unix-Add-support-for-SOCK_SEQPACKET-unix-sockets.patch index 8ffb163..d30b49b 100644 --- a/0084-sk-unix-Add-support-for-SOCK_SEQPACKET-unix-sockets.patch +++ b/0083-sk-unix-Add-support-for-SOCK_SEQPACKET-unix-sockets.patch @@ -1,7 +1,7 @@ -From 96bc16b15d06d6176fc8bc95cd4db815cd9ad536 Mon Sep 17 00:00:00 2001 +From 858aac29618d89b898af87d9e05169361453beba Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Tue, 14 Dec 2021 22:28:27 +0700 -Subject: [PATCH 084/245] sk-unix: Add support for SOCK_SEQPACKET unix sockets +Subject: [PATCH 083/249] sk-unix: Add support for SOCK_SEQPACKET unix sockets Adjust some SOCK_STREAM cases to handle SOCK_SEQPACKET too. diff --git a/0085-zdtm-Add-SOCK_SEQPACKET-variants-to-unix-socket-test.patch b/0084-zdtm-Add-SOCK_SEQPACKET-variants-to-unix-socket-test.patch similarity index 99% rename from 0085-zdtm-Add-SOCK_SEQPACKET-variants-to-unix-socket-test.patch rename to 0084-zdtm-Add-SOCK_SEQPACKET-variants-to-unix-socket-test.patch index 7434e75..6e40de0 100644 --- a/0085-zdtm-Add-SOCK_SEQPACKET-variants-to-unix-socket-test.patch +++ b/0084-zdtm-Add-SOCK_SEQPACKET-variants-to-unix-socket-test.patch @@ -1,7 +1,7 @@ -From 315619c91047dce2fc11e4dbb074d31fcd409327 Mon Sep 17 00:00:00 2001 +From 2d459717d161abb3330133a8f00ac7b4b9672c42 Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Thu, 16 Dec 2021 09:35:25 +0700 -Subject: [PATCH 085/245] zdtm: Add SOCK_SEQPACKET variants to unix socket +Subject: [PATCH 084/249] zdtm: Add SOCK_SEQPACKET variants to unix socket tests This commit simply makes copies of SOCK_STREAM unix socket tests and uses diff --git a/0086-tls-fix-typo.patch b/0085-tls-fix-typo.patch similarity index 85% rename from 0086-tls-fix-typo.patch rename to 0085-tls-fix-typo.patch index f53aed2..0824a2d 100644 --- a/0086-tls-fix-typo.patch +++ b/0085-tls-fix-typo.patch @@ -1,7 +1,7 @@ -From 64178a1c7fa4ce1107074520392b98906672317f Mon Sep 17 00:00:00 2001 +From 8bbfee99809952bf6eadd5e0142fe8b2e97cf6f6 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Tue, 7 Dec 2021 21:29:44 +0000 -Subject: [PATCH 086/245] tls: fix typo +Subject: [PATCH 085/249] tls: fix typo Signed-off-by: Radostin Stoyanov --- diff --git a/0087-tls-use-ssize_t-for-return-value.patch b/0086-tls-use-ssize_t-for-return-value.patch similarity index 93% rename from 0087-tls-use-ssize_t-for-return-value.patch rename to 0086-tls-use-ssize_t-for-return-value.patch index f1fad8f..7dc904f 100644 --- a/0087-tls-use-ssize_t-for-return-value.patch +++ b/0086-tls-use-ssize_t-for-return-value.patch @@ -1,7 +1,7 @@ -From 71221e60aa8465e6794d749ef8d5dd404416a17d Mon Sep 17 00:00:00 2001 +From 311328d1c2a5715bd091ec6cad7cb0d32af99b26 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Tue, 7 Dec 2021 22:32:54 +0000 -Subject: [PATCH 087/245] tls: use ssize_t for return value +Subject: [PATCH 086/249] tls: use ssize_t for return value Signed-off-by: Radostin Stoyanov --- diff --git a/0088-tls-add-more-comments.patch b/0087-tls-add-more-comments.patch similarity index 96% rename from 0088-tls-add-more-comments.patch rename to 0087-tls-add-more-comments.patch index 3a3a007..2053693 100644 --- a/0088-tls-add-more-comments.patch +++ b/0087-tls-add-more-comments.patch @@ -1,7 +1,7 @@ -From 7451db84fbabc4efa4eec9eb1f0302af11c5ccd1 Mon Sep 17 00:00:00 2001 +From 5e48487aaf227c1e3be2b742956579c177e8b5bd Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Thu, 16 Dec 2021 14:26:53 +0000 -Subject: [PATCH 088/245] tls: add more comments +Subject: [PATCH 087/249] tls: add more comments Signed-off-by: Radostin Stoyanov --- diff --git a/0089-uffd-call-disconnect_from_page_server-to-shutdown-a-.patch b/0088-uffd-call-disconnect_from_page_server-to-shutdown-a-.patch similarity index 84% rename from 0089-uffd-call-disconnect_from_page_server-to-shutdown-a-.patch rename to 0088-uffd-call-disconnect_from_page_server-to-shutdown-a-.patch index 217cc3c..53aad96 100644 --- a/0089-uffd-call-disconnect_from_page_server-to-shutdown-a-.patch +++ b/0088-uffd-call-disconnect_from_page_server-to-shutdown-a-.patch @@ -1,7 +1,7 @@ -From 58b97c0ae5bbeeac50dc83fb79a7b55bf2b8e683 Mon Sep 17 00:00:00 2001 +From 00f2efee03869d2494ed10333372eb401ab27546 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Tue, 21 Dec 2021 21:59:13 -0800 -Subject: [PATCH 089/245] uffd: call disconnect_from_page_server to shutdown a +Subject: [PATCH 088/249] uffd: call disconnect_from_page_server to shutdown a page-server connection We need to be sure that page-server doesn't wait for a new command when we diff --git a/0090-tls-allow-to-terminate-connections-synchronously.patch b/0089-tls-allow-to-terminate-connections-synchronously.patch similarity index 95% rename from 0090-tls-allow-to-terminate-connections-synchronously.patch rename to 0089-tls-allow-to-terminate-connections-synchronously.patch index d124bde..da4caec 100644 --- a/0090-tls-allow-to-terminate-connections-synchronously.patch +++ b/0089-tls-allow-to-terminate-connections-synchronously.patch @@ -1,7 +1,7 @@ -From 6e2b052636e3f57b22302db21bd5c6d8eba9ba8b Mon Sep 17 00:00:00 2001 +From 89c24a1324e6d77f064465bbd2b45d717b07d252 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Wed, 22 Dec 2021 09:36:09 -0800 -Subject: [PATCH 090/245] tls: allow to terminate connections synchronously +Subject: [PATCH 089/249] tls: allow to terminate connections synchronously GNUTLS_SHUT_RDWR sends an alert containing a close request and waits for the peer to reply with the same message. diff --git a/0091-page-xfer-stop-waiting-for-a-new-command-after-a-clo.patch b/0090-page-xfer-stop-waiting-for-a-new-command-after-a-clo.patch similarity index 92% rename from 0091-page-xfer-stop-waiting-for-a-new-command-after-a-clo.patch rename to 0090-page-xfer-stop-waiting-for-a-new-command-after-a-clo.patch index f46b223..3909e69 100644 --- a/0091-page-xfer-stop-waiting-for-a-new-command-after-a-clo.patch +++ b/0090-page-xfer-stop-waiting-for-a-new-command-after-a-clo.patch @@ -1,7 +1,7 @@ -From 80aff4e7b4c7331bd7724939389539c2eb6e8e85 Mon Sep 17 00:00:00 2001 +From 02d8540a973ca5a045eac67c95cd3667ccb12579 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Wed, 22 Dec 2021 09:59:11 -0800 -Subject: [PATCH 091/245] page-xfer: stop waiting for a new command after a +Subject: [PATCH 090/249] page-xfer: stop waiting for a new command after a close command There is no reason to do that and in case of tls, __recv returns EAGAIN diff --git a/0092-ci-reenable-the-lazy-thp-test-in-the-lazy-remote-mod.patch b/0091-ci-reenable-the-lazy-thp-test-in-the-lazy-remote-mod.patch similarity index 88% rename from 0092-ci-reenable-the-lazy-thp-test-in-the-lazy-remote-mod.patch rename to 0091-ci-reenable-the-lazy-thp-test-in-the-lazy-remote-mod.patch index 9aa082e..718e3d1 100644 --- a/0092-ci-reenable-the-lazy-thp-test-in-the-lazy-remote-mod.patch +++ b/0091-ci-reenable-the-lazy-thp-test-in-the-lazy-remote-mod.patch @@ -1,7 +1,7 @@ -From 0c7a9e1c464ac6b1c497b27fc5989ece8e286771 Mon Sep 17 00:00:00 2001 +From 5132edbd018755985e664b8a4ee230265ac8c1eb Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Wed, 22 Dec 2021 17:03:04 -0800 -Subject: [PATCH 092/245] ci: reenable the lazy-thp test in the lazy-remote +Subject: [PATCH 091/249] ci: reenable the lazy-thp test in the lazy-remote mode Signed-off-by: Andrei Vagin diff --git a/0093-test-log-testname.out.inprogress-if-a-test-has-faile.patch b/0092-test-log-testname.out.inprogress-if-a-test-has-faile.patch similarity index 89% rename from 0093-test-log-testname.out.inprogress-if-a-test-has-faile.patch rename to 0092-test-log-testname.out.inprogress-if-a-test-has-faile.patch index acd9867..10ab76c 100644 --- a/0093-test-log-testname.out.inprogress-if-a-test-has-faile.patch +++ b/0092-test-log-testname.out.inprogress-if-a-test-has-faile.patch @@ -1,7 +1,7 @@ -From 5f907445551685bd30af7567c08662f7100a0d70 Mon Sep 17 00:00:00 2001 +From e826db402697888e3cf4910fc9de6138c7e1dcf0 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Wed, 22 Dec 2021 17:06:21 -0800 -Subject: [PATCH 093/245] test: log testname.out.inprogress if a test has +Subject: [PATCH 092/249] test: log testname.out.inprogress if a test has failed This is required if the test failed by timeout. diff --git a/0094-zdtm-print-tails-of-all-logs-if-a-test-has-failed.patch b/0093-zdtm-print-tails-of-all-logs-if-a-test-has-failed.patch similarity index 92% rename from 0094-zdtm-print-tails-of-all-logs-if-a-test-has-failed.patch rename to 0093-zdtm-print-tails-of-all-logs-if-a-test-has-failed.patch index 3967d1a..c000115 100644 --- a/0094-zdtm-print-tails-of-all-logs-if-a-test-has-failed.patch +++ b/0093-zdtm-print-tails-of-all-logs-if-a-test-has-failed.patch @@ -1,7 +1,7 @@ -From cb604bacff3e469d53fd39e63d13e98cd460b9cb Mon Sep 17 00:00:00 2001 +From e7296cd2c631aec1b34b1411bd01b38b4a251b2b Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Wed, 22 Dec 2021 17:08:16 -0800 -Subject: [PATCH 094/245] zdtm: print tails of all logs if a test has failed +Subject: [PATCH 093/249] zdtm: print tails of all logs if a test has failed Signed-off-by: Andrei Vagin --- diff --git a/0095-zdtm-static-uffd-events-add-more-log-messages.patch b/0094-zdtm-static-uffd-events-add-more-log-messages.patch similarity index 90% rename from 0095-zdtm-static-uffd-events-add-more-log-messages.patch rename to 0094-zdtm-static-uffd-events-add-more-log-messages.patch index 8e80c73..7aed029 100644 --- a/0095-zdtm-static-uffd-events-add-more-log-messages.patch +++ b/0094-zdtm-static-uffd-events-add-more-log-messages.patch @@ -1,7 +1,7 @@ -From c36dbb082e60a4a267502cf73661eec78eb8d034 Mon Sep 17 00:00:00 2001 +From 32375bb1e4dd58c630f0e15e83c6056fffab7176 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Wed, 22 Dec 2021 17:08:42 -0800 -Subject: [PATCH 095/245] zdtm/static/uffd-events: add more log messages +Subject: [PATCH 094/249] zdtm/static/uffd-events: add more log messages Signed-off-by: Andrei Vagin --- diff --git a/0096-mount-split-check_mountpoint_fd-from-__open_mountpoi.patch b/0095-mount-split-check_mountpoint_fd-from-__open_mountpoi.patch similarity index 96% rename from 0096-mount-split-check_mountpoint_fd-from-__open_mountpoi.patch rename to 0095-mount-split-check_mountpoint_fd-from-__open_mountpoi.patch index 4413302..25c035b 100644 --- a/0096-mount-split-check_mountpoint_fd-from-__open_mountpoi.patch +++ b/0095-mount-split-check_mountpoint_fd-from-__open_mountpoi.patch @@ -1,7 +1,7 @@ -From 3e716ab20a6de56bce5ac7d66d67e7c3507facae Mon Sep 17 00:00:00 2001 +From 609533a1d54d27fe96e4adad569716e70c38efa2 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 17 Dec 2021 14:58:47 +0300 -Subject: [PATCH 096/245] mount: split check_mountpoint_fd from +Subject: [PATCH 095/249] mount: split check_mountpoint_fd from __open_mountpoint Now we can reuse "check" part separately in other places. diff --git a/0097-mount-remove-mnt_fd-argument-of-__open_mountpoint.patch b/0096-mount-remove-mnt_fd-argument-of-__open_mountpoint.patch similarity index 96% rename from 0097-mount-remove-mnt_fd-argument-of-__open_mountpoint.patch rename to 0096-mount-remove-mnt_fd-argument-of-__open_mountpoint.patch index 11974c4..c2b19f6 100644 --- a/0097-mount-remove-mnt_fd-argument-of-__open_mountpoint.patch +++ b/0096-mount-remove-mnt_fd-argument-of-__open_mountpoint.patch @@ -1,7 +1,7 @@ -From e1d20922e907d173d7f3308c00440d93e21bb568 Mon Sep 17 00:00:00 2001 +From 518f18aa83523d218073d100c4aa0f482ec60b53 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 17 Dec 2021 15:13:35 +0300 -Subject: [PATCH 097/245] mount: remove mnt_fd argument of __open_mountpoint +Subject: [PATCH 096/249] mount: remove mnt_fd argument of __open_mountpoint Only place where we used __open_mountpoint with non -1 mnt_fd is open_mountpoint. Let's use check_mountpoint_fd for this case, so that we diff --git a/0098-proc_parse-add-helper-to-resolve-sdev-from-fd.patch b/0097-proc_parse-add-helper-to-resolve-sdev-from-fd.patch similarity index 95% rename from 0098-proc_parse-add-helper-to-resolve-sdev-from-fd.patch rename to 0097-proc_parse-add-helper-to-resolve-sdev-from-fd.patch index 9ad0640..099f6bc 100644 --- a/0098-proc_parse-add-helper-to-resolve-sdev-from-fd.patch +++ b/0097-proc_parse-add-helper-to-resolve-sdev-from-fd.patch @@ -1,7 +1,7 @@ -From 7b3b76f8d1650e3f208bfd85583755376b30b93a Mon Sep 17 00:00:00 2001 +From c573260ced3929d3c84d51e7073f3636d44ba69f Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 16 Dec 2021 16:14:41 +0300 -Subject: [PATCH 098/245] proc_parse: add helper to resolve sdev from fd +Subject: [PATCH 097/249] proc_parse: add helper to resolve sdev from fd New get_sdev_from_fd helper first gets mnt_id from fd using fdinfo and then converts mnt_id to sdev using mountinfo. diff --git a/0099-mount-btrfs-make-check_mountpoint_fd-fallback-to-get.patch b/0098-mount-btrfs-make-check_mountpoint_fd-fallback-to-get.patch similarity index 97% rename from 0099-mount-btrfs-make-check_mountpoint_fd-fallback-to-get.patch rename to 0098-mount-btrfs-make-check_mountpoint_fd-fallback-to-get.patch index 011264b..1bc79e3 100644 --- a/0099-mount-btrfs-make-check_mountpoint_fd-fallback-to-get.patch +++ b/0098-mount-btrfs-make-check_mountpoint_fd-fallback-to-get.patch @@ -1,7 +1,7 @@ -From ce0be851f296738bb10043477a52250502394182 Mon Sep 17 00:00:00 2001 +From 84b0b31a06a51f5620f53395c8496108879010af Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 16 Dec 2021 12:57:23 +0300 -Subject: [PATCH 099/245] mount/btrfs: make check_mountpoint_fd fallback to +Subject: [PATCH 098/249] mount/btrfs: make check_mountpoint_fd fallback to get_sdev_from_fd We face that btrfs returns anonymous device in stat instead of real diff --git a/0100-ci-test-criu-image-streamer-with-all-tests.patch b/0099-ci-test-criu-image-streamer-with-all-tests.patch similarity index 88% rename from 0100-ci-test-criu-image-streamer-with-all-tests.patch rename to 0099-ci-test-criu-image-streamer-with-all-tests.patch index 98d26c3..b46fa0e 100644 --- a/0100-ci-test-criu-image-streamer-with-all-tests.patch +++ b/0099-ci-test-criu-image-streamer-with-all-tests.patch @@ -1,7 +1,7 @@ -From b003ce7cb55f656c3c29fee5cb3021213463910f Mon Sep 17 00:00:00 2001 +From b635de93ce372b8e3bea213ecd743e26251d7a9a Mon Sep 17 00:00:00 2001 From: Nicolas Viennot Date: Tue, 28 Dec 2021 19:30:09 +0000 -Subject: [PATCH 100/245] ci: test criu-image-streamer with all tests +Subject: [PATCH 099/249] ci: test criu-image-streamer with all tests All the bugs that were in the way got fixed. We can enable all tests. diff --git a/0101-readme-add-docker-test-badge.patch b/0100-readme-add-docker-test-badge.patch similarity index 89% rename from 0101-readme-add-docker-test-badge.patch rename to 0100-readme-add-docker-test-badge.patch index 06d81f5..437cbd6 100644 --- a/0101-readme-add-docker-test-badge.patch +++ b/0100-readme-add-docker-test-badge.patch @@ -1,7 +1,7 @@ -From 616e9d9f937d7adf49573f2e15b9edd6aed9ba46 Mon Sep 17 00:00:00 2001 +From dc89784e542bdbc034eb7503e25dd4d695b3242c Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Mon, 10 Jan 2022 10:37:19 +0000 -Subject: [PATCH 101/245] readme: add docker test badge +Subject: [PATCH 100/249] readme: add docker test badge Signed-off-by: Radostin Stoyanov --- diff --git a/0102-contributing-remove-old-badges-and-logo.patch b/0101-contributing-remove-old-badges-and-logo.patch similarity index 90% rename from 0102-contributing-remove-old-badges-and-logo.patch rename to 0101-contributing-remove-old-badges-and-logo.patch index 847b08c..8908915 100644 --- a/0102-contributing-remove-old-badges-and-logo.patch +++ b/0101-contributing-remove-old-badges-and-logo.patch @@ -1,7 +1,7 @@ -From d6d3e35c7ca3d1cc838b95d36dc224edd2d23942 Mon Sep 17 00:00:00 2001 +From 69f24c0a35c7980fdbedfcc1fe903ca0fe2e86c5 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Mon, 10 Jan 2022 10:37:52 +0000 -Subject: [PATCH 102/245] contributing: remove old badges and logo +Subject: [PATCH 101/249] contributing: remove old badges and logo CI badges and logo are already present in the readme file. diff --git a/0103-ci-update-to-latest-Vagrant-and-Fedora-images.patch b/0102-ci-update-to-latest-Vagrant-and-Fedora-images.patch similarity index 87% rename from 0103-ci-update-to-latest-Vagrant-and-Fedora-images.patch rename to 0102-ci-update-to-latest-Vagrant-and-Fedora-images.patch index 3b3d754..ce66485 100644 --- a/0103-ci-update-to-latest-Vagrant-and-Fedora-images.patch +++ b/0102-ci-update-to-latest-Vagrant-and-Fedora-images.patch @@ -1,7 +1,7 @@ -From 673373c3bc8ff0e464b2392cfe4aab5e67748454 Mon Sep 17 00:00:00 2001 +From 85648ff4af95a547c95a2afaf93a56bc059348af Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 3 Dec 2021 17:13:27 +0000 -Subject: [PATCH 103/245] ci: update to latest Vagrant and Fedora images +Subject: [PATCH 102/249] ci: update to latest Vagrant and Fedora images Signed-off-by: Adrian Reber --- diff --git a/0104-ci-added-.lgtm.yml-file.patch b/0103-ci-added-.lgtm.yml-file.patch similarity index 92% rename from 0104-ci-added-.lgtm.yml-file.patch rename to 0103-ci-added-.lgtm.yml-file.patch index 0ba086c..a5c1b82 100644 --- a/0104-ci-added-.lgtm.yml-file.patch +++ b/0103-ci-added-.lgtm.yml-file.patch @@ -1,7 +1,7 @@ -From 2af4e839804f5f60e080dd3667d8acf0682502dd Mon Sep 17 00:00:00 2001 +From f697623efc8f8f050402c8009e7ac4c2f72a7d0d Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sun, 16 Jan 2022 11:17:33 +0000 -Subject: [PATCH 104/245] ci: added .lgtm.yml file +Subject: [PATCH 103/249] ci: added .lgtm.yml file A couple of months (or years) ago I looked into lgtm.com for CRIU. Today on a pull request I saw result from lgtm.com for the first time and it diff --git a/0105-lib-introduce-feature-check-in-libcriu.patch b/0104-lib-introduce-feature-check-in-libcriu.patch similarity index 97% rename from 0105-lib-introduce-feature-check-in-libcriu.patch rename to 0104-lib-introduce-feature-check-in-libcriu.patch index 66897bb..8a48f79 100644 --- a/0105-lib-introduce-feature-check-in-libcriu.patch +++ b/0104-lib-introduce-feature-check-in-libcriu.patch @@ -1,7 +1,7 @@ -From 0a26cde1b8b454b64951ce1b0b67c937e2188241 Mon Sep 17 00:00:00 2001 +From 421c8eab8f79ce4e70b34dcaa2e51524683e5cb3 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 6 Dec 2021 16:51:21 +0000 -Subject: [PATCH 105/245] lib: introduce feature check in libcriu +Subject: [PATCH 104/249] lib: introduce feature check in libcriu This commit adds feature check support to libcriu. It already exists in the CLI and RPC and this just extends it to libcriu. diff --git a/0106-lib-added-tests-for-feature-check-in-libcriu.patch b/0105-lib-added-tests-for-feature-check-in-libcriu.patch similarity index 96% rename from 0106-lib-added-tests-for-feature-check-in-libcriu.patch rename to 0105-lib-added-tests-for-feature-check-in-libcriu.patch index 9556617..3c5a491 100644 --- a/0106-lib-added-tests-for-feature-check-in-libcriu.patch +++ b/0105-lib-added-tests-for-feature-check-in-libcriu.patch @@ -1,7 +1,7 @@ -From edb88c7c7bddc69e03130507f2f96e03e930c0c0 Mon Sep 17 00:00:00 2001 +From 6fd677682716d80b3a082aba530e021e7c02b078 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 6 Dec 2021 16:51:21 +0000 -Subject: [PATCH 106/245] lib: added tests for feature check in libcriu +Subject: [PATCH 105/249] lib: added tests for feature check in libcriu Signed-off-by: Adrian Reber --- diff --git a/0107-pagemap-tiny-fix-on-truncating-memory-image.patch b/0106-pagemap-tiny-fix-on-truncating-memory-image.patch similarity index 93% rename from 0107-pagemap-tiny-fix-on-truncating-memory-image.patch rename to 0106-pagemap-tiny-fix-on-truncating-memory-image.patch index f6b6504..c845efb 100644 --- a/0107-pagemap-tiny-fix-on-truncating-memory-image.patch +++ b/0106-pagemap-tiny-fix-on-truncating-memory-image.patch @@ -1,7 +1,7 @@ -From 9df7dbdc6168918a8bbf401631885cd14eba62fe Mon Sep 17 00:00:00 2001 +From 7bf62eb79d70296a375e98e1b7b241ad7faecb55 Mon Sep 17 00:00:00 2001 From: Liu Hua Date: Thu, 6 Jan 2022 20:44:21 +0800 -Subject: [PATCH 107/245] pagemap: tiny fix on truncating memory image +Subject: [PATCH 106/249] pagemap: tiny fix on truncating memory image When requested iovs are huge, criu needs to invoke more then one preadv()s. In this situation criu truncates memory image with diff --git a/0108-zdtm-fix-zdtm-static-maps00-case-in-arm64.patch b/0107-zdtm-fix-zdtm-static-maps00-case-in-arm64.patch similarity index 91% rename from 0108-zdtm-fix-zdtm-static-maps00-case-in-arm64.patch rename to 0107-zdtm-fix-zdtm-static-maps00-case-in-arm64.patch index 6c9dcb4..33cd903 100644 --- a/0108-zdtm-fix-zdtm-static-maps00-case-in-arm64.patch +++ b/0107-zdtm-fix-zdtm-static-maps00-case-in-arm64.patch @@ -1,7 +1,7 @@ -From 996178e6696ddf3a4a18eeca0c6a3c58a38b07e1 Mon Sep 17 00:00:00 2001 +From aae40f3a5307856e3409a4200c6cbafa624cbaec Mon Sep 17 00:00:00 2001 From: "fu.lin" Date: Sun, 16 Jan 2022 18:37:09 +0800 -Subject: [PATCH 108/245] zdtm: fix zdtm/static/maps00 case in arm64 +Subject: [PATCH 107/249] zdtm: fix zdtm/static/maps00 case in arm64 This case sometimes will cause SIGILL signal in arm64 platform. diff --git a/0109-compel-fix-GCC-12-failure-out-of-bounds.patch b/0108-compel-fix-GCC-12-failure-out-of-bounds.patch similarity index 95% rename from 0109-compel-fix-GCC-12-failure-out-of-bounds.patch rename to 0108-compel-fix-GCC-12-failure-out-of-bounds.patch index 08b86ad..109118d 100644 --- a/0109-compel-fix-GCC-12-failure-out-of-bounds.patch +++ b/0108-compel-fix-GCC-12-failure-out-of-bounds.patch @@ -1,7 +1,7 @@ -From 0f99b5243eedf276479a92fbf9213eb15a3c241a Mon Sep 17 00:00:00 2001 +From 81233d507af42ad79ef53eaaa60d1893ac19c2ef Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 18 Jan 2022 16:49:40 +0000 -Subject: [PATCH 109/245] compel: fix GCC 12 failure (out of bounds) +Subject: [PATCH 108/249] compel: fix GCC 12 failure (out of bounds) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/0110-criu-fix-configuration-file-scanner-with-GCC-12.patch b/0109-criu-fix-configuration-file-scanner-with-GCC-12.patch similarity index 90% rename from 0110-criu-fix-configuration-file-scanner-with-GCC-12.patch rename to 0109-criu-fix-configuration-file-scanner-with-GCC-12.patch index 118f397..b8af6eb 100644 --- a/0110-criu-fix-configuration-file-scanner-with-GCC-12.patch +++ b/0109-criu-fix-configuration-file-scanner-with-GCC-12.patch @@ -1,7 +1,7 @@ -From d7576bbbae2fbf9eafd81d26203ddcd71698b750 Mon Sep 17 00:00:00 2001 +From 631997ebe61f261a240e804cf30e95d03f78582d Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 18 Jan 2022 17:20:35 +0000 -Subject: [PATCH 110/245] criu: fix configuration file scanner with GCC 12 +Subject: [PATCH 109/249] criu: fix configuration file scanner with GCC 12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/0111-compel-fix-parasite-with-GCC-12.patch b/0110-compel-fix-parasite-with-GCC-12.patch similarity index 91% rename from 0111-compel-fix-parasite-with-GCC-12.patch rename to 0110-compel-fix-parasite-with-GCC-12.patch index 734b267..7b036c3 100644 --- a/0111-compel-fix-parasite-with-GCC-12.patch +++ b/0110-compel-fix-parasite-with-GCC-12.patch @@ -1,7 +1,7 @@ -From 0d33fb189ff89b80e40a82b70e9357df1f5482b2 Mon Sep 17 00:00:00 2001 +From 72435f60d52ea5fe44ff330c6e30a1b9d05b74f2 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 18 Jan 2022 17:22:46 +0000 -Subject: [PATCH 111/245] compel: fix parasite with GCC 12 +Subject: [PATCH 110/249] compel: fix parasite with GCC 12 Parasite creation started to fail with GCC 12: diff --git a/0112-ci-set-continue-on-error-for-cross-compile.patch b/0111-ci-set-continue-on-error-for-cross-compile.patch similarity index 91% rename from 0112-ci-set-continue-on-error-for-cross-compile.patch rename to 0111-ci-set-continue-on-error-for-cross-compile.patch index 6ed4ca4..d2d06a1 100644 --- a/0112-ci-set-continue-on-error-for-cross-compile.patch +++ b/0111-ci-set-continue-on-error-for-cross-compile.patch @@ -1,7 +1,7 @@ -From e659ab526e49ee61b4630bd6f77ef825ced8373c Mon Sep 17 00:00:00 2001 +From 7093620c045e5ed3662031cc6a2f224efdc1ac98 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Thu, 27 Jan 2022 22:13:33 +0000 -Subject: [PATCH 112/245] ci: set continue-on-error for cross-compile +Subject: [PATCH 111/249] ci: set continue-on-error for cross-compile Running cross compile tests with Debian unstable sometimes fails due to missing or outdated packages. diff --git a/0113-test-autofs-fix-use-after-free.patch b/0112-test-autofs-fix-use-after-free.patch similarity index 94% rename from 0113-test-autofs-fix-use-after-free.patch rename to 0112-test-autofs-fix-use-after-free.patch index 5cbaca4..3cca450 100644 --- a/0113-test-autofs-fix-use-after-free.patch +++ b/0112-test-autofs-fix-use-after-free.patch @@ -1,7 +1,7 @@ -From 588625722f69f9e7dc976f658910e95d8508619f Mon Sep 17 00:00:00 2001 +From 334ebaef9fb2cad0cb6de248ecc3fa75a9388fb3 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Thu, 27 Jan 2022 14:49:41 +0000 -Subject: [PATCH 113/245] test/autofs: fix use-after-free +Subject: [PATCH 112/249] test/autofs: fix use-after-free autofs.c:66:17: error: pointer 'str' may be used after 'realloc' [-Werror=use-after-free] diff --git a/0114-Fix-formatting-in-criu-documentation.patch b/0113-Fix-formatting-in-criu-documentation.patch similarity index 91% rename from 0114-Fix-formatting-in-criu-documentation.patch rename to 0113-Fix-formatting-in-criu-documentation.patch index 0e7a8c4..75a698b 100644 --- a/0114-Fix-formatting-in-criu-documentation.patch +++ b/0113-Fix-formatting-in-criu-documentation.patch @@ -1,7 +1,7 @@ -From 103e7ed6f355acd93dc090f4e63e98c7c941f12b Mon Sep 17 00:00:00 2001 +From 46055022a6310a8d986d7351571ba6f04769624c Mon Sep 17 00:00:00 2001 From: Ashutosh Mehra Date: Wed, 26 Jan 2022 14:14:38 -0500 -Subject: [PATCH 114/245] Fix formatting in criu documentation +Subject: [PATCH 113/249] Fix formatting in criu documentation Signed-off-by: Ashutosh Mehra --- diff --git a/0115-ci-install-libbsd-dependency.patch b/0114-ci-install-libbsd-dependency.patch similarity index 97% rename from 0115-ci-install-libbsd-dependency.patch rename to 0114-ci-install-libbsd-dependency.patch index c9b8d82..4d8787e 100644 --- a/0115-ci-install-libbsd-dependency.patch +++ b/0114-ci-install-libbsd-dependency.patch @@ -1,7 +1,7 @@ -From b917d808bc474321b09751625b3b7e2b03818633 Mon Sep 17 00:00:00 2001 +From 29f504fd9a029142a985184bc7dc66894f9fa35a Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Tue, 1 Feb 2022 15:59:14 +0000 -Subject: [PATCH 115/245] ci: install libbsd dependency +Subject: [PATCH 114/249] ci: install libbsd dependency The libbsd dependency is used to enable support for `setproctitle()` and `strlcpy()`. diff --git a/0116-pstree-when-updating-sid-for-shell-job-also-update-m.patch b/0115-pstree-when-updating-sid-for-shell-job-also-update-m.patch similarity index 86% rename from 0116-pstree-when-updating-sid-for-shell-job-also-update-m.patch rename to 0115-pstree-when-updating-sid-for-shell-job-also-update-m.patch index e73b5f8..9e4a4b2 100644 --- a/0116-pstree-when-updating-sid-for-shell-job-also-update-m.patch +++ b/0115-pstree-when-updating-sid-for-shell-job-also-update-m.patch @@ -1,7 +1,7 @@ -From 0e6cf87f121c72669d13d32ac8faafae3cc114bc Mon Sep 17 00:00:00 2001 +From d4bd2e60758dc9ba7fced79350080cf0ca6f5fc0 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 27 Jan 2022 10:28:29 +0300 -Subject: [PATCH 116/245] pstree: when updating sid for shell job also update +Subject: [PATCH 115/249] pstree: when updating sid for shell job also update matching pgid If we replace old_sid with current_sid we should also do same diff --git a/0117-criu-ns-fix-exit-code-o-for-criu-dump.patch b/0116-criu-ns-fix-exit-code-o-for-criu-dump.patch similarity index 83% rename from 0117-criu-ns-fix-exit-code-o-for-criu-dump.patch rename to 0116-criu-ns-fix-exit-code-o-for-criu-dump.patch index 7e9feb5..063396d 100644 --- a/0117-criu-ns-fix-exit-code-o-for-criu-dump.patch +++ b/0116-criu-ns-fix-exit-code-o-for-criu-dump.patch @@ -1,7 +1,7 @@ -From 991a8231313eeb0e56f70990de5e768e6ef8203b Mon Sep 17 00:00:00 2001 +From cc3b58c7c362cbaf43df574167f08897e8a80bd7 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Tue, 1 Feb 2022 13:44:42 +0000 -Subject: [PATCH 117/245] criu-ns: fix exit code o for criu dump +Subject: [PATCH 116/249] criu-ns: fix exit code o for criu dump Fixes: #1739 diff --git a/0118-criu-ns-use-os.waitstatus_to_exitcode.patch b/0117-criu-ns-use-os.waitstatus_to_exitcode.patch similarity index 88% rename from 0118-criu-ns-use-os.waitstatus_to_exitcode.patch rename to 0117-criu-ns-use-os.waitstatus_to_exitcode.patch index 6edaaf4..30f4d42 100644 --- a/0118-criu-ns-use-os.waitstatus_to_exitcode.patch +++ b/0117-criu-ns-use-os.waitstatus_to_exitcode.patch @@ -1,7 +1,7 @@ -From 278c5b3edd1bcf2515faa10d5e341deae36b8db9 Mon Sep 17 00:00:00 2001 +From cae5b84f70476b931620670c94bcd47d76a5e32d Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Fri, 4 Feb 2022 20:41:07 +0000 -Subject: [PATCH 118/245] criu-ns: use os.waitstatus_to_exitcode() +Subject: [PATCH 117/249] criu-ns: use os.waitstatus_to_exitcode() os.WEXITSTATUS() returns the process exit status and it should be used only if WIFEXITED() is true, i.e., the process terminated normally. diff --git a/0119-restorer-Fix-sys_mmap-s-returned-value-check.patch b/0118-restorer-Fix-sys_mmap-s-returned-value-check.patch similarity index 87% rename from 0119-restorer-Fix-sys_mmap-s-returned-value-check.patch rename to 0118-restorer-Fix-sys_mmap-s-returned-value-check.patch index f14efde..a4df36b 100644 --- a/0119-restorer-Fix-sys_mmap-s-returned-value-check.patch +++ b/0118-restorer-Fix-sys_mmap-s-returned-value-check.patch @@ -1,7 +1,7 @@ -From 85e612fe770ae23f097e43faeec42cabf4b83d21 Mon Sep 17 00:00:00 2001 +From 3fe8644e5bf60d6ab2ef7bfd09a87f156b2b41f0 Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Sat, 5 Feb 2022 14:23:38 +0700 -Subject: [PATCH 119/245] restorer: Fix sys_mmap's returned value check +Subject: [PATCH 118/249] restorer: Fix sys_mmap's returned value check As we call mmap syscall directly, the returned value in error case is the error number not -1 like in libc wrapper. Use IS_ERR for correct checking in error diff --git a/0120-compel-fix-how-PTRACE_GET_THREAD_AREA-errors-are-han.patch b/0119-compel-fix-how-PTRACE_GET_THREAD_AREA-errors-are-han.patch similarity index 92% rename from 0120-compel-fix-how-PTRACE_GET_THREAD_AREA-errors-are-han.patch rename to 0119-compel-fix-how-PTRACE_GET_THREAD_AREA-errors-are-han.patch index e5fcac9..5a92b49 100644 --- a/0120-compel-fix-how-PTRACE_GET_THREAD_AREA-errors-are-han.patch +++ b/0119-compel-fix-how-PTRACE_GET_THREAD_AREA-errors-are-han.patch @@ -1,7 +1,7 @@ -From ce4a2f6accc6dede778dd90b7e54daa6f3b6e3b8 Mon Sep 17 00:00:00 2001 +From fd30dd42a6ea39d1bde06fa51155e5f1bc286688 Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Sun, 13 Feb 2022 08:48:07 +0200 -Subject: [PATCH 120/245] compel: fix how PTRACE_GET_THREAD_AREA errors are +Subject: [PATCH 119/249] compel: fix how PTRACE_GET_THREAD_AREA errors are handled When PTRACE_GET_THREAD_AREA errors on kernels with diff --git a/0121-util-add-an-unique-ID-of-the-current-criu-run.patch b/0120-util-add-an-unique-ID-of-the-current-criu-run.patch similarity index 93% rename from 0121-util-add-an-unique-ID-of-the-current-criu-run.patch rename to 0120-util-add-an-unique-ID-of-the-current-criu-run.patch index 4ebcebd..f3dd064 100644 --- a/0121-util-add-an-unique-ID-of-the-current-criu-run.patch +++ b/0120-util-add-an-unique-ID-of-the-current-criu-run.patch @@ -1,7 +1,7 @@ -From 42ff2dd8d495a8ef50da4bcc76987050993497a7 Mon Sep 17 00:00:00 2001 +From ac8b684c2cc8dafdcc7648ec4cea6f0b27dc2a71 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Sat, 12 Feb 2022 17:17:27 -0800 -Subject: [PATCH 121/245] util: add an unique ID of the current criu run +Subject: [PATCH 120/249] util: add an unique ID of the current criu run This ID will be used to generate resource ID-s that can conflicts with other CRIU processes. diff --git a/0122-files-generate-unique-transport-socket-names.patch b/0121-files-generate-unique-transport-socket-names.patch similarity index 86% rename from 0122-files-generate-unique-transport-socket-names.patch rename to 0121-files-generate-unique-transport-socket-names.patch index 0f0275b..c7028a6 100644 --- a/0122-files-generate-unique-transport-socket-names.patch +++ b/0121-files-generate-unique-transport-socket-names.patch @@ -1,7 +1,7 @@ -From e55f38cae12e8017c71ac1ee2458379ff5a38ca5 Mon Sep 17 00:00:00 2001 +From 518f6e6a84cb377d62b325f92f67596b6562a26d Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Sat, 12 Feb 2022 17:24:07 -0800 -Subject: [PATCH 122/245] files: generate unique transport socket names +Subject: [PATCH 121/249] files: generate unique transport socket names Transport socket names have to be unique for each criu run. diff --git a/0123-check-Add-a-check-for-using-memfd-with-hugetlb.patch b/0122-check-Add-a-check-for-using-memfd-with-hugetlb.patch similarity index 95% rename from 0123-check-Add-a-check-for-using-memfd-with-hugetlb.patch rename to 0122-check-Add-a-check-for-using-memfd-with-hugetlb.patch index b81b231..7a264a2 100644 --- a/0123-check-Add-a-check-for-using-memfd-with-hugetlb.patch +++ b/0122-check-Add-a-check-for-using-memfd-with-hugetlb.patch @@ -1,7 +1,7 @@ -From 50810e99345bd770239050d4a7c436c809b9ae09 Mon Sep 17 00:00:00 2001 +From bb95d4c4d2928f1124283742af5978bcd637b6b2 Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Wed, 15 Dec 2021 22:15:21 +0700 -Subject: [PATCH 123/245] check: Add a check for using memfd with hugetlb +Subject: [PATCH 122/249] check: Add a check for using memfd with hugetlb Signed-off-by: Bui Quang Minh --- diff --git a/0124-kerndat-Collect-hugetlb-device-numbers.patch b/0123-kerndat-Collect-hugetlb-device-numbers.patch similarity index 98% rename from 0124-kerndat-Collect-hugetlb-device-numbers.patch rename to 0123-kerndat-Collect-hugetlb-device-numbers.patch index de35537..9387b02 100644 --- a/0124-kerndat-Collect-hugetlb-device-numbers.patch +++ b/0123-kerndat-Collect-hugetlb-device-numbers.patch @@ -1,7 +1,7 @@ -From cd8f553d7d165a5e4588ec0914b27a1bfb9d4446 Mon Sep 17 00:00:00 2001 +From 2eb37a63d8ba56dee5da7acc9f3ccf0cb1a97eb3 Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Wed, 15 Dec 2021 22:26:08 +0700 -Subject: [PATCH 124/245] kerndat: Collect hugetlb device numbers +Subject: [PATCH 123/249] kerndat: Collect hugetlb device numbers These numbers are used to determine whether a memory mapping is backed by hugetlb and its page size. diff --git a/0125-ipc-Add-support-for-checkpoint-restore-hugetlb-Syste.patch b/0124-ipc-Add-support-for-checkpoint-restore-hugetlb-Syste.patch similarity index 96% rename from 0125-ipc-Add-support-for-checkpoint-restore-hugetlb-Syste.patch rename to 0124-ipc-Add-support-for-checkpoint-restore-hugetlb-Syste.patch index db714a0..bf59b00 100644 --- a/0125-ipc-Add-support-for-checkpoint-restore-hugetlb-Syste.patch +++ b/0124-ipc-Add-support-for-checkpoint-restore-hugetlb-Syste.patch @@ -1,7 +1,7 @@ -From b8ec2e49bb3b1403569a0db599338ba5edcac09a Mon Sep 17 00:00:00 2001 +From c3015e3b6daa7159dfb66fd0595dbce342c95d12 Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Wed, 15 Dec 2021 22:53:09 +0700 -Subject: [PATCH 125/245] ipc: Add support for checkpoint/restore hugetlb +Subject: [PATCH 124/249] ipc: Add support for checkpoint/restore hugetlb System V shared memory Attach the System V shared memory segments to the address space via shmat() to diff --git a/0126-memfd-shmem-Add-support-for-checkpoint-restore-memfd.patch b/0125-memfd-shmem-Add-support-for-checkpoint-restore-memfd.patch similarity index 96% rename from 0126-memfd-shmem-Add-support-for-checkpoint-restore-memfd.patch rename to 0125-memfd-shmem-Add-support-for-checkpoint-restore-memfd.patch index 101e78b..f28c98f 100644 --- a/0126-memfd-shmem-Add-support-for-checkpoint-restore-memfd.patch +++ b/0125-memfd-shmem-Add-support-for-checkpoint-restore-memfd.patch @@ -1,7 +1,7 @@ -From 2d241a537ec32e1bb3590f5b63a23221c116af1b Mon Sep 17 00:00:00 2001 +From 18c10885c3cb1b39908361b9250330e21ebf119f Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Wed, 15 Dec 2021 23:01:29 +0700 -Subject: [PATCH 126/245] memfd, shmem: Add support for checkpoint/restore +Subject: [PATCH 125/249] memfd, shmem: Add support for checkpoint/restore memfd and anon shared memory Co-developed-by: Andrei Vagin diff --git a/0127-proc_parse-files-Add-support-for-hugetlb-memory-mapp.patch b/0126-proc_parse-files-Add-support-for-hugetlb-memory-mapp.patch similarity index 97% rename from 0127-proc_parse-files-Add-support-for-hugetlb-memory-mapp.patch rename to 0126-proc_parse-files-Add-support-for-hugetlb-memory-mapp.patch index 85eda90..409d050 100644 --- a/0127-proc_parse-files-Add-support-for-hugetlb-memory-mapp.patch +++ b/0126-proc_parse-files-Add-support-for-hugetlb-memory-mapp.patch @@ -1,7 +1,7 @@ -From cb412fc56d8b30e3917364e58b3411f1cdc069ab Mon Sep 17 00:00:00 2001 +From 3c7bb45946478e856b1c893948a0d2dba4cead20 Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Wed, 15 Dec 2021 23:03:29 +0700 -Subject: [PATCH 127/245] proc_parse, files: Add support for hugetlb memory +Subject: [PATCH 126/249] proc_parse, files: Add support for hugetlb memory mapping When memfd can be used with hugetlb, we use memfd for checkpoint/restore diff --git a/0128-mem-Skip-premapping-hugetlb-mapping.patch b/0127-mem-Skip-premapping-hugetlb-mapping.patch similarity index 90% rename from 0128-mem-Skip-premapping-hugetlb-mapping.patch rename to 0127-mem-Skip-premapping-hugetlb-mapping.patch index b31e9b3..84b2991 100644 --- a/0128-mem-Skip-premapping-hugetlb-mapping.patch +++ b/0127-mem-Skip-premapping-hugetlb-mapping.patch @@ -1,7 +1,7 @@ -From 5de55e2f87d815abc30373ee70798644239eb718 Mon Sep 17 00:00:00 2001 +From 8ec1e04580b30bd0365839a4fef301e95c6c6f2d Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Wed, 9 Feb 2022 22:11:51 +0700 -Subject: [PATCH 128/245] mem: Skip premapping hugetlb mapping +Subject: [PATCH 127/249] mem: Skip premapping hugetlb mapping As we cannot use mremap() to move the hugetlb mapping around until Linux kernel version 5.16, we need to skip premapping hugetlb mapping. diff --git a/0129-uffd-Skip-lazy-mode-restore-on-hugetlb-mappings.patch b/0128-uffd-Skip-lazy-mode-restore-on-hugetlb-mappings.patch similarity index 89% rename from 0129-uffd-Skip-lazy-mode-restore-on-hugetlb-mappings.patch rename to 0128-uffd-Skip-lazy-mode-restore-on-hugetlb-mappings.patch index 5a68965..d5420b4 100644 --- a/0129-uffd-Skip-lazy-mode-restore-on-hugetlb-mappings.patch +++ b/0128-uffd-Skip-lazy-mode-restore-on-hugetlb-mappings.patch @@ -1,7 +1,7 @@ -From 7460bfb291b585fd97803dbe99b5a23b3fd61ab5 Mon Sep 17 00:00:00 2001 +From 70a0a2dd7257c6969f040e18e37c4d8eca4dc224 Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Wed, 9 Feb 2022 22:12:53 +0700 -Subject: [PATCH 129/245] uffd: Skip lazy-mode restore on hugetlb mappings +Subject: [PATCH 128/249] uffd: Skip lazy-mode restore on hugetlb mappings As hugetlb mappings are not premapped, they are not registered to uffd service in restorer code. We must not mark these mappings as PPB_LAZY in generate_iovs() diff --git a/0130-zdtm-Add-MAP_HUGETLB-memory-mapping-test.patch b/0129-zdtm-Add-MAP_HUGETLB-memory-mapping-test.patch similarity index 97% rename from 0130-zdtm-Add-MAP_HUGETLB-memory-mapping-test.patch rename to 0129-zdtm-Add-MAP_HUGETLB-memory-mapping-test.patch index c64b8da..afe9e14 100644 --- a/0130-zdtm-Add-MAP_HUGETLB-memory-mapping-test.patch +++ b/0129-zdtm-Add-MAP_HUGETLB-memory-mapping-test.patch @@ -1,7 +1,7 @@ -From 0cd3c2e6d5161a7ace1067f32104248d97f3960e Mon Sep 17 00:00:00 2001 +From 94453cdd46f5791fe1ecd1fa1624233b95d00941 Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Tue, 26 Oct 2021 22:22:08 +0700 -Subject: [PATCH 130/245] zdtm: Add MAP_HUGETLB memory mapping test +Subject: [PATCH 129/249] zdtm: Add MAP_HUGETLB memory mapping test This commit add a test for checkpoint/restore MAP_HUGETLB memory mappings. A new zdtm helper get_mapping_dev() is added to get the device number of diff --git a/0131-zdtm-Add-memfd-hugetlb-test.patch b/0130-zdtm-Add-memfd-hugetlb-test.patch similarity index 97% rename from 0131-zdtm-Add-memfd-hugetlb-test.patch rename to 0130-zdtm-Add-memfd-hugetlb-test.patch index a3daadb..3cd1d13 100644 --- a/0131-zdtm-Add-memfd-hugetlb-test.patch +++ b/0130-zdtm-Add-memfd-hugetlb-test.patch @@ -1,7 +1,7 @@ -From ee16f173785327667bc4702e6c2f1c0419d6fc95 Mon Sep 17 00:00:00 2001 +From 44da7370c4fe39785d753c6de15caf782d75b7de Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Tue, 26 Oct 2021 22:31:44 +0700 -Subject: [PATCH 131/245] zdtm: Add memfd hugetlb test +Subject: [PATCH 130/249] zdtm: Add memfd hugetlb test Signed-off-by: Bui Quang Minh --- diff --git a/0132-zdtm-Add-shm-hugetlb-test.patch b/0131-zdtm-Add-shm-hugetlb-test.patch similarity index 96% rename from 0132-zdtm-Add-shm-hugetlb-test.patch rename to 0131-zdtm-Add-shm-hugetlb-test.patch index 098ef94..6d3cb02 100644 --- a/0132-zdtm-Add-shm-hugetlb-test.patch +++ b/0131-zdtm-Add-shm-hugetlb-test.patch @@ -1,7 +1,7 @@ -From fcb4236677ec1b8cbf53f5a513a173d39cc23e24 Mon Sep 17 00:00:00 2001 +From 78b113d4563c74a1fc320bfc84afc798c5c8ee91 Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Tue, 26 Oct 2021 22:34:22 +0700 -Subject: [PATCH 132/245] zdtm: Add shm hugetlb test +Subject: [PATCH 131/249] zdtm: Add shm hugetlb test Signed-off-by: Bui Quang Minh --- diff --git a/0133-zdtm-Add-MAP_HUGETLB-mappings-test-for-parent-child-.patch b/0132-zdtm-Add-MAP_HUGETLB-mappings-test-for-parent-child-.patch similarity index 96% rename from 0133-zdtm-Add-MAP_HUGETLB-mappings-test-for-parent-child-.patch rename to 0132-zdtm-Add-MAP_HUGETLB-mappings-test-for-parent-child-.patch index 9326183..3b86ab0 100644 --- a/0133-zdtm-Add-MAP_HUGETLB-mappings-test-for-parent-child-.patch +++ b/0132-zdtm-Add-MAP_HUGETLB-mappings-test-for-parent-child-.patch @@ -1,7 +1,7 @@ -From 922713c230aab7d763f39f72e21b7e2460927437 Mon Sep 17 00:00:00 2001 +From df3ab72beec7972abf925a10294f26529a81beff Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Fri, 31 Dec 2021 17:15:18 +0700 -Subject: [PATCH 133/245] zdtm: Add MAP_HUGETLB mappings test for parent-child +Subject: [PATCH 132/249] zdtm: Add MAP_HUGETLB mappings test for parent-child relationship processes Signed-off-by: Bui Quang Minh diff --git a/0134-ci-skip-MAP_HUGETLB-tests-in-stream-test.patch b/0133-ci-skip-MAP_HUGETLB-tests-in-stream-test.patch similarity index 92% rename from 0134-ci-skip-MAP_HUGETLB-tests-in-stream-test.patch rename to 0133-ci-skip-MAP_HUGETLB-tests-in-stream-test.patch index 02a993d..2a3cd70 100644 --- a/0134-ci-skip-MAP_HUGETLB-tests-in-stream-test.patch +++ b/0133-ci-skip-MAP_HUGETLB-tests-in-stream-test.patch @@ -1,7 +1,7 @@ -From 09c33d32399abd1a60a87a016560f44f73d0e5ea Mon Sep 17 00:00:00 2001 +From 316e3cfddad8409f3978bd7ffbd6bb42f04350e2 Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Sat, 12 Feb 2022 16:00:39 +0700 -Subject: [PATCH 134/245] ci: skip MAP_HUGETLB tests in stream test +Subject: [PATCH 133/249] ci: skip MAP_HUGETLB tests in stream test Currently, hugetlb mappings is not premapped so in the restore content phase, we skip page read these pages, enqueue the iovec for later reading in restorer and diff --git a/0135-bpfmap-handle-new-field-in-fdinfo.patch b/0134-bpfmap-handle-new-field-in-fdinfo.patch similarity index 97% rename from 0135-bpfmap-handle-new-field-in-fdinfo.patch rename to 0134-bpfmap-handle-new-field-in-fdinfo.patch index 2dce9aa..07a6e44 100644 --- a/0135-bpfmap-handle-new-field-in-fdinfo.patch +++ b/0134-bpfmap-handle-new-field-in-fdinfo.patch @@ -1,7 +1,7 @@ -From ab887fa5e04c2605464e6b4f6f6582c6c3b8d1c2 Mon Sep 17 00:00:00 2001 +From 9b35c3b51c0ea314a10d80f935f0b9e25ce20c80 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 15 Feb 2022 16:55:45 +0000 -Subject: [PATCH 135/245] bpfmap: handle new field in fdinfo +Subject: [PATCH 134/249] bpfmap: handle new field in fdinfo Starting with Linux Kernel release 5.16 the fdinfo proc entry contains a map_extra field which breaks CRIU parsing of bpfmap entries. diff --git a/0136-test-remove-test-for-LOCK_MAND-flock.patch b/0135-test-remove-test-for-LOCK_MAND-flock.patch similarity index 90% rename from 0136-test-remove-test-for-LOCK_MAND-flock.patch rename to 0135-test-remove-test-for-LOCK_MAND-flock.patch index e0d961a..d0e7920 100644 --- a/0136-test-remove-test-for-LOCK_MAND-flock.patch +++ b/0135-test-remove-test-for-LOCK_MAND-flock.patch @@ -1,7 +1,7 @@ -From 222eedb93d505ce966e4ec7491edfc34080f668f Mon Sep 17 00:00:00 2001 +From 1a89b19b66abc45c47c94bc078217af9dc676cac Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 15 Feb 2022 17:01:32 +0000 -Subject: [PATCH 136/245] test: remove test for LOCK_MAND flock +Subject: [PATCH 135/249] test: remove test for LOCK_MAND flock Linux Kernel release 5.16 removed support for LOCK_MAND flock and so the test to verify if LOCK_MAND works started to fail with 5.16. diff --git a/0137-test-disable-rseq-also-on-Archlinux.patch b/0136-test-disable-rseq-also-on-Archlinux.patch similarity index 85% rename from 0137-test-disable-rseq-also-on-Archlinux.patch rename to 0136-test-disable-rseq-also-on-Archlinux.patch index 404a74f..010af0f 100644 --- a/0137-test-disable-rseq-also-on-Archlinux.patch +++ b/0136-test-disable-rseq-also-on-Archlinux.patch @@ -1,7 +1,7 @@ -From 29bd4f0dd513a15e96c3374267b185d04ccf0357 Mon Sep 17 00:00:00 2001 +From e25f35ccb538c4b1542c608147c541efd2bf95c2 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 15 Feb 2022 18:09:27 +0000 -Subject: [PATCH 137/245] test: disable rseq also on Archlinux +Subject: [PATCH 136/249] test: disable rseq also on Archlinux Seems like Archlinux also uses rseq now and that breaks CRIU. Also disable rseq on Archlinux. diff --git a/0138-zdtm-fix-missplacement-of-err-True.patch b/0137-zdtm-fix-missplacement-of-err-True.patch similarity index 89% rename from 0138-zdtm-fix-missplacement-of-err-True.patch rename to 0137-zdtm-fix-missplacement-of-err-True.patch index e9e74da..9c06413 100644 --- a/0138-zdtm-fix-missplacement-of-err-True.patch +++ b/0137-zdtm-fix-missplacement-of-err-True.patch @@ -1,7 +1,7 @@ -From 7c3994f673107cbde368b385116358ce2a122ca8 Mon Sep 17 00:00:00 2001 +From 5aa1b1f48e5cd4186a70b7ce47ae23182e698b65 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 18 Feb 2022 18:13:14 +0300 -Subject: [PATCH 138/245] zdtm: fix missplacement of err=True +Subject: [PATCH 137/249] zdtm: fix missplacement of err=True There is no 'err' argument for print(), it should be in grep_errors() in line below. diff --git a/0139-compel-set-mxcsr-during-error-injection-to-zero.patch b/0138-compel-set-mxcsr-during-error-injection-to-zero.patch similarity index 91% rename from 0139-compel-set-mxcsr-during-error-injection-to-zero.patch rename to 0138-compel-set-mxcsr-during-error-injection-to-zero.patch index dab875e..00cee3c 100644 --- a/0139-compel-set-mxcsr-during-error-injection-to-zero.patch +++ b/0138-compel-set-mxcsr-during-error-injection-to-zero.patch @@ -1,7 +1,7 @@ -From 509bbef51ab2f3ed3d4156c07ca03dbb0ad63c29 Mon Sep 17 00:00:00 2001 +From 89173abcebfe38f584f2340d1ce39437b3c22ff9 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 9 Mar 2022 08:40:35 +0000 -Subject: [PATCH 139/245] compel: set mxcsr during error injection to zero +Subject: [PATCH 138/249] compel: set mxcsr during error injection to zero During error injection tests there are random values loaded in some of the registers. The kernel, however, has the following check: diff --git a/0140-proc_smaps-remove-useless-nonlinear-check.patch b/0139-proc_smaps-remove-useless-nonlinear-check.patch similarity index 89% rename from 0140-proc_smaps-remove-useless-nonlinear-check.patch rename to 0139-proc_smaps-remove-useless-nonlinear-check.patch index 5e5a189..6f9d011 100644 --- a/0140-proc_smaps-remove-useless-nonlinear-check.patch +++ b/0139-proc_smaps-remove-useless-nonlinear-check.patch @@ -1,7 +1,7 @@ -From 85ae3104dac41a6cbbb76c9b8b1a78a71184cb7a Mon Sep 17 00:00:00 2001 +From ae84fbbcb525715a0d0915a0e4182d0702cd6bd0 Mon Sep 17 00:00:00 2001 From: anatasluo Date: Tue, 8 Mar 2022 08:34:14 +0000 -Subject: [PATCH 140/245] proc_smaps: remove useless nonlinear check +Subject: [PATCH 139/249] proc_smaps: remove useless nonlinear check nonlinear information has been removed since commit 1da4b35b001481df99 in kernel. diff --git a/0141-mount-fix-e_str-leak-in-ext_mount_add.patch b/0140-mount-fix-e_str-leak-in-ext_mount_add.patch similarity index 92% rename from 0141-mount-fix-e_str-leak-in-ext_mount_add.patch rename to 0140-mount-fix-e_str-leak-in-ext_mount_add.patch index 5faf120..947d24d 100644 --- a/0141-mount-fix-e_str-leak-in-ext_mount_add.patch +++ b/0140-mount-fix-e_str-leak-in-ext_mount_add.patch @@ -1,7 +1,7 @@ -From 06ad515e6b084900aef7a9b5b62f3dbc0dfd0b6d Mon Sep 17 00:00:00 2001 +From b6a0ee4f8146442d7fa382bdee669472267c49fa Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 9 Mar 2022 14:32:25 +0300 -Subject: [PATCH 141/245] mount: fix e_str leak in ext_mount_add +Subject: [PATCH 140/249] mount: fix e_str leak in ext_mount_add coverity CID 389202: 54int ext_mount_add(char *key, char *val) diff --git a/0142-cr-dump-fix-cr_imgset-leak-in-dump_one_task.patch b/0141-cr-dump-fix-cr_imgset-leak-in-dump_one_task.patch similarity index 96% rename from 0142-cr-dump-fix-cr_imgset-leak-in-dump_one_task.patch rename to 0141-cr-dump-fix-cr_imgset-leak-in-dump_one_task.patch index d829a1f..0702751 100644 --- a/0142-cr-dump-fix-cr_imgset-leak-in-dump_one_task.patch +++ b/0141-cr-dump-fix-cr_imgset-leak-in-dump_one_task.patch @@ -1,7 +1,7 @@ -From 403e91569597b937bd69ca5f60b4516d85dc793f Mon Sep 17 00:00:00 2001 +From 7fc272fc191fb2b909a6bc623ff75ea688fe2864 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 9 Mar 2022 15:14:50 +0300 -Subject: [PATCH 142/245] cr-dump: fix cr_imgset leak in dump_one_task +Subject: [PATCH 141/249] cr-dump: fix cr_imgset leak in dump_one_task coverity CID 389194: diff --git a/0143-tun-fix-tun_link-leak-in-dump_tun_link.patch b/0142-tun-fix-tun_link-leak-in-dump_tun_link.patch similarity index 94% rename from 0143-tun-fix-tun_link-leak-in-dump_tun_link.patch rename to 0142-tun-fix-tun_link-leak-in-dump_tun_link.patch index de14eb2..3009d42 100644 --- a/0143-tun-fix-tun_link-leak-in-dump_tun_link.patch +++ b/0142-tun-fix-tun_link-leak-in-dump_tun_link.patch @@ -1,7 +1,7 @@ -From 33df574cd57a0919d1acd0e9184f4986d9974031 Mon Sep 17 00:00:00 2001 +From 8f2244a4c1d655e101f5dd0f790c56df7f0835dd Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 9 Mar 2022 13:52:00 +0300 -Subject: [PATCH 143/245] tun: fix tun_link leak in dump_tun_link +Subject: [PATCH 142/249] tun: fix tun_link leak in dump_tun_link coverity CID 389205: diff --git a/0144-sk-unix-fix-uint32_t-id-variable-printf-format-speci.patch b/0143-sk-unix-fix-uint32_t-id-variable-printf-format-speci.patch similarity index 90% rename from 0144-sk-unix-fix-uint32_t-id-variable-printf-format-speci.patch rename to 0143-sk-unix-fix-uint32_t-id-variable-printf-format-speci.patch index e1694af..b4c1239 100644 --- a/0144-sk-unix-fix-uint32_t-id-variable-printf-format-speci.patch +++ b/0143-sk-unix-fix-uint32_t-id-variable-printf-format-speci.patch @@ -1,7 +1,7 @@ -From 1b54115953453e739fe1a68dd3ced39912c352f3 Mon Sep 17 00:00:00 2001 +From 7399d1957001be0af6291c4168602ae154207677 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 10 Mar 2022 13:35:50 +0300 -Subject: [PATCH 144/245] sk-unix: fix uint32_t id variable printf format +Subject: [PATCH 143/249] sk-unix: fix uint32_t id variable printf format specifier coverity CID 389193: diff --git a/0145-zdtm-refactor-main.patch b/0144-zdtm-refactor-main.patch similarity index 99% rename from 0145-zdtm-refactor-main.patch rename to 0144-zdtm-refactor-main.patch index 451784a..7399615 100644 --- a/0145-zdtm-refactor-main.patch +++ b/0144-zdtm-refactor-main.patch @@ -1,7 +1,7 @@ -From 0edd663bb959e5a424abba670ac87fbd45edd0b9 Mon Sep 17 00:00:00 2001 +From 4bf7f3e1dfb0d01e59dd6f9af1b945018b1df034 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sat, 24 Jul 2021 12:19:22 +0100 -Subject: [PATCH 145/245] zdtm: refactor main +Subject: [PATCH 144/249] zdtm: refactor main This patch improves the readability of zdtm by refactoring the top-level code into a main function. diff --git a/0146-zdtm-sort-import-lines.patch b/0145-zdtm-sort-import-lines.patch similarity index 93% rename from 0146-zdtm-sort-import-lines.patch rename to 0145-zdtm-sort-import-lines.patch index 16ff511..a0510a7 100644 --- a/0146-zdtm-sort-import-lines.patch +++ b/0145-zdtm-sort-import-lines.patch @@ -1,7 +1,7 @@ -From 49a2414f365fe2f4c887332b172568d9b121b542 Mon Sep 17 00:00:00 2001 +From c2f8e185938863082efbd525fabef22d6b719cb3 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 15 Aug 2021 10:27:37 +0100 -Subject: [PATCH 146/245] zdtm: sort import lines +Subject: [PATCH 145/249] zdtm: sort import lines These changes have been auto-generated with: diff --git a/0147-zdtm-use-long-form-cli-options.patch b/0146-zdtm-use-long-form-cli-options.patch similarity index 95% rename from 0147-zdtm-use-long-form-cli-options.patch rename to 0146-zdtm-use-long-form-cli-options.patch index a0fbc18..4765f2d 100644 --- a/0147-zdtm-use-long-form-cli-options.patch +++ b/0146-zdtm-use-long-form-cli-options.patch @@ -1,7 +1,7 @@ -From 0cec066cb200680f7cb1429b026c643f1035b5f5 Mon Sep 17 00:00:00 2001 +From fa4b4f7103804f3995cace5e4405894737f4ff4a Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 15 Aug 2021 10:53:29 +0100 -Subject: [PATCH 147/245] zdtm: use long form cli options +Subject: [PATCH 146/249] zdtm: use long form cli options Using long-form command-line options would allows us to provide them via config file to CRIU. diff --git a/0148-zdtm-add-criu-config-option.patch b/0147-zdtm-add-criu-config-option.patch similarity index 97% rename from 0148-zdtm-add-criu-config-option.patch rename to 0147-zdtm-add-criu-config-option.patch index a61806e..6494ba5 100644 --- a/0148-zdtm-add-criu-config-option.patch +++ b/0147-zdtm-add-criu-config-option.patch @@ -1,7 +1,7 @@ -From 9caafe1d72257646d55976b9c74a2480149b9279 Mon Sep 17 00:00:00 2001 +From 3facb361f138a484effb064215fe1b7d45796d6b Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 15 Aug 2021 10:58:32 +0100 -Subject: [PATCH 148/245] zdtm: add --criu-config option +Subject: [PATCH 147/249] zdtm: add --criu-config option The --criu-config option allows to run test with CRIU options provided via configuration files instead of command-line arguments. diff --git a/0149-zdtm-drop-redundant-config_inotify_irmap-test.patch b/0148-zdtm-drop-redundant-config_inotify_irmap-test.patch similarity index 97% rename from 0149-zdtm-drop-redundant-config_inotify_irmap-test.patch rename to 0148-zdtm-drop-redundant-config_inotify_irmap-test.patch index fee952e..d8d7422 100644 --- a/0149-zdtm-drop-redundant-config_inotify_irmap-test.patch +++ b/0148-zdtm-drop-redundant-config_inotify_irmap-test.patch @@ -1,7 +1,7 @@ -From 7df50d6bdc535dc62e299ef0e94e5dac29d4a7ac Mon Sep 17 00:00:00 2001 +From b69701e308743135e86d461cb66cd807ed2c0fc2 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 15 Aug 2021 11:16:28 +0100 -Subject: [PATCH 149/245] zdtm: drop redundant config_inotify_irmap test +Subject: [PATCH 148/249] zdtm: drop redundant config_inotify_irmap test The config_inotify_irmap test duplicates inotify_irmap with slight change to add the --force-irmap and --irmap-scan-path options in diff --git a/0150-ci-run-criu-config-tests.patch b/0149-ci-run-criu-config-tests.patch similarity index 92% rename from 0150-ci-run-criu-config-tests.patch rename to 0149-ci-run-criu-config-tests.patch index f48623c..d8c5f2b 100644 --- a/0150-ci-run-criu-config-tests.patch +++ b/0149-ci-run-criu-config-tests.patch @@ -1,7 +1,7 @@ -From 88caa7a5083039157f340df1497fc7a6c91a9174 Mon Sep 17 00:00:00 2001 +From 3fd1487983c59bbf17e45484ceb42011e5d74eda Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sun, 15 Aug 2021 11:29:22 +0100 -Subject: [PATCH 150/245] ci: run criu-config tests +Subject: [PATCH 149/249] ci: run criu-config tests Signed-off-by: Radostin Stoyanov --- diff --git a/0151-config-fix-ns-leak-in-parse_join_ns.patch b/0150-config-fix-ns-leak-in-parse_join_ns.patch similarity index 92% rename from 0151-config-fix-ns-leak-in-parse_join_ns.patch rename to 0150-config-fix-ns-leak-in-parse_join_ns.patch index 3a4c390..c6f3828 100644 --- a/0151-config-fix-ns-leak-in-parse_join_ns.patch +++ b/0150-config-fix-ns-leak-in-parse_join_ns.patch @@ -1,7 +1,7 @@ -From f2d2062d3635921e9a4a43a5c5868abc680183ff Mon Sep 17 00:00:00 2001 +From 96fdf556f85dc13067e265ec8227ebdeb71ec068 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 10 Mar 2022 14:15:23 +0300 -Subject: [PATCH 151/245] config: fix ns leak in parse_join_ns +Subject: [PATCH 150/249] config: fix ns leak in parse_join_ns coverity CID 389192: diff --git a/0152-net-fix-e_str-leak-in-veth_pair_add.patch b/0151-net-fix-e_str-leak-in-veth_pair_add.patch similarity index 93% rename from 0152-net-fix-e_str-leak-in-veth_pair_add.patch rename to 0151-net-fix-e_str-leak-in-veth_pair_add.patch index a6c234c..3aa88c6 100644 --- a/0152-net-fix-e_str-leak-in-veth_pair_add.patch +++ b/0151-net-fix-e_str-leak-in-veth_pair_add.patch @@ -1,7 +1,7 @@ -From 072f84fb2f9b5b14db1b81e789e2bebf913137a3 Mon Sep 17 00:00:00 2001 +From fc4b654c9264ee5cb48437a96293695d05b89e5b Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 11 Mar 2022 19:57:06 +0300 -Subject: [PATCH 152/245] net: fix e_str leak in veth_pair_add +Subject: [PATCH 151/249] net: fix e_str leak in veth_pair_add coverity CID 389187: diff --git a/0153-files-fix-inh-leak-in-inherit_fd_add.patch b/0152-files-fix-inh-leak-in-inherit_fd_add.patch similarity index 92% rename from 0153-files-fix-inh-leak-in-inherit_fd_add.patch rename to 0152-files-fix-inh-leak-in-inherit_fd_add.patch index 3cf38ed..18111e9 100644 --- a/0153-files-fix-inh-leak-in-inherit_fd_add.patch +++ b/0152-files-fix-inh-leak-in-inherit_fd_add.patch @@ -1,7 +1,7 @@ -From ea271af140a0d63de19acd7cb4107ef83e734c1d Mon Sep 17 00:00:00 2001 +From 711c1fb9385678320572e8bc35a6342d435cb2ba Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 11 Mar 2022 18:45:37 +0300 -Subject: [PATCH 153/245] files: fix inh leak in inherit_fd_add +Subject: [PATCH 152/249] files: fix inh leak in inherit_fd_add coverity CID 389190: diff --git a/0154-sk-unix-fix-e_str-leak-in-unix_sk_id_add.patch b/0153-sk-unix-fix-e_str-leak-in-unix_sk_id_add.patch similarity index 92% rename from 0154-sk-unix-fix-e_str-leak-in-unix_sk_id_add.patch rename to 0153-sk-unix-fix-e_str-leak-in-unix_sk_id_add.patch index 06fa27a..31362fe 100644 --- a/0154-sk-unix-fix-e_str-leak-in-unix_sk_id_add.patch +++ b/0153-sk-unix-fix-e_str-leak-in-unix_sk_id_add.patch @@ -1,7 +1,7 @@ -From 210d54ef1e4534c8d6a861f31f294e7df5134b5b Mon Sep 17 00:00:00 2001 +From dac5689422ed1422f33bf6a39b929f3f40d4c86b Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 11 Mar 2022 18:36:55 +0300 -Subject: [PATCH 154/245] sk-unix: fix e_str leak in unix_sk_id_add +Subject: [PATCH 153/249] sk-unix: fix e_str leak in unix_sk_id_add coverity CID 389191: diff --git a/0155-uffd-fix-__u64-print-format-specifier.patch b/0154-uffd-fix-__u64-print-format-specifier.patch similarity index 90% rename from 0155-uffd-fix-__u64-print-format-specifier.patch rename to 0154-uffd-fix-__u64-print-format-specifier.patch index efa17db..a453bd5 100644 --- a/0155-uffd-fix-__u64-print-format-specifier.patch +++ b/0154-uffd-fix-__u64-print-format-specifier.patch @@ -1,7 +1,7 @@ -From c4b5110df1cb83dca79ca57d5413bf93968aa040 Mon Sep 17 00:00:00 2001 +From d13ed3d1c42afcff082517c08acd825558966127 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 11 Mar 2022 17:31:07 +0300 -Subject: [PATCH 155/245] uffd: fix __u64 print format specifier +Subject: [PATCH 154/249] uffd: fix __u64 print format specifier coverity CID 389197: diff --git a/0156-zdtm-fix-mnt_ext_master-test-to-correspond-to-it-s-n.patch b/0155-zdtm-fix-mnt_ext_master-test-to-correspond-to-it-s-n.patch similarity index 93% rename from 0156-zdtm-fix-mnt_ext_master-test-to-correspond-to-it-s-n.patch rename to 0155-zdtm-fix-mnt_ext_master-test-to-correspond-to-it-s-n.patch index c3dd597..87fdfa1 100644 --- a/0156-zdtm-fix-mnt_ext_master-test-to-correspond-to-it-s-n.patch +++ b/0155-zdtm-fix-mnt_ext_master-test-to-correspond-to-it-s-n.patch @@ -1,7 +1,7 @@ -From 80a918b3fad70613e7257c22d4c1ad585908440d Mon Sep 17 00:00:00 2001 +From b54f9f22e379da0fba7e8f84265e9af50d0a9dc7 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Mon, 30 Dec 2019 16:17:54 +0300 -Subject: [PATCH 156/245] zdtm: fix mnt_ext_master test to correspond to it's +Subject: [PATCH 155/249] zdtm: fix mnt_ext_master test to correspond to it's name Before these change the on-host-"zdtm_auto_ext_mnt" mount with diff --git a/0157-mount-add-mntinfo_add_list_before-helper-for-adding-.patch b/0156-mount-add-mntinfo_add_list_before-helper-for-adding-.patch similarity index 95% rename from 0157-mount-add-mntinfo_add_list_before-helper-for-adding-.patch rename to 0156-mount-add-mntinfo_add_list_before-helper-for-adding-.patch index 9483361..1bb7e96 100644 --- a/0157-mount-add-mntinfo_add_list_before-helper-for-adding-.patch +++ b/0156-mount-add-mntinfo_add_list_before-helper-for-adding-.patch @@ -1,7 +1,7 @@ -From 3a285b79b73a30400ae13605c3d1e6ae46c661e9 Mon Sep 17 00:00:00 2001 +From e9d53beca393b683e86ed5c5695412317616b1a1 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Sun, 12 Apr 2020 20:53:54 +0300 -Subject: [PATCH 157/245] mount: add mntinfo_add_list_before helper for adding +Subject: [PATCH 156/249] mount: add mntinfo_add_list_before helper for adding to mntinfo list Use this helper everywhere instead of manually adding mounts to the head diff --git a/0158-mount-do-not-detect-non-fsroot-mounts-as-device-exte.patch b/0157-mount-do-not-detect-non-fsroot-mounts-as-device-exte.patch similarity index 92% rename from 0158-mount-do-not-detect-non-fsroot-mounts-as-device-exte.patch rename to 0157-mount-do-not-detect-non-fsroot-mounts-as-device-exte.patch index 4c06e64..e352ded 100644 --- a/0158-mount-do-not-detect-non-fsroot-mounts-as-device-exte.patch +++ b/0157-mount-do-not-detect-non-fsroot-mounts-as-device-exte.patch @@ -1,7 +1,7 @@ -From 4ce94c75c78cacbddf6c374f5efa359f1714f18d Mon Sep 17 00:00:00 2001 +From ff991f4b5f369640408887dd7e2c9bc1c9ccc53b Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 16 Jan 2020 12:36:08 +0300 -Subject: [PATCH 158/245] mount: do not detect non-fsroot mounts as +Subject: [PATCH 157/249] mount: do not detect non-fsroot mounts as device-external Device-external mounts are restored via do_new_mount(), but function diff --git a/0159-mount-mark-mounts-of-external-devices-external.patch b/0158-mount-mark-mounts-of-external-devices-external.patch similarity index 97% rename from 0159-mount-mark-mounts-of-external-devices-external.patch rename to 0158-mount-mark-mounts-of-external-devices-external.patch index 793bf2b..7f5742e 100644 --- a/0159-mount-mark-mounts-of-external-devices-external.patch +++ b/0158-mount-mark-mounts-of-external-devices-external.patch @@ -1,7 +1,7 @@ -From 6685ad8b808184e2dcb6adecab8e0b97844404d2 Mon Sep 17 00:00:00 2001 +From 8e1769318b436a69a67e399e432cc0436abf4298 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Mon, 16 Sep 2019 18:07:32 +0300 -Subject: [PATCH 159/245] mount: mark mounts of external devices external +Subject: [PATCH 158/249] mount: mark mounts of external devices external Previously only autodetected and mountpoint external mounts had mount_info->external field set, let's fix this injustice so that we can diff --git a/0160-mount-skip-fstype-and-source-checks-for-external-mou.patch b/0159-mount-skip-fstype-and-source-checks-for-external-mou.patch similarity index 95% rename from 0160-mount-skip-fstype-and-source-checks-for-external-mou.patch rename to 0159-mount-skip-fstype-and-source-checks-for-external-mou.patch index 8a3a925..3204c35 100644 --- a/0160-mount-skip-fstype-and-source-checks-for-external-mou.patch +++ b/0159-mount-skip-fstype-and-source-checks-for-external-mou.patch @@ -1,7 +1,7 @@ -From 85a2a46355e436f8c78c288dac354d610c1bfe97 Mon Sep 17 00:00:00 2001 +From c2396a5fb549f186e6f5f0031e492143d01cc949 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Tue, 21 Apr 2020 18:12:00 +0300 -Subject: [PATCH 160/245] mount: skip fstype and source checks for external +Subject: [PATCH 159/249] mount: skip fstype and source checks for external mounts in mounts_sb_equal Fstype and source fields can be changed by resolve_external_mounts() or diff --git a/0161-mount-setup-mnt_bind-list-before-using-it-in-mnt_is_.patch b/0160-mount-setup-mnt_bind-list-before-using-it-in-mnt_is_.patch similarity index 97% rename from 0161-mount-setup-mnt_bind-list-before-using-it-in-mnt_is_.patch rename to 0160-mount-setup-mnt_bind-list-before-using-it-in-mnt_is_.patch index 2e55161..db98818 100644 --- a/0161-mount-setup-mnt_bind-list-before-using-it-in-mnt_is_.patch +++ b/0160-mount-setup-mnt_bind-list-before-using-it-in-mnt_is_.patch @@ -1,7 +1,7 @@ -From 579cdbc0567451ed2df89584a267c13ba7365b89 Mon Sep 17 00:00:00 2001 +From 2b57250db0bec7e396a531c24145ecd07334a402 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 20 Dec 2019 17:26:07 +0300 -Subject: [PATCH 161/245] mount: setup mnt_bind list before using it in +Subject: [PATCH 160/249] mount: setup mnt_bind list before using it in mnt_is_external Before this patch mnt_is_external() used non-populated mnt_bind list diff --git a/0162-util-add-get_relative_path-helper.patch b/0161-util-add-get_relative_path-helper.patch similarity index 97% rename from 0162-util-add-get_relative_path-helper.patch rename to 0161-util-add-get_relative_path-helper.patch index 679b915..92ae5ba 100644 --- a/0162-util-add-get_relative_path-helper.patch +++ b/0161-util-add-get_relative_path-helper.patch @@ -1,7 +1,7 @@ -From 127d2aa360d2f3fa61f6c3930bede8b388379020 Mon Sep 17 00:00:00 2001 +From eabcda449fa87d3e1e3060528a316988bbf5b748 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 14 May 2020 13:50:20 +0300 -Subject: [PATCH 162/245] util: add get_relative_path helper +Subject: [PATCH 161/249] util: add get_relative_path helper This is a smart way of getting relative paths: diff --git a/0163-unittest-add-some-tests-for-get_relative_path-helper.patch b/0162-unittest-add-some-tests-for-get_relative_path-helper.patch similarity index 96% rename from 0163-unittest-add-some-tests-for-get_relative_path-helper.patch rename to 0162-unittest-add-some-tests-for-get_relative_path-helper.patch index 1010747..6acfc49 100644 --- a/0163-unittest-add-some-tests-for-get_relative_path-helper.patch +++ b/0162-unittest-add-some-tests-for-get_relative_path-helper.patch @@ -1,7 +1,7 @@ -From 3287ff222c0f748dddbac8e21b6eeec71d251141 Mon Sep 17 00:00:00 2001 +From 9cb726827941e24a5e9f0ed12680d4b69e10551c Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 19 Jan 2022 12:34:51 +0300 -Subject: [PATCH 163/245] unittest: add some tests for get_relative_path helper +Subject: [PATCH 162/249] unittest: add some tests for get_relative_path helper v2: let's also mock kerndat_s.sysctl_nr_open field, to make aarch64 clang ci happy diff --git a/0164-mount-add-mnt_bind_pick-helper-to-pick-the-desired-b.patch b/0163-mount-add-mnt_bind_pick-helper-to-pick-the-desired-b.patch similarity index 93% rename from 0164-mount-add-mnt_bind_pick-helper-to-pick-the-desired-b.patch rename to 0163-mount-add-mnt_bind_pick-helper-to-pick-the-desired-b.patch index 04942fc..805af27 100644 --- a/0164-mount-add-mnt_bind_pick-helper-to-pick-the-desired-b.patch +++ b/0163-mount-add-mnt_bind_pick-helper-to-pick-the-desired-b.patch @@ -1,7 +1,7 @@ -From 0bd2d50db651b6f59744e3445fa596bc298dd57e Mon Sep 17 00:00:00 2001 +From 5a8c2335b2f5ede7faa1b7d38a12a4610d0b2374 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Mon, 29 Nov 2021 12:54:51 +0300 -Subject: [PATCH 164/245] mount: add mnt_bind_pick helper to pick the desired +Subject: [PATCH 163/249] mount: add mnt_bind_pick helper to pick the desired bind Adding different pick functions we would be able to search different diff --git a/0165-mount-split-mnt_is_external-_bind-and-can_receive_ma.patch b/0164-mount-split-mnt_is_external-_bind-and-can_receive_ma.patch similarity index 97% rename from 0165-mount-split-mnt_is_external-_bind-and-can_receive_ma.patch rename to 0164-mount-split-mnt_is_external-_bind-and-can_receive_ma.patch index 23433b9..51de7ff 100644 --- a/0165-mount-split-mnt_is_external-_bind-and-can_receive_ma.patch +++ b/0164-mount-split-mnt_is_external-_bind-and-can_receive_ma.patch @@ -1,7 +1,7 @@ -From 569a003b3993f27e651dc9f7e644806553d5908f Mon Sep 17 00:00:00 2001 +From 05b68230b794d7f16453c6241c90b005d0b277aa Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 18 Dec 2019 13:45:22 +0300 -Subject: [PATCH 165/245] mount: split mnt_is_external(_bind) and +Subject: [PATCH 164/249] mount: split mnt_is_external(_bind) and can_receive_master_from_external We use mnt_is_external(): diff --git a/0166-mount-rework-skipping-external-mounts-in-dump_one_mo.patch b/0165-mount-rework-skipping-external-mounts-in-dump_one_mo.patch similarity index 91% rename from 0166-mount-rework-skipping-external-mounts-in-dump_one_mo.patch rename to 0165-mount-rework-skipping-external-mounts-in-dump_one_mo.patch index c98a8c8..422f85b 100644 --- a/0166-mount-rework-skipping-external-mounts-in-dump_one_mo.patch +++ b/0165-mount-rework-skipping-external-mounts-in-dump_one_mo.patch @@ -1,7 +1,7 @@ -From 8e04c0735d8049a628bc47ba0a92b8c7bde0b922 Mon Sep 17 00:00:00 2001 +From 9a5362e9160a14fb35c709f7b1862c27caa9dac2 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 12 Jan 2022 13:34:39 +0300 -Subject: [PATCH 166/245] mount: rework skipping external mounts in +Subject: [PATCH 165/249] mount: rework skipping external mounts in dump_one_mountpoint Function dump_one_fs already has mnt_is_external_bind check inside, so diff --git a/0167-mount-show-more-info-about-why-we-can-t-mount.patch b/0166-mount-show-more-info-about-why-we-can-t-mount.patch similarity index 96% rename from 0167-mount-show-more-info-about-why-we-can-t-mount.patch rename to 0166-mount-show-more-info-about-why-we-can-t-mount.patch index 6e4859a..0e672d2 100644 --- a/0167-mount-show-more-info-about-why-we-can-t-mount.patch +++ b/0166-mount-show-more-info-about-why-we-can-t-mount.patch @@ -1,7 +1,7 @@ -From 323ca816334a16f0af3aa78587fd09cbe248b0e1 Mon Sep 17 00:00:00 2001 +From 43ff6e839fd1a7802075193b1534cc4ae1ea96fb Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 12 Sep 2019 10:10:37 +0300 -Subject: [PATCH 167/245] mount: show more info about why we can't mount +Subject: [PATCH 166/249] mount: show more info about why we can't mount Currently if we have mount deadlock it is hard to understand which mounts lock each other, these makes it easier. diff --git a/0168-mount-mount-external-mount-before-mounting-it-s-bind.patch b/0167-mount-mount-external-mount-before-mounting-it-s-bind.patch similarity index 96% rename from 0168-mount-mount-external-mount-before-mounting-it-s-bind.patch rename to 0167-mount-mount-external-mount-before-mounting-it-s-bind.patch index 9a85d51..ffbc7b6 100644 --- a/0168-mount-mount-external-mount-before-mounting-it-s-bind.patch +++ b/0167-mount-mount-external-mount-before-mounting-it-s-bind.patch @@ -1,7 +1,7 @@ -From 2f347af01f5ec1525b989fe4ed9d9c5ead2c5f27 Mon Sep 17 00:00:00 2001 +From f24aa442f004730f4994e667dd0d794a00427c48 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Mon, 17 Feb 2020 11:58:41 +0300 -Subject: [PATCH 168/245] mount: mount external mount before mounting it's +Subject: [PATCH 167/249] mount: mount external mount before mounting it's binds The problem when we don't order these mounts we can get to mounting diff --git a/0169-zdtm-add-new-mnt_ext_root-test.patch b/0168-zdtm-add-new-mnt_ext_root-test.patch similarity index 97% rename from 0169-zdtm-add-new-mnt_ext_root-test.patch rename to 0168-zdtm-add-new-mnt_ext_root-test.patch index 2edd55a..c4b45c0 100644 --- a/0169-zdtm-add-new-mnt_ext_root-test.patch +++ b/0168-zdtm-add-new-mnt_ext_root-test.patch @@ -1,7 +1,7 @@ -From 8f1a5dadf72c917336c06f028b58111b6c00fd50 Mon Sep 17 00:00:00 2001 +From f59efe89bcc72c7104e08cad64b47d03e098bcca Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 18 Feb 2020 13:41:18 +0300 -Subject: [PATCH 169/245] zdtm: add new mnt_ext_root test +Subject: [PATCH 168/249] zdtm: add new mnt_ext_root test This test simply creates a) root external mount and b) "deeper" bindmount for it (deeper in terms of mnt_depth). Our mount restore code diff --git a/0170-mount-restrict-mp-external-mount-map-to-init-contain.patch b/0169-mount-restrict-mp-external-mount-map-to-init-contain.patch similarity index 94% rename from 0170-mount-restrict-mp-external-mount-map-to-init-contain.patch rename to 0169-mount-restrict-mp-external-mount-map-to-init-contain.patch index 8ba4d49..d54a606 100644 --- a/0170-mount-restrict-mp-external-mount-map-to-init-contain.patch +++ b/0169-mount-restrict-mp-external-mount-map-to-init-contain.patch @@ -1,7 +1,7 @@ -From 573137b58e00dce2d58c7e669a6a07ecbcddf9b0 Mon Sep 17 00:00:00 2001 +From 0744a30a70c96f6d4de0577c354ec682220ec2e3 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 26 Nov 2021 12:53:41 +0300 -Subject: [PATCH 170/245] mount: restrict mp-external mount map to init +Subject: [PATCH 169/249] mount: restrict mp-external mount map to init container mntns only We resolve mountpoint-external mounts on dump by mountpoint comparison, diff --git a/0171-zdtm-add-mnt_ext_collision-test.patch b/0170-zdtm-add-mnt_ext_collision-test.patch similarity index 98% rename from 0171-zdtm-add-mnt_ext_collision-test.patch rename to 0170-zdtm-add-mnt_ext_collision-test.patch index 8bf24de..994549d 100644 --- a/0171-zdtm-add-mnt_ext_collision-test.patch +++ b/0170-zdtm-add-mnt_ext_collision-test.patch @@ -1,7 +1,7 @@ -From cd43fdffbaadd0406a73c02939d07493de014244 Mon Sep 17 00:00:00 2001 +From 0e4b310a3a2af3aa6b33c07f402f5a46aa1e51b5 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 12 Jan 2022 16:00:56 +0300 -Subject: [PATCH 171/245] zdtm: add mnt_ext_collision test +Subject: [PATCH 170/249] zdtm: add mnt_ext_collision test This test creates two mount namespaces, one "root" with external mount at /mnt_ext_collision.test/dst and one "nested" with different internal diff --git a/0172-mount-add-mnt_is_root_bind-helper.patch b/0171-mount-add-mnt_is_root_bind-helper.patch similarity index 96% rename from 0172-mount-add-mnt_is_root_bind-helper.patch rename to 0171-mount-add-mnt_is_root_bind-helper.patch index 3573261..b4686eb 100644 --- a/0172-mount-add-mnt_is_root_bind-helper.patch +++ b/0171-mount-add-mnt_is_root_bind-helper.patch @@ -1,7 +1,7 @@ -From e6b94a2ee627fa4806f14310e3cc66d4ca4c08fe Mon Sep 17 00:00:00 2001 +From 8cf73188d2ce803a13712a10e9894efed7d32123 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 8 May 2020 14:33:13 +0300 -Subject: [PATCH 172/245] mount: add mnt_is_root_bind helper +Subject: [PATCH 171/249] mount: add mnt_is_root_bind helper Helper mnt_is_root_bind indicates that mount can be bind-mounted from the root mount (which in it's turn from opts.root). diff --git a/0173-mount-allow-nested-mount-namespaces-with-different-r.patch b/0172-mount-allow-nested-mount-namespaces-with-different-r.patch similarity index 92% rename from 0173-mount-allow-nested-mount-namespaces-with-different-r.patch rename to 0172-mount-allow-nested-mount-namespaces-with-different-r.patch index 3b38454..d887842 100644 --- a/0173-mount-allow-nested-mount-namespaces-with-different-r.patch +++ b/0172-mount-allow-nested-mount-namespaces-with-different-r.patch @@ -1,7 +1,7 @@ -From 009877169d13f9d6437fc2d11113bccdbad6b15f Mon Sep 17 00:00:00 2001 +From b775febb36915afcd6e6d320a6c30f08c433c4f0 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Mon, 27 Apr 2020 18:24:54 +0300 -Subject: [PATCH 173/245] mount: allow nested mount namespaces with different +Subject: [PATCH 172/249] mount: allow nested mount namespaces with different roots Only root in root-mntns is special (see rst_mnt_is_root) all other diff --git a/0174-zdtm-add-mntns_pivot_root-test.patch b/0173-zdtm-add-mntns_pivot_root-test.patch similarity index 97% rename from 0174-zdtm-add-mntns_pivot_root-test.patch rename to 0173-zdtm-add-mntns_pivot_root-test.patch index c7ebbc5..4a0ef6d 100644 --- a/0174-zdtm-add-mntns_pivot_root-test.patch +++ b/0173-zdtm-add-mntns_pivot_root-test.patch @@ -1,7 +1,7 @@ -From 4a1fb7b6d7093f4dd9ed4f544bac69241b641208 Mon Sep 17 00:00:00 2001 +From bde8ec21a973e0cb129fa9214a17b8ce91cf8a41 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 12 Jan 2022 19:30:07 +0300 -Subject: [PATCH 174/245] zdtm: add mntns_pivot_root test +Subject: [PATCH 173/249] zdtm: add mntns_pivot_root test This creates nested mntns and does pivot_root to tmpfs mount, so that roots of original test mntns and in nested mntns are different. diff --git a/0175-mount-apply-superblock-flags-to-nested-ns-roots.patch b/0174-mount-apply-superblock-flags-to-nested-ns-roots.patch similarity index 88% rename from 0175-mount-apply-superblock-flags-to-nested-ns-roots.patch rename to 0174-mount-apply-superblock-flags-to-nested-ns-roots.patch index 7d514ec..cd9c4ee 100644 --- a/0175-mount-apply-superblock-flags-to-nested-ns-roots.patch +++ b/0174-mount-apply-superblock-flags-to-nested-ns-roots.patch @@ -1,7 +1,7 @@ -From 68aa0fc0b531ecdf954e79af6f04303c167b2d59 Mon Sep 17 00:00:00 2001 +From af12f2ef7c38bc06cd9ce43b7feb40bc968ec251 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 27 May 2020 13:43:49 +0300 -Subject: [PATCH 175/245] mount: apply superblock flags to nested ns roots +Subject: [PATCH 174/249] mount: apply superblock flags to nested ns roots Before this change we didn't apply sb-flags if we mount the root mount of non-root mntns. There is no point in it, if we got to do_new_mount this root diff --git a/0176-zdtm-add-mntns_pivot_root_ro-test.patch b/0175-zdtm-add-mntns_pivot_root_ro-test.patch similarity index 96% rename from 0176-zdtm-add-mntns_pivot_root_ro-test.patch rename to 0175-zdtm-add-mntns_pivot_root_ro-test.patch index d165f23..1a5f14d 100644 --- a/0176-zdtm-add-mntns_pivot_root_ro-test.patch +++ b/0175-zdtm-add-mntns_pivot_root_ro-test.patch @@ -1,7 +1,7 @@ -From b79f69573471a5bcb0ea8e74d5b1eae5dd5e3d24 Mon Sep 17 00:00:00 2001 +From 432f84d74bed3ef0edd2d9271c1b6f3e681fc9ca Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 13 Jan 2022 10:46:44 +0300 -Subject: [PATCH 176/245] zdtm: add mntns_pivot_root_ro test +Subject: [PATCH 175/249] zdtm: add mntns_pivot_root_ro test This checks that superblock readonly flag is applied to nested mntns roots on restore. diff --git a/0177-mount-restore-create-auxiliary-binfmt_misc-mount-in-.patch b/0176-mount-restore-create-auxiliary-binfmt_misc-mount-in-.patch similarity index 97% rename from 0177-mount-restore-create-auxiliary-binfmt_misc-mount-in-.patch rename to 0176-mount-restore-create-auxiliary-binfmt_misc-mount-in-.patch index 6dc0d17..3bfa274 100644 --- a/0177-mount-restore-create-auxiliary-binfmt_misc-mount-in-.patch +++ b/0176-mount-restore-create-auxiliary-binfmt_misc-mount-in-.patch @@ -1,7 +1,7 @@ -From e1a4ba44de4eb4bd0818236323afee1264d220da Mon Sep 17 00:00:00 2001 +From 764cb9f4074b0a4378a80036e7fd8c6a3b0e668c Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 23 Jul 2019 18:33:59 +0300 -Subject: [PATCH 177/245] mount/restore: create auxiliary binfmt_misc mount in +Subject: [PATCH 176/249] mount/restore: create auxiliary binfmt_misc mount in the root yard Put our auxiliary binfmt_misc mount in "/binfmt_misc" instead diff --git a/0178-mount-restore-leave-ns_mountpoint-NULL-for-aux-binfm.patch b/0177-mount-restore-leave-ns_mountpoint-NULL-for-aux-binfm.patch similarity index 88% rename from 0178-mount-restore-leave-ns_mountpoint-NULL-for-aux-binfm.patch rename to 0177-mount-restore-leave-ns_mountpoint-NULL-for-aux-binfm.patch index 87b51dc..17c45ea 100644 --- a/0178-mount-restore-leave-ns_mountpoint-NULL-for-aux-binfm.patch +++ b/0177-mount-restore-leave-ns_mountpoint-NULL-for-aux-binfm.patch @@ -1,7 +1,7 @@ -From db85d61119ce01ca7f1fd20b955517ca7afb647d Mon Sep 17 00:00:00 2001 +From 3d86ba5d0a0d5acdcfcc18ec6e0f9f95f9f934d2 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 13 Jan 2022 17:45:46 +0300 -Subject: [PATCH 178/245] mount/restore: leave ns_mountpoint NULL for aux +Subject: [PATCH 177/249] mount/restore: leave ns_mountpoint NULL for aux binfmt_misc mount On dump, yes, mountpoint and ns_mountpoint are the same, but on restore diff --git a/0179-mount-replace-CRTIME_MNT_ID-with-HELPER_MNT_ID.patch b/0178-mount-replace-CRTIME_MNT_ID-with-HELPER_MNT_ID.patch similarity index 94% rename from 0179-mount-replace-CRTIME_MNT_ID-with-HELPER_MNT_ID.patch rename to 0178-mount-replace-CRTIME_MNT_ID-with-HELPER_MNT_ID.patch index 1ed88b1..b100f8e 100644 --- a/0179-mount-replace-CRTIME_MNT_ID-with-HELPER_MNT_ID.patch +++ b/0178-mount-replace-CRTIME_MNT_ID-with-HELPER_MNT_ID.patch @@ -1,7 +1,7 @@ -From 583409d5cde3e2bd26f932ef1164e18725dd0a8a Mon Sep 17 00:00:00 2001 +From 63f702594183d1bd5a08cabb0751f63acc94902d Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 7 May 2020 16:13:02 +0300 -Subject: [PATCH 179/245] mount: replace CRTIME_MNT_ID with HELPER_MNT_ID +Subject: [PATCH 178/249] mount: replace CRTIME_MNT_ID with HELPER_MNT_ID Root yard mount also has mnt_id == 0 so it will look better with a new name. Let's explicitly initialize root yard mnt_id to HELPER_MNT_ID diff --git a/0180-mount-add-can_receive_master_from_root-helper.patch b/0179-mount-add-can_receive_master_from_root-helper.patch similarity index 94% rename from 0180-mount-add-can_receive_master_from_root-helper.patch rename to 0179-mount-add-can_receive_master_from_root-helper.patch index c9b94d8..c57396f 100644 --- a/0180-mount-add-can_receive_master_from_root-helper.patch +++ b/0179-mount-add-can_receive_master_from_root-helper.patch @@ -1,7 +1,7 @@ -From 4ca0014e28625bf24cdd646c3ddf11254b246d5a Mon Sep 17 00:00:00 2001 +From 46386c3566ad82f17c96048a275b5ba4c2475fa9 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 30 Dec 2021 15:24:30 +0300 -Subject: [PATCH 180/245] mount: add can_receive_master_from_root helper +Subject: [PATCH 179/249] mount: add can_receive_master_from_root helper If mount has external master_id it can inherit it as a bind of external mount, but also it can inherit it as a bind of container root mount, so diff --git a/0181-mount-put-external-slavery-mounts-to-separate-mnt_ex.patch b/0180-mount-put-external-slavery-mounts-to-separate-mnt_ex.patch similarity index 95% rename from 0181-mount-put-external-slavery-mounts-to-separate-mnt_ex.patch rename to 0180-mount-put-external-slavery-mounts-to-separate-mnt_ex.patch index 295cc85..2e1bcb8 100644 --- a/0181-mount-put-external-slavery-mounts-to-separate-mnt_ex.patch +++ b/0180-mount-put-external-slavery-mounts-to-separate-mnt_ex.patch @@ -1,7 +1,7 @@ -From d64abf2fd7f87b87a002060cfb48366d8a5acf42 Mon Sep 17 00:00:00 2001 +From f08c3b899fbaf2e4b0f496cfdfa1cc5523161c80 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 20 Feb 2020 10:50:42 +0300 -Subject: [PATCH 181/245] mount: put external slavery mounts to separate +Subject: [PATCH 180/249] mount: put external slavery mounts to separate mnt_ext_slave list We need to put mounts which need to inherit master_id from external diff --git a/0182-mount-do-not-override-master_id-to-1-for-root-binds.patch b/0181-mount-do-not-override-master_id-to-1-for-root-binds.patch similarity index 96% rename from 0182-mount-do-not-override-master_id-to-1-for-root-binds.patch rename to 0181-mount-do-not-override-master_id-to-1-for-root-binds.patch index 7e83dd6..ddaf9c6 100644 --- a/0182-mount-do-not-override-master_id-to-1-for-root-binds.patch +++ b/0181-mount-do-not-override-master_id-to-1-for-root-binds.patch @@ -1,7 +1,7 @@ -From c1614365dd48ff9bde55f452e1bbcd75f59394d5 Mon Sep 17 00:00:00 2001 +From 03cb0595a299ffe3e7e55ecb9cc0402277f75e65 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 14 Jan 2022 14:33:30 +0300 -Subject: [PATCH 182/245] mount: do not override master_id to -1 for root binds +Subject: [PATCH 181/249] mount: do not override master_id to -1 for root binds There is no point to lose this information, having -1 everywhere in mount images instead of acutall master id can be confusing. diff --git a/0183-mount-add-helper-mnt_get_external_bind_nodev.patch b/0182-mount-add-helper-mnt_get_external_bind_nodev.patch similarity index 93% rename from 0183-mount-add-helper-mnt_get_external_bind_nodev.patch rename to 0182-mount-add-helper-mnt_get_external_bind_nodev.patch index 67bd648..ce5d05a 100644 --- a/0183-mount-add-helper-mnt_get_external_bind_nodev.patch +++ b/0182-mount-add-helper-mnt_get_external_bind_nodev.patch @@ -1,7 +1,7 @@ -From 62d2a03d575b7876fb28e54c44407d9e398ed2f8 Mon Sep 17 00:00:00 2001 +From dc2aaeb239af4851d0d157e85d2d2f98bad289d5 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 27 May 2020 11:50:34 +0300 -Subject: [PATCH 183/245] mount: add helper mnt_get_external_bind_nodev +Subject: [PATCH 182/249] mount: add helper mnt_get_external_bind_nodev Will use it to find shared mount we can bind from and also can inherit external slavery. Device-external can't give us external slavery. diff --git a/0184-mount-prepare-is_overmounted-as-early-as-possible.patch b/0183-mount-prepare-is_overmounted-as-early-as-possible.patch similarity index 96% rename from 0184-mount-prepare-is_overmounted-as-early-as-possible.patch rename to 0183-mount-prepare-is_overmounted-as-early-as-possible.patch index b47c79a..5d47d03 100644 --- a/0184-mount-prepare-is_overmounted-as-early-as-possible.patch +++ b/0183-mount-prepare-is_overmounted-as-early-as-possible.patch @@ -1,7 +1,7 @@ -From 7d5222dce8fc65def14c935b8a669d38d65c81e0 Mon Sep 17 00:00:00 2001 +From 85f9f104c25b032db7f4012e4209d6039ed9042e Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 29 May 2020 10:27:05 +0300 -Subject: [PATCH 184/245] mount: prepare is_overmounted as early as possible +Subject: [PATCH 183/249] mount: prepare is_overmounted as early as possible Function mnt_is_overmounted is designed to detect if mount is overmounted in current tree using comparison of mountpoints of neighbour mounts for detection. diff --git a/0185-mount-move-root-yard-tree-merge-as-early-as-possible.patch b/0184-mount-move-root-yard-tree-merge-as-early-as-possible.patch similarity index 95% rename from 0185-mount-move-root-yard-tree-merge-as-early-as-possible.patch rename to 0184-mount-move-root-yard-tree-merge-as-early-as-possible.patch index 0e00940..cf719be 100644 --- a/0185-mount-move-root-yard-tree-merge-as-early-as-possible.patch +++ b/0184-mount-move-root-yard-tree-merge-as-early-as-possible.patch @@ -1,7 +1,7 @@ -From bdd198cd917643f92e3b7bec7146eb3f51fec92b Mon Sep 17 00:00:00 2001 +From 96d694c36abfb17427e058958ca61865491da160 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Mon, 29 Jun 2020 18:04:41 +0300 -Subject: [PATCH 185/245] mount: move root yard tree merge as early as possible +Subject: [PATCH 184/249] mount: move root yard tree merge as early as possible Let's merge mount trees under root_yard just after reading from image. diff --git a/0186-mount-fix-broken-remounted_rw-check.patch b/0185-mount-fix-broken-remounted_rw-check.patch similarity index 88% rename from 0186-mount-fix-broken-remounted_rw-check.patch rename to 0185-mount-fix-broken-remounted_rw-check.patch index d4b51f4..71ce9cc 100644 --- a/0186-mount-fix-broken-remounted_rw-check.patch +++ b/0185-mount-fix-broken-remounted_rw-check.patch @@ -1,7 +1,7 @@ -From 8b6d30c5a762065fb1a30dda7a7b061df3df8cbe Mon Sep 17 00:00:00 2001 +From 38a7d96e01f897f1da38d1fcbcbc362fc6628052 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 8 Jul 2020 09:57:33 +0300 -Subject: [PATCH 186/245] mount: fix broken remounted_rw check +Subject: [PATCH 185/249] mount: fix broken remounted_rw check Expression (x && REMOUNTED_RW) is always same as just (x). diff --git a/0187-mount-make-general-place-for-shared-variables-on-mou.patch b/0186-mount-make-general-place-for-shared-variables-on-mou.patch similarity index 95% rename from 0187-mount-make-general-place-for-shared-variables-on-mou.patch rename to 0186-mount-make-general-place-for-shared-variables-on-mou.patch index 97a630c..f824b9d 100644 --- a/0187-mount-make-general-place-for-shared-variables-on-mou.patch +++ b/0186-mount-make-general-place-for-shared-variables-on-mou.patch @@ -1,7 +1,7 @@ -From 6453e35364bc9816aac9087501082aa157d67d23 Mon Sep 17 00:00:00 2001 +From a554c2d6d9a652ad32f272e7c2a03eec056220e5 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 16 Jun 2020 16:19:42 +0300 -Subject: [PATCH 187/245] mount: make general place for shared variables on +Subject: [PATCH 186/249] mount: make general place for shared variables on mount-info on restore Put remounted_rw to it. This allows us to easily add some more of such diff --git a/0188-autofs-use-ns_mountpoint-in-autofs_create_dentries.patch b/0187-autofs-use-ns_mountpoint-in-autofs_create_dentries.patch similarity index 93% rename from 0188-autofs-use-ns_mountpoint-in-autofs_create_dentries.patch rename to 0187-autofs-use-ns_mountpoint-in-autofs_create_dentries.patch index c1e8a52..fc6943d 100644 --- a/0188-autofs-use-ns_mountpoint-in-autofs_create_dentries.patch +++ b/0187-autofs-use-ns_mountpoint-in-autofs_create_dentries.patch @@ -1,7 +1,7 @@ -From 3bd5d9b39eac0cd20c427a77f94700530c5c1044 Mon Sep 17 00:00:00 2001 +From f84949f68f001a1a06e9c612f34ec573d962e6c4 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 26 May 2020 16:40:57 +0300 -Subject: [PATCH 188/245] autofs: use ns_mountpoint in autofs_create_dentries +Subject: [PATCH 187/249] autofs: use ns_mountpoint in autofs_create_dentries Replace ->mountpoint with ->ns_mountpoint for determining relations between mounts. diff --git a/0189-mount-use-ns_mountpoint-in-mnt_is_overmounted.patch b/0188-mount-use-ns_mountpoint-in-mnt_is_overmounted.patch similarity index 91% rename from 0189-mount-use-ns_mountpoint-in-mnt_is_overmounted.patch rename to 0188-mount-use-ns_mountpoint-in-mnt_is_overmounted.patch index 0c07830..394ddd2 100644 --- a/0189-mount-use-ns_mountpoint-in-mnt_is_overmounted.patch +++ b/0188-mount-use-ns_mountpoint-in-mnt_is_overmounted.patch @@ -1,7 +1,7 @@ -From 7fa7b4a49e5e3ff2f244ab85b41baa78d53eabb2 Mon Sep 17 00:00:00 2001 +From eebae8cb3ef05114fbcce56c37d405c18d640d4a Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 30 Nov 2021 12:11:02 +0300 -Subject: [PATCH 189/245] mount: use ns_mountpoint in mnt_is_overmounted +Subject: [PATCH 188/249] mount: use ns_mountpoint in mnt_is_overmounted Let's use ->ns_mountpoint in comparison as ->mountpoint can change (e.g. see how we add ns root in get_mp_mountpoint and in do_remap_mount we can diff --git a/0190-mount-skip-root-yard-children-from-mnt_needs_remap-c.patch b/0189-mount-skip-root-yard-children-from-mnt_needs_remap-c.patch similarity index 91% rename from 0190-mount-skip-root-yard-children-from-mnt_needs_remap-c.patch rename to 0189-mount-skip-root-yard-children-from-mnt_needs_remap-c.patch index 858c52a..b37ef34 100644 --- a/0190-mount-skip-root-yard-children-from-mnt_needs_remap-c.patch +++ b/0189-mount-skip-root-yard-children-from-mnt_needs_remap-c.patch @@ -1,7 +1,7 @@ -From e1bb0fb902c77668bbc41ad7c1fd6a1ea777c8df Mon Sep 17 00:00:00 2001 +From 744bd436864bda3bef9d5117c802c6d6355dc568 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 29 May 2020 12:40:52 +0300 -Subject: [PATCH 190/245] mount: skip root yard children from mnt_needs_remap +Subject: [PATCH 189/249] mount: skip root yard children from mnt_needs_remap check There is no point of remaping ns root mounts they can't overmount anybody. diff --git a/0191-mount-use-ns_mountpoint-in-validate_children_collisi.patch b/0190-mount-use-ns_mountpoint-in-validate_children_collisi.patch similarity index 91% rename from 0191-mount-use-ns_mountpoint-in-validate_children_collisi.patch rename to 0190-mount-use-ns_mountpoint-in-validate_children_collisi.patch index 8b82a12..1757c47 100644 --- a/0191-mount-use-ns_mountpoint-in-validate_children_collisi.patch +++ b/0190-mount-use-ns_mountpoint-in-validate_children_collisi.patch @@ -1,7 +1,7 @@ -From aab7439cca03f04107e1783d43f9dc898a7bea11 Mon Sep 17 00:00:00 2001 +From 1c00cde48a8dd65cd49c253af655eb98aa002967 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 29 May 2020 13:00:48 +0300 -Subject: [PATCH 191/245] mount: use ns_mountpoint in +Subject: [PATCH 190/249] mount: use ns_mountpoint in validate_children_collision Function validate_children_collision is both called on dump and on diff --git a/0192-mount-use-ns_mountpoint-in-root_path_from_parent.patch b/0191-mount-use-ns_mountpoint-in-root_path_from_parent.patch similarity index 92% rename from 0192-mount-use-ns_mountpoint-in-root_path_from_parent.patch rename to 0191-mount-use-ns_mountpoint-in-root_path_from_parent.patch index 4b09fda..1e203c3 100644 --- a/0192-mount-use-ns_mountpoint-in-root_path_from_parent.patch +++ b/0191-mount-use-ns_mountpoint-in-root_path_from_parent.patch @@ -1,7 +1,7 @@ -From e78d1e91a6e66757482138da54c4d2efa2e668ff Mon Sep 17 00:00:00 2001 +From 305750f27c8492bd51145ae4a18ff2dd12793d12 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 29 May 2020 13:39:10 +0300 -Subject: [PATCH 192/245] mount: use ns_mountpoint in root_path_from_parent +Subject: [PATCH 191/249] mount: use ns_mountpoint in root_path_from_parent Fail root_path_from_parent if parent is root_yard, we want to only lookup root path in real parent mounts. diff --git a/0193-mount-use-ns_mountpoint-for-children-overmount-check.patch b/0192-mount-use-ns_mountpoint-for-children-overmount-check.patch similarity index 89% rename from 0193-mount-use-ns_mountpoint-for-children-overmount-check.patch rename to 0192-mount-use-ns_mountpoint-for-children-overmount-check.patch index e1a8ae9..94146b4 100644 --- a/0193-mount-use-ns_mountpoint-for-children-overmount-check.patch +++ b/0192-mount-use-ns_mountpoint-for-children-overmount-check.patch @@ -1,7 +1,7 @@ -From 8900c398fc323924eb9fd6b4ed66b18e5cadd9a9 Mon Sep 17 00:00:00 2001 +From 16b279a63594bdff1e5376e22794439487d6f0bb Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 29 May 2020 13:52:45 +0300 -Subject: [PATCH 193/245] mount: use ns_mountpoint for children-overmount check +Subject: [PATCH 192/249] mount: use ns_mountpoint for children-overmount check We need to skip root_yard_mp parent as it has no ns_mountpoint, it also has no children overmounts so we are safe, all others can be compared by diff --git a/0194-path-simplify-mnt_get_sibling_path-via-get_relative_.patch b/0193-path-simplify-mnt_get_sibling_path-via-get_relative_.patch similarity index 97% rename from 0194-path-simplify-mnt_get_sibling_path-via-get_relative_.patch rename to 0193-path-simplify-mnt_get_sibling_path-via-get_relative_.patch index 92eb15a..eff2caa 100644 --- a/0194-path-simplify-mnt_get_sibling_path-via-get_relative_.patch +++ b/0193-path-simplify-mnt_get_sibling_path-via-get_relative_.patch @@ -1,7 +1,7 @@ -From 421fb3b73b950669600160ea74913e5c3d953d5c Mon Sep 17 00:00:00 2001 +From bdb7345ebea7034738a391534bd0c77ce144203c Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 1 Dec 2021 12:52:27 +0300 -Subject: [PATCH 194/245] path: simplify mnt_get_sibling_path via +Subject: [PATCH 193/249] path: simplify mnt_get_sibling_path via get_relative_path Previous code did: diff --git a/0195-mount-use-ns_mountpoint-in-collect_mntinfo.patch b/0194-mount-use-ns_mountpoint-in-collect_mntinfo.patch similarity index 92% rename from 0195-mount-use-ns_mountpoint-in-collect_mntinfo.patch rename to 0194-mount-use-ns_mountpoint-in-collect_mntinfo.patch index 598df95..be9dbbb 100644 --- a/0195-mount-use-ns_mountpoint-in-collect_mntinfo.patch +++ b/0194-mount-use-ns_mountpoint-in-collect_mntinfo.patch @@ -1,7 +1,7 @@ -From ef5460e9d44d4a94bf9845d7d0d8b52cb9b8a35e Mon Sep 17 00:00:00 2001 +From b37b302d47277d41a3a8287529739805bfa427a4 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 29 May 2020 14:34:03 +0300 -Subject: [PATCH 195/245] mount: use ns_mountpoint in collect_mntinfo +Subject: [PATCH 194/249] mount: use ns_mountpoint in collect_mntinfo At this point ns_mountpoint is equal to mountpoint. diff --git a/0196-mount-use-ns_mountpoint-in-aufs_parse.patch b/0195-mount-use-ns_mountpoint-in-aufs_parse.patch similarity index 85% rename from 0196-mount-use-ns_mountpoint-in-aufs_parse.patch rename to 0195-mount-use-ns_mountpoint-in-aufs_parse.patch index de4d860..b0f8fe7 100644 --- a/0196-mount-use-ns_mountpoint-in-aufs_parse.patch +++ b/0195-mount-use-ns_mountpoint-in-aufs_parse.patch @@ -1,7 +1,7 @@ -From 1f9b525b6f7c9a4a31f0f05b695dbb1c2e0d2592 Mon Sep 17 00:00:00 2001 +From 8506fbfdc3bcd4983f0808c76540ceba76c1bebb Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 29 May 2020 14:40:01 +0300 -Subject: [PATCH 196/245] mount: use ns_mountpoint in aufs_parse +Subject: [PATCH 195/249] mount: use ns_mountpoint in aufs_parse At this point ns_mountpoint is equal to mountpoint. diff --git a/0197-mount-use-ns_mountpoint-in-mnt_depth.patch b/0196-mount-use-ns_mountpoint-in-mnt_depth.patch similarity index 86% rename from 0197-mount-use-ns_mountpoint-in-mnt_depth.patch rename to 0196-mount-use-ns_mountpoint-in-mnt_depth.patch index c7a29c3..48dfad8 100644 --- a/0197-mount-use-ns_mountpoint-in-mnt_depth.patch +++ b/0196-mount-use-ns_mountpoint-in-mnt_depth.patch @@ -1,7 +1,7 @@ -From 9dc8da68e08544940403a0159f10c3df9bf664b7 Mon Sep 17 00:00:00 2001 +From b23ba1e4a50e7b9a1ca3f208983d73c683acbea1 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 29 May 2020 15:18:10 +0300 -Subject: [PATCH 197/245] mount: use ns_mountpoint in mnt_depth +Subject: [PATCH 196/249] mount: use ns_mountpoint in mnt_depth Function mnt_depth is only used on real mounts when building mount tree for single namespace, thats why we can compare those mounts with ns_mountpoint diff --git a/0198-mount-use-ns_mountpoint-instead-of-mountpoint-where-.patch b/0197-mount-use-ns_mountpoint-instead-of-mountpoint-where-.patch similarity index 99% rename from 0198-mount-use-ns_mountpoint-instead-of-mountpoint-where-.patch rename to 0197-mount-use-ns_mountpoint-instead-of-mountpoint-where-.patch index 9873349..b2d8d9f 100644 --- a/0198-mount-use-ns_mountpoint-instead-of-mountpoint-where-.patch +++ b/0197-mount-use-ns_mountpoint-instead-of-mountpoint-where-.patch @@ -1,7 +1,7 @@ -From fdb14abc5703c4da8afcae05fe10d83445283d61 Mon Sep 17 00:00:00 2001 +From fec02ce6c42779386cd621030887194aeb7f2aca Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 29 May 2020 12:02:16 +0300 -Subject: [PATCH 198/245] mount: use ns_mountpoint instead of mountpoint where +Subject: [PATCH 197/249] mount: use ns_mountpoint instead of mountpoint where possible On dump ->mountpoint and ->ns_mountpoint is the same, but on restore diff --git a/0199-mount-add-service_mountpoint-getter-for-mountpoint.patch b/0198-mount-add-service_mountpoint-getter-for-mountpoint.patch similarity index 99% rename from 0199-mount-add-service_mountpoint-getter-for-mountpoint.patch rename to 0198-mount-add-service_mountpoint-getter-for-mountpoint.patch index dc7b0a2..4bd9ea0 100644 --- a/0199-mount-add-service_mountpoint-getter-for-mountpoint.patch +++ b/0198-mount-add-service_mountpoint-getter-for-mountpoint.patch @@ -1,7 +1,7 @@ -From 06ad6dc02320535221228481a9fb6b864af81992 Mon Sep 17 00:00:00 2001 +From 569d5e17f39c8c206c4b20386b101b29a8fee188 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 28 May 2020 11:14:39 +0300 -Subject: [PATCH 199/245] mount: add service_mountpoint getter for ->mountpoint +Subject: [PATCH 198/249] mount: add service_mountpoint getter for ->mountpoint This getter should be used when we wan't to access the mount on the filesystem. In next patches we want to be able to change the location of the mount on diff --git a/0200-files-reg-split-create_ghost_dentry-out-of-create_gh.patch b/0199-files-reg-split-create_ghost_dentry-out-of-create_gh.patch similarity index 96% rename from 0200-files-reg-split-create_ghost_dentry-out-of-create_gh.patch rename to 0199-files-reg-split-create_ghost_dentry-out-of-create_gh.patch index 145f127..1bf2d51 100644 --- a/0200-files-reg-split-create_ghost_dentry-out-of-create_gh.patch +++ b/0199-files-reg-split-create_ghost_dentry-out-of-create_gh.patch @@ -1,7 +1,7 @@ -From 942d9f5e0d484eefbdef9ee69c326aa176da4d10 Mon Sep 17 00:00:00 2001 +From e9ff05033bda690539b42e658d110ff3991414b4 Mon Sep 17 00:00:00 2001 From: Stanislav Kinsburskiy Date: Mon, 11 Jul 2016 14:14:15 +0300 -Subject: [PATCH 200/245] files-reg: split create_ghost_dentry out of +Subject: [PATCH 199/249] files-reg: split create_ghost_dentry out of create_ghost Will use it to make create_ghost work with mount-v2. diff --git a/0201-files-reg-teach-create_ghost-to-work-with-mount-v2.patch b/0200-files-reg-teach-create_ghost-to-work-with-mount-v2.patch similarity index 96% rename from 0201-files-reg-teach-create_ghost-to-work-with-mount-v2.patch rename to 0200-files-reg-teach-create_ghost-to-work-with-mount-v2.patch index c061809..69c3469 100644 --- a/0201-files-reg-teach-create_ghost-to-work-with-mount-v2.patch +++ b/0200-files-reg-teach-create_ghost-to-work-with-mount-v2.patch @@ -1,7 +1,7 @@ -From 494e92c1e7ef7e8ea8e506884de18b2affe21df7 Mon Sep 17 00:00:00 2001 +From d33eee29e43f5f8a0aa8d4ee9c21006e08685367 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 14 May 2020 14:11:47 +0300 -Subject: [PATCH 201/245] files-reg: teach create_ghost to work with mount-v2 +Subject: [PATCH 200/249] files-reg: teach create_ghost to work with mount-v2 While mounts-v2 would mount all mounts plain without tree in service mntns we can't just use path relative to mntns to find remap. Make it diff --git a/0202-files-reg-teach-clean_one_remap-to-work-with-mount-v.patch b/0201-files-reg-teach-clean_one_remap-to-work-with-mount-v.patch similarity index 95% rename from 0202-files-reg-teach-clean_one_remap-to-work-with-mount-v.patch rename to 0201-files-reg-teach-clean_one_remap-to-work-with-mount-v.patch index e23a476..78d9221 100644 --- a/0202-files-reg-teach-clean_one_remap-to-work-with-mount-v.patch +++ b/0201-files-reg-teach-clean_one_remap-to-work-with-mount-v.patch @@ -1,7 +1,7 @@ -From a50e588c378ebe862e79a17609f1023be06324b0 Mon Sep 17 00:00:00 2001 +From 379cfdd821911d475e0c74e36c9d8913a5f9a989 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 14 May 2020 16:36:57 +0300 -Subject: [PATCH 202/245] files-reg: teach clean_one_remap to work with +Subject: [PATCH 201/249] files-reg: teach clean_one_remap to work with mount-v2 While mounts-v2 mounts all mounts plain without tree in service mntns we can't diff --git a/0203-kerndat-Check-for-MOVE_MOUNT_SET_GROUP-availability.patch b/0202-kerndat-Check-for-MOVE_MOUNT_SET_GROUP-availability.patch similarity index 98% rename from 0203-kerndat-Check-for-MOVE_MOUNT_SET_GROUP-availability.patch rename to 0202-kerndat-Check-for-MOVE_MOUNT_SET_GROUP-availability.patch index 54fc3a5..d06987a 100644 --- a/0203-kerndat-Check-for-MOVE_MOUNT_SET_GROUP-availability.patch +++ b/0202-kerndat-Check-for-MOVE_MOUNT_SET_GROUP-availability.patch @@ -1,7 +1,7 @@ -From d48d4f9e3b5c08028a07e8a77f01cf419db530ec Mon Sep 17 00:00:00 2001 +From 44be7557f0477237945e244de6b26a9472a1591b Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 25 Mar 2021 13:37:55 +0300 -Subject: [PATCH 203/245] kerndat: Check for MOVE_MOUNT_SET_GROUP availability +Subject: [PATCH 202/249] kerndat: Check for MOVE_MOUNT_SET_GROUP availability Mounts-v2 requires new kernel feature MOVE_MOUNT_SET_GROUP to be able to restore propagation between mounts right. diff --git a/0204-compel-add-open_tree-syscall.patch b/0203-compel-add-open_tree-syscall.patch similarity index 98% rename from 0204-compel-add-open_tree-syscall.patch rename to 0203-compel-add-open_tree-syscall.patch index 212887b..05d0b8c 100644 --- a/0204-compel-add-open_tree-syscall.patch +++ b/0203-compel-add-open_tree-syscall.patch @@ -1,7 +1,7 @@ -From 51f04ae1074b115f486aaaf0a3feb72d0bf90130 Mon Sep 17 00:00:00 2001 +From e72cf151b6dfe88f78715fca4dff560350688e66 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 24 Dec 2021 13:23:29 +0300 -Subject: [PATCH 204/245] compel: add open_tree syscall +Subject: [PATCH 203/249] compel: add open_tree syscall Will use this for cross mount namespace bindmounts. diff --git a/0205-kerndat-check-whether-the-openat2-syscall-is-support.patch b/0204-kerndat-check-whether-the-openat2-syscall-is-support.patch similarity index 98% rename from 0205-kerndat-check-whether-the-openat2-syscall-is-support.patch rename to 0204-kerndat-check-whether-the-openat2-syscall-is-support.patch index c72e3ee..ae9dd65 100644 --- a/0205-kerndat-check-whether-the-openat2-syscall-is-support.patch +++ b/0204-kerndat-check-whether-the-openat2-syscall-is-support.patch @@ -1,7 +1,7 @@ -From 4fd088daf734226b17c7590420fd5bea6a5d3f7c Mon Sep 17 00:00:00 2001 +From 5bffbff69465054b7e9c879e4a18707df1534fe9 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 22 Dec 2021 11:07:24 +0300 -Subject: [PATCH 205/245] kerndat: check whether the openat2 syscall is +Subject: [PATCH 204/249] kerndat: check whether the openat2 syscall is supported Will use openat2 + RESOLVE_NO_XDEV to detect mountpoints. diff --git a/0206-util-add-resolve_mountpoint-helper.patch b/0205-util-add-resolve_mountpoint-helper.patch similarity index 96% rename from 0206-util-add-resolve_mountpoint-helper.patch rename to 0205-util-add-resolve_mountpoint-helper.patch index fb0b21d..c249c42 100644 --- a/0206-util-add-resolve_mountpoint-helper.patch +++ b/0205-util-add-resolve_mountpoint-helper.patch @@ -1,7 +1,7 @@ -From da16ce9766bc15aa7a623fe4c6e9af6275f943d3 Mon Sep 17 00:00:00 2001 +From 7d1f6274209d2991016f1c4c8bd7b46321ca4d88 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 22 Dec 2021 19:26:32 +0300 -Subject: [PATCH 206/245] util: add resolve_mountpoint helper +Subject: [PATCH 205/249] util: add resolve_mountpoint helper This helper would be useful to get mountpoints of source path of external mounts without parsing host mountinfo. When we restore diff --git a/0207-crtools-move-check_options-after-kerndat_init-and-lo.patch b/0206-crtools-move-check_options-after-kerndat_init-and-lo.patch similarity index 87% rename from 0207-crtools-move-check_options-after-kerndat_init-and-lo.patch rename to 0206-crtools-move-check_options-after-kerndat_init-and-lo.patch index 8ecf6b5..ce43968 100644 --- a/0207-crtools-move-check_options-after-kerndat_init-and-lo.patch +++ b/0206-crtools-move-check_options-after-kerndat_init-and-lo.patch @@ -1,7 +1,7 @@ -From d077770b9acf0128bf8d3f02a37e5ce4d15883d2 Mon Sep 17 00:00:00 2001 +From dd64b33d47631a47de17e807d7928a345272046c Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 23 Dec 2021 17:19:49 +0300 -Subject: [PATCH 207/245] crtools: move check_options after kerndat_init and +Subject: [PATCH 206/249] crtools: move check_options after kerndat_init and log_init This can be useful to check options which depend on some kernel features diff --git a/0208-config-rpc-add-new-option-mntns-compat-mode-for-old-.patch b/0207-config-rpc-add-new-option-mntns-compat-mode-for-old-.patch similarity index 98% rename from 0208-config-rpc-add-new-option-mntns-compat-mode-for-old-.patch rename to 0207-config-rpc-add-new-option-mntns-compat-mode-for-old-.patch index 1cb6660..935de6f 100644 --- a/0208-config-rpc-add-new-option-mntns-compat-mode-for-old-.patch +++ b/0207-config-rpc-add-new-option-mntns-compat-mode-for-old-.patch @@ -1,7 +1,7 @@ -From 4bfe5acc009d600e037758938616656a257c8dfb Mon Sep 17 00:00:00 2001 +From 273d3f4ccc95eb7bd0553de1caa217835525311c Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Mon, 25 May 2020 17:43:48 +0300 -Subject: [PATCH 208/245] config/rpc: add new option --mntns-compat-mode for +Subject: [PATCH 207/249] config/rpc: add new option --mntns-compat-mode for old mount engine We plan to switch to Mounts-v2 engine for restoring mounts by default, diff --git a/0209-mount-add-plain-mountpoints.patch b/0208-mount-add-plain-mountpoints.patch similarity index 97% rename from 0209-mount-add-plain-mountpoints.patch rename to 0208-mount-add-plain-mountpoints.patch index 509ee1d..4108ddf 100644 --- a/0209-mount-add-plain-mountpoints.patch +++ b/0208-mount-add-plain-mountpoints.patch @@ -1,7 +1,7 @@ -From 71ace0aa142e5c94d055c41e90581c98f9c90be0 Mon Sep 17 00:00:00 2001 +From db674a523b391ccb8eb65191096931cc2e95b9a5 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 28 May 2020 11:30:16 +0300 -Subject: [PATCH 209/245] mount: add plain mountpoints +Subject: [PATCH 208/249] mount: add plain mountpoints This is a preparation of mounts-v2 new algorithm for mount restore, we add an alternative mountpoints to each mount, so that if we mount mounts diff --git a/0210-files-reg-export-parent-dirs-helpers-for-mount-v2.patch b/0209-files-reg-export-parent-dirs-helpers-for-mount-v2.patch similarity index 91% rename from 0210-files-reg-export-parent-dirs-helpers-for-mount-v2.patch rename to 0209-files-reg-export-parent-dirs-helpers-for-mount-v2.patch index 268302a..525b394 100644 --- a/0210-files-reg-export-parent-dirs-helpers-for-mount-v2.patch +++ b/0209-files-reg-export-parent-dirs-helpers-for-mount-v2.patch @@ -1,7 +1,7 @@ -From 19d0fad36fc1e52e1202e439c702f155ff67b395 Mon Sep 17 00:00:00 2001 +From 9191dbc6decd1cf15bcfce5fcb09488f69680c50 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 21 Dec 2021 12:14:23 +0300 -Subject: [PATCH 210/245] files-reg: export parent dirs helpers for mount-v2 +Subject: [PATCH 209/249] files-reg: export parent dirs helpers for mount-v2 Signed-off-by: Pavel Tikhomirov --- diff --git a/0211-mount-remove-double-ns_id-declaration.patch b/0210-mount-remove-double-ns_id-declaration.patch similarity index 86% rename from 0211-mount-remove-double-ns_id-declaration.patch rename to 0210-mount-remove-double-ns_id-declaration.patch index fca6582..40758c7 100644 --- a/0211-mount-remove-double-ns_id-declaration.patch +++ b/0210-mount-remove-double-ns_id-declaration.patch @@ -1,7 +1,7 @@ -From dd282f4655fc487554fe69476218093921107c6c Mon Sep 17 00:00:00 2001 +From 35f5403cef372bab0f593747c3b0348fc1d10c17 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 21 Dec 2021 12:43:42 +0300 -Subject: [PATCH 211/245] mount: remove double ns_id declaration +Subject: [PATCH 210/249] mount: remove double ns_id declaration Fixes: d0d117986 ("mount: move functions about mounts from proc_parse.h") diff --git a/0212-mount-export-common-defines-for-mount-v2.patch b/0211-mount-export-common-defines-for-mount-v2.patch similarity index 94% rename from 0212-mount-export-common-defines-for-mount-v2.patch rename to 0211-mount-export-common-defines-for-mount-v2.patch index 1ebd1c2..e350682 100644 --- a/0212-mount-export-common-defines-for-mount-v2.patch +++ b/0211-mount-export-common-defines-for-mount-v2.patch @@ -1,7 +1,7 @@ -From 3aa6f0cee2cf05ad2cc2aa571921cd75f2b864bc Mon Sep 17 00:00:00 2001 +From da341d7cd3e0a9ab312ce9ea18755a938d61e1bb Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 21 Dec 2021 12:46:57 +0300 -Subject: [PATCH 212/245] mount: export common defines for mount-v2 +Subject: [PATCH 211/249] mount: export common defines for mount-v2 Signed-off-by: Pavel Tikhomirov --- diff --git a/0213-mount-export-several-functions-for-mount-v2.patch b/0212-mount-export-several-functions-for-mount-v2.patch similarity index 97% rename from 0213-mount-export-several-functions-for-mount-v2.patch rename to 0212-mount-export-several-functions-for-mount-v2.patch index 29ac575..775acc1 100644 --- a/0213-mount-export-several-functions-for-mount-v2.patch +++ b/0212-mount-export-several-functions-for-mount-v2.patch @@ -1,7 +1,7 @@ -From 830934745e70c0837bf6c657540773243d3c5e16 Mon Sep 17 00:00:00 2001 +From ee35200cf6627cc0ea2b8067d759c0e4e798d825 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 21 Dec 2021 13:29:52 +0300 -Subject: [PATCH 213/245] mount: export several functions for mount-v2 +Subject: [PATCH 212/249] mount: export several functions for mount-v2 Signed-off-by: Pavel Tikhomirov --- diff --git a/0214-mount-export-global-variables-for-mount-v2.patch b/0213-mount-export-global-variables-for-mount-v2.patch similarity index 91% rename from 0214-mount-export-global-variables-for-mount-v2.patch rename to 0213-mount-export-global-variables-for-mount-v2.patch index 1722371..8d289d0 100644 --- a/0214-mount-export-global-variables-for-mount-v2.patch +++ b/0213-mount-export-global-variables-for-mount-v2.patch @@ -1,7 +1,7 @@ -From 270ea3e162fd31245b92bb1c64cafd00cadedd93 Mon Sep 17 00:00:00 2001 +From 0dfc8717477416fa14d87335f1be5f2e2f89a71e Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 21 Dec 2021 14:04:19 +0300 -Subject: [PATCH 214/245] mount: export global variables for mount-v2 +Subject: [PATCH 213/249] mount: export global variables for mount-v2 Export root_yard_mp and it's mntns_roots. diff --git a/0215-mount-add-new-mounts-v2-engine.patch b/0214-mount-add-new-mounts-v2-engine.patch similarity index 99% rename from 0215-mount-add-new-mounts-v2-engine.patch rename to 0214-mount-add-new-mounts-v2-engine.patch index 5caf98d..c4b794a 100644 --- a/0215-mount-add-new-mounts-v2-engine.patch +++ b/0214-mount-add-new-mounts-v2-engine.patch @@ -1,7 +1,7 @@ -From 2b18e8004dcebda432cd9cedb069eef9126148ad Mon Sep 17 00:00:00 2001 +From 14c2dd341a5a3b0a15095ae68047d7c061b53033 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Mon, 25 May 2020 18:12:49 +0300 -Subject: [PATCH 215/245] mount: add new mounts-v2 engine +Subject: [PATCH 214/249] mount: add new mounts-v2 engine Design of mounts-v2: diff --git a/0216-zdtm-enable-mounts-compat-mode-on-restore-with-mntns.patch b/0215-zdtm-enable-mounts-compat-mode-on-restore-with-mntns.patch similarity index 95% rename from 0216-zdtm-enable-mounts-compat-mode-on-restore-with-mntns.patch rename to 0215-zdtm-enable-mounts-compat-mode-on-restore-with-mntns.patch index 77600e6..84295ca 100644 --- a/0216-zdtm-enable-mounts-compat-mode-on-restore-with-mntns.patch +++ b/0215-zdtm-enable-mounts-compat-mode-on-restore-with-mntns.patch @@ -1,7 +1,7 @@ -From b43b740a33f13b0a5e902b0ef333a90a76f74d05 Mon Sep 17 00:00:00 2001 +From 3e814aba5a1ea040b655c5e4102ffaab157a433e Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 27 May 2020 16:11:20 +0300 -Subject: [PATCH 216/245] zdtm: enable mounts compat mode on restore with +Subject: [PATCH 215/249] zdtm: enable mounts compat mode on restore with --mntns-compat-mode option Cherry-picked from Virtuozzo criu: diff --git a/0217-ci-run-tests-for-old-mount-engine.patch b/0216-ci-run-tests-for-old-mount-engine.patch similarity index 89% rename from 0217-ci-run-tests-for-old-mount-engine.patch rename to 0216-ci-run-tests-for-old-mount-engine.patch index c387874..4b628ad 100644 --- a/0217-ci-run-tests-for-old-mount-engine.patch +++ b/0216-ci-run-tests-for-old-mount-engine.patch @@ -1,7 +1,7 @@ -From 73d2b2f9348261a1a47a8532446aa4efc29c4273 Mon Sep 17 00:00:00 2001 +From e4823210911c344e668eba7783f170816777f388 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 14 Jan 2022 12:12:12 +0300 -Subject: [PATCH 217/245] ci: run tests for old mount engine +Subject: [PATCH 216/249] ci: run tests for old mount engine Now when we switched to mount-v2 by default to check old mount engine we need to explicitly run with --mntns-compat-mode option. diff --git a/0218-zdtm-add-new-mnt_ext_sharing-test-for-mount-v2.patch b/0217-zdtm-add-new-mnt_ext_sharing-test-for-mount-v2.patch similarity index 98% rename from 0218-zdtm-add-new-mnt_ext_sharing-test-for-mount-v2.patch rename to 0217-zdtm-add-new-mnt_ext_sharing-test-for-mount-v2.patch index 0e9401a..f0d46c2 100644 --- a/0218-zdtm-add-new-mnt_ext_sharing-test-for-mount-v2.patch +++ b/0217-zdtm-add-new-mnt_ext_sharing-test-for-mount-v2.patch @@ -1,7 +1,7 @@ -From 05a3ccb37f67b40f4b734236b1175b30da0fe693 Mon Sep 17 00:00:00 2001 +From 289bfe5cb61a964ed022010e765ba2de489c389d Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 31 Dec 2019 15:56:44 +0300 -Subject: [PATCH 218/245] zdtm: add new mnt_ext_sharing test for mount-v2 +Subject: [PATCH 217/249] zdtm: add new mnt_ext_sharing test for mount-v2 These test simply checks that sharing between two mounts in container: 1) external mount and 2) it's bind persists (case when bind has the same diff --git a/0219-zdtm-add-mount_complex_sharing-test.patch b/0218-zdtm-add-mount_complex_sharing-test.patch similarity index 98% rename from 0219-zdtm-add-mount_complex_sharing-test.patch rename to 0218-zdtm-add-mount_complex_sharing-test.patch index cf2ceaa..68901e8 100644 --- a/0219-zdtm-add-mount_complex_sharing-test.patch +++ b/0218-zdtm-add-mount_complex_sharing-test.patch @@ -1,7 +1,7 @@ -From 19621b2b22680d4d9b811ac1a4d55e2b7952f53f Mon Sep 17 00:00:00 2001 +From 659f16d27bb23528229427c61b7591eeb51189a1 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 28 Jul 2020 11:49:45 +0300 -Subject: [PATCH 219/245] zdtm: add mount_complex_sharing test +Subject: [PATCH 218/249] zdtm: add mount_complex_sharing test Mounts-v2 engine should fix multiple problems of old engine relative to sharing options, lets add a test for such problems. diff --git a/0220-zdtm-add-propagation-group-with-mount-flags-to-mount.patch b/0219-zdtm-add-propagation-group-with-mount-flags-to-mount.patch similarity index 96% rename from 0220-zdtm-add-propagation-group-with-mount-flags-to-mount.patch rename to 0219-zdtm-add-propagation-group-with-mount-flags-to-mount.patch index a0705fc..75519c7 100644 --- a/0220-zdtm-add-propagation-group-with-mount-flags-to-mount.patch +++ b/0219-zdtm-add-propagation-group-with-mount-flags-to-mount.patch @@ -1,7 +1,7 @@ -From 799d2e2a4d9a3289138206cf1f8b843082490355 Mon Sep 17 00:00:00 2001 +From b7070dd5675a53b22db912c36242c0dde94d5a3e Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Wed, 14 Oct 2020 15:56:52 +0300 -Subject: [PATCH 220/245] zdtm: add propagation group with mount flags to +Subject: [PATCH 219/249] zdtm: add propagation group with mount flags to mount_complex_sharing Before mounts-v2 we have seen mounts loosing their mount readonly flags diff --git a/0221-zdtm-mount-v2-disable-mnt_tracefs-test.patch b/0220-zdtm-mount-v2-disable-mnt_tracefs-test.patch similarity index 90% rename from 0221-zdtm-mount-v2-disable-mnt_tracefs-test.patch rename to 0220-zdtm-mount-v2-disable-mnt_tracefs-test.patch index 7d5993f..0c0c057 100644 --- a/0221-zdtm-mount-v2-disable-mnt_tracefs-test.patch +++ b/0220-zdtm-mount-v2-disable-mnt_tracefs-test.patch @@ -1,7 +1,7 @@ -From 116692772b5f4ff1818262096ec7934086749be5 Mon Sep 17 00:00:00 2001 +From 5abbefa1f66eaded7f03f1d65a00b6aa8a57ab47 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Tue, 1 Dec 2020 16:07:16 +0300 -Subject: [PATCH 221/245] zdtm/mount-v2: disable mnt_tracefs test +Subject: [PATCH 220/249] zdtm/mount-v2: disable mnt_tracefs test We can have tracefs separate mount from debugfs and that's why the /sys/kernel/debug external mount now has children and this thing is not diff --git a/0222-ci-make-others-mnt_ext_dev-also-run-for-old-mount-en.patch b/0221-ci-make-others-mnt_ext_dev-also-run-for-old-mount-en.patch similarity index 91% rename from 0222-ci-make-others-mnt_ext_dev-also-run-for-old-mount-en.patch rename to 0221-ci-make-others-mnt_ext_dev-also-run-for-old-mount-en.patch index 418bb99..74b8d9e 100644 --- a/0222-ci-make-others-mnt_ext_dev-also-run-for-old-mount-en.patch +++ b/0221-ci-make-others-mnt_ext_dev-also-run-for-old-mount-en.patch @@ -1,7 +1,7 @@ -From fa1c38177f1d49a7cfe506a5cfb4c8cd8231a21e Mon Sep 17 00:00:00 2001 +From c72b743d0ccdfc2af699b87d75af8ddab675fa26 Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Fri, 14 Jan 2022 19:29:08 +0300 -Subject: [PATCH 222/245] ci: make others/mnt_ext_dev also run for old mount +Subject: [PATCH 221/249] ci: make others/mnt_ext_dev also run for old mount engine Now when we switched to mount-v2 by default to check old mount engine we diff --git a/0223-test-jenkins-test-for-old-mount-engine.patch b/0222-test-jenkins-test-for-old-mount-engine.patch similarity index 88% rename from 0223-test-jenkins-test-for-old-mount-engine.patch rename to 0222-test-jenkins-test-for-old-mount-engine.patch index 32f9347..c695058 100644 --- a/0223-test-jenkins-test-for-old-mount-engine.patch +++ b/0222-test-jenkins-test-for-old-mount-engine.patch @@ -1,7 +1,7 @@ -From de47b29c8410d930c55e3341e287964de1395efa Mon Sep 17 00:00:00 2001 +From 24dffdc2410627966a82d7cc8b29797cecbab61b Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Mon, 31 Jan 2022 11:02:36 +0300 -Subject: [PATCH 223/245] test/jenkins: test for old mount engine +Subject: [PATCH 222/249] test/jenkins: test for old mount engine Let's run zdtm in jenkins with --mntns-compat-mode option and same for device-external mount test from others. diff --git a/0224-zdtm-mount-v2-disable-pty-console-test.patch b/0223-zdtm-mount-v2-disable-pty-console-test.patch similarity index 95% rename from 0224-zdtm-mount-v2-disable-pty-console-test.patch rename to 0223-zdtm-mount-v2-disable-pty-console-test.patch index 129ebf3..99f5968 100644 --- a/0224-zdtm-mount-v2-disable-pty-console-test.patch +++ b/0223-zdtm-mount-v2-disable-pty-console-test.patch @@ -1,7 +1,7 @@ -From b86b40a1f4d9cba0c1494d94c1aaf496006bffaa Mon Sep 17 00:00:00 2001 +From 16285bfab2f24816554ee6cb70430fcbcae7ac3f Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Mon, 14 Mar 2022 12:01:10 +0300 -Subject: [PATCH 224/245] zdtm/mount-v2: disable pty-console test +Subject: [PATCH 223/249] zdtm/mount-v2: disable pty-console test [root@fedora criu]# ./test/zdtm.py run -t zdtm/static/pty-console --iters 2 --keep-going --ignore-taint [WARNING] Option --keep-going is more useful when running multiple tests diff --git a/0225-mount-v2-make-mount-engine-fallback-messages-logleve.patch b/0224-mount-v2-make-mount-engine-fallback-messages-logleve.patch similarity index 92% rename from 0225-mount-v2-make-mount-engine-fallback-messages-logleve.patch rename to 0224-mount-v2-make-mount-engine-fallback-messages-logleve.patch index 5f7b7a7..8ffc46f 100644 --- a/0225-mount-v2-make-mount-engine-fallback-messages-logleve.patch +++ b/0224-mount-v2-make-mount-engine-fallback-messages-logleve.patch @@ -1,7 +1,7 @@ -From 10b38162535149095ee7290d98632043c63a21e9 Mon Sep 17 00:00:00 2001 +From 14621c81247af478617ad8295c5819e99ffa188c Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Sun, 20 Mar 2022 19:38:34 +0300 -Subject: [PATCH 225/245] mount-v2: make mount engine fallback messages +Subject: [PATCH 224/249] mount-v2: make mount engine fallback messages loglevel debug On pre v5.15 kernel we don't have MOVE_MOUNT_SET_GROUP support and thus diff --git a/0226-mount-make-error-messages-differ-in-different-places.patch b/0225-mount-make-error-messages-differ-in-different-places.patch similarity index 89% rename from 0226-mount-make-error-messages-differ-in-different-places.patch rename to 0225-mount-make-error-messages-differ-in-different-places.patch index dadf9df..7f366c4 100644 --- a/0226-mount-make-error-messages-differ-in-different-places.patch +++ b/0225-mount-make-error-messages-differ-in-different-places.patch @@ -1,7 +1,7 @@ -From 41df675d49afa4bb2e68fd0184ea1656b7d9900f Mon Sep 17 00:00:00 2001 +From b2e857c42a8086f735f0018fab556d259adcc71a Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Mon, 21 Mar 2022 10:19:29 +0300 -Subject: [PATCH 226/245] mount: make error messages differ in different places +Subject: [PATCH 225/249] mount: make error messages differ in different places We have three of "Can't mount at %s", let's distinguish simple mount from bind-mount and re-mount to make log reading easier. diff --git a/0227-zdtm-use-unique-holder-for-cgroups.patch b/0226-zdtm-use-unique-holder-for-cgroups.patch similarity index 95% rename from 0227-zdtm-use-unique-holder-for-cgroups.patch rename to 0226-zdtm-use-unique-holder-for-cgroups.patch index ae25641..c02e2ef 100644 --- a/0227-zdtm-use-unique-holder-for-cgroups.patch +++ b/0226-zdtm-use-unique-holder-for-cgroups.patch @@ -1,7 +1,7 @@ -From 11e288fdab74a81a6ad678c0d6e24e1f6e689185 Mon Sep 17 00:00:00 2001 +From 20f4b7a8a5151dfc49463c01bb7509f6dd74defc Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Sun, 20 Mar 2022 22:11:19 -0700 -Subject: [PATCH 227/245] zdtm: use unique holder for cgroups +Subject: [PATCH 226/249] zdtm: use unique holder for cgroups The idea that each zdtm.py should have own helder, so that two zdtm.py that are running on the same host don't effect each other. diff --git a/0228-scripts-ci-mount-test-cgroups-once.patch b/0227-scripts-ci-mount-test-cgroups-once.patch similarity index 87% rename from 0228-scripts-ci-mount-test-cgroups-once.patch rename to 0227-scripts-ci-mount-test-cgroups-once.patch index 710a406..eb8e10b 100644 --- a/0228-scripts-ci-mount-test-cgroups-once.patch +++ b/0227-scripts-ci-mount-test-cgroups-once.patch @@ -1,7 +1,7 @@ -From 7cd8cfad1ed46962363441010ffa83f1de5ff551 Mon Sep 17 00:00:00 2001 +From c0637fc646ee6f0043dbe0bd741ce311e5f9b5b6 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Sun, 20 Mar 2022 22:13:45 -0700 -Subject: [PATCH 228/245] scripts/ci: mount test cgroups once +Subject: [PATCH 227/249] scripts/ci: mount test cgroups once zdtm.py mounts two named controllers for tests. In CI, we run zdtm.py a few times, so we can mount (create) these controllers once to avoid any unwanted diff --git a/0229-criu-ns-add-a-helper-to-hold-a-pid-namespace.patch b/0228-criu-ns-add-a-helper-to-hold-a-pid-namespace.patch similarity index 93% rename from 0229-criu-ns-add-a-helper-to-hold-a-pid-namespace.patch rename to 0228-criu-ns-add-a-helper-to-hold-a-pid-namespace.patch index a3adbe0..2258996 100644 --- a/0229-criu-ns-add-a-helper-to-hold-a-pid-namespace.patch +++ b/0228-criu-ns-add-a-helper-to-hold-a-pid-namespace.patch @@ -1,7 +1,7 @@ -From 734553d5d0c784e8610d7c7ebbcda8607b28188b Mon Sep 17 00:00:00 2001 +From e4c1e520e90b40ed639b544322d8700451d3659f Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Sun, 20 Mar 2022 00:43:45 -0700 -Subject: [PATCH 229/245] criu-ns: add a helper to hold a pid namespace +Subject: [PATCH 228/249] criu-ns: add a helper to hold a pid namespace The init process can exit if it doesn't have any child processes and its pidns is destroyed in this case. CRIU dump is running in the target pid diff --git a/0230-apparmor-Fix-Wfortify-source-for-Clang.patch b/0229-apparmor-Fix-Wfortify-source-for-Clang.patch similarity index 87% rename from 0230-apparmor-Fix-Wfortify-source-for-Clang.patch rename to 0229-apparmor-Fix-Wfortify-source-for-Clang.patch index f424dac..3185b22 100644 --- a/0230-apparmor-Fix-Wfortify-source-for-Clang.patch +++ b/0229-apparmor-Fix-Wfortify-source-for-Clang.patch @@ -1,7 +1,7 @@ -From 6dd4c918bb3e5381a82a91cdb19119db33c2de74 Mon Sep 17 00:00:00 2001 +From c4d7e86771edcaed33bce40e93f06d1920a40c4d Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Fri, 25 Mar 2022 17:18:30 -0700 -Subject: [PATCH 230/245] apparmor: Fix -Wfortify-source for Clang +Subject: [PATCH 229/249] apparmor: Fix -Wfortify-source for Clang ``` criu/apparmor.c:679:26: error: 'fscanf' may overflow; destination buffer in argument 3 has size 48, but the corresponding specifier may require size 49 [-Werror,-Wfortify-source] diff --git a/0231-style-delete-some-redundant-code.patch b/0230-style-delete-some-redundant-code.patch similarity index 89% rename from 0231-style-delete-some-redundant-code.patch rename to 0230-style-delete-some-redundant-code.patch index 05f91c9..f7552a0 100644 --- a/0231-style-delete-some-redundant-code.patch +++ b/0230-style-delete-some-redundant-code.patch @@ -1,7 +1,7 @@ -From 985713ac34cbf89cd894b12168abc13a77114311 Mon Sep 17 00:00:00 2001 +From 2060c0cd9e1d7184597050ccab4c0d08b36bb2f4 Mon Sep 17 00:00:00 2001 From: jiang wei Date: Wed, 23 Mar 2022 21:48:16 +0800 -Subject: [PATCH 231/245] style: delete some redundant code +Subject: [PATCH 230/249] style: delete some redundant code There is some redundant in compel/src/main.c, making it better diff --git a/0232-mount-fix-Wunused-but-set-variable-for-Clang-15.patch b/0231-mount-fix-Wunused-but-set-variable-for-Clang-15.patch similarity index 85% rename from 0232-mount-fix-Wunused-but-set-variable-for-Clang-15.patch rename to 0231-mount-fix-Wunused-but-set-variable-for-Clang-15.patch index ad0138c..d5c9d02 100644 --- a/0232-mount-fix-Wunused-but-set-variable-for-Clang-15.patch +++ b/0231-mount-fix-Wunused-but-set-variable-for-Clang-15.patch @@ -1,7 +1,7 @@ -From 797bfaf363ba73844de0030f9d8f4fd0252133dc Mon Sep 17 00:00:00 2001 +From d1fe7612208caa12c03f2e35e91e42a093148bcc Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Fri, 25 Mar 2022 17:27:11 -0700 -Subject: [PATCH 232/245] mount: fix -Wunused-but-set-variable for Clang 15 +Subject: [PATCH 231/249] mount: fix -Wunused-but-set-variable for Clang 15 Since https://reviews.llvm.org/D122271, Clang -Wset-but-unused-variable gets smarter to warn about unused post-increments. diff --git a/0235-compel-add-rseq-syscall-into-compel-std-plugin-sysca.patch b/0232-compel-add-rseq-syscall-into-compel-std-plugin-sysca.patch similarity index 97% rename from 0235-compel-add-rseq-syscall-into-compel-std-plugin-sysca.patch rename to 0232-compel-add-rseq-syscall-into-compel-std-plugin-sysca.patch index a83355e..72e08a0 100644 --- a/0235-compel-add-rseq-syscall-into-compel-std-plugin-sysca.patch +++ b/0232-compel-add-rseq-syscall-into-compel-std-plugin-sysca.patch @@ -1,7 +1,7 @@ -From f015c6b97bf6e074783d5c11d511b3263f95332e Mon Sep 17 00:00:00 2001 +From 9456e11dbb326e93cdd01456b629230db996c0d4 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Tue, 21 Dec 2021 17:38:25 +0300 -Subject: [PATCH 235/245] compel: add rseq syscall into compel std plugin +Subject: [PATCH 232/249] compel: add rseq syscall into compel std plugin syscall tables Add rseq syscall numbers for: diff --git a/0233-criu-generate-unique-socket-names.patch b/0233-criu-generate-unique-socket-names.patch deleted file mode 100644 index be45786..0000000 --- a/0233-criu-generate-unique-socket-names.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 574316fe95bcbcc74f31a1dc40025baec7ffd1c7 Mon Sep 17 00:00:00 2001 -From: Andrei Vagin -Date: Thu, 31 Mar 2022 23:52:33 -0700 -Subject: [PATCH 233/245] criu: generate unique socket names - -CRIU has a few places where it creates unix sockets and their names have to be -unique for each criu run. - -Fixes: #1798 -Signed-off-by: Andrei Vagin ---- - compel/include/uapi/infect-util.h | 6 ++++++ - compel/src/lib/infect-util.c | 2 ++ - compel/src/lib/infect.c | 3 ++- - criu/fdstore.c | 4 +++- - criu/pidfd-store.c | 3 ++- - criu/unittest/mock.c | 3 +++ - criu/util.c | 3 +++ - 7 files changed, 21 insertions(+), 3 deletions(-) - -diff --git a/compel/include/uapi/infect-util.h b/compel/include/uapi/infect-util.h -index 4e32d13dc..ace6f6b6b 100644 ---- a/compel/include/uapi/infect-util.h -+++ b/compel/include/uapi/infect-util.h -@@ -3,6 +3,12 @@ - - #include "common/compiler.h" - -+/* -+ * compel_run_id is a unique value of the current run. It can be used to -+ * generate resource ID-s to avoid conflicts with other processes. -+ */ -+extern uint64_t compel_run_id; -+ - struct parasite_ctl; - extern int __must_check compel_util_send_fd(struct parasite_ctl *ctl, int fd); - extern int compel_util_recv_fd(struct parasite_ctl *ctl, int *pfd); -diff --git a/compel/src/lib/infect-util.c b/compel/src/lib/infect-util.c -index 5d6d0ddd8..00a7c83f7 100644 ---- a/compel/src/lib/infect-util.c -+++ b/compel/src/lib/infect-util.c -@@ -7,6 +7,8 @@ - #include "infect-rpc.h" - #include "infect-util.h" - -+uint64_t compel_run_id; -+ - int compel_util_send_fd(struct parasite_ctl *ctl, int fd) - { - int sk; -diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c -index 0fb9e715c..78e4d7e0e 100644 ---- a/compel/src/lib/infect.c -+++ b/compel/src/lib/infect.c -@@ -1,3 +1,4 @@ -+#include - #include - #include - #include -@@ -364,7 +365,7 @@ static int gen_parasite_saddr(struct sockaddr_un *saddr, int key) - int sun_len; - - saddr->sun_family = AF_UNIX; -- snprintf(saddr->sun_path, UNIX_PATH_MAX, "X/crtools-pr-%d", key); -+ snprintf(saddr->sun_path, UNIX_PATH_MAX, "X/crtools-pr-%d-%" PRIx64, key, compel_run_id); - - sun_len = SUN_LEN(saddr); - *saddr->sun_path = '\0'; -diff --git a/criu/fdstore.c b/criu/fdstore.c -index 65264a511..6a7f73a59 100644 ---- a/criu/fdstore.c -+++ b/criu/fdstore.c -@@ -12,6 +12,7 @@ - #include "xmalloc.h" - #include "rst-malloc.h" - #include "log.h" -+#include "util.h" - - /* clang-format off */ - static struct fdstore_desc { -@@ -56,7 +57,8 @@ int fdstore_init(void) - } - - addr.sun_family = AF_UNIX; -- addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-fdstore-%" PRIx64, st.st_ino); -+ addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-fdstore-%" PRIx64 "-%" PRIx64, st.st_ino, -+ criu_run_id); - addrlen += sizeof(addr.sun_family); - - addr.sun_path[0] = 0; -diff --git a/criu/pidfd-store.c b/criu/pidfd-store.c -index 98b478b30..b15568e08 100644 ---- a/criu/pidfd-store.c -+++ b/criu/pidfd-store.c -@@ -100,7 +100,8 @@ int init_pidfd_store_sk(pid_t pid, int sk) - goto err; - } - -- addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-pidfd-store-%d-%d", pid, sk); -+ addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-pidfd-store-%d-%d-%" PRIx64, pid, sk, -+ criu_run_id); - addrlen += sizeof(addr.sun_family); - - addr.sun_path[0] = 0; -diff --git a/criu/unittest/mock.c b/criu/unittest/mock.c -index dc5b627f7..0151873dc 100644 ---- a/criu/unittest/mock.c -+++ b/criu/unittest/mock.c -@@ -2,6 +2,7 @@ - - #include - #include -+#include - #include - - int add_external(char *key) -@@ -141,3 +142,5 @@ int check_mount_v2(void) - { - return 0; - } -+ -+uint64_t compel_run_id; -diff --git a/criu/util.c b/criu/util.c -index f8da4ac5c..dd1fd97f5 100644 ---- a/criu/util.c -+++ b/criu/util.c -@@ -52,6 +52,8 @@ - #include "cr-errno.h" - #include "action-scripts.h" - -+#include "compel/infect-util.h" -+ - #define VMA_OPT_LEN 128 - - static int xatol_base(const char *string, long *number, int base) -@@ -1816,6 +1818,7 @@ void util_init() - - clock_gettime(CLOCK_MONOTONIC, &tp); - criu_run_id = ((uint64_t)getpid() << 32) + tp.tv_sec + tp.tv_nsec; -+ compel_run_id = criu_run_id; - } - - /* --- -2.35.1 - diff --git a/0236-kerndat-check-for-rseq-syscall-support.patch b/0233-kerndat-check-for-rseq-syscall-support.patch similarity index 92% rename from 0236-kerndat-check-for-rseq-syscall-support.patch rename to 0233-kerndat-check-for-rseq-syscall-support.patch index 9032c5c..a9c79ad 100644 --- a/0236-kerndat-check-for-rseq-syscall-support.patch +++ b/0233-kerndat-check-for-rseq-syscall-support.patch @@ -1,7 +1,7 @@ -From e4cc6dda5da18153a5ecfb969d9aa4d64ba05a4c Mon Sep 17 00:00:00 2001 +From 79fd6d1c54c7b8b925df11adbce9ef687b0f0f4f Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Tue, 21 Dec 2021 18:27:52 +0300 -Subject: [PATCH 236/245] kerndat: check for rseq syscall support +Subject: [PATCH 233/249] kerndat: check for rseq syscall support Signed-off-by: Alexander Mikhalitsyn --- diff --git a/0234-ci-Ubuntu-broke-overlayfs-again.patch b/0234-ci-Ubuntu-broke-overlayfs-again.patch deleted file mode 100644 index fc2403e..0000000 --- a/0234-ci-Ubuntu-broke-overlayfs-again.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4edd5dd5b2ef0ad051cec79adbdd10067fd821df Mon Sep 17 00:00:00 2001 -From: Adrian Reber -Date: Tue, 5 Apr 2022 07:05:53 +0000 -Subject: [PATCH 234/245] ci: Ubuntu broke overlayfs again - -Switch to non overlaysfs tests for Podman and Docker. - -Signed-off-by: Adrian Reber ---- - scripts/ci/docker-test.sh | 5 ++++- - scripts/ci/podman-test.sh | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh -index d4b11bd55..397fd7b0e 100755 ---- a/scripts/ci/docker-test.sh -+++ b/scripts/ci/docker-test.sh -@@ -21,7 +21,10 @@ add-apt-repository \ - - . /etc/lsb-release - --echo '{ "experimental": true }' > /etc/docker/daemon.json -+# overlayfs behaves differently on Ubuntu (18.04) and breaks CRIU -+# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257 -+# Switch to devicemapper -+echo '{ "experimental": true, "storage-driver": "devicemapper" }' > /etc/docker/daemon.json - - CRIU_LOG='/criu.log' - mkdir -p /etc/criu -diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh -index 5e5eb764d..d66b281b3 100755 ---- a/scripts/ci/podman-test.sh -+++ b/scripts/ci/podman-test.sh -@@ -25,7 +25,10 @@ make install - popd - rm -rf "${tmp_dir}" - --podman info -+# overlaysfs behaves differently on Ubuntu and breaks CRIU -+# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257 -+export STORAGE_DRIVER=vfs -+podman --storage-driver vfs info - - # shellcheck disable=SC2016 - podman run --name cr -d docker.io/library/alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done' --- -2.35.1 - diff --git a/0237-util-move-fork_and_ptrace_attach-helper-from-cr-chec.patch b/0234-util-move-fork_and_ptrace_attach-helper-from-cr-chec.patch similarity index 94% rename from 0237-util-move-fork_and_ptrace_attach-helper-from-cr-chec.patch rename to 0234-util-move-fork_and_ptrace_attach-helper-from-cr-chec.patch index a9a56a2..c831cc7 100644 --- a/0237-util-move-fork_and_ptrace_attach-helper-from-cr-chec.patch +++ b/0234-util-move-fork_and_ptrace_attach-helper-from-cr-chec.patch @@ -1,7 +1,7 @@ -From e79349513330ecbb1891d49670e7283ce62a2799 Mon Sep 17 00:00:00 2001 +From 4dcca982579264fbc3fab176f63c7273799f7a9c Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Tue, 21 Dec 2021 21:17:16 +0300 -Subject: [PATCH 237/245] util: move fork_and_ptrace_attach helper from +Subject: [PATCH 234/249] util: move fork_and_ptrace_attach helper from cr-check Signed-off-by: Alexander Mikhalitsyn @@ -92,10 +92,10 @@ index 5ccd24722..4e29c079e 100644 extern int status_ready(void); extern int is_root_user(void); diff --git a/criu/util.c b/criu/util.c -index dd1fd97f5..2c7749457 100644 +index f8da4ac5c..4f871f594 100644 --- a/criu/util.c +++ b/criu/util.c -@@ -660,6 +660,63 @@ out: +@@ -658,6 +658,63 @@ out: return ret; } diff --git a/0238-cr-check-Add-ptrace-rseq-conf-dump-feature.patch b/0235-cr-check-Add-ptrace-rseq-conf-dump-feature.patch similarity index 97% rename from 0238-cr-check-Add-ptrace-rseq-conf-dump-feature.patch rename to 0235-cr-check-Add-ptrace-rseq-conf-dump-feature.patch index 88b8a8e..941450d 100644 --- a/0238-cr-check-Add-ptrace-rseq-conf-dump-feature.patch +++ b/0235-cr-check-Add-ptrace-rseq-conf-dump-feature.patch @@ -1,7 +1,7 @@ -From dbd7a5a689f47694eccdab44290873023007f026 Mon Sep 17 00:00:00 2001 +From c4399163eb28d0dd1d2f6d7041f361b9516c2911 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Tue, 21 Dec 2021 18:29:14 +0300 -Subject: [PATCH 238/245] cr-check: Add ptrace rseq conf dump feature +Subject: [PATCH 235/249] cr-check: Add ptrace rseq conf dump feature Add "get_rseq_conf" feature corresponding to the ptrace(PTRACE_GET_RSEQ_CONFIGURATION) support. diff --git a/0239-rseq-initial-support.patch b/0236-rseq-initial-support.patch similarity index 99% rename from 0239-rseq-initial-support.patch rename to 0236-rseq-initial-support.patch index 78887b5..3a69c02 100644 --- a/0239-rseq-initial-support.patch +++ b/0236-rseq-initial-support.patch @@ -1,7 +1,7 @@ -From 2a4d29c3be5cec0efb2cbc3ba20444cd0b358e29 Mon Sep 17 00:00:00 2001 +From 5dd6ace5934f8c95f4ac72e248433081f1be87d1 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Tue, 21 Dec 2021 23:27:26 +0300 -Subject: [PATCH 239/245] rseq: initial support +Subject: [PATCH 236/249] rseq: initial support TODO: 1. properly handle case when the kernel has rseq() diff --git a/0237-zdtm-add-basic-static-rseq00-test-for-rseq-C-R.patch b/0237-zdtm-add-basic-static-rseq00-test-for-rseq-C-R.patch new file mode 100644 index 0000000..cd18d2b --- /dev/null +++ b/0237-zdtm-add-basic-static-rseq00-test-for-rseq-C-R.patch @@ -0,0 +1,220 @@ +From 2eaa9e9fe9e9cda7b5fd72fc2ebc743a05864883 Mon Sep 17 00:00:00 2001 +From: Alexander Mikhalitsyn +Date: Tue, 21 Dec 2021 23:40:01 +0300 +Subject: [PATCH 237/249] zdtm: add basic static/rseq00 test for rseq C/R + +Signed-off-by: Alexander Mikhalitsyn +--- + test/zdtm/static/Makefile | 1 + + test/zdtm/static/rseq00.c | 177 +++++++++++++++++++++++++++++++++++ + test/zdtm/static/rseq00.desc | 1 + + 3 files changed, 179 insertions(+) + create mode 100644 test/zdtm/static/rseq00.c + create mode 100644 test/zdtm/static/rseq00.desc + +diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile +index 717306dbb..568886d60 100644 +--- a/test/zdtm/static/Makefile ++++ b/test/zdtm/static/Makefile +@@ -61,6 +61,7 @@ TST_NOFILE := \ + pthread02 \ + pthread_timers \ + pthread_timers_h \ ++ rseq00 \ + vdso00 \ + vdso01 \ + vdso02 \ +diff --git a/test/zdtm/static/rseq00.c b/test/zdtm/static/rseq00.c +new file mode 100644 +index 000000000..95e9f40b4 +--- /dev/null ++++ b/test/zdtm/static/rseq00.c +@@ -0,0 +1,177 @@ ++/* ++ * test for rseq() syscall ++ * See also https://www.efficios.com/blog/2019/02/08/linux-restartable-sequences/ ++ * https://github.com/torvalds/linux/commit/d7822b1e24f2df5df98c76f0e94a5416349ff759 ++ */ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "zdtmtst.h" ++ ++#if defined(__x86_64__) ++ ++const char *test_doc = "Check that rseq() basic C/R works"; ++const char *test_author = "Alexander Mikhalitsyn "; ++/* parts of code borrowed from https://www.efficios.com/blog/2019/02/08/linux-restartable-sequences/ */ ++ ++/* some useful definitions from kernel uapi */ ++enum rseq_flags { ++ RSEQ_FLAG_UNREGISTER = (1 << 0), ++}; ++ ++struct rseq { ++ uint32_t cpu_id_start; ++ uint32_t cpu_id; ++ uint64_t rseq_cs; ++ uint32_t flags; ++} __attribute__((aligned(4 * sizeof(uint64_t)))); ++ ++#ifndef __NR_rseq ++#define __NR_rseq 334 ++#endif ++/* EOF */ ++ ++static __thread volatile struct rseq __rseq_abi; ++ ++#define RSEQ_SIG 0x53053053 ++ ++static int sys_rseq(volatile struct rseq *rseq_abi, uint32_t rseq_len, int flags, uint32_t sig) ++{ ++ return syscall(__NR_rseq, rseq_abi, rseq_len, flags, sig); ++} ++ ++static void register_thread(void) ++{ ++ int rc; ++ rc = sys_rseq(&__rseq_abi, sizeof(struct rseq), 0, RSEQ_SIG); ++ if (rc) { ++ fail("Failed to register rseq"); ++ exit(1); ++ } ++} ++ ++static void unregister_thread(void) ++{ ++ int rc; ++ rc = sys_rseq(&__rseq_abi, sizeof(struct rseq), RSEQ_FLAG_UNREGISTER, RSEQ_SIG); ++ if (rc) { ++ fail("Failed to unregister rseq"); ++ exit(1); ++ } ++} ++ ++static void check_thread(void) ++{ ++ int rc; ++ rc = sys_rseq(&__rseq_abi, sizeof(struct rseq), 0, RSEQ_SIG); ++ if (!(rc && errno == EBUSY)) { ++ fail("Failed to check rseq %d", rc); ++ exit(1); ++ } ++} ++ ++#define RSEQ_ACCESS_ONCE(x) (*(__volatile__ __typeof__(x) *)&(x)) ++ ++static int rseq_addv(intptr_t *v, intptr_t count, int cpu) ++{ ++ /* clang-format off */ ++ __asm__ __volatile__ goto( ++ ".pushsection __rseq_table, \"aw\"\n\t" ++ ".balign 32\n\t" ++ "cs_obj:\n\t" ++ /* version, flags */ ++ ".long 0, 0\n\t" ++ /* start_ip, post_commit_offset, abort_ip */ ++ ".quad 1f, (2f-1f), 4f\n\t" ++ ".popsection\n\t" ++ "1:\n\t" ++ "leaq cs_obj(%%rip), %%rax\n\t" ++ "movq %%rax, %[rseq_cs]\n\t" ++ "cmpl %[cpu_id], %[current_cpu_id]\n\t" ++ "jnz 4f\n\t" ++ "addq %[count], %[v]\n\t" /* final store */ ++ "2:\n\t" ++ ".pushsection __rseq_failure, \"ax\"\n\t" ++ /* Disassembler-friendly signature: nopl (%rip). */ ++ ".byte 0x0f, 0x1f, 0x05\n\t" ++ ".long 0x53053053\n\t" /* RSEQ_FLAGS */ ++ "4:\n\t" ++ "jmp abort\n\t" ++ ".popsection\n\t" ++ : /* gcc asm goto does not allow outputs */ ++ : [cpu_id] "r" (cpu), ++ [current_cpu_id] "m" (__rseq_abi.cpu_id), ++ [rseq_cs] "m" (__rseq_abi.rseq_cs), ++ /* final store input */ ++ [v] "m" (*v), ++ [count] "er" (count) ++ : "memory", "cc", "rax" ++ : abort ++ ); ++ /* clang-format on */ ++ ++ return 0; ++abort: ++ return -1; ++} ++ ++int main(int argc, char *argv[]) ++{ ++ int cpu, ret; ++ intptr_t *cpu_data; ++ long nr_cpus = sysconf(_SC_NPROCESSORS_ONLN); ++ ++ test_init(argc, argv); ++ ++ cpu_data = calloc(nr_cpus, sizeof(*cpu_data)); ++ if (!cpu_data) { ++ fail("calloc"); ++ exit(EXIT_FAILURE); ++ } ++ ++ register_thread(); ++ ++ test_daemon(); ++ test_waitsig(); ++ ++ check_thread(); ++ ++ cpu = RSEQ_ACCESS_ONCE(__rseq_abi.cpu_id_start); ++ ret = rseq_addv(&cpu_data[cpu], 2, cpu); ++ if (ret) ++ fail("Failed to increment per-cpu counter"); ++ else ++ test_msg("cpu_data[%d] == %ld\n", cpu, (long int)cpu_data[cpu]); ++ ++ if (cpu_data[cpu] == 2) ++ pass(); ++ else ++ fail(); ++ ++ return 0; ++} ++ ++#else /* #if defined(__x86_64__) */ ++ ++int main(int argc, char *argv[]) ++{ ++ test_init(argc, argv); ++ skip("Unsupported arch"); ++ test_daemon(); ++ test_waitsig(); ++ pass(); ++ return 0; ++} ++ ++#endif /* #if defined(__x86_64__) */ +\ No newline at end of file +diff --git a/test/zdtm/static/rseq00.desc b/test/zdtm/static/rseq00.desc +new file mode 100644 +index 000000000..0324fa39c +--- /dev/null ++++ b/test/zdtm/static/rseq00.desc +@@ -0,0 +1 @@ ++{'flavor': 'h', 'arch': 'x86_64', 'feature': 'get_rseq_conf'} +-- +2.35.1 + diff --git a/0238-Revert-ci-disable-glibc-rseq-support.patch b/0238-Revert-ci-disable-glibc-rseq-support.patch new file mode 100644 index 0000000..0d3d264 --- /dev/null +++ b/0238-Revert-ci-disable-glibc-rseq-support.patch @@ -0,0 +1,49 @@ +From 872ac9f34454fd256af9aae7f72976e355244da2 Mon Sep 17 00:00:00 2001 +From: Alexander Mikhalitsyn +Date: Tue, 21 Dec 2021 23:42:26 +0300 +Subject: [PATCH 238/249] Revert "ci: disable glibc rseq support" + +Let's see how rseq() C/R feature works + +This reverts commit d99def7dcfa938918368c91021f72a77f738bc61. + +Signed-off-by: Alexander Mikhalitsyn +--- + scripts/build/Dockerfile.fedora.tmpl | 3 --- + scripts/ci/run-ci-tests.sh | 7 +------ + 2 files changed, 1 insertion(+), 9 deletions(-) + +diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl +index fd4ba4aef..9d3bb0f87 100644 +--- a/scripts/build/Dockerfile.fedora.tmpl ++++ b/scripts/build/Dockerfile.fedora.tmpl +@@ -1,8 +1,5 @@ + ARG CC=gcc + +-# FIXME: Temporary solution for https://github.com/checkpoint-restore/criu/issues/1696 +-ENV GLIBC_TUNABLES=glibc.pthread.rseq=0 +- + COPY scripts/ci/prepare-for-fedora-rawhide.sh /bin/prepare-for-fedora-rawhide.sh + RUN /bin/prepare-for-fedora-rawhide.sh + +diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh +index 14e6b1224..f89783630 100755 +--- a/scripts/ci/run-ci-tests.sh ++++ b/scripts/ci/run-ci-tests.sh +@@ -255,12 +255,7 @@ if [ -n "$TRAVIS" ] || [ -n "$CIRCLECI" ]; then + # Error (criu/tty.c:1014): tty: Don't have tty to inherit session from, aborting + make -C test/others/shell-job/ run + fi +- +-# FIXME: rpc tests fail even with set glibc tunable +-# https://github.com/checkpoint-restore/criu/issues/1696 +-if [ "$GLIBC_TUNABLES" != "glibc.pthread.rseq=0" ]; then +- make -C test/others/rpc/ run +-fi ++make -C test/others/rpc/ run + + ./test/zdtm.py run -t zdtm/static/env00 --sibling + +-- +2.35.1 + diff --git a/0239-ci-add-Fedora-Rawhide-based-test-on-Cirrus.patch b/0239-ci-add-Fedora-Rawhide-based-test-on-Cirrus.patch new file mode 100644 index 0000000..3edb3be --- /dev/null +++ b/0239-ci-add-Fedora-Rawhide-based-test-on-Cirrus.patch @@ -0,0 +1,98 @@ +From e31ca9daf19eefd14fdddf2709e9e734301630e1 Mon Sep 17 00:00:00 2001 +From: Alexander Mikhalitsyn +Date: Thu, 23 Dec 2021 14:57:43 +0300 +Subject: [PATCH 239/249] ci: add Fedora Rawhide based test on Cirrus + +We have ability to use nested virtualization on +Cirrus, and already have "Vagrant Fedora based test (no VDSO)" +test, let's do analogical for Fedora Rawhide to get fresh kernel. + +Suggested-by: Adrian Reber +Signed-off-by: Alexander Mikhalitsyn +--- + .cirrus.yml | 21 +++++++++++++++++++++ + scripts/ci/Makefile | 7 +++++-- + scripts/ci/vagrant.sh | 12 ++++++++++++ + 3 files changed, 38 insertions(+), 2 deletions(-) + +diff --git a/.cirrus.yml b/.cirrus.yml +index 588cf3e82..2b6903ddc 100644 +--- a/.cirrus.yml ++++ b/.cirrus.yml +@@ -19,6 +19,27 @@ task: + build_script: | + make -C scripts/ci vagrant-fedora-no-vdso + ++task: ++ name: Vagrant Fedora Rawhide based test ++ environment: ++ HOME: "/root" ++ CIRRUS_WORKING_DIR: "/tmp/criu" ++ ++ compute_engine_instance: ++ image_project: cirrus-images ++ image: family/docker-kvm ++ platform: linux ++ cpu: 4 ++ memory: 16G ++ nested_virtualization: true ++ ++ setup_script: | ++ scripts/ci/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker ++ sudo kvm-ok ++ ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto ++ build_script: | ++ make -C scripts/ci vagrant-fedora-rawhide ++ + task: + name: CentOS 8 based test + environment: +diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile +index 3e4d59430..eaab2f201 100644 +--- a/scripts/ci/Makefile ++++ b/scripts/ci/Makefile +@@ -41,7 +41,7 @@ export CONTAINER_TERMINAL + ifeq ($(UNAME),x86_64) + # On anything besides x86_64 Travis is running unprivileged LXD + # containers which do not support running docker with '--privileged'. +- CONTAINER_OPTS := --rm $(CONTAINER_TERMINAL) --privileged -v /lib/modules:/lib/modules --tmpfs /run ++ CONTAINER_OPTS := --rm $(CONTAINER_TERMINAL) --privileged --userns=host --cgroupns=host -v /lib/modules:/lib/modules --tmpfs /run + else + CONTAINER_OPTS := --rm -v /lib/modules:/lib/modules --tmpfs /run + endif +@@ -92,7 +92,10 @@ setup-vagrant: + vagrant-fedora-no-vdso: setup-vagrant + ./vagrant.sh fedora-no-vdso + +-.PHONY: setup-vagrant vagrant-fedora-no-vdso ++vagrant-fedora-rawhide: setup-vagrant ++ ./vagrant.sh fedora-rawhide ++ ++.PHONY: setup-vagrant vagrant-fedora-no-vdso vagrant-fedora-rawhide + + %: + $(MAKE) -C ../build $@$(target-suffix) +diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh +index 0440193bc..af0f7335a 100755 +--- a/scripts/ci/vagrant.sh ++++ b/scripts/ci/vagrant.sh +@@ -56,4 +56,16 @@ fedora-no-vdso() { + ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -t zdtm/transition/pidfd_store_sk --rpc --pre 2' + } + ++fedora-rawhide() { ++ # ++ # Workaround the problem: ++ # error running container: error from /usr/bin/crun creating container for [...]: sd-bus call: Transport endpoint is not connected ++ # Let's just use runc instead of crun ++ # see also https://github.com/kata-containers/tests/issues/4283 ++ # ++ ssh default 'sudo dnf remove -y crun || true' ++ ssh default sudo dnf install -y podman runc ++ ssh default 'cd /vagrant; tar xf criu.tar; cd criu; sudo -E make -C scripts/ci fedora-rawhide CONTAINER_RUNTIME=podman BUILD_OPTIONS="--security-opt seccomp=unconfined"' ++} ++ + $1 +-- +2.35.1 + diff --git a/0240-include-add-thread_pointer.h-from-Glibc.patch b/0240-include-add-thread_pointer.h-from-Glibc.patch index 636ceb0..3c06959 100644 --- a/0240-include-add-thread_pointer.h-from-Glibc.patch +++ b/0240-include-add-thread_pointer.h-from-Glibc.patch @@ -1,7 +1,7 @@ -From 7262d5ee6d82ecc9c53bc7b23f458de7e794f097 Mon Sep 17 00:00:00 2001 +From d49426d3dce173c61ede04cbd7a3caee8cd24a78 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Tue, 22 Feb 2022 14:58:10 +0300 -Subject: [PATCH 240/245] include: add thread_pointer.h from Glibc +Subject: [PATCH 240/249] include: add thread_pointer.h from Glibc Implementation was taken from the Glibc. diff --git a/0241-clone-noasan-unregister-rseq-at-the-thread-start-for.patch b/0241-clone-noasan-unregister-rseq-at-the-thread-start-for.patch index 75c16b2..dbf2d7f 100644 --- a/0241-clone-noasan-unregister-rseq-at-the-thread-start-for.patch +++ b/0241-clone-noasan-unregister-rseq-at-the-thread-start-for.patch @@ -1,7 +1,7 @@ -From 74f602b66fb6ae3559b570cfc369477a579367c8 Mon Sep 17 00:00:00 2001 +From b26dfea16373b8207f432bbebcfc836b09c05751 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Fri, 24 Dec 2021 18:57:54 +0300 -Subject: [PATCH 241/245] clone-noasan: unregister rseq at the thread start for +Subject: [PATCH 241/249] clone-noasan: unregister rseq at the thread start for new glibc Fresh glibc does rseq registration by default during start_thread(). diff --git a/0242-zdtm-static-rseq00-fix-rseq-test-when-linking-with-a.patch b/0242-zdtm-static-rseq00-fix-rseq-test-when-linking-with-a.patch new file mode 100644 index 0000000..c4ed8f6 --- /dev/null +++ b/0242-zdtm-static-rseq00-fix-rseq-test-when-linking-with-a.patch @@ -0,0 +1,152 @@ +From 5f311e25837fdf75643cba8b3f47920308a1625a Mon Sep 17 00:00:00 2001 +From: Alexander Mikhalitsyn +Date: Fri, 24 Dec 2021 22:56:56 +0300 +Subject: [PATCH 242/249] zdtm/static/rseq00: fix rseq test when linking with a + fresh Glibc + +Fresh Glibc does rseq() register by default. We need to unregister +rseq before registering our own. + +Signed-off-by: Alexander Mikhalitsyn +--- + test/zdtm/static/rseq00.c | 66 +++++++++++++++++++++++++++++---------- + 1 file changed, 49 insertions(+), 17 deletions(-) + +diff --git a/test/zdtm/static/rseq00.c b/test/zdtm/static/rseq00.c +index 95e9f40b4..acf790753 100644 +--- a/test/zdtm/static/rseq00.c ++++ b/test/zdtm/static/rseq00.c +@@ -19,13 +19,48 @@ + + #include "zdtmtst.h" + ++#ifdef __has_include ++#if __has_include("sys/rseq.h") ++#include ++#endif ++#endif ++ + #if defined(__x86_64__) + ++#if defined(RSEQ_SIG) ++static inline void *__criu_thread_pointer(void) ++{ ++#if __GNUC_PREREQ(11, 1) ++ return __builtin_thread_pointer(); ++#else ++ void *__result; ++#ifdef __x86_64__ ++ __asm__("mov %%fs:0, %0" : "=r"(__result)); ++#else ++ __asm__("mov %%gs:0, %0" : "=r"(__result)); ++#endif ++ return __result; ++#endif /* !GCC 11 */ ++} ++ ++static inline void unregister_glibc_rseq(void) ++{ ++ /* unregister rseq */ ++ syscall(__NR_rseq, (void *)((char *)__criu_thread_pointer() + __rseq_offset), __rseq_size, 1, RSEQ_SIG); ++} ++#else ++static inline void unregister_glibc_rseq(void) ++{ ++} ++#endif ++ + const char *test_doc = "Check that rseq() basic C/R works"; + const char *test_author = "Alexander Mikhalitsyn "; + /* parts of code borrowed from https://www.efficios.com/blog/2019/02/08/linux-restartable-sequences/ */ + + /* some useful definitions from kernel uapi */ ++#ifndef RSEQ_SIG ++ + enum rseq_flags { + RSEQ_FLAG_UNREGISTER = (1 << 0), + }; +@@ -37,15 +72,18 @@ struct rseq { + uint32_t flags; + } __attribute__((aligned(4 * sizeof(uint64_t)))); + ++#define RSEQ_SIG 0x53053053 ++ ++#endif ++ + #ifndef __NR_rseq + #define __NR_rseq 334 + #endif + /* EOF */ + ++static volatile struct rseq *rseq_ptr; + static __thread volatile struct rseq __rseq_abi; + +-#define RSEQ_SIG 0x53053053 +- + static int sys_rseq(volatile struct rseq *rseq_abi, uint32_t rseq_len, int flags, uint32_t sig) + { + return syscall(__NR_rseq, rseq_abi, rseq_len, flags, sig); +@@ -54,27 +92,18 @@ static int sys_rseq(volatile struct rseq *rseq_abi, uint32_t rseq_len, int flags + static void register_thread(void) + { + int rc; +- rc = sys_rseq(&__rseq_abi, sizeof(struct rseq), 0, RSEQ_SIG); ++ unregister_glibc_rseq(); ++ rc = sys_rseq(rseq_ptr, sizeof(struct rseq), 0, RSEQ_SIG); + if (rc) { + fail("Failed to register rseq"); + exit(1); + } + } + +-static void unregister_thread(void) +-{ +- int rc; +- rc = sys_rseq(&__rseq_abi, sizeof(struct rseq), RSEQ_FLAG_UNREGISTER, RSEQ_SIG); +- if (rc) { +- fail("Failed to unregister rseq"); +- exit(1); +- } +-} +- + static void check_thread(void) + { + int rc; +- rc = sys_rseq(&__rseq_abi, sizeof(struct rseq), 0, RSEQ_SIG); ++ rc = sys_rseq(rseq_ptr, sizeof(struct rseq), 0, RSEQ_SIG); + if (!(rc && errno == EBUSY)) { + fail("Failed to check rseq %d", rc); + exit(1); +@@ -111,8 +140,8 @@ static int rseq_addv(intptr_t *v, intptr_t count, int cpu) + ".popsection\n\t" + : /* gcc asm goto does not allow outputs */ + : [cpu_id] "r" (cpu), +- [current_cpu_id] "m" (__rseq_abi.cpu_id), +- [rseq_cs] "m" (__rseq_abi.rseq_cs), ++ [current_cpu_id] "m" (rseq_ptr->cpu_id), ++ [rseq_cs] "m" (rseq_ptr->rseq_cs), + /* final store input */ + [v] "m" (*v), + [count] "er" (count) +@@ -132,6 +161,9 @@ int main(int argc, char *argv[]) + intptr_t *cpu_data; + long nr_cpus = sysconf(_SC_NPROCESSORS_ONLN); + ++ rseq_ptr = &__rseq_abi; ++ memset((void *)rseq_ptr, 0, sizeof(struct rseq)); ++ + test_init(argc, argv); + + cpu_data = calloc(nr_cpus, sizeof(*cpu_data)); +@@ -147,7 +179,7 @@ int main(int argc, char *argv[]) + + check_thread(); + +- cpu = RSEQ_ACCESS_ONCE(__rseq_abi.cpu_id_start); ++ cpu = RSEQ_ACCESS_ONCE(rseq_ptr->cpu_id_start); + ret = rseq_addv(&cpu_data[cpu], 2, cpu); + if (ret) + fail("Failed to increment per-cpu counter"); +-- +2.35.1 + diff --git a/0242-compel-add-helpers-to-get-set-instruction-pointer.patch b/0243-compel-add-helpers-to-get-set-instruction-pointer.patch similarity index 97% rename from 0242-compel-add-helpers-to-get-set-instruction-pointer.patch rename to 0243-compel-add-helpers-to-get-set-instruction-pointer.patch index 5af24a3..d1e806a 100644 --- a/0242-compel-add-helpers-to-get-set-instruction-pointer.patch +++ b/0243-compel-add-helpers-to-get-set-instruction-pointer.patch @@ -1,7 +1,7 @@ -From 067052969e57789251d604be94caeb7ec2554707 Mon Sep 17 00:00:00 2001 +From cbbd1f1491be604b501ab93bc51b51853abdb7a8 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Mon, 21 Feb 2022 15:15:52 +0300 -Subject: [PATCH 242/245] compel: add helpers to get/set instruction pointer +Subject: [PATCH 243/249] compel: add helpers to get/set instruction pointer Signed-off-by: Alexander Mikhalitsyn --- @@ -155,10 +155,10 @@ index 7fa0bd8a0..e01b3a22c 100644 + #endif diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c -index 78e4d7e0e..c49f2f4e5 100644 +index 0fb9e715c..6a13cc1b4 100644 --- a/compel/src/lib/infect.c +++ b/compel/src/lib/infect.c -@@ -1687,3 +1687,23 @@ uint64_t compel_get_thread_sp(struct parasite_thread_ctl *tctl) +@@ -1686,3 +1686,23 @@ uint64_t compel_get_thread_sp(struct parasite_thread_ctl *tctl) { return REG_SP(tctl->th.regs); } diff --git a/0243-cr-dump-fixup-thread-IP-when-inside-rseq-cs.patch b/0244-cr-dump-fixup-thread-IP-when-inside-rseq-cs.patch similarity index 91% rename from 0243-cr-dump-fixup-thread-IP-when-inside-rseq-cs.patch rename to 0244-cr-dump-fixup-thread-IP-when-inside-rseq-cs.patch index d727a2a..321bc24 100644 --- a/0243-cr-dump-fixup-thread-IP-when-inside-rseq-cs.patch +++ b/0244-cr-dump-fixup-thread-IP-when-inside-rseq-cs.patch @@ -1,21 +1,21 @@ -From 3b3f3c153e189202bbdbae186e13cc0b3f245195 Mon Sep 17 00:00:00 2001 +From a8d33aa97d51655272bd141fd4fbd6f683a98318 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Mon, 21 Feb 2022 15:25:21 +0300 -Subject: [PATCH 243/245] cr-dump: fixup thread IP when inside rseq cs +Subject: [PATCH 244/249] cr-dump: fixup thread IP when inside rseq cs Signed-off-by: Alexander Mikhalitsyn --- - criu/cr-dump.c | 155 +++++++++++++++++++++++++++++++++++++- + criu/cr-dump.c | 156 +++++++++++++++++++++++++++++++++++++- criu/include/linux/rseq.h | 2 +- criu/include/parasite.h | 2 + criu/include/pstree.h | 1 + - 4 files changed, 155 insertions(+), 5 deletions(-) + 4 files changed, 156 insertions(+), 5 deletions(-) diff --git a/criu/cr-dump.c b/criu/cr-dump.c -index eb645a597..3f12e7721 100644 +index eb645a597..1992991a2 100644 --- a/criu/cr-dump.c +++ b/criu/cr-dump.c -@@ -1034,11 +1034,58 @@ static int dump_task_signals(pid_t pid, struct pstree_item *item) +@@ -1034,11 +1034,59 @@ static int dump_task_signals(pid_t pid, struct pstree_item *item) return 0; } @@ -45,7 +45,8 @@ index eb645a597..3f12e7721 100644 + sizeof(uint64_t)); + if (ret) { + pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq_cs addr\n", tid, (unsigned long)&addr, -+ (unsigned long)(rseq->rseq_abi_pointer + offsetof(struct rseq, rseq_cs)), sizeof(uint64_t)); ++ (unsigned long)(rseq->rseq_abi_pointer + offsetof(struct rseq, rseq_cs)), ++ (unsigned long)sizeof(uint64_t)); + return -1; + } + @@ -56,7 +57,7 @@ index eb645a597..3f12e7721 100644 + ret = ptrace_peek_area(tid, rseq_cs, decode_pointer(addr), sizeof(struct rseq_cs)); + if (ret) { + pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq_cs struct\n", tid, -+ (unsigned long)rseq_cs, (unsigned long)addr, sizeof(struct rseq_cs)); ++ (unsigned long)rseq_cs, (unsigned long)addr, (unsigned long)sizeof(struct rseq_cs)); + return -1; + } + @@ -75,7 +76,7 @@ index eb645a597..3f12e7721 100644 /* * If we are here it means that rseq() syscall is supported, -@@ -1063,7 +1110,8 @@ static int dump_thread_rseq(pid_t tid, RseqEntry **rseqep) +@@ -1063,7 +1111,8 @@ static int dump_thread_rseq(pid_t tid, RseqEntry **rseqep) return -1; } @@ -85,7 +86,7 @@ index eb645a597..3f12e7721 100644 rseqe = xmalloc(sizeof(*rseqe)); if (!rseqe) -@@ -1075,25 +1123,118 @@ static int dump_thread_rseq(pid_t tid, RseqEntry **rseqep) +@@ -1075,25 +1124,118 @@ static int dump_thread_rseq(pid_t tid, RseqEntry **rseqep) rseqe->rseq_abi_size = rseq.rseq_abi_size; rseqe->signature = rseq.signature; @@ -206,7 +207,7 @@ index eb645a597..3f12e7721 100644 } static struct proc_pid_stat pps_buf; -@@ -1403,6 +1544,12 @@ static int dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie) +@@ -1403,6 +1545,12 @@ static int dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie) goto err; } diff --git a/0245-fixup.patch b/0245-fixup.patch deleted file mode 100644 index 9adb44a..0000000 --- a/0245-fixup.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9a0c293c5ea8ca0430d1887b1f2647d0217e222f Mon Sep 17 00:00:00 2001 -From: Radostin Stoyanov -Date: Tue, 5 Apr 2022 10:48:40 +0100 -Subject: [PATCH] fixup - -Signed-off-by: Radostin Stoyanov ---- - criu/cr-dump.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/criu/cr-dump.c b/criu/cr-dump.c -index 0984bd11c..4ca436d26 100644 ---- a/criu/cr-dump.c -+++ b/criu/cr-dump.c -@@ -1057,7 +1057,7 @@ static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseqc, st - */ - ret = ptrace_peek_area(tid, rseq, decode_pointer(rseqc->rseq_abi_pointer), sizeof(struct rseq)); - if (ret) { -- pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq struct\n", tid, (unsigned long)rseq, -+ pr_err("ptrace_peek_area(%d, %lx, %lx, %lu): fail to read rseq struct\n", tid, (unsigned long)rseq, - (unsigned long)(rseqc->rseq_abi_pointer), sizeof(uint64_t)); - return -1; - } -@@ -1067,7 +1067,7 @@ static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseqc, st - - ret = ptrace_peek_area(tid, rseq_cs, decode_pointer(rseq->rseq_cs.ptr64), sizeof(struct rseq_cs)); - if (ret) { -- pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq_cs struct\n", tid, -+ pr_err("ptrace_peek_area(%d, %lx, %lx, %lu): fail to read rseq_cs struct\n", tid, - (unsigned long)rseq_cs, (unsigned long)rseq->rseq_cs.ptr64, sizeof(struct rseq_cs)); - return -1; - } --- -2.35.1 - diff --git a/0245-zdtm-add-transition-rseq01-test-for-amd64.patch b/0245-zdtm-add-transition-rseq01-test-for-amd64.patch new file mode 100644 index 0000000..b86acce --- /dev/null +++ b/0245-zdtm-add-transition-rseq01-test-for-amd64.patch @@ -0,0 +1,251 @@ +From 7f91af616406a97761d658550fdfcdb38a5e333d Mon Sep 17 00:00:00 2001 +From: Alexander Mikhalitsyn +Date: Mon, 21 Feb 2022 15:45:40 +0300 +Subject: [PATCH 245/249] zdtm: add transition/rseq01 test for amd64 + +Signed-off-by: Alexander Mikhalitsyn +--- + test/zdtm/transition/Makefile | 1 + + test/zdtm/transition/rseq01.c | 209 +++++++++++++++++++++++++++++++ + test/zdtm/transition/rseq01.desc | 1 + + 3 files changed, 211 insertions(+) + create mode 100644 test/zdtm/transition/rseq01.c + create mode 100644 test/zdtm/transition/rseq01.desc + +diff --git a/test/zdtm/transition/Makefile b/test/zdtm/transition/Makefile +index 9388157e8..fae4e27b3 100644 +--- a/test/zdtm/transition/Makefile ++++ b/test/zdtm/transition/Makefile +@@ -23,6 +23,7 @@ TST_NOFILE = \ + lazy-thp \ + pid_reuse \ + pidfd_store_sk \ ++ rseq01 \ + + + TST_FILE = \ +diff --git a/test/zdtm/transition/rseq01.c b/test/zdtm/transition/rseq01.c +new file mode 100644 +index 000000000..a0c3dbc82 +--- /dev/null ++++ b/test/zdtm/transition/rseq01.c +@@ -0,0 +1,209 @@ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "zdtmtst.h" ++ ++#ifdef __has_include ++#if __has_include("sys/rseq.h") ++#include ++#endif ++#endif ++ ++#if defined(__x86_64__) ++ ++#if defined(__x86_64__) && defined(RSEQ_SIG) ++static inline void *thread_pointer(void) ++{ ++ void *result; ++ asm("mov %%fs:0, %0" : "=r"(result)); ++ return result; ++} ++ ++static inline void unregister_old_rseq(void) ++{ ++ /* unregister rseq */ ++ syscall(__NR_rseq, (void *)((char *)thread_pointer() + __rseq_offset), __rseq_size, 1, RSEQ_SIG); ++} ++#else ++static inline void unregister_old_rseq(void) ++{ ++} ++#endif ++ ++const char *test_doc = "rseq() transition test"; ++const char *test_author = "Alexander Mikhalitsyn "; ++ ++/* parts of code borrowed from https://www.efficios.com/blog/2019/02/08/linux-restartable-sequences/ */ ++ ++/* some useful definitions from kernel uapi */ ++#ifndef RSEQ_SIG ++ ++enum rseq_flags { ++ RSEQ_FLAG_UNREGISTER = (1 << 0), ++}; ++ ++struct rseq { ++ uint32_t cpu_id_start; ++ uint32_t cpu_id; ++ uint64_t rseq_cs; ++ uint32_t flags; ++} __attribute__((aligned(4 * sizeof(uint64_t)))); ++ ++#define RSEQ_SIG 0x53053053 ++ ++#endif ++ ++#ifndef __NR_rseq ++#define __NR_rseq 334 ++#endif ++/* EOF */ ++ ++static volatile struct rseq *rseq_ptr; ++static __thread volatile struct rseq __rseq_abi; ++ ++static int sys_rseq(volatile struct rseq *rseq_abi, uint32_t rseq_len, int flags, uint32_t sig) ++{ ++ return syscall(__NR_rseq, rseq_abi, rseq_len, flags, sig); ++} ++ ++static void register_thread(void) ++{ ++ int rc; ++ unregister_old_rseq(); ++ rc = sys_rseq(rseq_ptr, sizeof(struct rseq), 0, RSEQ_SIG); ++ if (rc) { ++ fail("Failed to register rseq"); ++ exit(1); ++ } ++} ++ ++static void check_thread(void) ++{ ++ int rc; ++ rc = sys_rseq(rseq_ptr, sizeof(struct rseq), 0, RSEQ_SIG); ++ if (!(rc && errno == EBUSY)) { ++ fail("Failed to check rseq %d", rc); ++ exit(1); ++ } ++} ++ ++#define RSEQ_ACCESS_ONCE(x) (*(__volatile__ __typeof__(x) *)&(x)) ++ ++static int rseq_addv(intptr_t *v, intptr_t count, int cpu) ++{ ++ double a = 10000000000000000.0; ++ double b = -1; ++ ++ /* clang-format off */ ++ __asm__ __volatile__ goto( ++ ".pushsection __rseq_table, \"aw\"\n\t" ++ ".balign 32\n\t" ++ "cs_obj:\n\t" ++ /* version, flags */ ++ ".long 0, 0\n\t" ++ /* start_ip, post_commit_offset, abort_ip */ ++ ".quad 1f, (2f-1f), 4f\n\t" ++ ".popsection\n\t" ++ "1:\n\t" ++ "leaq cs_obj(%%rip), %%rax\n\t" ++ "movq %%rax, %[rseq_cs]\n\t" ++ "cmpl %[cpu_id], %[current_cpu_id]\n\t" ++ "jnz 4f\n\t" ++ "addq %[count], %[v]\n\t" /* final store */ ++ "mov $10000000, %%rcx\n\t" ++ "fldl %[x]\n\t" /* we have st clobbered */ ++ "5:\n\t" ++ "fsqrt\n\t" /* heavy instruction */ ++ "dec %%rcx\n\t" ++ "jnz 5b\n\t" ++ "fstpl %[y]\n\t" ++ "2:\n\t" ++ ".pushsection __rseq_failure, \"ax\"\n\t" ++ /* Disassembler-friendly signature: nopl (%rip). */ ++ ".byte 0x0f, 0xb9, 0x3d\n\t" ++ ".long 0x53053053\n\t" /* RSEQ_FLAGS */ ++ "4:\n\t" ++ /*"fstpl %[y]\n\t"*/ ++ "jmp %l[abort]\n\t" ++ /*"jmp 1b\n\t"*/ ++ ".popsection\n\t" ++ : /* gcc asm goto does not allow outputs */ ++ : [cpu_id] "r" (cpu), ++ [current_cpu_id] "m" (rseq_ptr->cpu_id), ++ [rseq_cs] "m" (rseq_ptr->rseq_cs), ++ /* final store input */ ++ [v] "m" (*v), ++ [count] "er" (count), ++ [x] "m" (a), ++ [y] "m" (b) ++ : "memory", "cc", "rax", "rcx", "st" ++ : abort ++ ); ++ /* clang-format on */ ++ ++ return 0; ++abort: ++ return -1; ++} ++ ++int main(int argc, char *argv[]) ++{ ++ int cpu = 0; ++ int ret; ++ intptr_t *cpu_data; ++ long nr_cpus; ++ ++ rseq_ptr = &__rseq_abi; ++ memset((void *)rseq_ptr, 0, sizeof(struct rseq)); ++ ++ test_init(argc, argv); ++ nr_cpus = sysconf(_SC_NPROCESSORS_ONLN); ++ ++ cpu_data = calloc(nr_cpus, sizeof(*cpu_data)); ++ if (!cpu_data) { ++ fail("calloc"); ++ exit(EXIT_FAILURE); ++ } ++ register_thread(); ++ ++ test_daemon(); ++ ++ while (test_go()) { ++ cpu = RSEQ_ACCESS_ONCE(rseq_ptr->cpu_id_start); ++ ret = rseq_addv(&cpu_data[cpu], 2, cpu); ++ if (ret) ++ fail("Failed to increment per-cpu counter"); ++ } ++ ++ test_waitsig(); ++ ++ check_thread(); ++ pass(); ++ ++ return 0; ++} ++ ++#else /* #if defined(__x86_64__) */ ++ ++int main(int argc, char *argv[]) ++{ ++ test_init(argc, argv); ++ skip("Unsupported arch"); ++ test_daemon(); ++ test_waitsig(); ++ pass(); ++ return 0; ++} ++ ++#endif /* #if defined(__x86_64__) */ +diff --git a/test/zdtm/transition/rseq01.desc b/test/zdtm/transition/rseq01.desc +new file mode 100644 +index 000000000..0324fa39c +--- /dev/null ++++ b/test/zdtm/transition/rseq01.desc +@@ -0,0 +1 @@ ++{'flavor': 'h', 'arch': 'x86_64', 'feature': 'get_rseq_conf'} +-- +2.35.1 + diff --git a/0246-Revert-test-disable-rseq-also-on-Archlinux.patch b/0246-Revert-test-disable-rseq-also-on-Archlinux.patch new file mode 100644 index 0000000..0b3e77f --- /dev/null +++ b/0246-Revert-test-disable-rseq-also-on-Archlinux.patch @@ -0,0 +1,28 @@ +From b4e121a54c83c172d3b78b1d9002f4367a2c1fb8 Mon Sep 17 00:00:00 2001 +From: Alexander Mikhalitsyn +Date: Tue, 22 Feb 2022 15:25:37 +0300 +Subject: [PATCH 246/249] Revert "test: disable rseq also on Archlinux" + +This reverts commit f008f740411156b7309219c7e052cb8bc24d5aae. + +Signed-off-by: Alexander Mikhalitsyn +--- + scripts/build/Dockerfile.archlinux | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/scripts/build/Dockerfile.archlinux b/scripts/build/Dockerfile.archlinux +index b226d5701..d226244ee 100644 +--- a/scripts/build/Dockerfile.archlinux ++++ b/scripts/build/Dockerfile.archlinux +@@ -1,8 +1,5 @@ + FROM docker.io/library/archlinux:latest + +-# FIXME: Temporary solution for https://github.com/checkpoint-restore/criu/issues/1696 +-ENV GLIBC_TUNABLES=glibc.pthread.rseq=0 +- + ARG CC=gcc + + RUN pacman -Syu --noconfirm \ +-- +2.35.1 + diff --git a/0244-cr-dump-handle-rseq-flags-field.patch b/0247-cr-dump-handle-rseq-flags-field.patch similarity index 90% rename from 0244-cr-dump-handle-rseq-flags-field.patch rename to 0247-cr-dump-handle-rseq-flags-field.patch index b2b1a6c..d837bc8 100644 --- a/0244-cr-dump-handle-rseq-flags-field.patch +++ b/0247-cr-dump-handle-rseq-flags-field.patch @@ -1,21 +1,21 @@ -From 51528fc97bf42e8b7e7d19103970e82890f2cb58 Mon Sep 17 00:00:00 2001 +From 392f1ecdcbd53f558f101b384831876f4b3969f9 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Tue, 22 Feb 2022 18:22:45 +0300 -Subject: [PATCH 244/245] cr-dump: handle rseq flags field +Subject: [PATCH 247/249] cr-dump: handle rseq flags field Userspace may configure rseq critical section by def Signed-off-by: Alexander Mikhalitsyn --- - criu/cr-dump.c | 85 +++++++++++++++++++++++++---------------- + criu/cr-dump.c | 87 +++++++++++++++++++++++++---------------- criu/cr-restore.c | 57 +++++++++++++++++++++++++++ criu/include/rst_info.h | 8 ++++ criu/pstree.c | 36 +++++++++++++++++ images/rseq.proto | 1 + - 5 files changed, 154 insertions(+), 33 deletions(-) + 5 files changed, 155 insertions(+), 34 deletions(-) diff --git a/criu/cr-dump.c b/criu/cr-dump.c -index 3f12e7721..0984bd11c 100644 +index 1992991a2..5f40f2b5b 100644 --- a/criu/cr-dump.c +++ b/criu/cr-dump.c @@ -1034,13 +1034,13 @@ static int dump_task_signals(pid_t pid, struct pstree_item *item) @@ -35,7 +35,7 @@ index 3f12e7721..0984bd11c 100644 return 0; /* -@@ -1055,22 +1055,20 @@ static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseq, str +@@ -1055,23 +1055,21 @@ static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseq, str * then rseq_ip_fixup() -> clear_rseq_cs() and user space memory with struct rseq * will be cleared. So, let's use ptrace(PTRACE_PEEKDATA). */ @@ -44,9 +44,10 @@ index 3f12e7721..0984bd11c 100644 + ret = ptrace_peek_area(tid, rseq, decode_pointer(rseqc->rseq_abi_pointer), sizeof(struct rseq)); if (ret) { - pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq_cs addr\n", tid, (unsigned long)&addr, -- (unsigned long)(rseq->rseq_abi_pointer + offsetof(struct rseq, rseq_cs)), sizeof(uint64_t)); +- (unsigned long)(rseq->rseq_abi_pointer + offsetof(struct rseq, rseq_cs)), +- (unsigned long)sizeof(uint64_t)); + pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq struct\n", tid, (unsigned long)rseq, -+ (unsigned long)(rseqc->rseq_abi_pointer), sizeof(uint64_t)); ++ (unsigned long)(rseqc->rseq_abi_pointer), (unsigned long)sizeof(uint64_t)); return -1; } @@ -59,12 +60,13 @@ index 3f12e7721..0984bd11c 100644 + ret = ptrace_peek_area(tid, rseq_cs, decode_pointer(rseq->rseq_cs.ptr64), sizeof(struct rseq_cs)); if (ret) { pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq_cs struct\n", tid, -- (unsigned long)rseq_cs, (unsigned long)addr, sizeof(struct rseq_cs)); -+ (unsigned long)rseq_cs, (unsigned long)rseq->rseq_cs.ptr64, sizeof(struct rseq_cs)); +- (unsigned long)rseq_cs, (unsigned long)addr, (unsigned long)sizeof(struct rseq_cs)); ++ (unsigned long)rseq_cs, (unsigned long)rseq->rseq_cs.ptr64, ++ (unsigned long)sizeof(struct rseq_cs)); return -1; } -@@ -1079,11 +1077,12 @@ static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseq, str +@@ -1080,11 +1078,12 @@ static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseq, str static int dump_thread_rseq(struct pstree_item *item, int i) { @@ -78,7 +80,7 @@ index 3f12e7721..0984bd11c 100644 struct rseq_cs *rseq_cs = &dmpi(item)->thread_rseq_cs[i]; pid_t tid = item->threads[i].real; -@@ -1098,20 +1097,20 @@ static int dump_thread_rseq(struct pstree_item *item, int i) +@@ -1099,20 +1098,20 @@ static int dump_thread_rseq(struct pstree_item *item, int i) if (!kdat.has_ptrace_get_rseq_conf) return 0; @@ -105,7 +107,7 @@ index 3f12e7721..0984bd11c 100644 rseqe = xmalloc(sizeof(*rseqe)); if (!rseqe) -@@ -1119,13 +1118,22 @@ static int dump_thread_rseq(struct pstree_item *item, int i) +@@ -1120,13 +1119,22 @@ static int dump_thread_rseq(struct pstree_item *item, int i) rseq_entry__init(rseqe); @@ -132,7 +134,7 @@ index 3f12e7721..0984bd11c 100644 /* save rseq entry to the image */ *rseqep = rseqe; -@@ -1175,11 +1183,12 @@ static int fixup_thread_rseq(struct pstree_item *item, int i) +@@ -1176,11 +1184,12 @@ static int fixup_thread_rseq(struct pstree_item *item, int i) struct rseq_cs *rseq_cs = &dmpi(item)->thread_rseq_cs[i]; pid_t tid = item->threads[i].real; @@ -147,7 +149,7 @@ index 3f12e7721..0984bd11c 100644 tid, rseq_cs->start_ip, rseq_cs->abort_ip, rseq_cs->post_commit_offset, rseq_cs->flags, rseq_cs->version, (unsigned long)TI_IP(core)); -@@ -1191,25 +1200,35 @@ static int fixup_thread_rseq(struct pstree_item *item, int i) +@@ -1192,25 +1201,35 @@ static int fixup_thread_rseq(struct pstree_item *item, int i) if (task_in_rseq(rseq_cs, TI_IP(core))) { struct pid *tid = &item->threads[i]; @@ -193,7 +195,7 @@ index 3f12e7721..0984bd11c 100644 } diff --git a/criu/cr-restore.c b/criu/cr-restore.c -index b2ddc8db0..ebf40d2df 100644 +index b2ddc8db0..77b0a8c0f 100644 --- a/criu/cr-restore.c +++ b/criu/cr-restore.c @@ -23,6 +23,7 @@ @@ -257,7 +259,7 @@ index b2ddc8db0..ebf40d2df 100644 + continue; + + if (ptrace_poke_area(pid, &rseqe[i].rseq_cs_pointer, -+ (void *)(rseqe[i].rseq_abi_pointer + offsetof(struct rseq, rseq_cs)), ++ decode_pointer(rseqe[i].rseq_abi_pointer + offsetof(struct rseq, rseq_cs)), + sizeof(uint64_t))) { + pr_err("Can't restore rseq_cs pointer (pid: %d)\n", pid); + return -1; @@ -315,7 +317,7 @@ index 9664e0a1c..d0a3db6c5 100644 }; diff --git a/criu/pstree.c b/criu/pstree.c -index d29de730a..d006c2660 100644 +index d29de730a..d299f41c0 100644 --- a/criu/pstree.c +++ b/criu/pstree.c @@ -954,6 +954,31 @@ static int prepare_pstree_kobj_ids(void) @@ -335,7 +337,7 @@ index d29de730a..d006c2660 100644 + + rseqs = shmalloc(sz); + if (!rseqs) { -+ pr_err("prepare_pstree_rseqs shmalloc(%ld) failed\n", sz); ++ pr_err("prepare_pstree_rseqs shmalloc(%lu) failed\n", (unsigned long)sz); + return -1; + } + diff --git a/0248-zdtm-add-rseq02-transition-test-with-NO_RESTART-CS-f.patch b/0248-zdtm-add-rseq02-transition-test-with-NO_RESTART-CS-f.patch new file mode 100644 index 0000000..0988931 --- /dev/null +++ b/0248-zdtm-add-rseq02-transition-test-with-NO_RESTART-CS-f.patch @@ -0,0 +1,175 @@ +From ab6d09a8c0303a036b0964c7263075e74b02ce48 Mon Sep 17 00:00:00 2001 +From: Alexander Mikhalitsyn +Date: Wed, 23 Feb 2022 23:20:29 +0300 +Subject: [PATCH 248/249] zdtm: add rseq02 transition test with NO_RESTART CS + flag + +Signed-off-by: Alexander Mikhalitsyn +--- + test/zdtm/transition/Makefile | 2 ++ + test/zdtm/transition/rseq01.c | 59 ++++++++++++++++++++++++++++++-- + test/zdtm/transition/rseq02.c | 1 + + test/zdtm/transition/rseq02.desc | 1 + + 4 files changed, 61 insertions(+), 2 deletions(-) + create mode 120000 test/zdtm/transition/rseq02.c + create mode 120000 test/zdtm/transition/rseq02.desc + +diff --git a/test/zdtm/transition/Makefile b/test/zdtm/transition/Makefile +index fae4e27b3..378a4fc75 100644 +--- a/test/zdtm/transition/Makefile ++++ b/test/zdtm/transition/Makefile +@@ -24,6 +24,7 @@ TST_NOFILE = \ + pid_reuse \ + pidfd_store_sk \ + rseq01 \ ++ rseq02 \ + + + TST_FILE = \ +@@ -82,6 +83,7 @@ ptrace: LDFLAGS += -pthread + fork2: CFLAGS += -D FORK2 + thread-bomb.o: CFLAGS += -pthread + thread-bomb: LDFLAGS += -pthread ++rseq02: CFLAGS += -D NOABORT + + %: %.sh + cp $< $@ +diff --git a/test/zdtm/transition/rseq01.c b/test/zdtm/transition/rseq01.c +index a0c3dbc82..26b8fe335 100644 +--- a/test/zdtm/transition/rseq01.c ++++ b/test/zdtm/transition/rseq01.c +@@ -53,6 +53,18 @@ enum rseq_flags { + RSEQ_FLAG_UNREGISTER = (1 << 0), + }; + ++enum rseq_cs_flags_bit { ++ RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT_BIT = 0, ++ RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT = 1, ++ RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT = 2, ++}; ++ ++enum rseq_cs_flags { ++ RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT = (1U << RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT_BIT), ++ RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL = (1U << RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT), ++ RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE = (1U << RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT), ++}; ++ + struct rseq { + uint32_t cpu_id_start; + uint32_t cpu_id; +@@ -104,6 +116,7 @@ static int rseq_addv(intptr_t *v, intptr_t count, int cpu) + { + double a = 10000000000000000.0; + double b = -1; ++ uint64_t rseq_cs1 = 0, rseq_cs2 = 0; + + /* clang-format off */ + __asm__ __volatile__ goto( +@@ -128,6 +141,9 @@ static int rseq_addv(intptr_t *v, intptr_t count, int cpu) + "dec %%rcx\n\t" + "jnz 5b\n\t" + "fstpl %[y]\n\t" ++ "movq %%rax, %[rseq_cs_check2]\n\t" ++ "movq %[rseq_cs], %%rax\n\t" ++ "movq %%rax, %[rseq_cs_check1]\n\t" + "2:\n\t" + ".pushsection __rseq_failure, \"ax\"\n\t" + /* Disassembler-friendly signature: nopl (%rip). */ +@@ -142,6 +158,8 @@ static int rseq_addv(intptr_t *v, intptr_t count, int cpu) + : [cpu_id] "r" (cpu), + [current_cpu_id] "m" (rseq_ptr->cpu_id), + [rseq_cs] "m" (rseq_ptr->rseq_cs), ++ [rseq_cs_check1] "m" (rseq_cs1), ++ [rseq_cs_check2] "m" (rseq_cs2), + /* final store input */ + [v] "m" (*v), + [count] "er" (count), +@@ -152,8 +170,21 @@ static int rseq_addv(intptr_t *v, intptr_t count, int cpu) + ); + /* clang-format on */ + ++ test_msg("exit %lx %lx %f %f\n", rseq_cs1, rseq_cs2, a, b); ++ if (rseq_cs1 != rseq_cs2) { ++ /* ++ * It means that we finished critical section ++ * *normally* (haven't jumped to abort) but the kernel had cleaned up ++ * rseq_ptr->rseq_cs before we left critical section ++ * and CRIU wasn't restored it correctly. ++ * That's a bug picture. ++ */ ++ return -1; ++ } ++ + return 0; + abort: ++ test_msg("abort %lx %lx %f %f\n", rseq_cs1, rseq_cs2, a, b); + return -1; + } + +@@ -175,21 +206,45 @@ int main(int argc, char *argv[]) + fail("calloc"); + exit(EXIT_FAILURE); + } ++ + register_thread(); + ++ /* ++ * We want to test that RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL ++ * is handled properly by CRIU, but that flag can be used ++ * only with all another flags set. ++ * Please, refer to ++ * https://github.com/torvalds/linux/blob/master/kernel/rseq.c#L192 ++ */ ++#ifdef NOABORT ++ rseq_ptr->flags = RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT | RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL | ++ RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE; ++#endif ++ + test_daemon(); + + while (test_go()) { + cpu = RSEQ_ACCESS_ONCE(rseq_ptr->cpu_id_start); + ret = rseq_addv(&cpu_data[cpu], 2, cpu); +- if (ret) ++#ifndef NOABORT ++ /* just ignore abort */ ++ ret = 0; ++#else ++ if (ret) { + fail("Failed to increment per-cpu counter"); ++ break; ++ } ++#endif + } + + test_waitsig(); + + check_thread(); +- pass(); ++ ++ if (ret) ++ fail(); ++ else ++ pass(); + + return 0; + } +diff --git a/test/zdtm/transition/rseq02.c b/test/zdtm/transition/rseq02.c +new file mode 120000 +index 000000000..d56491719 +--- /dev/null ++++ b/test/zdtm/transition/rseq02.c +@@ -0,0 +1 @@ ++rseq01.c +\ No newline at end of file +diff --git a/test/zdtm/transition/rseq02.desc b/test/zdtm/transition/rseq02.desc +new file mode 120000 +index 000000000..b888f0da7 +--- /dev/null ++++ b/test/zdtm/transition/rseq02.desc +@@ -0,0 +1 @@ ++rseq01.desc +\ No newline at end of file +-- +2.35.1 + diff --git a/0249-zdtm-temporary-disable-rseq02-test.patch b/0249-zdtm-temporary-disable-rseq02-test.patch new file mode 100644 index 0000000..f07a174 --- /dev/null +++ b/0249-zdtm-temporary-disable-rseq02-test.patch @@ -0,0 +1,41 @@ +From 149d70490d27bfa302ed977b40f55df4aecd36ea Mon Sep 17 00:00:00 2001 +From: Alexander Mikhalitsyn +Date: Tue, 5 Apr 2022 12:27:07 +0300 +Subject: [PATCH 249/249] zdtm: temporary disable rseq02 test + +That's strange but rseq02 test fails with: +09:06:16.222: 51: exit 555f52082120 555f52082120 +09:06:16.282: 51: exit 555f52082120 555f52082120 +09:06:16.340: 51: exit 555f52082120 555f52082120 +09:06:16.397: 51: exit 555f52082120 555f52082120 +09:06:16.503: 51: exit 0 555f52082120 +09:06:16.503: 51: FAIL: rseq02.c:235: Failed to increment per-cpu counter (errno = 2 (No such file or directory)) +09:06:16.503: 51: FAIL: rseq02.c:246: (errno = 16 (Device or resource busy)) + +It means that rseq_cs pointer was cleaned up by the kernel despite of +NO_RESTART* flags. That's a hardly reproducible and I will investigate that. + +Signed-off-by: Alexander Mikhalitsyn +--- + test/zdtm/transition/rseq02.desc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + mode change 120000 => 100644 test/zdtm/transition/rseq02.desc + +diff --git a/test/zdtm/transition/rseq02.desc b/test/zdtm/transition/rseq02.desc +deleted file mode 120000 +index b888f0da7..000000000 +--- a/test/zdtm/transition/rseq02.desc ++++ /dev/null +@@ -1 +0,0 @@ +-rseq01.desc +\ No newline at end of file +diff --git a/test/zdtm/transition/rseq02.desc b/test/zdtm/transition/rseq02.desc +new file mode 100644 +index 000000000..1ce7f240f +--- /dev/null ++++ b/test/zdtm/transition/rseq02.desc +@@ -0,0 +1 @@ ++{'flavor': 'h', 'arch': 'x86_64', 'feature': 'get_rseq_conf', 'flags': 'noauto'} +-- +2.35.1 + diff --git a/criu.spec b/criu.spec index 9276ae8..c1e1167 100644 --- a/criu.spec +++ b/criu.spec @@ -17,257 +17,261 @@ Name: criu Version: 3.16.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Tool for Checkpoint/Restore in User-space License: GPLv2 URL: http://criu.org/ Source0: https://github.com/checkpoint-restore/criu/archive/v%{version}/criu-%{version}.tar.gz Patch1: 0001-criu-8-add-external-net-option.patch -Patch2: 0002-criu-files-Don-t-cache-fd-ids-for-device-files.patch -Patch3: 0003-tcp-Skip-restoring-TCP-state-when-dumping-with-tcp-c.patch -Patch4: 0004-zdtm-Dumping-restoring-with-tcp-close-on-TCP_CLOSE-s.patch -Patch5: 0005-criu-8-Add-more-detailed-description-about-tcp-close.patch -Patch6: 0006-Add-support-for-python3-in-criu-coredump.patch -Patch7: 0007-Add-new-files-for-running-criu-coredump-via-python-2.patch -Patch8: 0008-coredump-remove-unused-import.patch -Patch9: 0009-coredump-sort-imports.patch -Patch10: 0010-coredump-convert-indentation-to-spaces.patch -Patch11: 0011-python-replace-equality-with-identity-test.patch -Patch12: 0012-coredump-drop-unused-variable.patch -Patch13: 0013-coredump-drop-exec-permission.patch -Patch14: 0014-coredump-lint-fix-for-block-comments.patch -Patch15: 0015-coredump-fix-missing-whitespace-around-operator.patch -Patch16: 0016-coredump-fix-too-many-blank-lines.patch -Patch17: 0017-coredump-fix-comparison-to-true.patch -Patch18: 0018-coredump-lint-fix-visually-indented-line.patch -Patch19: 0019-test-coredump-fix-shellcheck-errors.patch -Patch20: 0020-make-enable-lint-for-coredump.patch -Patch21: 0021-ci-enable-coredump-tests.patch -Patch22: 0022-pie-restorer-remove-excess-hash-printf-specifier.patch -Patch23: 0023-tty-fix-the-null-pointer-of-get_tty_driver.patch -Patch24: 0024-util-use-nftw-in-rmrf-helper.patch -Patch25: 0025-criu-ns-make-pidns-init-first-do-setsid.patch -Patch26: 0026-net-optimize-restore_rule-to-not-open-the-CR_FD_RULE.patch -Patch27: 0027-ci-replace-deprecated-codecov-bash-uploader.patch -Patch28: 0028-ci-fix-userfaultfd-test-failures.patch -Patch29: 0029-ci-use-Fedora-34-for-lint-CI-runs.patch -Patch30: 0030-tests-improve-the-image-streamer-process-control.patch -Patch31: 0031-sockets-don-t-call-sk_setbufs-asyncronously.patch -Patch32: 0032-kerndat-check-for-set-getsockopt-SO_BUF_LOCK-availab.patch -Patch33: 0033-sockets-c-r-bufer-size-locks.patch -Patch34: 0034-zdtm-add-test-for-socket-buffer-size-locks.patch -Patch35: 0035-zdtm-make-sock_opts02-also-check-lock-change-by-SO_-.patch -Patch36: 0036-clang-format-enable-AlignTrailingComments.patch -Patch37: 0037-clang-format-do-several-manual-comment-fixups.patch -Patch38: 0038-clang-format-do-automatic-comment-fixups.patch -Patch39: 0039-cr-dump-fail-dumping-when-zombie-process-with-sid-0.patch -Patch40: 0040-clang-format-make-x86_ins_capability_mask-human-read.patch -Patch41: 0041-ci-disable-socket-raw-test-on-centos8.patch -Patch42: 0042-zdtm.py-make-tests-with-link_remap-exclusive.patch -Patch43: 0043-tests-improve-the-deterministic-behavior-of-the-test.patch -Patch44: 0044-clang-format-zdtm-fix-clang-complains-about-strange-.patch -Patch45: 0045-seize-restore-cgroup-freezer-to-right-state.patch -Patch46: 0046-ci-Use-latest-Fedora-for-lint-ci-runs-again.patch -Patch47: 0047-crtools-ignore-SIGPIPE-in-swrk-mode.patch -Patch48: 0048-ci-switch-to-centos-stream-8.patch -Patch49: 0049-check-cleanup-child-processes.patch -Patch50: 0050-files-reg-fix-error-handling-in-open_path.patch -Patch51: 0051-files-reg-fix-error-handling-of-rm_parent_dirs.patch -Patch52: 0052-ghost-mount-allocate-remounted_rw-in-shmem-to-get-in.patch -Patch53: 0053-files-reg-temporary-remount-writable-the-mount-we-do.patch -Patch54: 0054-zdtm-add-ro-mount-check-after-c-r-to-mntns_ghost01.patch -Patch55: 0055-clang-format-disable-wrong-struct-pointer-declaratio.patch -Patch56: 0056-ci-Run-cross-compile-on-debian-stable.patch -Patch57: 0057-ci-Run-cross-compile-with-debian-testing.patch -Patch58: 0058-make-Explicitly-enable-FPU-on-ARMv7-builds.patch -Patch59: 0059-ci-disable-broken-tests-until-fixed.patch -Patch60: 0060-test-do-not-use-keep-going-for-single-zdtm-tests.patch -Patch61: 0061-files-reg-try-dump_ghost_remap-if-link-remap-failed-.patch -Patch62: 0062-util-make-page-server-IPv6-safe.patch -Patch63: 0063-sk-unix-Fix-TCP_ESTABLISHED-checks-in-unix-sockets.patch -Patch64: 0064-ci-Enable-disabled-unix-socket-related-tests.patch -Patch65: 0065-ci-install-procps-in-Alpine.patch -Patch66: 0066-test-another-try-to-correctly-fix-the-kernel-version.patch -Patch67: 0067-x86-compel-fault-inject-bound-xsave-features-set.patch -Patch68: 0068-x86-compel-fault-inject-print-the-initial-seed.patch -Patch69: 0069-ci-enable-x86-xsave-fault-injection-tests-back.patch -Patch70: 0070-Add-documentation-for-timeout-option.patch -Patch71: 0071-usernsd-UNS_FDOUT-should-not-require-an-input-descri.patch -Patch72: 0072-libcriu-add-setting-lsm-mount-context-to-libcriu.patch -Patch73: 0073-ci-use-unstable-release-for-cross-compile.patch -Patch74: 0074-ci-disable-glibc-rseq-support.patch -Patch75: 0075-libcriu-add-single-pre-dump-support.patch -Patch76: 0076-tests-added-test-for-single-pre-dump-support.patch -Patch77: 0077-zdtm.py-clean-up-MAKEFLAGS-env-variable-before-runni.patch -Patch78: 0078-zdtm-zdtm_ct-fix-compilation-error-with-strict-proto.patch -Patch79: 0079-zdtm-remove-mntns-deleted-dst-test-leftover-from-git.patch -Patch80: 0080-crtools-remove-excess-always-true-condition.patch -Patch81: 0081-crtools-rpc-export-current-criu-mode-to-opts.mode.patch -Patch82: 0082-crtools-use-new-opts.mode-in-image_dir_mode.patch -Patch83: 0083-crtools-check-that-cpuinfo-command-has-sub-command.patch -Patch84: 0084-sk-unix-Add-support-for-SOCK_SEQPACKET-unix-sockets.patch -Patch85: 0085-zdtm-Add-SOCK_SEQPACKET-variants-to-unix-socket-test.patch -Patch86: 0086-tls-fix-typo.patch -Patch87: 0087-tls-use-ssize_t-for-return-value.patch -Patch88: 0088-tls-add-more-comments.patch -Patch89: 0089-uffd-call-disconnect_from_page_server-to-shutdown-a-.patch -Patch90: 0090-tls-allow-to-terminate-connections-synchronously.patch -Patch91: 0091-page-xfer-stop-waiting-for-a-new-command-after-a-clo.patch -Patch92: 0092-ci-reenable-the-lazy-thp-test-in-the-lazy-remote-mod.patch -Patch93: 0093-test-log-testname.out.inprogress-if-a-test-has-faile.patch -Patch94: 0094-zdtm-print-tails-of-all-logs-if-a-test-has-failed.patch -Patch95: 0095-zdtm-static-uffd-events-add-more-log-messages.patch -Patch96: 0096-mount-split-check_mountpoint_fd-from-__open_mountpoi.patch -Patch97: 0097-mount-remove-mnt_fd-argument-of-__open_mountpoint.patch -Patch98: 0098-proc_parse-add-helper-to-resolve-sdev-from-fd.patch -Patch99: 0099-mount-btrfs-make-check_mountpoint_fd-fallback-to-get.patch -Patch100: 0100-ci-test-criu-image-streamer-with-all-tests.patch -Patch101: 0101-readme-add-docker-test-badge.patch -Patch102: 0102-contributing-remove-old-badges-and-logo.patch -Patch103: 0103-ci-update-to-latest-Vagrant-and-Fedora-images.patch -Patch104: 0104-ci-added-.lgtm.yml-file.patch -Patch105: 0105-lib-introduce-feature-check-in-libcriu.patch -Patch106: 0106-lib-added-tests-for-feature-check-in-libcriu.patch -Patch107: 0107-pagemap-tiny-fix-on-truncating-memory-image.patch -Patch108: 0108-zdtm-fix-zdtm-static-maps00-case-in-arm64.patch -Patch109: 0109-compel-fix-GCC-12-failure-out-of-bounds.patch -Patch110: 0110-criu-fix-configuration-file-scanner-with-GCC-12.patch -Patch111: 0111-compel-fix-parasite-with-GCC-12.patch -Patch112: 0112-ci-set-continue-on-error-for-cross-compile.patch -Patch113: 0113-test-autofs-fix-use-after-free.patch -Patch114: 0114-Fix-formatting-in-criu-documentation.patch -Patch115: 0115-ci-install-libbsd-dependency.patch -Patch116: 0116-pstree-when-updating-sid-for-shell-job-also-update-m.patch -Patch117: 0117-criu-ns-fix-exit-code-o-for-criu-dump.patch -Patch118: 0118-criu-ns-use-os.waitstatus_to_exitcode.patch -Patch119: 0119-restorer-Fix-sys_mmap-s-returned-value-check.patch -Patch120: 0120-compel-fix-how-PTRACE_GET_THREAD_AREA-errors-are-han.patch -Patch121: 0121-util-add-an-unique-ID-of-the-current-criu-run.patch -Patch122: 0122-files-generate-unique-transport-socket-names.patch -Patch123: 0123-check-Add-a-check-for-using-memfd-with-hugetlb.patch -Patch124: 0124-kerndat-Collect-hugetlb-device-numbers.patch -Patch125: 0125-ipc-Add-support-for-checkpoint-restore-hugetlb-Syste.patch -Patch126: 0126-memfd-shmem-Add-support-for-checkpoint-restore-memfd.patch -Patch127: 0127-proc_parse-files-Add-support-for-hugetlb-memory-mapp.patch -Patch128: 0128-mem-Skip-premapping-hugetlb-mapping.patch -Patch129: 0129-uffd-Skip-lazy-mode-restore-on-hugetlb-mappings.patch -Patch130: 0130-zdtm-Add-MAP_HUGETLB-memory-mapping-test.patch -Patch131: 0131-zdtm-Add-memfd-hugetlb-test.patch -Patch132: 0132-zdtm-Add-shm-hugetlb-test.patch -Patch133: 0133-zdtm-Add-MAP_HUGETLB-mappings-test-for-parent-child-.patch -Patch134: 0134-ci-skip-MAP_HUGETLB-tests-in-stream-test.patch -Patch135: 0135-bpfmap-handle-new-field-in-fdinfo.patch -Patch136: 0136-test-remove-test-for-LOCK_MAND-flock.patch -Patch137: 0137-test-disable-rseq-also-on-Archlinux.patch -Patch138: 0138-zdtm-fix-missplacement-of-err-True.patch -Patch139: 0139-compel-set-mxcsr-during-error-injection-to-zero.patch -Patch140: 0140-proc_smaps-remove-useless-nonlinear-check.patch -Patch141: 0141-mount-fix-e_str-leak-in-ext_mount_add.patch -Patch142: 0142-cr-dump-fix-cr_imgset-leak-in-dump_one_task.patch -Patch143: 0143-tun-fix-tun_link-leak-in-dump_tun_link.patch -Patch144: 0144-sk-unix-fix-uint32_t-id-variable-printf-format-speci.patch -Patch145: 0145-zdtm-refactor-main.patch -Patch146: 0146-zdtm-sort-import-lines.patch -Patch147: 0147-zdtm-use-long-form-cli-options.patch -Patch148: 0148-zdtm-add-criu-config-option.patch -Patch149: 0149-zdtm-drop-redundant-config_inotify_irmap-test.patch -Patch150: 0150-ci-run-criu-config-tests.patch -Patch151: 0151-config-fix-ns-leak-in-parse_join_ns.patch -Patch152: 0152-net-fix-e_str-leak-in-veth_pair_add.patch -Patch153: 0153-files-fix-inh-leak-in-inherit_fd_add.patch -Patch154: 0154-sk-unix-fix-e_str-leak-in-unix_sk_id_add.patch -Patch155: 0155-uffd-fix-__u64-print-format-specifier.patch -Patch156: 0156-zdtm-fix-mnt_ext_master-test-to-correspond-to-it-s-n.patch -Patch157: 0157-mount-add-mntinfo_add_list_before-helper-for-adding-.patch -Patch158: 0158-mount-do-not-detect-non-fsroot-mounts-as-device-exte.patch -Patch159: 0159-mount-mark-mounts-of-external-devices-external.patch -Patch160: 0160-mount-skip-fstype-and-source-checks-for-external-mou.patch -Patch161: 0161-mount-setup-mnt_bind-list-before-using-it-in-mnt_is_.patch -Patch162: 0162-util-add-get_relative_path-helper.patch -Patch163: 0163-unittest-add-some-tests-for-get_relative_path-helper.patch -Patch164: 0164-mount-add-mnt_bind_pick-helper-to-pick-the-desired-b.patch -Patch165: 0165-mount-split-mnt_is_external-_bind-and-can_receive_ma.patch -Patch166: 0166-mount-rework-skipping-external-mounts-in-dump_one_mo.patch -Patch167: 0167-mount-show-more-info-about-why-we-can-t-mount.patch -Patch168: 0168-mount-mount-external-mount-before-mounting-it-s-bind.patch -Patch169: 0169-zdtm-add-new-mnt_ext_root-test.patch -Patch170: 0170-mount-restrict-mp-external-mount-map-to-init-contain.patch -Patch171: 0171-zdtm-add-mnt_ext_collision-test.patch -Patch172: 0172-mount-add-mnt_is_root_bind-helper.patch -Patch173: 0173-mount-allow-nested-mount-namespaces-with-different-r.patch -Patch174: 0174-zdtm-add-mntns_pivot_root-test.patch -Patch175: 0175-mount-apply-superblock-flags-to-nested-ns-roots.patch -Patch176: 0176-zdtm-add-mntns_pivot_root_ro-test.patch -Patch177: 0177-mount-restore-create-auxiliary-binfmt_misc-mount-in-.patch -Patch178: 0178-mount-restore-leave-ns_mountpoint-NULL-for-aux-binfm.patch -Patch179: 0179-mount-replace-CRTIME_MNT_ID-with-HELPER_MNT_ID.patch -Patch180: 0180-mount-add-can_receive_master_from_root-helper.patch -Patch181: 0181-mount-put-external-slavery-mounts-to-separate-mnt_ex.patch -Patch182: 0182-mount-do-not-override-master_id-to-1-for-root-binds.patch -Patch183: 0183-mount-add-helper-mnt_get_external_bind_nodev.patch -Patch184: 0184-mount-prepare-is_overmounted-as-early-as-possible.patch -Patch185: 0185-mount-move-root-yard-tree-merge-as-early-as-possible.patch -Patch186: 0186-mount-fix-broken-remounted_rw-check.patch -Patch187: 0187-mount-make-general-place-for-shared-variables-on-mou.patch -Patch188: 0188-autofs-use-ns_mountpoint-in-autofs_create_dentries.patch -Patch189: 0189-mount-use-ns_mountpoint-in-mnt_is_overmounted.patch -Patch190: 0190-mount-skip-root-yard-children-from-mnt_needs_remap-c.patch -Patch191: 0191-mount-use-ns_mountpoint-in-validate_children_collisi.patch -Patch192: 0192-mount-use-ns_mountpoint-in-root_path_from_parent.patch -Patch193: 0193-mount-use-ns_mountpoint-for-children-overmount-check.patch -Patch194: 0194-path-simplify-mnt_get_sibling_path-via-get_relative_.patch -Patch195: 0195-mount-use-ns_mountpoint-in-collect_mntinfo.patch -Patch196: 0196-mount-use-ns_mountpoint-in-aufs_parse.patch -Patch197: 0197-mount-use-ns_mountpoint-in-mnt_depth.patch -Patch198: 0198-mount-use-ns_mountpoint-instead-of-mountpoint-where-.patch -Patch199: 0199-mount-add-service_mountpoint-getter-for-mountpoint.patch -Patch200: 0200-files-reg-split-create_ghost_dentry-out-of-create_gh.patch -Patch201: 0201-files-reg-teach-create_ghost-to-work-with-mount-v2.patch -Patch202: 0202-files-reg-teach-clean_one_remap-to-work-with-mount-v.patch -Patch203: 0203-kerndat-Check-for-MOVE_MOUNT_SET_GROUP-availability.patch -Patch204: 0204-compel-add-open_tree-syscall.patch -Patch205: 0205-kerndat-check-whether-the-openat2-syscall-is-support.patch -Patch206: 0206-util-add-resolve_mountpoint-helper.patch -Patch207: 0207-crtools-move-check_options-after-kerndat_init-and-lo.patch -Patch208: 0208-config-rpc-add-new-option-mntns-compat-mode-for-old-.patch -Patch209: 0209-mount-add-plain-mountpoints.patch -Patch210: 0210-files-reg-export-parent-dirs-helpers-for-mount-v2.patch -Patch211: 0211-mount-remove-double-ns_id-declaration.patch -Patch212: 0212-mount-export-common-defines-for-mount-v2.patch -Patch213: 0213-mount-export-several-functions-for-mount-v2.patch -Patch214: 0214-mount-export-global-variables-for-mount-v2.patch -Patch215: 0215-mount-add-new-mounts-v2-engine.patch -Patch216: 0216-zdtm-enable-mounts-compat-mode-on-restore-with-mntns.patch -Patch217: 0217-ci-run-tests-for-old-mount-engine.patch -Patch218: 0218-zdtm-add-new-mnt_ext_sharing-test-for-mount-v2.patch -Patch219: 0219-zdtm-add-mount_complex_sharing-test.patch -Patch220: 0220-zdtm-add-propagation-group-with-mount-flags-to-mount.patch -Patch221: 0221-zdtm-mount-v2-disable-mnt_tracefs-test.patch -Patch222: 0222-ci-make-others-mnt_ext_dev-also-run-for-old-mount-en.patch -Patch223: 0223-test-jenkins-test-for-old-mount-engine.patch -Patch224: 0224-zdtm-mount-v2-disable-pty-console-test.patch -Patch225: 0225-mount-v2-make-mount-engine-fallback-messages-logleve.patch -Patch226: 0226-mount-make-error-messages-differ-in-different-places.patch -Patch227: 0227-zdtm-use-unique-holder-for-cgroups.patch -Patch228: 0228-scripts-ci-mount-test-cgroups-once.patch -Patch229: 0229-criu-ns-add-a-helper-to-hold-a-pid-namespace.patch -Patch230: 0230-apparmor-Fix-Wfortify-source-for-Clang.patch -Patch231: 0231-style-delete-some-redundant-code.patch -Patch232: 0232-mount-fix-Wunused-but-set-variable-for-Clang-15.patch -Patch233: 0233-criu-generate-unique-socket-names.patch -Patch234: 0234-ci-Ubuntu-broke-overlayfs-again.patch -Patch235: 0235-compel-add-rseq-syscall-into-compel-std-plugin-sysca.patch -Patch236: 0236-kerndat-check-for-rseq-syscall-support.patch -Patch237: 0237-util-move-fork_and_ptrace_attach-helper-from-cr-chec.patch -Patch238: 0238-cr-check-Add-ptrace-rseq-conf-dump-feature.patch -Patch239: 0239-rseq-initial-support.patch +Patch2: 0002-tcp-Skip-restoring-TCP-state-when-dumping-with-tcp-c.patch +Patch3: 0003-zdtm-Dumping-restoring-with-tcp-close-on-TCP_CLOSE-s.patch +Patch4: 0004-criu-8-Add-more-detailed-description-about-tcp-close.patch +Patch5: 0005-Add-support-for-python3-in-criu-coredump.patch +Patch6: 0006-Add-new-files-for-running-criu-coredump-via-python-2.patch +Patch7: 0007-coredump-remove-unused-import.patch +Patch8: 0008-coredump-sort-imports.patch +Patch9: 0009-coredump-convert-indentation-to-spaces.patch +Patch10: 0010-python-replace-equality-with-identity-test.patch +Patch11: 0011-coredump-drop-unused-variable.patch +Patch12: 0012-coredump-drop-exec-permission.patch +Patch13: 0013-coredump-lint-fix-for-block-comments.patch +Patch14: 0014-coredump-fix-missing-whitespace-around-operator.patch +Patch15: 0015-coredump-fix-too-many-blank-lines.patch +Patch16: 0016-coredump-fix-comparison-to-true.patch +Patch17: 0017-coredump-lint-fix-visually-indented-line.patch +Patch18: 0018-test-coredump-fix-shellcheck-errors.patch +Patch19: 0019-make-enable-lint-for-coredump.patch +Patch20: 0020-ci-enable-coredump-tests.patch +Patch21: 0021-pie-restorer-remove-excess-hash-printf-specifier.patch +Patch22: 0022-tty-fix-the-null-pointer-of-get_tty_driver.patch +Patch23: 0023-util-use-nftw-in-rmrf-helper.patch +Patch24: 0024-criu-ns-make-pidns-init-first-do-setsid.patch +Patch25: 0025-net-optimize-restore_rule-to-not-open-the-CR_FD_RULE.patch +Patch26: 0026-ci-replace-deprecated-codecov-bash-uploader.patch +Patch27: 0027-ci-fix-userfaultfd-test-failures.patch +Patch28: 0028-ci-use-Fedora-34-for-lint-CI-runs.patch +Patch29: 0029-tests-improve-the-image-streamer-process-control.patch +Patch30: 0030-sockets-don-t-call-sk_setbufs-asyncronously.patch +Patch31: 0031-kerndat-check-for-set-getsockopt-SO_BUF_LOCK-availab.patch +Patch32: 0032-sockets-c-r-bufer-size-locks.patch +Patch33: 0033-zdtm-add-test-for-socket-buffer-size-locks.patch +Patch34: 0034-zdtm-make-sock_opts02-also-check-lock-change-by-SO_-.patch +Patch35: 0035-clang-format-enable-AlignTrailingComments.patch +Patch36: 0036-clang-format-do-several-manual-comment-fixups.patch +Patch37: 0037-clang-format-do-automatic-comment-fixups.patch +Patch38: 0038-cr-dump-fail-dumping-when-zombie-process-with-sid-0.patch +Patch39: 0039-clang-format-make-x86_ins_capability_mask-human-read.patch +Patch40: 0040-ci-disable-socket-raw-test-on-centos8.patch +Patch41: 0041-zdtm.py-make-tests-with-link_remap-exclusive.patch +Patch42: 0042-tests-improve-the-deterministic-behavior-of-the-test.patch +Patch43: 0043-clang-format-zdtm-fix-clang-complains-about-strange-.patch +Patch44: 0044-seize-restore-cgroup-freezer-to-right-state.patch +Patch45: 0045-ci-Use-latest-Fedora-for-lint-ci-runs-again.patch +Patch46: 0046-crtools-ignore-SIGPIPE-in-swrk-mode.patch +Patch47: 0047-ci-switch-to-centos-stream-8.patch +Patch48: 0048-check-cleanup-child-processes.patch +Patch49: 0049-files-reg-fix-error-handling-in-open_path.patch +Patch50: 0050-files-reg-fix-error-handling-of-rm_parent_dirs.patch +Patch51: 0051-ghost-mount-allocate-remounted_rw-in-shmem-to-get-in.patch +Patch52: 0052-files-reg-temporary-remount-writable-the-mount-we-do.patch +Patch53: 0053-zdtm-add-ro-mount-check-after-c-r-to-mntns_ghost01.patch +Patch54: 0054-clang-format-disable-wrong-struct-pointer-declaratio.patch +Patch55: 0055-ci-Run-cross-compile-on-debian-stable.patch +Patch56: 0056-ci-Run-cross-compile-with-debian-testing.patch +Patch57: 0057-make-Explicitly-enable-FPU-on-ARMv7-builds.patch +Patch58: 0058-ci-disable-broken-tests-until-fixed.patch +Patch59: 0059-test-do-not-use-keep-going-for-single-zdtm-tests.patch +Patch60: 0060-files-reg-try-dump_ghost_remap-if-link-remap-failed-.patch +Patch61: 0061-util-make-page-server-IPv6-safe.patch +Patch62: 0062-sk-unix-Fix-TCP_ESTABLISHED-checks-in-unix-sockets.patch +Patch63: 0063-ci-Enable-disabled-unix-socket-related-tests.patch +Patch64: 0064-ci-install-procps-in-Alpine.patch +Patch65: 0065-test-another-try-to-correctly-fix-the-kernel-version.patch +Patch66: 0066-x86-compel-fault-inject-bound-xsave-features-set.patch +Patch67: 0067-x86-compel-fault-inject-print-the-initial-seed.patch +Patch68: 0068-ci-enable-x86-xsave-fault-injection-tests-back.patch +Patch69: 0069-Add-documentation-for-timeout-option.patch +Patch70: 0070-usernsd-UNS_FDOUT-should-not-require-an-input-descri.patch +Patch71: 0071-libcriu-add-setting-lsm-mount-context-to-libcriu.patch +Patch72: 0072-ci-use-unstable-release-for-cross-compile.patch +Patch73: 0073-ci-disable-glibc-rseq-support.patch +Patch74: 0074-libcriu-add-single-pre-dump-support.patch +Patch75: 0075-tests-added-test-for-single-pre-dump-support.patch +Patch76: 0076-zdtm.py-clean-up-MAKEFLAGS-env-variable-before-runni.patch +Patch77: 0077-zdtm-zdtm_ct-fix-compilation-error-with-strict-proto.patch +Patch78: 0078-zdtm-remove-mntns-deleted-dst-test-leftover-from-git.patch +Patch79: 0079-crtools-remove-excess-always-true-condition.patch +Patch80: 0080-crtools-rpc-export-current-criu-mode-to-opts.mode.patch +Patch81: 0081-crtools-use-new-opts.mode-in-image_dir_mode.patch +Patch82: 0082-crtools-check-that-cpuinfo-command-has-sub-command.patch +Patch83: 0083-sk-unix-Add-support-for-SOCK_SEQPACKET-unix-sockets.patch +Patch84: 0084-zdtm-Add-SOCK_SEQPACKET-variants-to-unix-socket-test.patch +Patch85: 0085-tls-fix-typo.patch +Patch86: 0086-tls-use-ssize_t-for-return-value.patch +Patch87: 0087-tls-add-more-comments.patch +Patch88: 0088-uffd-call-disconnect_from_page_server-to-shutdown-a-.patch +Patch89: 0089-tls-allow-to-terminate-connections-synchronously.patch +Patch90: 0090-page-xfer-stop-waiting-for-a-new-command-after-a-clo.patch +Patch91: 0091-ci-reenable-the-lazy-thp-test-in-the-lazy-remote-mod.patch +Patch92: 0092-test-log-testname.out.inprogress-if-a-test-has-faile.patch +Patch93: 0093-zdtm-print-tails-of-all-logs-if-a-test-has-failed.patch +Patch94: 0094-zdtm-static-uffd-events-add-more-log-messages.patch +Patch95: 0095-mount-split-check_mountpoint_fd-from-__open_mountpoi.patch +Patch96: 0096-mount-remove-mnt_fd-argument-of-__open_mountpoint.patch +Patch97: 0097-proc_parse-add-helper-to-resolve-sdev-from-fd.patch +Patch98: 0098-mount-btrfs-make-check_mountpoint_fd-fallback-to-get.patch +Patch99: 0099-ci-test-criu-image-streamer-with-all-tests.patch +Patch100: 0100-readme-add-docker-test-badge.patch +Patch101: 0101-contributing-remove-old-badges-and-logo.patch +Patch102: 0102-ci-update-to-latest-Vagrant-and-Fedora-images.patch +Patch103: 0103-ci-added-.lgtm.yml-file.patch +Patch104: 0104-lib-introduce-feature-check-in-libcriu.patch +Patch105: 0105-lib-added-tests-for-feature-check-in-libcriu.patch +Patch106: 0106-pagemap-tiny-fix-on-truncating-memory-image.patch +Patch107: 0107-zdtm-fix-zdtm-static-maps00-case-in-arm64.patch +Patch108: 0108-compel-fix-GCC-12-failure-out-of-bounds.patch +Patch109: 0109-criu-fix-configuration-file-scanner-with-GCC-12.patch +Patch110: 0110-compel-fix-parasite-with-GCC-12.patch +Patch111: 0111-ci-set-continue-on-error-for-cross-compile.patch +Patch112: 0112-test-autofs-fix-use-after-free.patch +Patch113: 0113-Fix-formatting-in-criu-documentation.patch +Patch114: 0114-ci-install-libbsd-dependency.patch +Patch115: 0115-pstree-when-updating-sid-for-shell-job-also-update-m.patch +Patch116: 0116-criu-ns-fix-exit-code-o-for-criu-dump.patch +Patch117: 0117-criu-ns-use-os.waitstatus_to_exitcode.patch +Patch118: 0118-restorer-Fix-sys_mmap-s-returned-value-check.patch +Patch119: 0119-compel-fix-how-PTRACE_GET_THREAD_AREA-errors-are-han.patch +Patch120: 0120-util-add-an-unique-ID-of-the-current-criu-run.patch +Patch121: 0121-files-generate-unique-transport-socket-names.patch +Patch122: 0122-check-Add-a-check-for-using-memfd-with-hugetlb.patch +Patch123: 0123-kerndat-Collect-hugetlb-device-numbers.patch +Patch124: 0124-ipc-Add-support-for-checkpoint-restore-hugetlb-Syste.patch +Patch125: 0125-memfd-shmem-Add-support-for-checkpoint-restore-memfd.patch +Patch126: 0126-proc_parse-files-Add-support-for-hugetlb-memory-mapp.patch +Patch127: 0127-mem-Skip-premapping-hugetlb-mapping.patch +Patch128: 0128-uffd-Skip-lazy-mode-restore-on-hugetlb-mappings.patch +Patch129: 0129-zdtm-Add-MAP_HUGETLB-memory-mapping-test.patch +Patch130: 0130-zdtm-Add-memfd-hugetlb-test.patch +Patch131: 0131-zdtm-Add-shm-hugetlb-test.patch +Patch132: 0132-zdtm-Add-MAP_HUGETLB-mappings-test-for-parent-child-.patch +Patch133: 0133-ci-skip-MAP_HUGETLB-tests-in-stream-test.patch +Patch134: 0134-bpfmap-handle-new-field-in-fdinfo.patch +Patch135: 0135-test-remove-test-for-LOCK_MAND-flock.patch +Patch136: 0136-test-disable-rseq-also-on-Archlinux.patch +Patch137: 0137-zdtm-fix-missplacement-of-err-True.patch +Patch138: 0138-compel-set-mxcsr-during-error-injection-to-zero.patch +Patch139: 0139-proc_smaps-remove-useless-nonlinear-check.patch +Patch140: 0140-mount-fix-e_str-leak-in-ext_mount_add.patch +Patch141: 0141-cr-dump-fix-cr_imgset-leak-in-dump_one_task.patch +Patch142: 0142-tun-fix-tun_link-leak-in-dump_tun_link.patch +Patch143: 0143-sk-unix-fix-uint32_t-id-variable-printf-format-speci.patch +Patch144: 0144-zdtm-refactor-main.patch +Patch145: 0145-zdtm-sort-import-lines.patch +Patch146: 0146-zdtm-use-long-form-cli-options.patch +Patch147: 0147-zdtm-add-criu-config-option.patch +Patch148: 0148-zdtm-drop-redundant-config_inotify_irmap-test.patch +Patch149: 0149-ci-run-criu-config-tests.patch +Patch150: 0150-config-fix-ns-leak-in-parse_join_ns.patch +Patch151: 0151-net-fix-e_str-leak-in-veth_pair_add.patch +Patch152: 0152-files-fix-inh-leak-in-inherit_fd_add.patch +Patch153: 0153-sk-unix-fix-e_str-leak-in-unix_sk_id_add.patch +Patch154: 0154-uffd-fix-__u64-print-format-specifier.patch +Patch155: 0155-zdtm-fix-mnt_ext_master-test-to-correspond-to-it-s-n.patch +Patch156: 0156-mount-add-mntinfo_add_list_before-helper-for-adding-.patch +Patch157: 0157-mount-do-not-detect-non-fsroot-mounts-as-device-exte.patch +Patch158: 0158-mount-mark-mounts-of-external-devices-external.patch +Patch159: 0159-mount-skip-fstype-and-source-checks-for-external-mou.patch +Patch160: 0160-mount-setup-mnt_bind-list-before-using-it-in-mnt_is_.patch +Patch161: 0161-util-add-get_relative_path-helper.patch +Patch162: 0162-unittest-add-some-tests-for-get_relative_path-helper.patch +Patch163: 0163-mount-add-mnt_bind_pick-helper-to-pick-the-desired-b.patch +Patch164: 0164-mount-split-mnt_is_external-_bind-and-can_receive_ma.patch +Patch165: 0165-mount-rework-skipping-external-mounts-in-dump_one_mo.patch +Patch166: 0166-mount-show-more-info-about-why-we-can-t-mount.patch +Patch167: 0167-mount-mount-external-mount-before-mounting-it-s-bind.patch +Patch168: 0168-zdtm-add-new-mnt_ext_root-test.patch +Patch169: 0169-mount-restrict-mp-external-mount-map-to-init-contain.patch +Patch170: 0170-zdtm-add-mnt_ext_collision-test.patch +Patch171: 0171-mount-add-mnt_is_root_bind-helper.patch +Patch172: 0172-mount-allow-nested-mount-namespaces-with-different-r.patch +Patch173: 0173-zdtm-add-mntns_pivot_root-test.patch +Patch174: 0174-mount-apply-superblock-flags-to-nested-ns-roots.patch +Patch175: 0175-zdtm-add-mntns_pivot_root_ro-test.patch +Patch176: 0176-mount-restore-create-auxiliary-binfmt_misc-mount-in-.patch +Patch177: 0177-mount-restore-leave-ns_mountpoint-NULL-for-aux-binfm.patch +Patch178: 0178-mount-replace-CRTIME_MNT_ID-with-HELPER_MNT_ID.patch +Patch179: 0179-mount-add-can_receive_master_from_root-helper.patch +Patch180: 0180-mount-put-external-slavery-mounts-to-separate-mnt_ex.patch +Patch181: 0181-mount-do-not-override-master_id-to-1-for-root-binds.patch +Patch182: 0182-mount-add-helper-mnt_get_external_bind_nodev.patch +Patch183: 0183-mount-prepare-is_overmounted-as-early-as-possible.patch +Patch184: 0184-mount-move-root-yard-tree-merge-as-early-as-possible.patch +Patch185: 0185-mount-fix-broken-remounted_rw-check.patch +Patch186: 0186-mount-make-general-place-for-shared-variables-on-mou.patch +Patch187: 0187-autofs-use-ns_mountpoint-in-autofs_create_dentries.patch +Patch188: 0188-mount-use-ns_mountpoint-in-mnt_is_overmounted.patch +Patch189: 0189-mount-skip-root-yard-children-from-mnt_needs_remap-c.patch +Patch190: 0190-mount-use-ns_mountpoint-in-validate_children_collisi.patch +Patch191: 0191-mount-use-ns_mountpoint-in-root_path_from_parent.patch +Patch192: 0192-mount-use-ns_mountpoint-for-children-overmount-check.patch +Patch193: 0193-path-simplify-mnt_get_sibling_path-via-get_relative_.patch +Patch194: 0194-mount-use-ns_mountpoint-in-collect_mntinfo.patch +Patch195: 0195-mount-use-ns_mountpoint-in-aufs_parse.patch +Patch196: 0196-mount-use-ns_mountpoint-in-mnt_depth.patch +Patch197: 0197-mount-use-ns_mountpoint-instead-of-mountpoint-where-.patch +Patch198: 0198-mount-add-service_mountpoint-getter-for-mountpoint.patch +Patch199: 0199-files-reg-split-create_ghost_dentry-out-of-create_gh.patch +Patch200: 0200-files-reg-teach-create_ghost-to-work-with-mount-v2.patch +Patch201: 0201-files-reg-teach-clean_one_remap-to-work-with-mount-v.patch +Patch202: 0202-kerndat-Check-for-MOVE_MOUNT_SET_GROUP-availability.patch +Patch203: 0203-compel-add-open_tree-syscall.patch +Patch204: 0204-kerndat-check-whether-the-openat2-syscall-is-support.patch +Patch205: 0205-util-add-resolve_mountpoint-helper.patch +Patch206: 0206-crtools-move-check_options-after-kerndat_init-and-lo.patch +Patch207: 0207-config-rpc-add-new-option-mntns-compat-mode-for-old-.patch +Patch208: 0208-mount-add-plain-mountpoints.patch +Patch209: 0209-files-reg-export-parent-dirs-helpers-for-mount-v2.patch +Patch210: 0210-mount-remove-double-ns_id-declaration.patch +Patch211: 0211-mount-export-common-defines-for-mount-v2.patch +Patch212: 0212-mount-export-several-functions-for-mount-v2.patch +Patch213: 0213-mount-export-global-variables-for-mount-v2.patch +Patch214: 0214-mount-add-new-mounts-v2-engine.patch +Patch215: 0215-zdtm-enable-mounts-compat-mode-on-restore-with-mntns.patch +Patch216: 0216-ci-run-tests-for-old-mount-engine.patch +Patch217: 0217-zdtm-add-new-mnt_ext_sharing-test-for-mount-v2.patch +Patch218: 0218-zdtm-add-mount_complex_sharing-test.patch +Patch219: 0219-zdtm-add-propagation-group-with-mount-flags-to-mount.patch +Patch220: 0220-zdtm-mount-v2-disable-mnt_tracefs-test.patch +Patch221: 0221-ci-make-others-mnt_ext_dev-also-run-for-old-mount-en.patch +Patch222: 0222-test-jenkins-test-for-old-mount-engine.patch +Patch223: 0223-zdtm-mount-v2-disable-pty-console-test.patch +Patch224: 0224-mount-v2-make-mount-engine-fallback-messages-logleve.patch +Patch225: 0225-mount-make-error-messages-differ-in-different-places.patch +Patch226: 0226-zdtm-use-unique-holder-for-cgroups.patch +Patch227: 0227-scripts-ci-mount-test-cgroups-once.patch +Patch228: 0228-criu-ns-add-a-helper-to-hold-a-pid-namespace.patch +Patch229: 0229-apparmor-Fix-Wfortify-source-for-Clang.patch +Patch230: 0230-style-delete-some-redundant-code.patch +Patch231: 0231-mount-fix-Wunused-but-set-variable-for-Clang-15.patch +Patch232: 0232-compel-add-rseq-syscall-into-compel-std-plugin-sysca.patch +Patch233: 0233-kerndat-check-for-rseq-syscall-support.patch +Patch234: 0234-util-move-fork_and_ptrace_attach-helper-from-cr-chec.patch +Patch235: 0235-cr-check-Add-ptrace-rseq-conf-dump-feature.patch +Patch236: 0236-rseq-initial-support.patch +Patch237: 0237-zdtm-add-basic-static-rseq00-test-for-rseq-C-R.patch +Patch238: 0238-Revert-ci-disable-glibc-rseq-support.patch +Patch239: 0239-ci-add-Fedora-Rawhide-based-test-on-Cirrus.patch Patch240: 0240-include-add-thread_pointer.h-from-Glibc.patch Patch241: 0241-clone-noasan-unregister-rseq-at-the-thread-start-for.patch -Patch242: 0242-compel-add-helpers-to-get-set-instruction-pointer.patch -Patch243: 0243-cr-dump-fixup-thread-IP-when-inside-rseq-cs.patch -Patch244: 0244-cr-dump-handle-rseq-flags-field.patch -Patch245: 0245-fixup.patch +Patch242: 0242-zdtm-static-rseq00-fix-rseq-test-when-linking-with-a.patch +Patch243: 0243-compel-add-helpers-to-get-set-instruction-pointer.patch +Patch244: 0244-cr-dump-fixup-thread-IP-when-inside-rseq-cs.patch +Patch245: 0245-zdtm-add-transition-rseq01-test-for-amd64.patch +Patch246: 0246-Revert-test-disable-rseq-also-on-Archlinux.patch +Patch247: 0247-cr-dump-handle-rseq-flags-field.patch +Patch248: 0248-zdtm-add-rseq02-transition-test-with-NO_RESTART-CS-f.patch +Patch249: 0249-zdtm-temporary-disable-rseq02-test.patch # Add protobuf-c as a dependency. # We use this patch because the protobuf-c package name @@ -613,6 +617,10 @@ This script can help to workaround the so called "PID mismatch" problem. %patch243 -p1 %patch244 -p1 %patch245 -p1 +%patch246 -p1 +%patch247 -p1 +%patch248 -p1 +%patch249 -p1 %patch299 -p1 @@ -701,6 +709,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %doc %{_mandir}/man1/criu-ns.1* %changelog +* Tue Apr 5 2022 Radostin Stoyanov - 3.16.1-11 +- Update rseq patches + * Tue Apr 5 2022 Radostin Stoyanov - 3.16.1-10 - Update fixup patch