Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 15 Feb 2021 16:22:09 -0500
From:   Steven Rostedt <rostedt@goodmis.org>
To:     Josh Poimboeuf <jpoimboe@redhat.com>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Xi Ruoyao <xry111@mengyan1223.wang>,
        "# 3.4.x" <stable@vger.kernel.org>,
        Arnd Bergmann <arnd@kernel.org>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>,
        Miroslav Benes <mbenes@suse.cz>,
        "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" <x86@kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        linux-tip-commits@vger.kernel.org
Subject: Re: [tip: objtool/urgent] objtool: Fix seg fault with Clang
 non-section symbols
Message-ID: <20210215162209.5e2a475b@gandalf.local.home>
In-Reply-To: <20210215155806.bjcouvmkapj4pa4y@treble>
References: <CAKwvOd=GHdkvAU3u6ROSgtGqC_wrkXo8siL1nZHE-qsqSx0gsw@mail.gmail.com>
        <YCafKVSTX9MxDBMd@kroah.com>
        <20210212170750.y7xtitigfqzpchqd@treble>
        <20210212124547.1dcf067e@gandalf.local.home>
        <YCfdfkoeh8i0baCj@kroah.com>
        <20210213091304.2dd51e5f@oasis.local.home>
        <20210213155203.lehuegwc3h42nebs@treble>
        <YCf9bnsmXqRGMn+j@kroah.com>
        <20210214155147.3owdimqv2lyhu6by@treble>
        <20210215095307.6f5fb12f@gandalf.local.home>
        <20210215155806.bjcouvmkapj4pa4y@treble>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Mon, 15 Feb 2021 09:58:06 -0600
Josh Poimboeuf <jpoimboe@redhat.com> wrote:

> On Mon, Feb 15, 2021 at 09:53:07AM -0500, Steven Rostedt wrote:
> > On Sun, 14 Feb 2021 09:51:47 -0600
> > Josh Poimboeuf <jpoimboe@redhat.com> wrote:
> >   
> > > Steve, looks like recordmcount avoids referencing weak symbols directly
> > > by their function symbol.  Maybe it can just skip weak symbols which
> > > don't have a section symbol, since this seems like a rare scenario.  
> > 
> > When does the .text.unlikely section disappear? During the creation of the
> > object, or later in the linker stage?  
> 
> The section is there, but the symbol associated with the section
> (".text.unlikely" symbol) isn't generated by the assembler.
> 

Greg,

Does this fix the issue with you? It appears to fix it for my arch linux
VM that I created that uses binutils 2.36-3.

-- Steve

diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h
index f9b19524da11..558b67f8364e 100644
--- a/scripts/recordmcount.h
+++ b/scripts/recordmcount.h
@@ -562,7 +562,7 @@ static char const * __has_rel_mcount(Elf_Shdr const *const relhdr, /* reltype */
 	if (w(txthdr->sh_type) != SHT_PROGBITS ||
 	    !(_w(txthdr->sh_flags) & SHF_EXECINSTR))
 		return NULL;
-	return txtname;
+	return shdr0->sh_size ? txtname : NULL;
 }
 
 static char const *has_rel_mcount(Elf_Shdr const *const relhdr,