Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96955837 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf/hw_breakpoint: Enable breakpoint in modify_user_hw_breakpoint 



Currently we enable the breakpoint back only if the breakpoint
modification was successful. If it fails we can leave the breakpoint in
disabled state with attr->disabled == 0.

We can safely enable the breakpoint back for both the fail and success
paths by checking the bp->attr.disabled, which either holds the new
'requested' disabled state or the original breakpoint state.

Suggested-by: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Milind Chabbi <chabbi.milind@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180827091228.2878-5-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent cb45302d

kernel/events/hw_breakpoint.c

+2 −4
Original line number Diff line number Diff line
@@ -523,13 +523,11 @@ int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *att 
		perf_event_disable(bp);



	err = modify_user_hw_breakpoint_check(bp, attr, false);

	if (err)

		return err;



	if (!attr->disabled)

	if (!bp->attr.disabled)

		perf_event_enable(bp);



	return 0;

	return err;

}

EXPORT_SYMBOL_GPL(modify_user_hw_breakpoint);