Merge pull request #4023 from diederikdehaas/fix-SC2006

Replace backticks with $() construct

Replace deprecated backticks with $() construct

See https://github.com/koalaman/shellcheck/wiki/SC2006 for details.
Not only uses this the recommended construct, it also makes the code
more uniform as in many other places the $() construct was already used.

Signed-off-by: Diederik de Haas <didi.debian@cknow.org>

Merge pull request #4020 from brauner/2021-10-28.fixes

build & mainloop: fixes

Merge pull request #4018 from brauner/2021-10-28.fixes.2

confile: don't use path_simplify() on lxc.{execute,init}.cmd

Merge pull request #4019 from diederikdehaas/replace-which-with-command-v

Replace 'which' with 'command -v'

start: check event loop type before closing fd

Since this is a union we might otherwise stomp on io_uring mmap()ed
memory.

Fixes: #4016
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

mainloop: make sure that descr->ring is allocated

This is future proofing more than anything else.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Replace 'which' with 'command -v'

The 'which' command is deprecated on Debian Sid as it is not POSIX
compliant and it's behavior is therefor not consistent, so replace it
with 'command -v' which is POSIX compliant.
See https://stackoverflow.com/a/677212 for details.

Also replaced a use of backticks (`) as that is deprecated as well.
See https://github.com/koalaman/shellcheck/wiki/SC2006 for details.

Signed-off-by: Diederik de Haas <didi.debian@cknow.org>

build: add io-uring-event-loop option

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

build: add static libcap to output

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

confile: don't use path_simplify() on lxc.{execute,init}.cmd

Fixes: #4015
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #4013 from stgraber/master

AUTHORS: Update to point to git history

AUTHORS: Update to point to git history

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

Merge pull request #4010 from brauner/2021-10-23.fixes

conf: handle kernels without or not using SMT

conf: handle kernels without or not using SMT

On kernel not enabling or not using SMT core scheduling will return with
ENODEV. Handle such kernels.

Link: https://github.com/lxc/lxd/issues/9419
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #4008 from tenforward/japanese

doc: Update Japanese lxc.container.conf(5) and common options

doc: fix typo in English lxc.container.conf(5)

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>

doc: Add lxc.sched.core to Japanese lxc.container.conf(5)

Update for commit 09996a4

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>

doc: add way to specify broadcast address to Japanese lxc.container.conf(5)

Update for commit 5686798

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>

doc: add loglevels to ja and ko common options

Update for commit 44b87e8

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>

Merge pull request #4006 from coledishington/master

Make number of rx and tx queues configurable for veths

Make number of rx and tx queues configurable for veths

Distribute traffic over cpu cores of container by configuring more
than 1 tx/rx queue.

Signed-off-by: Cole Dishington <Cole.Dishington@alliedtelesis.co.nz>

Merge pull request #4005 from brauner/2021-10-21.fixes

conf: allow users to specify that they want a cgroup2 layout on a hybrid host

conf: add cgroup2, cgroup2:ro, cgroup2:force, cgroup2:ro:force options

We keep running into situations where we want to pre-mount a pure
cgroup2 layout regardless of the layout of the host.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

conf: make it more obvious how auto-mount flags are defined

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #4004 from brauner/2021-10-20.fixes.2

criu: support restoring containers with pre-created veth devices

criu: support restoring containers with pre-created veth devices

We did th CRIU and kernel work but for some reason we never did push the
LXC work.

Link: https://github.com/checkpoint-restore/criu/commit/cdb0d427020f0531f5a35146513c3a36b6eece11
      commit cdb0d427020f ("net: allow restoring of precreated veth devices")
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #4003 from brauner/2021-10-19.fixes

conf: verify that rootfs is stable after setting up mounts

conf: verify that rootfs is stable after setting up mounts

Apparently some users changed their rootfs via their lxc.mount.entry
entries. Let's not allow that as that can cause confusion during
container setup. So lets verify that the rootfs is stable after setup.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #4002 from xypron/riscv64

Riscv64

README.md: mention RISC-V architecture

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

Add riscv64 to --arch parameter values

lxc-attach uses an --arch parameter. 'riscv64' should be a usable value.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

Merge pull request #4000 from brauner/2021-10-18.fixes

conf: fixes

conf: don't fail umount2()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

conf: fix coding style

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3997 from brauner/2021-10-15.fixes

log: fixes

caps: ensure \0-termination

Fixes: Coverity 1492865
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

attach: improve error logging

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

af_unix: replace log_error_errno()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3996 from tych0/fix-criu-log

criu: fix error message

criu: fix error message

as of 59d8a539d106 ("criu: massage exec_criu()") I see:

In file included from criu.c:22:
criu.c: In function 'exec_criu':
log.h:376:2: error: '%s' directive argument is null [-Werror=format-overflow=]
  376 |  LXC_ERROR(&locinfo, format, ##__VA_ARGS__);   \
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
log.h:457:3: note: in expansion of macro 'ERROR'
  457 |   ERROR("%s - " format, ptr, ##__VA_ARGS__); \
      |   ^~~~~
log.h:491:3: note: in expansion of macro 'SYSERROR'
  491 |   SYSERROR(format, ##__VA_ARGS__);              \
      |   ^~~~~~~~
criu.c:325:11: note: in expansion of macro 'log_error_errno'
  325 |    return log_error_errno(-ENOMEM, ENOMEM, "Failed to remove extraneous slashes from \"%s\"", tmp);
      |           ^~~~~~~~~~~~~~~

it looks like we should be logging the string that failed, vs. tmp here.

(my log was taken from stable-4.0, but the same issue exists on master it
seems.)

Signed-off-by: Tycho Andersen <tycho@tycho.pizza>

Merge pull request #3995 from brauner/2021-10-13.fixes

tree-wide: capability tests and fixes

test: fix nested capability tests

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

attach: improve error logging for drop_capabilities()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

tests: expand capability tests

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

tree-wide: use __u32 for capabilities

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

cgroups: use __u32 for cpumasks

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3994 from brauner/2021-10-12.fixes

conf: improve and fix lxc.cap.keep

conf: improve capability handling

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

tests: add test for lxc.cap.keep

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

conf: fix lxc.cap.keep behavior

Fixes: ##3993
Fixes: 20ab75789eb9 ("conf: simplify and port caps to new list type")
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3992 from brauner/2021-10-11.fixes

terminal: log at warning message

terminal: log at warning message

The lxc_devpts_terminal() helper is called in contexts where it can fail
due to various reasons but where we safely fallback to allocating
terminal devices on the host. Logging error messages irritates users so
just log warning messages.

Link: https://discuss.linuxcontainers.org/t/lxc-attach-error-failed-to-open-terminal-multiplexer-device
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3988 from brauner/2021-10-04.fixes

log: improve %m handling on musl

log: improve %m handling on musl

Fixes: #3961
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3987 from brauner/2021-10-01.fixes

start: make failure to apply core scheduling fatal

start: make failure to apply core scheduling fatal

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3986 from brauner/2021-10-01.fixes

lxc: core scheduling tweaks

start: use core scheduling error helper

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

start: don't fail when core scheduling isn't supported

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

syscall_wrappers: fix core scheduling creation helper naming

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3985 from brauner/2021-09-30.fixes.2

tree-wide: cast to core scheduling cookie to llu

tree-wide: cast to core scheduling cookie to llu

Link: https://launchpadlibrarian.net/561086365/buildlog_ubuntu-focal-ppc64el.lxc_1%3A4.0.10+master~20210930-1812-0ubuntu1~focal_BUILDING.txt.gz
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3984 from brauner/2021-09-29.core_scheduling

lxc: core scheduling support

attach: handle core scheduling

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3983 from brauner/2021-09-29.fixes

build: compiler attribute improvements

lxc: add lxc.sched.core

Core scheduling defines if the container payload is marked as being
schedulable on the same core. Doing so will cause the kernel scheduler
to ensure that tasks that are not in the same group never run
simultaneously on a core. This can serve as an extra security measure to
prevent the container payload from using cross hyper thread attacks.

The only allowed values are 0 and 1. Set this to 1 to create a core
scheduling domain for the container or 0 to not create one. If not set
explicitly no core scheduling domain will be created for the container.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

initutils: add missing prctl include

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

build: compiler attribute improvements

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3982 from stgraber/master

github: Drop 16.04 tests

Merge pull request #3981 from brauner/2021-09-28.fixes

build: check whether compiler supports nonnull and returns_nonnull at…

github: Drop 16.04 tests

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

build: check whether compiler supports nonnull and returns_nonnull attributes

Fixes: #3980
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3979 from brauner/2021-09-27.fixes

build: add commands, hooks, and templates

hooks: fix quoting

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

templates: don't double quote

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

build: add templates

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

build: fix remaining HAVE_* generations

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

tree-wide: fix HAVE_* checks

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

cmds: fix includes

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

cmds: fix integer conversions

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

lxc-monitord: use {} around ;

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

build: add cmd builds

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

build: add hooks

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

build: build hooks directly in their folder

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3978 from brauner/2021-09-23.fixes

build: improve meson build

build: improve meson build

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3977 from brauner/2021-09-16.fixes

build: fixes

build: use dummy config data

to avoid having to rely on newer meson features.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

build: expand default_options

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

build: add commands

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

build: split netns_ifaddrs into separate sources

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

hooks: use cloexec everywhere

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

build: fix tools build

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

build: fix hook program build

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3976 from stgraber/master

Don't include internal headers in external library headers

Don't include internal headers in external library headers

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

Merge pull request #3974 from brauner/2021-09-15.fixes.2

tools: use correct include for Android

tools: use correct include for Android

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3972 from brauner/2021-09-15.fixes

build: ensure all relevant calls are checked for availability at buil…