- 12 Nov, 2016 4 commits
-
-
Kir Kolyshkin authored
I'm unsure where all these %%s before register names comes from, but they confuse clang, like this: > criu/arch/arm/parasite-head.S:6:6: error: unexpected token in operand > sub %r2, %pc, #8 @ get the address of this instruction > ^ This patch looks scary, but all it does is removing %s before register names, fixing a few "many spaces instead of a tab" issues along the way. travis-ci: success for Fixes to compile on arm with clang Cc: Christopher Covington <cov@codeaurora.org> Dmitry Safonov <dsafonov@virtuozzo.com> Signed-off-by:
Kir Kolyshkin <kir@openvz.org> Reviewed-by:
Christopher Covington <cov@codeaurora.org> Signed-off-by:
Pavel Emelyanov <xemul@virtuozzo.com>
-
Kir Kolyshkin authored
I got the following then trying to compile CRIU on ARM with clang: > criu/cr-restore.c:2476:22: error: implicit conversion from 'unsigned > long long' to 'unsigned long' changes value from 18446744073709551615 to > 4294967295 [-Werror,-Wconstant-conversion] > return ival == -1 ? RLIM_INFINITY : ival; > ~~~~~~ ^~~~~~~~~~~~~ > /usr/include/arm-linux-gnueabihf/bits/resource.h:117:24: note: expanded > from macro 'RLIM_INFINITY' > # define RLIM_INFINITY 0xffffffffffffffffuLL > ^~~~~~~~~~~~~~~~~~~~~ > 1 error generated. Fix by using provided rlim_t type in this and similar places. travis-ci: success for Fixes to compile on arm with clang Signed-off-by:
-
Kir Kolyshkin authored
Somehow clang doesn't always like -Wa flags, for example when making dependencies (see commit 9303ed3 ("Makefiles: move -Wa,--noexecstack out of CFLAGS"), which causes build break, scary error messages, and even hair loss. There are many ways to solve this. This patch employs the one that is simple and clean. The -Wa,-mimplicit-it=always flag was added by commit 79c4b747 ("arm: fix compilation on ARMv7"). The reason is, ARM needs an IT instruction before certain conditionals. Those IT instructions are almost always automatically generated by assembler itself, but in some cases a special assembler flag (like the one above) is needed. As there is only one place in the code that need IT, it's easy to patch it (add explicit IT) and remove the flag. Note that "IT" generates no machine code per se, so there should not be any functional change (although I haven't checked it). For more info on IT, see http://tinyurl.com/z3ldsdr Hope for a review from our ARM experts. travis-ci: success for Fixes to compile on arm with clang Cc: Christopher Covington <cov@codeaurora.org> Cc: Dmitry Safonov <dsafonov@virtuozzo.com> Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: -
Kir Kolyshkin authored
A couple of typos. Signed-off-by:
-
- 08 Nov, 2016 1 commit
-
-
Pavel Emelyanov authored
Signed-off-by:
-
- 04 Nov, 2016 1 commit
-
-
Pavel Emelyanov authored
Signed-off-by:
-
- 03 Nov, 2016 34 commits
-
-
Pavel Emelyanov authored
Otherwise we may forget compiling binfmt_misc_virtualized code. Signed-off-by: -
Kirill Tkhai authored
Do not ask kernel to transfer more opts than we really need. When we're sending fds with flags, we ask kernel to copy the whole struct scm_fdset::opts array, like we'd send CR_SCM_MAX_FD fds, even if really we're transmitting only one fd. send_fds() does not initializes the rest of array memory, but kernel transmits this garbage. Also, recv_msg() does not return it to userspace. This patch makes kernel do not transmit uninitialized garbage. travis-ci: success for pie: Optimize send_fds() and recv_fds() with opts Signed-off-by:
Kirill Tkhai <ktkhai@virtuozzo.com> Signed-off-by:
-
Pavel Emelyanov authored
The need to mess with binfmt_misc super-blocks only exists in OpenVZ kernel and troubes all the other users. So make this code get compiled-out by default. In VZ-builds the BINFMT_MISC_VIRTUALIZED should be put into .config file before running make. https://github.com/xemul/criu/issues/235 travis-ci: success for Don't compile in binfmt_misc dumping code by default (rev3) Signed-off-by:
Dmirty Safonov <dsafonov@virtuozzo.com>
-
Pavel Emelyanov authored
In this file one can add options with which to build CRIU. Each line is (for now) expanded into CONFIG_$(TEXT) macros defined in config.h that can be tested later in the code. v2: Add .config to .gitignore v3: Don't check that make mrproper removes .config https://github.com/xemul/criu/issues/235 travis-ci: success for Don't compile in binfmt_misc dumping code by default (rev3) Signed-off-by:
-
Andrei Vagin authored
When pages are swapped out we can't detect their presence with mincore. Pavel found that lseek(SEEK_DATA, SEEK_HOLE) can show which pages are used. travis-ci: success for shmem: use lseek(SEEK_DATA) instead of mincore Cc: Eugene Batalov <eabatalov89@gmail.com> Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com> Looks-good-to: Eugene Batalov <eabatalov89@gmail.com> Signed-off-by:
-
Andrei Vagin authored
It is required to not dump content of the root mount in dump_one_fd(). travis-ci: success for Fix a few issues to dump/restore Docker containers with userns Signed-off-by:
-
Andrei Vagin authored
Superblock flags can be changed only an owner of the global CAP_SYS_ADMIN. But it is posible to mount tmpfs with any flags. travis-ci: success for Fix a few issues to dump/restore Docker containers with userns Signed-off-by:
-
Andrei Vagin authored
travis-ci: success for Fix a few issues to dump/restore Docker containers with userns Signed-off-by:
-
Andrei Vagin authored
Part-of: Fix a few issues to dump/restore Docker containers with userns travis-ci: success for Fix a few issues to dump/restore Docker containers with userns Signed-off-by:
-
Kir Kolyshkin authored
This adds the description of --external option for all the supported cases, both for dump and restore. References: https://criu.org/CLI/opt/--external travis-ci: success for Add/fix description of --external and --inherit-fd Signed-off-by:
-
Kir Kolyshkin authored
First, minor/major are separated by a slash, not a semicolon. Second, use NAME not VAL. travis-ci: success for Add/fix description of --external and --inherit-fd Signed-off-by:
-
Kir Kolyshkin authored
Add that --inherit-fd may also access file_path argument, such as in this example from wiki (see https://criu.org/Inheriting_FDs_on_restore#Regular_files): $ ./test.sh > /tmp/old & <pid> $ sudo criu dump -j -t <pid> $ sudo criu restore -d -j --inherit-fd 'fd[7]:tmp/old' 7> /tmp/new travis-ci: success for Add/fix description of --external and --inherit-fd Signed-off-by:
-
Kir Kolyshkin authored
This patch describes the correct syntax of --inherit-fd. travis-ci: success for Add/fix description of --external and --inherit-fd CC: Andrei Vagin <avagin@virtuozzo.com> Signed-off-by:
-
Kir Kolyshkin authored
Remove the following options (obsoleted by --external): --ext-unix-sk --veth-pair --ext-mount-map --enable-external-masters --enable-exteral-sharing travis-ci: success for Add/fix description of --external and --inherit-fd Signed-off-by:
-
Andrei Vagin authored
If userns_restore_one_link() is called outside of usernsd, it switches into the criu namespace and switches back before exiting. v2: rid of the include of linux/net_namespace.h in criu/include/net.h, as well as the associated defines and feature checks travis-ci: success for net: simplify restore of macvlan-s (rev2) Signed-off-by:Tycho Andersen <tycho.andersen@canonical.com> Signed-off-by:
-
Andrei Vagin authored
It's like switch_ns, but it gets a namespace file descriptor instead of pid. travis-ci: success for net: simplify restore of macvlan-s (rev2) Signed-off-by:
-
Andrei Vagin authored
travis-ci: success for zdtm/cr_veth: use the --clean alias of the cleanup action Signed-off-by:
-
Pavel Emelyanov authored
-
Pavel Emelyanov authored
travis-ci: success for mnt: Deprecate --ext-mount-map for --external Signed-off-by: -
Pavel Emelyanov authored
The syntax for --ext-mount-map auto is --external mnt[]{:ms} where optional 'm' means --enable-external-masters and optional 's' means --enable-external-sharing. travis-ci: success for mnt: Deprecate --ext-mount-map for --external Signed-off-by: -
Pavel Emelyanov authored
Make --external support --ext-mount-map. The syntax is --ext-mount-map KEY:VAL == --external mnt[KEY]:VAL Old option is kept for backward compatibility. travis-ci: success for mnt: Deprecate --ext-mount-map for --external Signed-off-by: -
Tycho Andersen authored
Note, this depends on Pavel's patch here: https://lists.openvz.org/pipermail/criu/2016-October/032499.html which is not yet applied. travis-ci: success for test: use .pid.inprogress file for macvlan test (rev2) Signed-off-by:
-
Pavel Emelyanov authored
Inspired by Tycho's macvlan test, here's the same thing for --external veth option. In master we still have the --veth-pair one, but the plan is to move this all under the --external opt. v2: * Travis doesn't have /usr/bin/sed * Added .checkskip hook for older environments v3: * Delete bridge hanging around after previous flavor * Wait for host veth end to die after dump v4: * Get the pid of task to move veth into from .pid.inprogress file v5: * Wait for host veth end to die after test stop too :\ Travised-by: https://travis-ci.org/xemul/criu/builds/170726663Signed-off-by:
-
Tycho Andersen authored
travis-ci: success for images: add syntax declaration to macvlan.proto Signed-off-by:
-
Tycho Andersen authored
Note that this test doesn't run in uns mode, even though we have support for that. Without a full container engine, I couldn't think of a nice way to pass a macvlan device into the zdtm "container" when in UNS mode. v2: use the nsid_manip feature flag travis-ci: success for series starting with [v10,01/11] net: pass the struct nlattrs to dump() functions Signed-off-by:
-
Tycho Andersen authored
travis-ci: success for series starting with [v10,01/11] net: pass the struct nlattrs to dump() functions Signed-off-by:
-
Tycho Andersen authored
This header was only introduced in 2015, so we need to build without it. travis-ci: success for series starting with [v10,01/11] net: pass the struct nlattrs to dump() functions Signed-off-by:
-
Tycho Andersen authored
While this is in principle similar to how veths are handled, we have to do things in two different ways depending on whether or not there is a user namespace involved, because there is no way to ask the kernel to attach a macvlan NIC to a device in a net ns that we don't have CAP_NET_ADMIN in. So we do it in two ways: a. If we are in a user namespace, we create the device in usernsd and use IFLA_NET_NS_FD to set the netns which it should be created in (saving us a "move into this netns" step). b. If we aren't in a user namespace, we could still be in a net namespace, so we use IFLA_LINK_NETNSID to set namespace that the i/o device will be in. Then we open a netlink socket from criu's netns and use IFLA_NET_NS_FD to tell the kernel to create the macvlan device in the target's namespace. v2: * s/CLONE_NEWNET/CLONE_NEWUSER * Don't bother to dump IFLA_LINK and IFLA_LINK_NETNSID. Although we need to provide these on restore, there's no kernel interface that persists these. To populate IFLA_LINK, we require users pass --macvlan-pair, and we create a NETNSID relation as needed and pass that in for macvlan links (although this infrastructure could be used elsewhere for links that need it in the future, since is in the hoisted populate_newlink_req()). * use new external command instead of creating a --macvlan-pair option v3: add a feature check for linux/net_namespace.h, since not every arch in travis has this (new-ish) header v4: * include sys/types.h instead of linux/if.h to get IFF_UP flag * remove old doc addition about --macvlan-pair option v5: define IFLA_LINK_NETNSID and RTM_NEWNSID if they don't exist v6: define IFLA_MACVLAN_FLAGS and bump the size of IFLA_MACVLAN_MAX when necessary v7: * remove unused struct macvlan_pair * split feature test for linux/net_namespace.h into separate patch * move IFLA_INFO_MAX testing in dump_one_netdev to the right patch * add documents for netwlink_extras fields * split changeflags into separate patch * use existing netnsid if we get EEXIST * move macvlan code to a helper function * use netnsid to restore in userns case, and not pid v8: * define RTM_GETNSID since we use that too now :) * don't bother with IFLA_MACVLAN_MAX; we only understand things up to IFLA_MACVLAN_FLAGS, so let's just use that as our max instead. The problem with using macros here, is that IFLA_MACLAN_MAX is defined as a macro with an enum expansion in it, so we get bitten by the enum not being available at preprocessing time, and implicit zero coercion when testing against its value for stuff. Yeesh. v10: * add some comments about when we set up NET_NS_FD and why we use IFLA_LINK and IFLA_NET_NS_ID * use the socket opened in restore_links() instead of opening one in restore_one_macvlan() * split the new argument to restore_one_link into its own patch travis-ci: success for series starting with [v10,01/11] net: pass the struct nlattrs to dump() functions Signed-off-by: -
Tycho Andersen authored
We'll use this socket to restore macvlan interfaces. travis-ci: success for series starting with [v10,01/11] net: pass the struct nlattrs to dump() functions Signed-off-by:
-
Tycho Andersen authored
We'll use this struct in the next patch to set some top level IFLA_ members that we need for restoring macvlan devices. travis-ci: success for series starting with [v10,01/11] net: pass the struct nlattrs to dump() functions Signed-off-by:
-
Tycho Andersen authored
We'll use this in the next patch to set some macvlan flags. travis-ci: success for series starting with [v10,01/11] net: pass the struct nlattrs to dump() functions Signed-off-by:
-
Tycho Andersen authored
We'll use this in the next patch to find the ifindex for a macvlan bridge in the host's net ns. travis-ci: success for series starting with [v10,01/11] net: pass the struct nlattrs to dump() functions Signed-off-by:
-
Tycho Andersen authored
For macvlan we need to restore in different ways depending on whether we're inside or outside a user namespace. We want to share the code that does the building of the base request, so let's split it out into a populate() function. travis-ci: success for series starting with [v10,01/11] net: pass the struct nlattrs to dump() functions Signed-off-by:
-
Tycho Andersen authored
We'll use this later in the series to get specific information that macvlan links need. v2: pass the IFLA_LINKINFO instead of the whole attribute buffer, since that's al all we expect the info functions to need, and all we allow them to populate on restore travis-ci: success for series starting with [v10,01/11] net: pass the struct nlattrs to dump() functions Signed-off-by:
-
