From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4+Wl8jF0/18kLY4XAegkdvdU/W2KDxt6jrBUqRHfHfQ8B+WL2nobtHLlSQkyRoXqb94e+kC ARC-Seal: i=1; a=rsa-sha256; t=1523022050; cv=none; d=google.com; s=arc-20160816; b=A/dq8IEM6GhZLuZhwZ7PHcqA5+FhyDCZ5LuZpofV9MsqXw7h55GLIXXYw5OcfWUWPj LjYjv9V0dx9jdl9tkj8cKVL/rlQB6OuGy+mgr/tSPhS8ROjMmj8gYXtu7jlyuoTtpm0m 2VUgruMCw5yrUTrV152iLnvnS4Gk8bOQnidkP+IZp/7gsOrqPEY/dRUuGdnJhAhM7Lgy 73ZLPpb54O1fiQYgwnaTEEY0mKYxF+KHb+l7MrBT3c8+toMI+lQXUucMhg6zMsmcxlrU rh59yZ3CYzldRh+mXudYb7xi0MLHzY81EeH2MzfhYTnqpqDZWlf41uAKNLgMZHcveRVf geTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=K8xbigzMZyYSnrV7hfdyK3/oV1kviNghCXL5pZcWiuM=; b=G5qtI/ll55Lg8VxvGAueglNNeJl8v1dgKsiMP7tN68HXEeuU9jCU0TydoJSu/xSOI4 sYxk5V1zmShU8FR2h+X21eOsxUPS0Aern8U9YZTAMZOO9rvXWrdb8BztZYpWtqlQXinM tkt9Bfin/hPSo+rdzQxiEQxIjHRp3y3npuLJkAOqt8Qk0Q1/L1Kitn75QtRi7yZYAWBp bLO0cQXzASxvsSKwchjDbTBTuqLBXPjWU+DIjprrUGqwB6vOMT3TLyWDPWeZDHltu6lG nAPjfRC3Ni6IHXyCI7HtAxeTnuXEA79GB4/o/XprgsSogcT4tZqoACcV2HOjfa05Wrns kgAw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Torvalds , Thomas Gleixner , Alexander Shishkin , Andy Lutomirski , Arnaldo Carvalho de Melo , Frederic Weisbecker , Jiri Olsa , Peter Zijlstra , Stephane Eranian , Vince Weaver , Ingo Molnar Subject: [PATCH 4.15 11/72] perf/hwbp: Simplify the perf-hwbp code, fix documentation Date: Fri, 6 Apr 2018 15:23:46 +0200 Message-Id: <20180406084350.417645297@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180406084349.367583460@linuxfoundation.org> References: <20180406084349.367583460@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1597003469119697595?= X-GMAIL-MSGID: =?utf-8?q?1597004369704770941?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linus Torvalds commit f67b15037a7a50c57f72e69a6d59941ad90a0f0f upstream. Annoyingly, modify_user_hw_breakpoint() unnecessarily complicates the modification of a breakpoint - simplify it and remove the pointless local variables. Also update the stale Docbook while at it. Signed-off-by: Linus Torvalds Acked-by: Thomas Gleixner Cc: Cc: Alexander Shishkin Cc: Andy Lutomirski Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Vince Weaver Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- kernel/events/hw_breakpoint.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) --- a/kernel/events/hw_breakpoint.c +++ b/kernel/events/hw_breakpoint.c @@ -427,16 +427,9 @@ EXPORT_SYMBOL_GPL(register_user_hw_break * modify_user_hw_breakpoint - modify a user-space hardware breakpoint * @bp: the breakpoint structure to modify * @attr: new breakpoint attributes - * @triggered: callback to trigger when we hit the breakpoint - * @tsk: pointer to 'task_struct' of the process to which the address belongs */ int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr) { - u64 old_addr = bp->attr.bp_addr; - u64 old_len = bp->attr.bp_len; - int old_type = bp->attr.bp_type; - int err = 0; - /* * modify_user_hw_breakpoint can be invoked with IRQs disabled and hence it * will not be possible to raise IPIs that invoke __perf_event_disable. @@ -451,27 +444,18 @@ int modify_user_hw_breakpoint(struct per bp->attr.bp_addr = attr->bp_addr; bp->attr.bp_type = attr->bp_type; bp->attr.bp_len = attr->bp_len; + bp->attr.disabled = 1; - if (attr->disabled) - goto end; - - err = validate_hw_breakpoint(bp); - if (!err) - perf_event_enable(bp); + if (!attr->disabled) { + int err = validate_hw_breakpoint(bp); - if (err) { - bp->attr.bp_addr = old_addr; - bp->attr.bp_type = old_type; - bp->attr.bp_len = old_len; - if (!bp->attr.disabled) - perf_event_enable(bp); + if (err) + return err; - return err; + perf_event_enable(bp); + bp->attr.disabled = 0; } -end: - bp->attr.disabled = attr->disabled; - return 0; } EXPORT_SYMBOL_GPL(modify_user_hw_breakpoint);