linux-kernel - [PATCH] hw_breakpoint: Fix build for disabled CONFIG_HAVE_HW

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 for Android: free password hash cracker in your pocket

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

Date:   Wed, 14 Mar 2018 09:45:13 +0100
From:   Jiri Olsa <jolsa@...hat.com>
To:     Ingo Molnar <mingo@...nel.org>
Cc:     Jiri Olsa <jolsa@...nel.org>,
        Peter Zijlstra <a.p.zijlstra@...llo.nl>,
        Arnaldo Carvalho de Melo <acme@...nel.org>,
        lkml <linux-kernel@...r.kernel.org>,
        Namhyung Kim <namhyung@...nel.org>,
        David Ahern <dsahern@...il.com>,
        Andi Kleen <ak@...ux.intel.com>,
        Milind Chabbi <chabbi.milind@...il.com>,
        Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
        Michael Ellerman <mpe@...erman.id.au>,
        Hari Bathini <hbathini@...ux.vnet.ibm.com>,
        Jin Yao <yao.jin@...ux.intel.com>,
        Kan Liang <kan.liang@...el.com>,
        Sukadev Bhattiprolu <sukadev@...ux.vnet.ibm.com>,
        Oleg Nesterov <onestero@...hat.com>,
        Will Deacon <will.deacon@....com>
Subject: [PATCH] hw_breakpoint: Fix build for disabled
 CONFIG_HAVE_HW_BREAKPOINT

On Tue, Mar 13, 2018 at 10:50:45AM +0100, Jiri Olsa wrote:
> On Tue, Mar 13, 2018 at 10:28:01AM +0100, Jiri Olsa wrote:
> > On Tue, Mar 13, 2018 at 07:37:47AM +0100, Ingo Molnar wrote:
> > > 
> > > * Jiri Olsa <jolsa@...nel.org> wrote:
> > > 
> > > > Jiri Olsa (7):
> > > >       hw_breakpoint: Pass bp_type directly as find_slot_idx argument
> > > >       hw_breakpoint: Pass bp_type argument to __reserve_bp_slot|__release_bp_slot
> > > >       hw_breakpoint: Add modify_bp_slot function
> > > >       hw_breakpoint: Factor out __modify_user_hw_breakpoint function
> > > >       hw_breakpoint: Add perf_event_attr fields check in __modify_user_hw_breakpoint
> > > >       perf/core: Move perf_event_attr::sample_max_stack into perf_copy_attr
> > > >       perf tests: Add breakpoint accounting/modify test
> > > > 
> > > > Milind Chabbi (1):
> > > >       perf/core: fast breakpoint modification via _IOC_MODIFY_ATTRIBUTES.
> > > > 
> > > >  include/linux/hw_breakpoint.h         |   7 +++++
> > > >  include/uapi/linux/perf_event.h       |  23 ++++++++-------
> > > >  kernel/events/core.c                  |  54 ++++++++++++++++++++++++++++++++--
> > > >  kernel/events/hw_breakpoint.c         | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++---------------------
> > > >  tools/include/uapi/linux/perf_event.h |  23 ++++++++-------
> > > >  tools/perf/tests/Build                |   1 +
> > > >  tools/perf/tests/bp_account.c         | 195 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> > > >  tools/perf/tests/builtin-test.c       |   4 +++
> > > >  tools/perf/tests/tests.h              |   1 +
> > > >  9 files changed, 365 insertions(+), 58 deletions(-)
> > > >  create mode 100644 tools/perf/tests/bp_account.c
> > > 
> > > Note, there's a new PARISC build failure:
> > > 
> > >  home/mingo/tip/kernel/events/core.c:2858:2: error: implicit declaration of function 'modify_user_hw_breakpoint_check' [-Werror=implicit-function-declaration]
> > >    err = modify_user_hw_breakpoint_check(bp, attr, true);
> > > 
> > > will only be able to push it out to -next once this is fixed.
> > 
> > ok, checking on that
> 
> should be this one.. I'm checking on s390 which is also
> without breakpoint support, I'll send full patch after

and here it is

thanks,
jirka


---
We're missing stub for modify_user_hw_breakpoint_check function
when option CONFIG_HAVE_HW_BREAKPOINT is disabled. It was mixed
up in recent changes.

Fixes: f30b09b7f8ae ("perf/core: Implement fast breakpoint modification via _IOC_MODIFY_ATTRIBUTES")
Signed-off-by: Jiri Olsa <jolsa@...nel.org>
---
 include/linux/hw_breakpoint.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/hw_breakpoint.h b/include/linux/hw_breakpoint.h
index abeba094f080..6058c3844a76 100644
--- a/include/linux/hw_breakpoint.h
+++ b/include/linux/hw_breakpoint.h
@@ -101,8 +101,8 @@ static inline int
 modify_user_hw_breakpoint(struct perf_event *bp,
 			  struct perf_event_attr *attr)	{ return -ENOSYS; }
 static inline int
-__modify_user_hw_breakpoint(struct perf_event *bp,
-			    struct perf_event_attr *attr) { return -ENOSYS; }
+modify_user_hw_breakpoint_check(struct perf_event *bp, struct perf_event_attr *attr,
+				bool check)	{ return -ENOSYS; }
 
 static inline struct perf_event *
 register_wide_hw_breakpoint_cpu(struct perf_event_attr *attr,
-- 
2.13.6