wip

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

libcontainer/nsenter/nsexec.c

@@ -697,6 +697,17 @@ void nsexec(void)
 		return;
 	}
 
+	cpu_set_t cpus = {};
+	if (sched_getaffinity(0, sizeof(cpus), &cpus) >= 0) {
+		char buf[128], *bp;
+		bp = buf;
+		for (int i = 0; i < 32; i++) {
+			if CPU_ISSET(i, &cpus)
+				bp += sprintf(bp, "%d ", i);
+		}
+		write_log(DEBUG, "=> nsexec CPUs: %s", buf);
+	}
+
 	write_log(DEBUG, "=> nsexec container setup");
 
 	/* Parse all of the netlink configuration. */

tests/integration/cpu_affinity.bats

@@ -42,6 +42,7 @@ function first_cpu() {
 		exp=${exp//-/ }  # 2. "-" --> " ".
 		echo "CPUS: $cpus, exp: $exp"
 		runc --debug exec --process <(echo "$proc") ct1
+		[[ "$output" == *"nsexec CPUs: $exp "* ]]
 		[[ "$output" == *"Initial CPU affinity: $cpus"* ]]
 		[[ "$output" == *"Initial CPUs: [$exp]"* ]]
 	done
@@ -59,6 +60,8 @@ function first_cpu() {
 
 	runc --debug exec ct1 grep "Cpus_allowed_list:" /proc/self/status
 	[ "$status" -eq 0 ]
+	[[ "$output" == *"nsexec CPUs: $first "* ]] # nsexec.c
+	[[ "$output" == *"Initial CPU affinity: $first"* ]]
 	[[ "$output" == *"Initial CPUs: [$first]"* ]]
 	[[ "$output" == *"Cpus_allowed_list:	$second"* ]] # Mind the literal tab.
 }