commit: 190499d396a2eac96f71a02e4b9e65d1d169d0e7 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Fri Oct 29 07:11:32 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Oct 29 07:14:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=190499d3
app-emulation/lxc: add io-uring patches for 4.0.11 Bug: https://bugs.gentoo.org/820545 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../lxc/files/lxc-4.0.11_p1-liburing-sync1.patch | 29 ++++ .../lxc/files/lxc-4.0.11_p1-liburing-sync2.patch | 28 +++ app-emulation/lxc/lxc-4.0.11_p1.ebuild | 188 +++++++++++++++++++++ 3 files changed, 245 insertions(+) diff --git a/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch b/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch new file mode 100644 index 00000000000..cd497a75552 --- /dev/null +++ b/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch @@ -0,0 +1,29 @@ +From aac3f106ff012e1d6835b20c250dcf09c364530c Mon Sep 17 00:00:00 2001 +From: Christian Brauner <[email protected]> +Date: Thu, 28 Oct 2021 17:39:11 +0200 +Subject: [PATCH] mainloop: make sure that descr->ring is allocated + +This is future proofing more than anything else. + +Signed-off-by: Christian Brauner <[email protected]> +--- + src/lxc/mainloop.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/lxc/mainloop.c b/src/lxc/mainloop.c +index 7c8f5d86af..17a4d55293 100644 +--- a/src/lxc/mainloop.c ++++ b/src/lxc/mainloop.c +@@ -515,8 +515,10 @@ void lxc_mainloop_close(struct lxc_async_descr *descr) + + if (descr->type == LXC_MAINLOOP_IO_URING) { + #if HAVE_LIBURING +- io_uring_queue_exit(descr->ring); +- munmap(descr->ring, sizeof(struct io_uring)); ++ if (descr->ring) { ++ io_uring_queue_exit(descr->ring); ++ munmap(descr->ring, sizeof(struct io_uring)); ++ } + #else + ERROR("Unsupported io_uring mainloop"); + #endif diff --git a/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch b/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch new file mode 100644 index 00000000000..33b8554193d --- /dev/null +++ b/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch @@ -0,0 +1,28 @@ +From a585382b972c25ee8489147d94918d001ef439a7 Mon Sep 17 00:00:00 2001 +From: Christian Brauner <[email protected]> +Date: Thu, 28 Oct 2021 17:39:42 +0200 +Subject: [PATCH] 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 <[email protected]> +--- + src/lxc/start.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/lxc/start.c b/src/lxc/start.c +index 8f7173ec8c..1a6046c7a4 100644 +--- a/src/lxc/start.c ++++ b/src/lxc/start.c +@@ -629,7 +629,8 @@ int lxc_poll(const char *name, struct lxc_handler *handler) + TRACE("Mainloop is ready"); + + ret = lxc_mainloop(&descr, -1); +- close_prot_errno_disarm(descr.epfd); ++ if (descr.type == LXC_MAINLOOP_EPOLL) ++ close_prot_errno_disarm(descr.epfd); + if (ret < 0 || !handler->init_died) + goto out_mainloop_console; + diff --git a/app-emulation/lxc/lxc-4.0.11_p1.ebuild b/app-emulation/lxc/lxc-4.0.11_p1.ebuild new file mode 100644 index 00000000000..e7de06da0ae --- /dev/null +++ b/app-emulation/lxc/lxc-4.0.11_p1.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam readme.gentoo-r1 systemd verify-sig + +DESCRIPTION="A userspace interface for the Linux kernel containment features" +HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"; +SRC_URI="https://linuxcontainers.org/downloads/lxc/${P/_p1}.tar.gz + verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P/_p1}.tar.gz.asc )" + +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + +LICENSE="GPL-2 LGPL-2.1 LGPL-3" +SLOT="0" +IUSE="apparmor +caps doc io-uring man pam seccomp selinux +ssl +tools verify-sig" + +RDEPEND="acct-group/lxc + acct-user/lxc + app-misc/pax-utils + sys-apps/util-linux + sys-libs/libcap + virtual/awk + caps? ( sys-libs/libcap ) + io-uring? ( sys-libs/liburing:= ) + pam? ( sys-libs/pam ) + seccomp? ( sys-libs/libseccomp ) + selinux? ( sys-libs/libselinux ) + ssl? ( + dev-libs/openssl:0= + )" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-4 + apparmor? ( sys-apps/apparmor )" +BDEPEND="virtual/pkgconfig + doc? ( app-doc/doxygen[dot] ) + man? ( app-text/docbook-sgml-utils ) + verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )" + +CONFIG_CHECK="~!NETPRIO_CGROUP + ~CGROUPS + ~CGROUP_CPUACCT + ~CGROUP_DEVICE + ~CGROUP_FREEZER + + ~CGROUP_SCHED + ~CPUSETS + ~IPC_NS + ~MACVLAN + + ~MEMCG + ~NAMESPACES + ~NET_NS + ~PID_NS + + ~POSIX_MQUEUE + ~USER_NS + ~UTS_NS + ~VETH" + +ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" +ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" +ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers" +ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" +ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" +ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" +ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" + +DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt ) + +pkg_setup() { + linux-info_pkg_setup +} + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854 + "${FILESDIR}"/${P}-liburing-sync1.patch #820545 + "${FILESDIR}"/${P}-liburing-sync2.patch #820545 +) + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc + +S="${WORKDIR}/${PN}-${PV/_p1}" + +src_prepare() { + default + + export bashcompdir="/etc/bash_completion.d" + eautoreconf +} + +src_configure() { + append-flags -fno-strict-aliasing + + local myeconfargs=( + --bindir=/usr/bin + --localstatedir=/var + --sbindir=/usr/bin + + --with-config-path=/var/lib/lxc + --with-distro=gentoo + --with-init-script=systemd + --with-rootfs-path=/var/lib/lxc/rootfs + --with-runtime-path=/run + --with-systemdsystemunitdir=$(systemd_get_systemunitdir) + + --disable-coverity-build + --disable-dlog + --disable-fuzzers + --disable-mutex-debugging + --disable-no-undefined + --disable-rpath + --disable-sanitizers + --disable-tests + --disable-werror + + --enable-bash + --enable-commands + --enable-memfd-rexec + --enable-thread-safety + + $(use_enable apparmor) + $(use_enable caps capabilities) + $(use_enable doc api-docs) + $(use_enable doc examples) + $(use_enable io-uring liburing) + $(use_enable man doc) + $(use_enable pam) + $(use_enable seccomp) + $(use_enable selinux) + $(use_enable ssl openssl) + $(use_enable tools) + + $(use_with pam pamdir $(getpam_mod_dir)) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # The main bash-completion file will collide with lxd, need to relocate and update symlinks. + mkdir -p "${ED}"/$(get_bashcompdir) || die "Failed to create bashcompdir." + mv "${ED}"/etc/bash_completion.d/lxc "${ED}"/$(get_bashcompdir)/lxc-start || die "Failed to relocate lxc bash-completion file." + rm -r "${ED}"/etc/bash_completion.d || die "Failed to remove wrong bash_completion.d content." + + if use tools; then + bashcomp_alias lxc-start lxc-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,usernsexec,wait} + else + bashcomp_alias lxc-start lxc-usernsexec + fi + + keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc + rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed" + + find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die + + # Gentoo-specific additions! + newinitd "${FILESDIR}/lxc.initd.8" lxc + + # Remember to compare our systemd unit file with the upstream one + # config/init/systemd/lxc.service.in + systemd_newunit "${FILESDIR}"/lxc_at.service.4.0.0 "[email protected]" + + DOC_CONTENTS=" + For openrc, there is an init script provided with the package. + You should only need to symlink /etc/init.d/lxc to + /etc/init.d/lxc.configname to start the container defined in + /etc/lxc/configname.conf. + + Correspondingly, for systemd a service file [email protected] is installed. + Enable and start lxc@configname in order to start the container defined + in /etc/lxc/configname.conf." + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + elog "Please run 'lxc-checkconfig' to see optional kernel features." + elog + optfeature "automatic template scripts" app-emulation/lxc-templates + optfeature "Debian-based distribution container image support" dev-util/debootstrap + optfeature "snapshot & restore functionality" sys-process/criu +}
