linux-kernel - Re: [PATCH -tip] perf probe: Don't compile CFI related code if elfutils is old

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20100510172854.GD30926@ghostprotocols.net>
Date:	Mon, 10 May 2010 14:28:54 -0300
From:	Arnaldo Carvalho de Melo <acme@...radead.org>
To:	Masami Hiramatsu <mhiramat@...hat.com>
Cc:	Ingo Molnar <mingo@...e.hu>, lkml <linux-kernel@...r.kernel.org>,
	Robert Richter <robert.richter@....com>,
	systemtap <systemtap@...rces.redhat.com>,
	Roland McGrath <roland@...hat.com>,
	DLE <dle-develop@...ts.sourceforge.net>
Subject: Re: [PATCH -tip] perf probe: Don't compile CFI related code if
	elfutils is old

Em Mon, May 10, 2010 at 01:12:07PM -0400, Masami Hiramatsu escreveu:
> Check elfutils version, and if it is old don't compile
> CFI analysis code. This allows to compile perf with
> old elfutils.

_ELFUTILS_PREREQ was introduced in:

commit fbc7245df72ce0142f0a21fa0f4f88c97278bf60
Author: Roland McGrath <roland@...hat.com>
Date:   Tue Dec 16 17:03:03 2008 -0800

Which was released in elfutils 0.138, guess this is coverage enough?
Richard, which version is in your machine?

- Arnaldo
 
> Signed-off-by: Masami Hiramatsu <mhiramat@...hat.com>
> Reported-by: Robert Richter <robert.richter@....com>
> Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
> Cc: Ingo Molnar <mingo@...e.hu>
> ---
> 
>  tools/perf/util/probe-finder.c |    4 ++++
>  tools/perf/util/probe-finder.h |    3 +++
>  2 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
> index 562b144..93583eb 100644
> --- a/tools/perf/util/probe-finder.c
> +++ b/tools/perf/util/probe-finder.c
> @@ -668,6 +668,7 @@ static int convert_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf)
>  	ret = dwarf_getlocation_addr(&fb_attr, pf->addr, &pf->fb_ops, &nops, 1);
>  	if (ret <= 0 || nops == 0) {
>  		pf->fb_ops = NULL;
> +#if _ELFUTILS_PREREQ(0, 142)
>  	} else if (nops == 1 && pf->fb_ops[0].atom == DW_OP_call_frame_cfa &&
>  		   pf->cfi != NULL) {
>  		Dwarf_Frame *frame;
> @@ -677,6 +678,7 @@ static int convert_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf)
>  				   (uintmax_t)pf->addr);
>  			return -ENOENT;
>  		}
> +#endif
>  	}
>  
>  	/* Find each argument */
> @@ -956,8 +958,10 @@ int find_kprobe_trace_events(int fd, struct perf_probe_event *pev,
>  		return -EBADF;
>  	}
>  
> +#if _ELFUTILS_PREREQ(0, 142)
>  	/* Get the call frame information from this dwarf */
>  	pf.cfi = dwarf_getcfi(dbg);
> +#endif
>  
>  	off = 0;
>  	line_list__init(&pf.lcache);
> diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h
> index 66f1980..e1f61dc 100644
> --- a/tools/perf/util/probe-finder.h
> +++ b/tools/perf/util/probe-finder.h
> @@ -29,6 +29,7 @@ extern int find_line_range(int fd, struct line_range *lr);
>  
>  #include <dwarf.h>
>  #include <libdw.h>
> +#include <version.h>
>  
>  struct probe_finder {
>  	struct perf_probe_event	*pev;		/* Target probe event */
> @@ -44,7 +45,9 @@ struct probe_finder {
>  	struct list_head	lcache;		/* Line cache for lazy match */
>  
>  	/* For variable searching */
> +#if _ELFUTILS_PREREQ(0, 142)
>  	Dwarf_CFI		*cfi;		/* Call Frame Information */
> +#endif
>  	Dwarf_Op		*fb_ops;	/* Frame base attribute */
>  	struct perf_probe_arg	*pvar;		/* Current target variable */
>  	struct kprobe_trace_arg	*tvar;		/* Current result variable */
> 
> 
> -- 
> Masami Hiramatsu
> e-mail: mhiramat@...hat.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/