[PATCH] kernel.spec: enable building of perf with libnuma support

[Petr Holasek]

Patch makes perf package dependent on numactl-devel and so enables numa
subsystem benchmarks for perf bench command. numactl-devel is added to the
buildroot just for x86 archs, because we don't ship libnuma for any others
architectures.

Can be easily reproduced by calling 'perf bench numa mem -a':

- current output:

'Unknown subsystem:numa'

- built with this patch:

'Running numa/mem benchmark...'

Signed-off-by: Petr Holasek <pholasek(a)redhat.com&gt;
---
 kernel.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kernel.spec b/kernel.spec
index 838712d..6a2a04c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -386,6 +386,9 @@ BuildRequires: sparse
 %if %{with_perf}
 BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel
perl(ExtUtils::Embed) bison flex
 BuildRequires: audit-libs-devel
+%ifarch %{ix86} x86_64
+BuildRequires: numactl-devel
+%endif
 %endif
 %if %{with_tools}
 BuildRequires: pciutils-devel gettext ncurses-devel
@@ -1754,7 +1757,7 @@ BuildKernel %make_target %kernel_image
 %endif
 
 %global perf_make \
-  make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1
HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix}
+  make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1
HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix}
 %if %{with_perf}
 # perf
 %{perf_make} DESTDIR=$RPM_BUILD_ROOT all
-- 
1.9.3

[Josh Boyer]

On Thu, Oct 23, 2014 at 06:51:50PM +0200, Petr Holasek wrote:
>  Patch makes perf package dependent on numactl-devel and so enables
> numa
>  subsystem benchmarks for perf bench command. numactl-devel is added to the
>  buildroot just for x86 archs, because we don't ship libnuma for any others
>  architectures.
>  
>  Can be easily reproduced by calling 'perf bench numa mem -a':
>  
>  - current output:
>  
>  'Unknown subsystem:numa'
>  
>  - built with this patch:
>  
>  'Running numa/mem benchmark...'
>  
>  Signed-off-by: Petr Holasek <pholasek(a)redhat.com&gt; 
Thanks.  I'll look at getting this into today's rawhide build.

josh

>  ---
>   kernel.spec | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>  
>  diff --git a/kernel.spec b/kernel.spec
>  index 838712d..6a2a04c 100644
>  --- a/kernel.spec
>  +++ b/kernel.spec
>  @@ -386,6 +386,9 @@ BuildRequires: sparse
>   %if %{with_perf}
>   BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel
> perl(ExtUtils::Embed) bison flex
>   BuildRequires: audit-libs-devel
>  +%ifarch %{ix86} x86_64
>  +BuildRequires: numactl-devel
>  +%endif
>   %endif
>   %if %{with_tools}
>   BuildRequires: pciutils-devel gettext ncurses-devel
>  @@ -1754,7 +1757,7 @@ BuildKernel %make_target %kernel_image
>   %endif
>   
>   %global perf_make \
>  -  make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1
> HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix}
>  +  make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1
> HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix}
>   %if %{with_perf}
>   # perf
>   %{perf_make} DESTDIR=$RPM_BUILD_ROOT all
>  -- 
>  1.9.3
>  
>  _______________________________________________
>  kernel mailing list
>  kernel(a)lists.fedoraproject.org
>  https://admin.fedoraproject.org/mailman/listinfo/kernel

[Arnaldo Carvalho de Melo]

Em Fri, Oct 24, 2014 at 09:51:35AM -0400, Josh Boyer escreveu:
>  On Thu, Oct 23, 2014 at 06:51:50PM +0200, Petr Holasek wrote:
>  > Patch makes perf package dependent on numactl-devel and so enables numa
>  > subsystem benchmarks for perf bench command. numactl-devel is added to the
>  > buildroot just for x86 archs, because we don't ship libnuma for any others
>  > architectures.
>  > 
>  > Can be easily reproduced by calling 'perf bench numa mem -a':
>  > 
>  > - current output:
>  > 
>  > 'Unknown subsystem:numa'
>  > 
>  > - built with this patch:
>  > 
>  > 'Running numa/mem benchmark...'
>  > 
>  > Signed-off-by: Petr Holasek <pholasek(a)redhat.com&gt;
>  
>  Thanks.  I'll look at getting this into today's rawhide build. 
FYI, checked with Jiri Olsa and he tells me that in RHEL7 it is:

%if %{with_perf}
BuildRequires: elfutils-devel zlib-devel binutils-devel bison
BuildRequires: audit-libs-devel
%ifnarch s390 s390x
BuildRequires: numactl-devel
%endif
%endif
 
>  josh
>  
>  > ---
>  >  kernel.spec | 5 ++++-
>  >  1 file changed, 4 insertions(+), 1 deletion(-)
>  > 
>  > diff --git a/kernel.spec b/kernel.spec
>  > index 838712d..6a2a04c 100644
>  > --- a/kernel.spec
>  > +++ b/kernel.spec
>  > @@ -386,6 +386,9 @@ BuildRequires: sparse
>  >  %if %{with_perf}
>  >  BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel
> perl(ExtUtils::Embed) bison flex
>  >  BuildRequires: audit-libs-devel
>  > +%ifarch %{ix86} x86_64
>  > +BuildRequires: numactl-devel
>  > +%endif
>  >  %endif
>  >  %if %{with_tools}
>  >  BuildRequires: pciutils-devel gettext ncurses-devel
>  > @@ -1754,7 +1757,7 @@ BuildKernel %make_target %kernel_image
>  >  %endif
>  >  
>  >  %global perf_make \
>  > -  make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1
> HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix}
>  > +  make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1
> HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix}
>  >  %if %{with_perf}
>  >  # perf
>  >  %{perf_make} DESTDIR=$RPM_BUILD_ROOT all
>  > -- 
>  > 1.9.3
>  > 
>  > _______________________________________________
>  > kernel mailing list
>  > kernel(a)lists.fedoraproject.org
>  > https://admin.fedoraproject.org/mailman/listinfo/kernel
>  _______________________________________________
>  kernel mailing list
>  kernel(a)lists.fedoraproject.org
>  https://admin.fedoraproject.org/mailman/listinfo/kernel

[Josh Boyer]

On Fri, Oct 24, 2014 at 12:01:21PM -0200, Arnaldo Carvalho de Melo wrote:
>  Em Fri, Oct 24, 2014 at 09:51:35AM -0400, Josh Boyer escreveu:
>  > On Thu, Oct 23, 2014 at 06:51:50PM +0200, Petr Holasek wrote:
>  > > Patch makes perf package dependent on numactl-devel and so enables numa
>  > > subsystem benchmarks for perf bench command. numactl-devel is added to the
>  > > buildroot just for x86 archs, because we don't ship libnuma for any others
>  > > architectures.
>  > > 
>  > > Can be easily reproduced by calling 'perf bench numa mem -a':
>  > > 
>  > > - current output:
>  > > 
>  > > 'Unknown subsystem:numa'
>  > > 
>  > > - built with this patch:
>  > > 
>  > > 'Running numa/mem benchmark...'
>  > > 
>  > > Signed-off-by: Petr Holasek <pholasek(a)redhat.com&gt;
>  > 
>  > Thanks.  I'll look at getting this into today's rawhide build.
>  
>  FYI, checked with Jiri Olsa and he tells me that in RHEL7 it is:
>  
>  %if %{with_perf}
>  BuildRequires: elfutils-devel zlib-devel binutils-devel bison
>  BuildRequires: audit-libs-devel
>  %ifnarch s390 s390x
>  BuildRequires: numactl-devel
>  %endif
>  %endif 
Thanks.  I'll leave it as-is until the secondary arch teams request numa
support.

josh

[Dan Horák]

On Fri, 24 Oct 2014 10:10:11 -0400
Josh Boyer <jwboyer(a)fedoraproject.org&gt; wrote:

>  On Fri, Oct 24, 2014 at 12:01:21PM -0200, Arnaldo Carvalho de Melo
>  wrote:
>  > Em Fri, Oct 24, 2014 at 09:51:35AM -0400, Josh Boyer escreveu:
>  > > On Thu, Oct 23, 2014 at 06:51:50PM +0200, Petr Holasek wrote:
>  > > > Patch makes perf package dependent on numactl-devel and so
>  > > > enables numa subsystem benchmarks for perf bench command.
>  > > > numactl-devel is added to the buildroot just for x86 archs,
>  > > > because we don't ship libnuma for any others architectures.
>  > > > 
>  > > > Can be easily reproduced by calling 'perf bench numa mem -a':
>  > > > 
>  > > > - current output:
>  > > > 
>  > > > 'Unknown subsystem:numa'
>  > > > 
>  > > > - built with this patch:
>  > > > 
>  > > > 'Running numa/mem benchmark...'
>  > > > 
>  > > > Signed-off-by: Petr Holasek <pholasek(a)redhat.com&gt;
>  > > 
>  > > Thanks.  I'll look at getting this into today's rawhide build.
>  > 
>  > FYI, checked with Jiri Olsa and he tells me that in RHEL7 it is:
>  > 
>  > %if %{with_perf}
>  > BuildRequires: elfutils-devel zlib-devel binutils-devel bison
>  > BuildRequires: audit-libs-devel
>  > %ifnarch s390 s390x
>  > BuildRequires: numactl-devel
>  > %endif
>  > %endif
>  
>  Thanks.  I'll leave it as-is until the secondary arch teams request
>  numa support. 
my opinion is to go with the RHEL %ifnarch s390 s390x - we (at least
ppc + s390) want to be close to the enterprise kernel


		Dan

[Josh Boyer]

On Fri, Oct 24, 2014 at 10:19 AM, Dan Horák <dan(a)danny.cz&gt; wrote:
>  On Fri, 24 Oct 2014 10:10:11 -0400
>  Josh Boyer <jwboyer(a)fedoraproject.org&gt; wrote:
>
> > On Fri, Oct 24, 2014 at 12:01:21PM -0200, Arnaldo Carvalho de Melo
> > wrote:
> > > Em Fri, Oct 24, 2014 at 09:51:35AM -0400, Josh Boyer escreveu:
> > > > On Thu, Oct 23, 2014 at 06:51:50PM +0200, Petr Holasek wrote:
> > > > > Patch makes perf package dependent on numactl-devel and so
> > > > > enables numa subsystem benchmarks for perf bench command.
> > > > > numactl-devel is added to the buildroot just for x86 archs,
> > > > > because we don't ship libnuma for any others architectures.
> > > > >
> > > > > Can be easily reproduced by calling 'perf bench numa mem -a':
> > > > >
> > > > > - current output:
> > > > >
> > > > > 'Unknown subsystem:numa'
> > > > >
> > > > > - built with this patch:
> > > > >
> > > > > 'Running numa/mem benchmark...'
> > > > >
> > > > > Signed-off-by: Petr Holasek <pholasek(a)redhat.com&gt;
> > > >
> > > > Thanks.  I'll look at getting this into today's rawhide build.
> > >
> > > FYI, checked with Jiri Olsa and he tells me that in RHEL7 it is:
> > >
> > > %if %{with_perf}
> > > BuildRequires: elfutils-devel zlib-devel binutils-devel bison
> > > BuildRequires: audit-libs-devel
> > > %ifnarch s390 s390x
> > > BuildRequires: numactl-devel
> > > %endif
> > > %endif
> >
> > Thanks.  I'll leave it as-is until the secondary arch teams request
> > numa support.
>
>  my opinion is to go with the RHEL %ifnarch s390 s390x - we (at least
>  ppc + s390) want to be close to the enterprise kernel 
But then I have to do work instead of just running 'git am' :).  OK,
OK.  I'll tweak it to match RHEL.

josh

[Arnaldo Carvalho de Melo]

Em Fri, Oct 24, 2014 at 10:22:53AM -0400, Josh Boyer escreveu:
>  On Fri, Oct 24, 2014 at 10:19 AM, Dan Horák <dan(a)danny.cz&gt;
> wrote:
>  > On Fri, 24 Oct 2014 10:10:11 -0400
>  > Josh Boyer <jwboyer(a)fedoraproject.org&gt; wrote: 
>  >> On Fri, Oct 24, 2014 at 12:01:21PM -0200, Arnaldo Carvalho
> de Melo
>  >> wrote:
>  >> > Em Fri, Oct 24, 2014 at 09:51:35AM -0400, Josh Boyer escreveu:
>  >> > > Thanks.  I'll look at getting this into today's rawhide build.
>  >> > FYI, checked with Jiri Olsa and he tells me that in
> RHEL7 it is: 
>  >> > %if %{with_perf}
>  >> > BuildRequires: elfutils-devel zlib-devel binutils-devel bison
>  >> > BuildRequires: audit-libs-devel
>  >> > %ifnarch s390 s390x
>  >> > BuildRequires: numactl-devel
>  >> > %endif
>  >> > %endif 
>  >> Thanks.  I'll leave it as-is until the secondary arch
> teams request
>  >> numa support. 
>  > my opinion is to go with the RHEL %ifnarch s390 s390x - we (at
> least
>  > ppc + s390) want to be close to the enterprise kernel 
>  But then I have to do work instead of just running 'git am'
> :).  OK,
>  OK.  I'll tweak it to match RHEL. 
Thanks, my comment was on that line, its possible that this whole
process happened in RHEL, i.e. justification to be like that, and in
this case, Fedora should try to match that, if we find problems with
that, then we tell RHEL, etc, i.e. symbiosis. :-)

- Arnaldo

[Josh Boyer]

On Fri, Oct 24, 2014 at 10:48 AM, Arnaldo Carvalho de Melo
<acme(a)redhat.com&gt; wrote:
>  Em Fri, Oct 24, 2014 at 10:22:53AM -0400, Josh Boyer escreveu:
> > On Fri, Oct 24, 2014 at 10:19 AM, Dan Horák <dan(a)danny.cz&gt; wrote:
> > > On Fri, 24 Oct 2014 10:10:11 -0400
> > > Josh Boyer <jwboyer(a)fedoraproject.org&gt; wrote:
>
> > >> On Fri, Oct 24, 2014 at 12:01:21PM -0200, Arnaldo Carvalho de Melo
> > >> wrote:
> > >> > Em Fri, Oct 24, 2014 at 09:51:35AM -0400, Josh Boyer escreveu:
> > >> > > Thanks.  I'll look at getting this into today's rawhide
> build.
>
> > >> > FYI, checked with Jiri Olsa and he tells me that in RHEL7 it is:
>
> > >> > %if %{with_perf}
> > >> > BuildRequires: elfutils-devel zlib-devel binutils-devel bison
> > >> > BuildRequires: audit-libs-devel
> > >> > %ifnarch s390 s390x
> > >> > BuildRequires: numactl-devel
> > >> > %endif
> > >> > %endif
>
> > >> Thanks.  I'll leave it as-is until the secondary arch teams request
> > >> numa support.
>
> > > my opinion is to go with the RHEL %ifnarch s390 s390x - we (at least
> > > ppc + s390) want to be close to the enterprise kernel
>
> > But then I have to do work instead of just running 'git am' :).  OK,
> > OK.  I'll tweak it to match RHEL.
>
>  Thanks, my comment was on that line, its possible that this whole
>  process happened in RHEL, i.e. justification to be like that, and in
>  this case, Fedora should try to match that, if we find problems with
>  that, then we tell RHEL, etc, i.e. symbiosis. :-) 
Sure, makes sense.  Though if the whole thing evolved in RHEL and then
we have to change Fedora to match, it was done backwards.  Something
to keep in mind going forward :).

josh

[Don Zickus]

On Fri, Oct 24, 2014 at 10:53:30AM -0400, Josh Boyer wrote:
>  On Fri, Oct 24, 2014 at 10:48 AM, Arnaldo Carvalho de Melo
>  <acme(a)redhat.com&gt; wrote:
>  > Em Fri, Oct 24, 2014 at 10:22:53AM -0400, Josh Boyer escreveu:
>  >> On Fri, Oct 24, 2014 at 10:19 AM, Dan Horák <dan(a)danny.cz&gt; wrote:
>  >> > On Fri, 24 Oct 2014 10:10:11 -0400
>  >> > Josh Boyer <jwboyer(a)fedoraproject.org&gt; wrote:
>  >
>  >> >> On Fri, Oct 24, 2014 at 12:01:21PM -0200, Arnaldo Carvalho de Melo
>  >> >> wrote:
>  >> >> > Em Fri, Oct 24, 2014 at 09:51:35AM -0400, Josh Boyer escreveu:
>  >> >> > > Thanks.  I'll look at getting this into today's
> rawhide build.
>  >
>  >> >> > FYI, checked with Jiri Olsa and he tells me that in RHEL7 it is:
>  >
>  >> >> > %if %{with_perf}
>  >> >> > BuildRequires: elfutils-devel zlib-devel binutils-devel bison
>  >> >> > BuildRequires: audit-libs-devel
>  >> >> > %ifnarch s390 s390x
>  >> >> > BuildRequires: numactl-devel
>  >> >> > %endif
>  >> >> > %endif
>  >
>  >> >> Thanks.  I'll leave it as-is until the secondary arch teams
> request
>  >> >> numa support.
>  >
>  >> > my opinion is to go with the RHEL %ifnarch s390 s390x - we (at least
>  >> > ppc + s390) want to be close to the enterprise kernel
>  >
>  >> But then I have to do work instead of just running 'git am' :).  OK,
>  >> OK.  I'll tweak it to match RHEL.
>  >
>  > Thanks, my comment was on that line, its possible that this whole
>  > process happened in RHEL, i.e. justification to be like that, and in
>  > this case, Fedora should try to match that, if we find problems with
>  > that, then we tell RHEL, etc, i.e. symbiosis. :-)
>  
>  Sure, makes sense.  Though if the whole thing evolved in RHEL and then
>  we have to change Fedora to match, it was done backwards.  Something
>  to keep in mind going forward :). 
+1 Agreed.  I will try to remind RHEL folks to push spec file changes like
this to Fedora to help avoid fallout like the arm build. :-(

Cheers,
Don

[Josh Boyer]

On Fri, Oct 24, 2014 at 10:22 AM, Josh Boyer <jwboyer(a)fedoraproject.org&gt; wrote:
>  On Fri, Oct 24, 2014 at 10:19 AM, Dan Horák <dan(a)danny.cz&gt;
> wrote:
> > On Fri, 24 Oct 2014 10:10:11 -0400
> > Josh Boyer <jwboyer(a)fedoraproject.org&gt; wrote:
> >
> >> On Fri, Oct 24, 2014 at 12:01:21PM -0200, Arnaldo Carvalho de Melo
> >> wrote:
> >> > Em Fri, Oct 24, 2014 at 09:51:35AM -0400, Josh Boyer escreveu:
> >> > > On Thu, Oct 23, 2014 at 06:51:50PM +0200, Petr Holasek wrote:
> >> > > > Patch makes perf package dependent on numactl-devel and so
> >> > > > enables numa subsystem benchmarks for perf bench command.
> >> > > > numactl-devel is added to the buildroot just for x86 archs,
> >> > > > because we don't ship libnuma for any others architectures.
> >> > > >
> >> > > > Can be easily reproduced by calling 'perf bench numa mem
> -a':
> >> > > >
> >> > > > - current output:
> >> > > >
> >> > > > 'Unknown subsystem:numa'
> >> > > >
> >> > > > - built with this patch:
> >> > > >
> >> > > > 'Running numa/mem benchmark...'
> >> > > >
> >> > > > Signed-off-by: Petr Holasek <pholasek(a)redhat.com&gt;
> >> > >
> >> > > Thanks.  I'll look at getting this into today's rawhide build.
> >> >
> >> > FYI, checked with Jiri Olsa and he tells me that in RHEL7 it is:
> >> >
> >> > %if %{with_perf}
> >> > BuildRequires: elfutils-devel zlib-devel binutils-devel bison
> >> > BuildRequires: audit-libs-devel
> >> > %ifnarch s390 s390x
> >> > BuildRequires: numactl-devel
> >> > %endif
> >> > %endif
> >>
> >> Thanks.  I'll leave it as-is until the secondary arch teams request
> >> numa support.
> >
> > my opinion is to go with the RHEL %ifnarch s390 s390x - we (at least
> > ppc + s390) want to be close to the enterprise kernel
>
>  But then I have to do work instead of just running 'git am' :).  OK,
>  OK.  I'll tweak it to match RHEL. 
And of course, this failed to build.  Petr had it correct originally
for primary koji, as numactl is only available for i686 and x86_64.
It's missing on armv7hl.  Sigh.

http://koji.fedoraproject.org/koji/buildinfo?buildID=587593

josh