Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 20 Jul 2022 16:32:43 -0700
From:   Josh Poimboeuf <jpoimboe@kernel.org>
To:     John Garry <john.garry@huawei.com>
Cc:     keescook@chromium.org,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: faddr2line issue
Message-ID: <20220720233243.lyjrhi43bwaxecm3@treble>
References: <09df26a9-27af-1276-34c6-820bf7e27da8@huawei.com>
 <3492d341-a681-f344-f5cd-5b1ea3725f31@huawei.com>
 <20220714164136.n2ycc5axt7vtctgs@treble>
 <64da0019-4816-a409-be93-b1cf7021c584@huawei.com>
 <20220720000654.yospyvbrfliy3lrn@treble>
 <3bd9817d-1959-c081-e5d0-8b0e70b3f41e@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <3bd9817d-1959-c081-e5d0-8b0e70b3f41e@huawei.com>
Precedence: bulk

On Wed, Jul 20, 2022 at 09:39:42AM +0100, John Garry wrote:
> On 20/07/2022 01:06, Josh Poimboeuf wrote:
> > > So adding config DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT to v5.19-rc2 got it
> > > working again for me on arm64. However commit dcea997beed6 ("faddr2line: Fix
> > > overlapping text section failures, the sequel") seems to be broken for me,
> > > below - this first appeared in rc3. Any idea what the issue could be?
> > > 
> > > $./faddr.sh hisi_sas_sata_done+0x8/0x38
> > > hisi_sas_sata_done+0x8/0x38:
> > > fs mm ??:0
> > Hm, what does faddr.sh do?
> 
> ah, it's just a wrapper to call scripts/faddr2line with vmlinux and $1
> (being hisi_sas_sata_done+0x8/0x38, above) args
> 
> > Does addr2line also fail?
> 
> faddr2line fails, as below.
> 
> > 
> > Can you run
> > 
> >    bash -x scripts/faddr2line <vmlinux or .ko file> hisi_sas_sata_done+0x8/0x38
> > 
> > and share the output?
> 
> on rc3 we get:
> 
> https://raw.githubusercontent.com/hisilicon/kernel-dev/private-topic-sas-5.19-faddr2line-linux-rc3/before2

Does this fix it?

diff --git a/scripts/faddr2line b/scripts/faddr2line
index 94ed98dd899f..57099687e5e1 100755
--- a/scripts/faddr2line
+++ b/scripts/faddr2line
@@ -112,7 +112,9 @@ __faddr2line() {
 	# section offsets.
 	local file_type=$(${READELF} --file-header $objfile |
 		${AWK} '$1 == "Type:" { print $2; exit }')
-	[[ $file_type = "EXEC" ]] && is_vmlinux=1
+	if [[ $file_type = "EXEC" ]] || [[ $file_type == "DYN" ]]; then
+		is_vmlinux=1
+	fi
 
 	# Go through each of the object's symbols which match the func name.
 	# In rare cases there might be duplicates, in which case we print all