Received: by 10.213.65.68 with SMTP id h4csp697057imn; Fri, 6 Apr 2018 07:27:09 -0700 (PDT) X-Google-Smtp-Source: AIpwx49v/1ilRxRS27TM4jxnp/rHlvioYk3ug1v5DD5vRiVBO/OXljkMGGwVNEvk5lLrIyYutg0C X-Received: by 10.99.110.198 with SMTP id j189mr17721471pgc.71.1523024828989; Fri, 06 Apr 2018 07:27:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523024828; cv=none; d=google.com; s=arc-20160816; b=VMBVEe+OVsOlYN1GLvabU2fJBf8Xakpppu7tE4MAd8nsNwzXh8UUXC8QE5ib1ey3eQ VOWQos6/CMTDrXLfb1l6j6sbkwhdKsM/2zPiqvNqmNtjnhrRa1brPSLyD2OaCwhcQ9+F MYtW5UWc5/MW5bzvtXyQB39sjGxQijSInYDLjzDSkl83rRhqcBeTi+3IGZbFsTktCNo0 Z+KV2+LCsYPPRTAho0Wkgz/ukZxJQS+vI6w3atKuMHfPHow9IzI8iRuO7WIa8OChp6K5 JqrLpGdCwHV4e3Wrl0PxI4IXZBRiTxGL3PXA0wYM1MdPcJ7ytb3IzdwwxAmNeGMi3TaN HH7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=jDYqz8dADbrl6dqSJiCR16q6PLaNwCjKj8IIl+MzUq4=; b=ACv/dur0MX2YojzKrfjbSYxBwaM0ehqS4S0R7xL0Aoe0i9TG+9COK6X0N0k3EBfuUx gGLCLJ+pH7eLX3j0bdrkjwq8Gy3Vcnlngvn/Ev0vuxHfBTDHsl6Yk+iVTBOkuyUD6fKY 5oKF1gfHDYrUwnRv8DRZLbrnwiQp5w4q0sRyAgAvpIVikgUSe6rhafWe8dgY9woKtSpW XAt4N1iYlnLpIYrnXBifHVSZTJjp9c1Fgr3O3ior4ZKsR92vOAmC/PX/es+Xbpl1Z87F YRSVqAeeY0K3PvDRkkl2Oy/Dmun0CWr5IHNfFw2qlVYrXhhA+/Y21SeiUF3kMsgTVFLD LE/g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m18si7032104pgv.360.2018.04.06.07.26.54; Fri, 06 Apr 2018 07:27:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756824AbeDFOZk (ORCPT + 99 others); Fri, 6 Apr 2018 10:25:40 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:33086 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932299AbeDFNhn (ORCPT ); Fri, 6 Apr 2018 09:37:43 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 7BC25D08; Fri, 6 Apr 2018 13:37:31 +0000 (UTC) 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.14 11/67] perf/hwbp: Simplify the perf-hwbp code, fix documentation Date: Fri, 6 Apr 2018 15:23:41 +0200 Message-Id: <20180406084342.786291731@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180406084341.225558262@linuxfoundation.org> References: <20180406084341.225558262@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-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);