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 1CF9D283FC3 for ; Thu, 5 Mar 2026 23:15:59 +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=1772752560; cv=none; b=tVy0N44rY/0B+uVwZJhxF36UxwoFCLIHRK4zbKW0BKzFoVHmProGVUVSvfRwb9KDKxjA7yogyFIowZ+eOt1GhfVV+601uj3qyUmP4n5Yfj8Ft4OAdGVeErNmEEb++nehaZmhQQmSzIjJy1VupQr2TsMpvpewByJ9cdxdTAqDWZU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772752560; c=relaxed/simple; bh=ynT0kDA++/nCkpGy8G4VQIWFqUxBAoRN5dDcDvOKw50=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t8wArcFm9K3jrpwnN2SnFKKVYyACmT4UauSizZAhc2lJKXC/op5evxksQn0sF4GVyw9YP5QFktTMJwtnKUaXGnQYTOd0wEGLOARvDUcp9yAyh3bYW6Dzb9GV2P/AGoeQlCSToPfjFTqlZzdIWuJxuDlqLJdk89+gCe0hw1hVkMo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LP6w92C0; 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="LP6w92C0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D59BEC116C6; Thu, 5 Mar 2026 23:15:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772752559; bh=ynT0kDA++/nCkpGy8G4VQIWFqUxBAoRN5dDcDvOKw50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LP6w92C0/mvLtRnuYNwKpWmjwNYAs8JkckdnB/xYpdU+R7Pagr3LZTRAz+i2Q9WdQ 2mjv2Sc+wMSguzM0HhSKi/C3oATiS0lMZFXQSaDQ0o6S7i+YmdnPwRBX3ccWam8YYZ k1rfwFcawHjgWqUGL/IWrBtYPlkAFWRUbvLlei6c0y2i/izcbsRixQq/jKPif4dphz RgYcuoMPOhjoT+kF6tA4weXwn7HEhCk9ljD1FFVN6wUPk7/gF5bwMsgZEwlYIk/coa mxwJNOygSI71m1zL+Zhq28rnPpOWTdCkPO298OvYd43/cnCvSWGnGH76J/vTntJ0Jh W/DEL/n6HvDjQ== 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 v4 5/7] objtool/klp: Remove .llvm suffix in demangle_name() Date: Thu, 5 Mar 2026 15:15:29 -0800 Message-ID: <20260305231531.3847295-6-song@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260305231531.3847295-1-song@kernel.org> References: <20260305231531.3847295-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 Remove .llvm suffix, so that we can correlate foo.llvm. and foo.llvm.. Signed-off-by: Song Liu --- tools/objtool/elf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c index 78db51ebbed4..51e6267cdf8d 100644 --- a/tools/objtool/elf.c +++ b/tools/objtool/elf.c @@ -455,6 +455,11 @@ static int read_sections(struct elf *elf) static ssize_t demangled_name_len(const char *name) { ssize_t idx; + const char *p; + + p = strstr(name, ".llvm."); + if (p) + return p - name; if (!strstarts(name, "__UNIQUE_ID_") && !strchr(name, '.')) return strlen(name); @@ -482,6 +487,9 @@ static ssize_t demangled_name_len(const char *name) * __UNIQUE_ID_addressable___UNIQUE_ID_pci_invalid_bar_694_695 * * to remove both trailing numbers, also remove trailing '_'. + * + * For symbols with llvm suffix, i.e., foo.llvm., remove the + * .llvm. part. */ static const char *demangle_name(struct symbol *sym) { -- 2.52.0