From bca17d16ca0dabbe1b533bb78f367d64e076fe73 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 14 Jul 2022 21:18:15 -0700 Subject: syscall: add CgroupFD support for ForkExec on Linux Implement CLONE_INTO_CGROUP feature, allowing to put a child in a specified cgroup in a clean and simple way. Note that the feature only works for cgroup v2, and requires Linux kernel 5.7 or newer. Using the feature requires a new syscall, clone3. Currently this is the only reason to use clone3, but the code is structured in a way so that other cases may be easily added in the future. Add a test case. While at it, try to simplify the syscall calling code in forkAndExecInChild1, which became complicated over time because: 1. It was using either rawVforkSyscall or RawSyscall6 depending on whether CLONE_NEWUSER was set. 2. On Linux/s390, the first two arguments to clone(2) system call are swapped (which deserved a mention in Linux ABI hall of shame). It was worked around in rawVforkSyscall on s390, but had to be implemented via a switch/case when using RawSyscall6, making the code less clear. Let's - modify rawVforkSyscall to have two arguments (which is also required for clone3); - remove the arguments workaround from s390 asm, instead implementing arguments swap in the caller (which still looks ugly but at least it's done once and is clearly documented now); - use rawVforkSyscall for all cases (since it is essentially similar to RawSyscall6, except for having less parameters, not returning r2, and saving/restoring the return address before/after syscall on 386 and amd64). Updates #51246. Change-Id: Ifcd418ebead9257177338ffbcccd0bdecb94474e Reviewed-on: https://go-review.googlesource.com/c/go/+/417695 Auto-Submit: Ian Lance Taylor Reviewed-by: Michael Knyszek Reviewed-by: Ian Lance Taylor Run-TryBot: Ian Lance Taylor Run-TryBot: Kirill Kolyshkin TryBot-Result: Gopher Robot --- src/syscall/asm_linux_ppc64x.s | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/syscall/asm_linux_ppc64x.s') diff --git a/src/syscall/asm_linux_ppc64x.s b/src/syscall/asm_linux_ppc64x.s index 89cc1c2b0b..b9412fec1d 100644 --- a/src/syscall/asm_linux_ppc64x.s +++ b/src/syscall/asm_linux_ppc64x.s @@ -10,10 +10,10 @@ // System calls for ppc64, Linux // -// func rawVforkSyscall(trap, a1 uintptr) (r1, err uintptr) -TEXT ·rawVforkSyscall(SB),NOSPLIT|NOFRAME,$0-32 +// func rawVforkSyscall(trap, a1, a2 uintptr) (r1, err uintptr) +TEXT ·rawVforkSyscall(SB),NOSPLIT|NOFRAME,$0-40 MOVD a1+8(FP), R3 - MOVD R0, R4 + MOVD a2+16(FP), R4 MOVD R0, R5 MOVD R0, R6 MOVD R0, R7 @@ -22,12 +22,12 @@ TEXT ·rawVforkSyscall(SB),NOSPLIT|NOFRAME,$0-32 SYSCALL R9 BVC ok MOVD $-1, R4 - MOVD R4, r1+16(FP) // r1 - MOVD R3, err+24(FP) // errno + MOVD R4, r1+24(FP) // r1 + MOVD R3, err+32(FP) // errno RET ok: - MOVD R3, r1+16(FP) // r1 - MOVD R0, err+24(FP) // errno + MOVD R3, r1+24(FP) // r1 + MOVD R0, err+32(FP) // errno RET TEXT ·rawSyscallNoError(SB),NOSPLIT,$0-48 -- cgit v1.3-5-g9baa