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:   Fri, 12 Jun 2020 15:26:56 +0200
From:   Peter Zijlstra <peterz@infradead.org>
To:     Matt Helsley <mhelsley@vmware.com>
Cc:     linux-kernel@vger.kernel.org, Josh Poimboeuf <jpoimboe@redhat.com>,
        Steven Rostedt <rostedt@goodmis.org>,
        Sami Tolvanen <samitolvanen@google.com>,
        Julien Thierry <jthierry@redhat.com>,
        Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Subject: Re: [RFC][PATCH v4 18/32] objtool: mcount: Move nop_mcount()
Message-ID: <20200612132656.GQ2531@hirez.programming.kicks-ass.net>
References: <cover.1591125127.git.mhelsley@vmware.com>
 <7109ceb239a88c2901eeb7f52c29f69cdb413cd3.1591125127.git.mhelsley@vmware.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <7109ceb239a88c2901eeb7f52c29f69cdb413cd3.1591125127.git.mhelsley@vmware.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, Jun 02, 2020 at 12:50:11PM -0700, Matt Helsley wrote:
> +static int nop_mcount(struct section * const rels,
> +		      const char *const txtname)
> +{
> +	struct reloc *reloc;
> +	struct section *txts = find_section_by_index(lf, rels->sh.sh_info);
> +	unsigned mcountsym = 0;
> +	int once = 0;
> +
> +	list_for_each_entry(reloc, &rels->reloc_list, list) {
> +		int ret = -1;
> +
> +		if (!mcountsym)
> +			mcountsym = get_mcountsym(reloc);
> +
> +		if (mcountsym == GELF_R_INFO(reloc->sym->idx, reloc->type) && !is_fake_mcount(reloc)) {

This makes no sense to me; why not have mcountsym be a 'struct symbol
*' and have get_mcountsym() return one of those.

	if (reloc->sym == mcountsym && ... )

is much nicer, no?

> +			if (make_nop) {
> +				ret = make_nop(txts, reloc->offset);
> +				if (ret < 0)
> +					return -1;
> +			}
> +			if (warn_on_notrace_sect && !once) {
> +				printf("Section %s has mcount callers being ignored\n",
> +				       txtname);
> +				once = 1;
> +				/* just warn? */
> +				if (!make_nop)
> +					return 0;
> +			}
> +		}
> +
> +		/*
> +		 * If we successfully removed the mcount, mark the relocation
> +		 * as a nop (don't do anything with it).
> +		 */
> +		if (!ret) {
> +			reloc->type = rel_type_nop;
> +			rels->changed = true;

I have an elf_write_rela(), I'll make sure to Cc you.

> +		}
> +	}
> +	return 0;
> +}