From nobody Sat Jun 13 22:13:15 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 7E1993E3DB6; Tue, 5 May 2026 10:56:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777978568; cv=none; b=LwAo94sfk6/gyBBcbSHhBN/5Dl4cSIUKCeouQVXzcvvB/h2ZNC3THHcuIohfDcYNfwibKp939FX8D2gVvwkoS5HsmYHjS/maj12u1wCtm4lFHwmTNd98qn5YlDJ2guSpZuzaJVbbSc5O48SYJEp7mMqYBL6R/9fav2MKPdVku0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777978568; c=relaxed/simple; bh=QEXYoJ4X+MQm5eA1H8jY8ZWxibJZ2gCt2gQnaaDwLps=; h=Date:From:To:Subject:Cc:MIME-Version:Message-ID:Content-Type; b=Bwxbq4s8PpSuHsG4QlMywFKk9Ml4vbn00oxx2Q56E6eFE8FCvMVYWYx4ey/tLGbpRuTWbMjFfLsPPHasM7fktyeCxajhtCYGbYERpSo2qAUOHn6qeVpiAabQkG0fc0SezENq46RTkNxyEMuBwKnn1NzErjqzzcLx0ADmq0h+avQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=XePBDySt; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=BieUMV6F; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="XePBDySt"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="BieUMV6F" Date: Tue, 05 May 2026 10:56:01 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1777978563; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j+nWfOewneJ3DaxafgBcWB8Jnn3k0QwQ+xMrdIQ5XQY=; b=XePBDyStRNlUeUQa9Wnh/InV6bHKvA/gojQZpKAt0Awrfg2BAHPGwg+kujtH8ugFvQDPzQ 8jyFTOcgLVzeIV3EsSJzuBEOWRBlnmeciWAgA9Id06X75dsBzDvt2hy0Vc87ojBVbsivrq ToNjpgzkUy2fZ0l2J/T3p0qTvQCTnlPOFENm6nKFcUCF+ynnuOxmcbnEfLL5jr2kqrjtWo C2/ELQabyY37vB6FKAJYakAiQwyFz/8P88HcF9ejUU5QIwq+JyNHjVsECxfFSwHVWAiR33 15u60Ae5BNmiyKo7PNdcGJusMhVhXihQsudAp+Tvwz9Wjn/dOJBaDqwXEyj57A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1777978563; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j+nWfOewneJ3DaxafgBcWB8Jnn3k0QwQ+xMrdIQ5XQY=; b=BieUMV6FZqjjbHQfaLEA2x2Qo+hpzDxzFMjZsloJta0AgyK5sG8CdqG2O5faAXTgAUJdhY W0c41ksiGXN3NhDg== From: "tip-bot2 for Josh Poimboeuf" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/core] klp-build: Validate short-circuit prerequisites Cc: Song Liu , Josh Poimboeuf , x86@kernel.org, linux-kernel@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177797856190.424702.3807103194584871501.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the objtool/core branch of tip: Commit-ID: 225d16dd510d92c8eaba8e6496cfaa7881a24827 Gitweb: https://git.kernel.org/tip/225d16dd510d92c8eaba8e6496cfaa788= 1a24827 Author: Josh Poimboeuf AuthorDate: Fri, 17 Apr 2026 13:33:55 -07:00 Committer: Josh Poimboeuf CommitterDate: Mon, 04 May 2026 21:16:06 -07:00 klp-build: Validate short-circuit prerequisites The --short-circuit option implicitly requires that certain directories are already in klp-tmp. Enforce that to prevent confusing errors. Acked-by: Song Liu Signed-off-by: Josh Poimboeuf --- scripts/livepatch/klp-build | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/scripts/livepatch/klp-build b/scripts/livepatch/klp-build index c1475c0..c4a7acf 100755 --- a/scripts/livepatch/klp-build +++ b/scripts/livepatch/klp-build @@ -437,6 +437,20 @@ do_init() { # builds in pwd. [[ ! "$PWD" -ef "$SCRIPT_DIR/../.." ]] && die "please run from the kernel= root directory" =20 + if (( SHORT_CIRCUIT >=3D 2 )); then + [[ -f "$ORIG_DIR/.complete" ]] || die "-S $SHORT_CIRCUIT requires comple= ted $ORIG_DIR" + fi + if (( SHORT_CIRCUIT >=3D 3 )); then + [[ -f "$PATCHED_DIR/.complete" ]] || die "-S $SHORT_CIRCUIT requires com= pleted $PATCHED_DIR" + fi + if (( SHORT_CIRCUIT >=3D 4 )); then + [[ -f "$ORIG_CSUM_DIR/.complete" ]] || die "-S $SHORT_CIRCUIT requires c= ompleted $ORIG_CSUM_DIR" + [[ -f "$PATCHED_CSUM_DIR/.complete" ]] || die "-S $SHORT_CIRCUIT require= s completed $PATCHED_CSUM_DIR" + fi + if (( SHORT_CIRCUIT >=3D 5 )); then + [[ -f "$DIFF_DIR/.complete" ]] || die "-S $SHORT_CIRCUIT requires comple= ted $DIFF_DIR" + fi + (( SHORT_CIRCUIT <=3D 1 )) && rm -rf "$TMP_DIR" mkdir -p "$TMP_DIR" =20 @@ -593,6 +607,7 @@ copy_orig_objects() { =20 mv -f "$TMP_DIR/build.log" "$ORIG_DIR" touch "$TIMESTAMP" + touch "$ORIG_DIR/.complete" } =20 # Copy all changed objects to $PATCHED_DIR @@ -631,6 +646,7 @@ copy_patched_objects() { (( found =3D=3D 0 )) && die "no changes detected" =20 mv -f "$TMP_DIR/build.log" "$PATCHED_DIR" + touch "$PATCHED_DIR/.complete" } =20 # Copy .o files to a separate directory and run "objtool klp checksum" on = each @@ -712,6 +728,8 @@ diff_objects() { die "objtool klp diff failed" ) done + + touch "$DIFF_DIR/.complete" } =20 # For each changed object, run "objtool klp checksum" with --debug-checksu= m to