From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.210.70 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794874122; b=LeIJrvhjiTXJI2qd0vWjrf1kiWMmrOmovX032pXz28tGqVorVwPjnCy14VxELQNyrYeC eqsNj1oU0YRuzLdJxHcWDsB/nSv9ZVyX/V1VcwVGz3h9VGOSkehis44CuNerUiRD98tSY SXUTXb9Ow1E6VfO2QZfB+Zd8ZITmcltM2OJ8lfZHOjor5qd1GL5TTMdAcuuQTJeJYrHDz GIAjBvgXY86Oi90o5A5tS3BQrAYn30yz/VX0ou56Sa6o70tYbqheXfMX6zH+DKGymFfeS etz3uy3NO3DehhCwkkqVqHoQCJYVE5GaCXHUkTL66QGB7X1il0z4Bc3THiK/3bTFk8Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794874122; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=oWMis7rJvxkqS+rj264WdJn+/Y9mj3so8eTBQ0Zbl/s=; b=MkQ8xnWmY3Op0yAmE71JSMA/IROHXtqrOdCeGuwwXQw3y+ggjy6M141qD+gVPonfhXBT NxjsJn5m4J4jLUrjY5air2MUbjaMcKO5SJO+CfJnQxDEbr5IQfb64nYUbcGbltFSQDvvz vufvsofCUV/FET+f6vT4ViIGoGTjvU0jWNfeWXU6qpKJnZjO93deFaZ4etpLkan+nHXcw 51ztZMzUA17SmdLfsCT71ryBOG/HzahL8sV3zEfYmUq/hGOVbTa3UXvAscXODQPlSF7jF 2+CGgjEuQLGlbA2nLclqHanN5lwWrIlgMjm2lksgQOkSFYUkeROyfj8FyURGxLWaqNw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--wfelipe.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=O6Fb7h15; arc=none smtp.remote-ip=209.85.210.70 Received: from mail-ot1-f70.google.com (mail-ot1-f70.google.com [209.85.210.70]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6ED89606A335 for ; Tue, 17 Nov 2026 00:08:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 6ED89606A335 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--wfelipe.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=O6Fb7h15 Received: by mail-ot1-f70.google.com with SMTP id 46e09a7af769-85c1135c289so2834067a34.3 for ; Mon, 16 Nov 2026 16:08:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794874121; x=1795478921; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=oWMis7rJvxkqS+rj264WdJn+/Y9mj3so8eTBQ0Zbl/s=; b=O6Fb7h15XBmAtolhjVZ0PMGOTT5pxZ0JwoByJsSQUaBj+d0j9lt28WMbNA1AWiEVB+ mSIv5ifjeAu+djnBOrYhol0bnwrbAoaM4NlWaFqYuyJ/REWVEf2ScSUlolfI1x7GDjX6 IFEBo44A1l2HXfZ8ZlsPijzLsdkH24Xpkw431XsWkmPN1GTX5a/bt7IFDx7SPLp4XOqY 4a8Fn5f/7FYSFkta8tfmgUdet7/54k8cd6oI52CMK1hyOmoIP43gFk9cagYf6AbAIZcN 7rVmpcj68jPxyQZJ8pixEn9GUBEaaAXLB1Zut8Xzia/B+8onBbm4ipm+rfOndmhVpMPe cRoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794874121; x=1795478921; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=oWMis7rJvxkqS+rj264WdJn+/Y9mj3so8eTBQ0Zbl/s=; b=AdNCmz+DVSZnlZOldkPGGNQba75Tcg+W1WRMwbPvmvoAYx3acKkaS2z1D1KxxDdYt0 WP+XWPqybkHokBsF2syXpP/boVSEu1Ld0+74NNLyKfbX5sWfzXMWAyj7LOotvYIdDnS6 lKjXa4/6nwhI7Y3RRqAW0KdgKjhtkjCXG5hiz/PR3LPrH5z0V3smarzYAg3NU38vk7r7 PKz5PVSL2BREafoqyDePho0jvAix5ztrB6yTse77CMjxK2x0dGgEyHg2sQaVO77dY1IZ f8KEiKQjlnfcxI6i2689g5IDNc+MsmfS5qKGRHyVAbir742Jro4PR1sH7VYUonhbiqWn E8JA== X-Forwarded-Encrypted: i=1; AL+hErHN+dDwAlVmv1i7ZxdqOHKya8YHPEhsL18gvpB/JahySeJOBcJ/CM0gAE2DGTlbrMoH6k/NU6AtoNhyhnY=@vger.kernel.org X-Gm-Message-State: APuU4Z/MPlJY+/UTRYXypy5+H/hnJg+MXJn+9vRvh56GM57jeF6oi47J 5sKzBur47KGyIhFwUaMhPgKG6hH1nrI+lsTatTUFFCMAt+FJfatnPqr5OLPL1QlONGiZOJLoGIP Jh9KpLz7MsA== X-Received: from oacff39.prod.google.com ([2002:a05:6871:51e7:b0:4ad:864c:9c16]) (user=wfelipe job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6808:320d:b0:55c:928:6a0f with SMTP id 5614622812f47-56e65c57faemr9880831b6e.52.1794874121014; Mon, 16 Nov 2026 16:08:41 -0800 (PST) Date: Tue, 17 Nov 2026 00:08:31 +0000 In-Reply-To: <20261117000835.1992893-1-wfelipe@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261117000835.1992893-1-wfelipe@google.com> X-Mailer: git-send-email 2.56.1.703.gf848ed807c-goog Message-ID: <20261117000835.1992893-2-wfelipe@google.com> Subject: [PATCH 1/2] objtool/klp: Disambiguate global symbols colliding with local symbols From: Wilson Felipe Pereira To: Josh Poimboeuf , Peter Zijlstra , Miroslav Benes , Petr Mladek , Joe Lawrence , Song Liu Cc: live-patching@vger.kernel.org, linux-kernel@vger.kernel.org, Dylan Hatch , Yi Zhu , Wilson Felipe Pereira Content-Type: text/plain; charset="UTF-8" klp_find_sympos() returns 0 for any non-STB_LOCAL symbol, symid_needed() skips non-local symbols when emitting .klp.symid entries for vmlinux.o, and clone_reloc_klp() hardcodes sympos = 0 when a relocation targets a restricted or module export. However, a global symbol in one translation unit can share its name with a static (STB_LOCAL) symbol in another translation unit (for example, cgroup_storage_lookup in kernel/bpf/local_storage.c vs kernel/bpf/bpf_cgrp_storage.c). At runtime, both kallsyms_on_each_match_symbol() and module_kallsyms_on_each_symbol() count local and global symbols together, so emitting sympos 0 for the global symbol fails module load in klp_find_object_symbol() with 'unresolvable ambiguity for symbol'. Allow defined non-local symbols to receive .klp.symid entries when duplicate names exist in vmlinux.o, compute sympos for defined non-local symbols in klp_find_sympos() (returning 0 when unique and skipping undefined and non-alloc symbols), and resolve sympos via klp_find_sympos() in clone_reloc_klp() when the exported target is defined in the patched object. Signed-off-by: Wilson Felipe Pereira --- tools/objtool/klp-diff.c | 11 +++++++++++ tools/objtool/klp-symid.c | 2 +- tools/objtool/klp-sympos.c | 9 ++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/objtool/klp-diff.c b/tools/objtool/klp-diff.c index 34da55e45609..37ad315d00af 100644 --- a/tools/objtool/klp-diff.c +++ b/tools/objtool/klp-diff.c @@ -1404,9 +1404,20 @@ static int clone_reloc_klp(struct elfs *e, struct reloc *patched_reloc, */ if (export) { + const char *modname = find_modname(e); + + if (!modname) + return -1; + sym_modname = export->mod; sym_orig_name = export->sym; sympos = 0; + if (!strcmp(export->mod, modname) && + patched_sym->twin && !is_undef_sym(patched_sym->twin)) { + sympos = klp_find_sympos(e->orig, patched_sym->twin); + if (sympos == ULONG_MAX) + return -1; + } } else { sym_modname = find_modname(e); if (!sym_modname) diff --git a/tools/objtool/klp-symid.c b/tools/objtool/klp-symid.c index b19f76dff13e..d01c13b8ffa8 100644 --- a/tools/objtool/klp-symid.c +++ b/tools/objtool/klp-symid.c @@ -52,7 +52,7 @@ static bool symid_needed(struct elf *elf, struct symbol *sym) { struct symbol *s; - if (!is_local_sym(sym) || is_undef_sym(sym)) + if (is_undef_sym(sym)) return false; if (!is_func_sym(sym) && !is_object_sym(sym)) diff --git a/tools/objtool/klp-sympos.c b/tools/objtool/klp-sympos.c index dfca9dd74681..087892ef3593 100644 --- a/tools/objtool/klp-sympos.c +++ b/tools/objtool/klp-sympos.c @@ -381,14 +381,14 @@ unsigned long klp_find_sympos(struct elf *elf, struct symbol *sym) bool has_dup = false; struct symbol *s; + if (is_undef_sym(sym)) + return 0; + if (is_init_sym(sym)) { ERROR("%s: can't patch or reference init code/data", sym->name); return ULONG_MAX; } - if (sym->bind != STB_LOCAL) - return 0; - /* * vmlinux: the final link reorders symbols relative to vmlinux.o, * so the position needs to be derived from the linked orig vmlinux via @@ -403,6 +403,9 @@ unsigned long klp_find_sympos(struct elf *elf, struct symbol *sym) * module_kallsyms_on_each_symbol(). */ for_each_sym(elf, s) { + if (is_sec_sym(s) || is_file_sym(s) || is_undef_sym(s) || + !(s->sec->sh.sh_flags & SHF_ALLOC)) + continue; if (!strcmp(s->name, sym->name)) { nr_matches++; if (s == sym) -- 2.56.1.703.gf848ed807c-goog