From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C74E43D4EA for ; Tue, 15 Sep 2026 23:35:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789515342; cv=none; b=hwrrQ2w83J9rjQ9G01n8IXqowUJzMnhyY04rloDzEuybQ57AWYQidroxPgJNpqkk2s728rOm7m0+ActSvdvl0VERm7QEV6rSfBKFfjQ/c0Oo+phLC5qOI40f/MtBElKj2zrBGjHjBfHf6Izf3R7TXCEhDuAvGJmpwTmeMvdHwSo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789515342; c=relaxed/simple; bh=dBq9lW2cYIr/6XSsjk/ykHc5g/U0fBqGw342pg/t0Q4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d3CRcrYeUze2sc7G/xG0LN4khNtyqGRDfh2rPSSQPjh5x8hUBxdXsKqPJYEXSXYlLgxkelR//YeyfJqTwqN0I5ftpKw5MA4mkSgvK+vPCEKCIyZ8IY54bSw9QgfbNtP5Pv8jmJTuYqGryxO5P6IrEQo4l8pnmTfcrJK8K9K3oKc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EkaxvNea; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EkaxvNea" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 990181F000FF; Tue, 15 Sep 2026 23:35:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789515341; bh=KJe08Yt3lmKP9x+0F4erByleIcsxkGa7UmD4kMrwIxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EkaxvNeaTyyuvOZ5opA1ymph43o8ljUhQ86RlBZtBTAIkKz8oj79gDWHnsb6Nech8 hTpYcSHoywFZ0kR9hsaZp36D1VXY7q1FiZtUwq6wRrHDsHQKhLAgV1wkhjFQe6dmFH XY2fGF7CIL56JHGLA6epBEJvPOeOVlESAWQ9xxwCifkIL82+9DY8jCLNpdGutrjnB8 76NKxs6p1oPWhjZMGr4UxQ5AtZb63UEHhVoFczh78aoTYGiJpXQlwErQ3CZz5zbMJ4 gvO6ToLXWfUpGq2P0uU8Ax1KWT0lgaql1MB4YyLx9ZXG44xaUyLy4GSGt6eFOUOyBz 2N5ivVrLlLVCA== From: Song Liu To: live-patching@vger.kernel.org Cc: jpoimboe@kernel.org, peterz@infradead.org, jikos@kernel.org, mbenes@suse.cz, pmladek@suse.com, joe.lawrence@redhat.com, puranjay@kernel.org, kernel-team@meta.com, Song Liu Subject: [PATCH v4 07/58] objtool/klp: Give each run one working directory, one per test inside it Date: Tue, 15 Sep 2026 16:34:03 -0700 Message-ID: <20260915233454.2405019-8-song@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260915233454.2405019-1-song@kernel.org> References: <20260915233454.2405019-1-song@kernel.org> Precedence: bulk X-Mailing-List: live-patching@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Each test made its own mktemp directory, so a run scattered them through /tmp among everything else using the same names, and there was no way to inspect what a failing test built -- the objects are gone the moment it exits, which is right every time but the one that matters. Give the run one directory and each test a subdirectory of it, named for the test and nested the way the source is: /tmp/klp-tests.3zC6oyfd/ generic/test-basic/{orig.o,patched.o,out.o,Module.symvers,...} x86/test-kcfi/... --keep then reports one path instead of forty, and removing it is one command. A test run by hand still falls back to a temp directory of its own, and still says where that went. Detecting a leak comes free. Cleanup is now "remove each test's directory, then rmdir the run's", and the rmdir fails if anything is left -- so a test which dies without running its own cleanup is reported rather than quietly leaving something behind. preflight names the directory the tests build under, since mktemp honours TMPDIR and a run in a container is otherwise silent about where its work went. The runner says what to do only when it is relevant: on a failure without --keep, that the option exists; with it, how many directories are waiting. Usage text is not read while something is broken. Assisted-by: Claude:claude-opus-5 Signed-off-by: Song Liu --- tools/objtool/tests/lib.sh | 23 ++++++++++++++++++----- tools/objtool/tests/run-tests.sh | 26 ++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/tools/objtool/tests/lib.sh b/tools/objtool/tests/lib.sh index ffc1efb06233..026b3fac2353 100644 --- a/tools/objtool/tests/lib.sh +++ b/tools/objtool/tests/lib.sh @@ -126,6 +126,7 @@ klp_preflight() # objtool $OBJTOOL (klp: yes) # compiler $cc_version # arch $KLP_TEST_ARCH$([ "$arch" = "$host" ] || echo " (host $host, cross)") +# tmpdir ${TMPDIR:-/tmp} (each test builds in a fresh directory here) EOF } @@ -189,15 +190,27 @@ xpass() exit 1 } -cleanup() { [ -n "$workdir" ] && rm -rf "$workdir"; } +cleanup() +{ + [ -n "$workdir" ] || return 0 + + if [ -n "${KLP_TEST_KEEP:-}" ]; then + [ -n "${KLP_TEST_WORKDIR:-}" ] || echo "# kept $workdir" + return 0 + fi + + rm -rf "$workdir" +} # setup [exported symbol...] setup() { - # The environment was checked once when this file was sourced, so there - # is nothing to verify here: objtool exists at the resolved path, has - # klp support, and $CC works. - workdir="$(mktemp -d)" || fail "mktemp failed" + if [ -n "${KLP_TEST_WORKDIR:-}" ]; then + workdir="$KLP_TEST_WORKDIR" + mkdir -p "$workdir" || fail "cannot create $workdir" + else + workdir="$(mktemp -d)" || fail "mktemp failed" + fi trap cleanup EXIT export_syms "$@" diff --git a/tools/objtool/tests/run-tests.sh b/tools/objtool/tests/run-tests.sh index 6b937fc7f5bd..e6f1ac1b5d0d 100755 --- a/tools/objtool/tests/run-tests.sh +++ b/tools/objtool/tests/run-tests.sh @@ -23,13 +23,17 @@ export LC_ALL=C usage() { cat <&2; usage 1 ;; *) break ;; @@ -98,12 +103,18 @@ else done fi +# One directory for the whole run, one per test inside it, mirroring the +# source layout. A run then leaves a single thing behind instead of 39 +# scattered among everything else using mktemp. +rundir="$(mktemp -d "${TMPDIR:-/tmp}/klp-tests.XXXXXXXX")" || + { echo "Bail out! cannot create a working directory" >&2; exit 1; } + echo "1..${#tests[@]}" pass=0 fail=0 static_skip=0 probe_skip=0 xfail=0 xpass=0 for t in "${tests[@]}"; do - out="$(./"$t" 2>&1)" + out="$(KLP_TEST_WORKDIR="$rundir/${t%.sh}" ./"$t" 2>&1)" rc=$? # A test prints one result line, but it is not necessarily the only @@ -156,4 +167,15 @@ done echo "# pass:$pass fail:$fail static-skip:$static_skip" \ "probe-skip:$probe_skip xfail:$xfail xpass:$xpass" +# A failure is the one time the objects matter, and by default they are +# already gone. Say so then rather than in the usage text nobody reads while +# something is broken. +if [ -n "${KLP_TEST_KEEP:-}" ]; then + echo "# working directories kept in $rundir -- inspect, then rm -rf it" +elif ! rmdir "$rundir"/*/ "$rundir" 2>/dev/null; then + echo "# $rundir was not empty; a test did not clean up after itself" +elif [ "$fail" != 0 ] || [ "$xpass" != 0 ]; then + echo "# re-run with --keep to hold on to what a failing test built" +fi + [ "$fail" = 0 ] && [ "$xpass" = 0 ] -- 2.53.0-Meta