From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D85064A21 for ; Thu, 26 Feb 2026 00:55:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772067318; cv=none; b=BxpizUnTTq0EdcQ8mhzqwJOXF/7Xo3qiwSwmNmhZ8qNDWXPWXZrbeV1/pY7l62W2yYZM2KZ+O6Z0bjz4Lcc7b+YmOPVP5o7ps2lTQmuyiMrq0XtQNwKhHJgCk0dhCV75Itn9jvDDsmooBxkYy0Knzy2E15Bsk+hIUGHL1fKlZAU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772067318; c=relaxed/simple; bh=Hcrwx/LU0/giVJamR3ZOtIWy+ComgossEN4UDTBsnLk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EGJ5BZrzI0JuZjgXtb2JrWTXzPr6sEHuWmSlhdVmBfw1EbqzT+sDj1nwYG8kHjkfVuw30SPuEcezpL0k60qMfWLjIm/+AAJI7VDnz8f3dzK2gVV55TrRAIGBckHhEXYIH530tiMktVIrChHH3mFhniy+g0dbxaJmdYsx+U1qsqU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LH88JAnB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LH88JAnB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67CB3C116D0; Thu, 26 Feb 2026 00:55:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772067318; bh=Hcrwx/LU0/giVJamR3ZOtIWy+ComgossEN4UDTBsnLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LH88JAnB16MHX7b1+EzfKmQreuUsMVAydeTq4vmkOUmUCzoHMRDG4nZKV9dJ1pfgJ EDR7HB1WKuRWN1066RadodmkteW7xrNcKXDh4iJjrAo9hQkJuHM/8q6ZPqRl+L99oB qTL/bjEmBJ/5yEacSmT7kaLI2yDd75V/rpmSMjgSvV3vpkPJWdvEX8wQ7r4FOA2UP1 EnLk6430TzF5duua1pp1Sxz13MUZuhNINmVMwLOyh323HENQ9hnY1bjMZdtmwwlsdG 2DiFbS77KBgyDdzr0zSRxyC7MiLCmS9AbGcHnO8dBsDFr7f13xACAA9nasRdiJUVsH VfVl0A8GP/vdw== From: Song Liu To: live-patching@vger.kernel.org Cc: jpoimboe@kernel.org, jikos@kernel.org, mbenes@suse.cz, pmladek@suse.com, joe.lawrence@redhat.com, kernel-team@meta.com, Song Liu Subject: [PATCH v3 7/8] objtool/klp: Correlate locals to globals Date: Wed, 25 Feb 2026 16:54:35 -0800 Message-ID: <20260226005436.379303-8-song@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260226005436.379303-1-song@kernel.org> References: <20260226005436.379303-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 Allow correlating original locals to patched globals, and vice versa. This is needed when: 1. User adds/removes "static" for a function. 2. CONFIG_LTO_CLANG_THIN promotes local functions and objects to global and add .llvm. suffix. Given this is a less common scenario, show warnings when this is needed. Signed-off-by: Song Liu --- tools/objtool/klp-diff.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tools/objtool/klp-diff.c b/tools/objtool/klp-diff.c index 92043da0ed0b..5cda965807a5 100644 --- a/tools/objtool/klp-diff.c +++ b/tools/objtool/klp-diff.c @@ -517,6 +517,40 @@ static int correlate_symbols(struct elfs *e) } } + /* Correlate original locals with patched globals */ + for_each_sym(e->orig, sym1) { + if (sym1->twin || dont_correlate(sym1) || !is_local_sym(sym1)) + continue; + + sym2 = find_global_symbol_by_name(e->patched, sym1->name); + if (!sym2 && find_global_symbol_by_demangled_name(e->patched, sym1, &sym2)) + return -1; + + if (sym2 && !sym2->twin) { + sym1->twin = sym2; + sym2->twin = sym1; + WARN("correlate LOCAL %s (original) to GLOBAL %s (patched)", + sym1->name, sym2->name); + } + } + + /* Correlate original globals with patched locals */ + for_each_sym(e->patched, sym2) { + if (sym2->twin || dont_correlate(sym2) || !is_local_sym(sym2)) + continue; + + sym1 = find_global_symbol_by_name(e->orig, sym2->name); + if (!sym1 && find_global_symbol_by_demangled_name(e->orig, sym2, &sym1)) + return -1; + + if (sym1 && !sym1->twin) { + sym2->twin = sym1; + sym1->twin = sym2; + WARN("correlate GLOBAL %s (origial) to LOCAL %s (patched)", + sym1->name, sym2->name); + } + } + for_each_sym(e->orig, sym1) { if (sym1->twin || dont_correlate(sym1)) continue; -- 2.47.3