Re: [PATCH v2 2/8] powerpc/module: Only try to generate the ftrace_caller() stub once

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Michael Ellerman <mpe@ellerman.id.au>
Newsgroups	linux.kernel
Subject	Re: [PATCH v2 2/8] powerpc/module: Only try to generate the ftrace_caller() stub once
Date	Wed, 02 Mar 2016 03:00:04 +0100
Message-ID	<r84f2-EO-43@gated-at.bofh.it> (permalink)
References	<r7sjo-198-3@gated-at.bofh.it> <r7sjp-198-23@gated-at.bofh.it> <r7RhM-wn-19@gated-at.bofh.it>
Content-Type	text/plain; charset="UTF-8"
X-Mailer	Evolution 3.16.5-1ubuntu3.1
MIME-Version	1.0
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	33
Organization	linux.* mail to news gateway
X-Original-Cc	linuxppc-dev@ozlabs.org, bsingharora@gmail.com, linux-kernel@vger.kernel.org, rostedt@goodmis.org, kamalesh@linux.vnet.ibm.com, pmladek@suse.com, jeyu@redhat.com, jkosina@suse.cz, live-patching@vger.kernel.org, mbenes@suse.cz
X-Original-Date	Wed, 02 Mar 2016 12:52:44 +1100
X-Original-Message-ID	<1456883564.24490.5.camel@ellerman.id.au>
X-Original-References	<1456737989-8755-1-git-send-email-mpe@ellerman.id.au> <1456737989-8755-2-git-send-email-mpe@ellerman.id.au> <20160301120011.GB10342@lst.de>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1347580

Show key headers only | View raw

On Tue, 2016-03-01 at 13:00 +0100, Torsten Duwe wrote:
> On Mon, Feb 29, 2016 at 08:26:23PM +1100, Michael Ellerman wrote:
> [...]
> > diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
> > index 2c01665eb410..dd095496d225 100644
> > --- a/arch/powerpc/kernel/module_32.c
> > +++ b/arch/powerpc/kernel/module_32.c
> > @@ -294,11 +294,19 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
> >  			return -ENOEXEC;
> >  		}
> >  	}
> > +
> > +	return 0;
> > +}
> > +
> >  #ifdef CONFIG_DYNAMIC_FTRACE
> > -	module->arch.tramp =
> > -		do_plt_call(module->core_layout.base,
> > -			    (unsigned long)ftrace_caller,
> > -			    sechdrs, module);
> > -#endif
> > +int module_finalize_ftrace(struct module *module, const Elf_Shdr *sechdrs)
> > +{
> > +	module->arch.tramp = do_plt_call(module->core_layout.base,
> > +					 (unsigned long)ftrace_caller,
> > +					 sechdrs, module);
> > +	if (!mod->arch.tramp)
>
> That should probably read (!module->arch.tramp).

Hah, you expect me to compile my patches?! :)

cheers

Thread

[PATCH v2 1/8] powerpc: Create a helper for getting the kernel toc value Michael Ellerman <mpe@ellerman.id.au> - 2016-02-29 10:30 +0100
  [PATCH v2 7/8] powerpc/ftrace: Add support for -mprofile-kernel ftrace ABI Michael Ellerman <mpe@ellerman.id.au> - 2016-02-29 10:30 +0100
  [PATCH v2 8/8] powerpc/ftrace: Add Kconfig & Make glue for mprofile-kernel Michael Ellerman <mpe@ellerman.id.au> - 2016-02-29 10:30 +0100
  [PATCH v2 2/8] powerpc/module: Only try to generate the ftrace_caller() stub once Michael Ellerman <mpe@ellerman.id.au> - 2016-02-29 10:30 +0100
    Re: [PATCH v2 2/8] powerpc/module: Only try to generate the  ftrace_caller() stub once Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> - 2016-03-01 11:10 +0100
    Re: [PATCH v2 2/8] powerpc/module: Only try to generate the  ftrace_caller() stub once Torsten Duwe <duwe@lst.de> - 2016-03-01 13:10 +0100
      Re: [PATCH v2 2/8] powerpc/module: Only try to generate the  ftrace_caller() stub once Michael Ellerman <mpe@ellerman.id.au> - 2016-03-02 03:00 +0100
  [PATCH v2 3/8] powerpc/module: Mark module stubs with a magic value Michael Ellerman <mpe@ellerman.id.au> - 2016-02-29 10:30 +0100
  Re: [PATCH v2 1/8] powerpc: Create a helper for getting the kernel  toc value Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> - 2016-03-01 11:00 +0100
  Re: [PATCH v2 1/8] powerpc: Create a helper for getting the kernel  toc value Torsten Duwe <duwe@lst.de> - 2016-03-01 13:00 +0100

csiph-web