From patchwork Mon May 17 14:01:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 440122 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1164355jac; Mon, 17 May 2021 07:57:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzO4nW7til8Dz6IXtE4Cm889/y9UDTEcfIacfqIxJfiU2RU3WAMWgPcwqJO/40Aacdmdd0Z X-Received: by 2002:a05:6e02:10c6:: with SMTP id s6mr97250ilj.15.1621263467282; Mon, 17 May 2021 07:57:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621263467; cv=none; d=google.com; s=arc-20160816; b=L+qKUAgy+whUA8DW/s9hWYwQoDLpIIwSpawmm20c6QkNa0MAIaBxS8ble7Sf6ro8Fe 8SY8FYv22KwHcHqbc3CWpA+Rjvjr0M/TUen6NpVyjgsbzip67ct9Y41MVtuY9bIyAOVp iEZ4o0bGAB9RbTGgd2hjOFmzkYrfWExChQBXgip+luEb8SGvk374GB3Wg/jWFPoMMp8b 9AqDmw15LtFNeBes9ONveEm+kLmyN8GCGPV4V33jLAW9PmEMVdhcNzlIWI5GxmXMZZg5 A8rNHtqu1P9w7vhb2f69J7BEafzBvLSGgDQ8MWHk8awOBTVOld4XOoT98Kbwn1F6Ixne qkCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=J0zrMnRdVhnFuBxKTliqU7HCzX7yW2dcvMgb/vkUm4c=; b=aqN/OC1p6H3NukQySbA5Pvq0NlRIhTmEDMOvZBuqUvP2SPDVjti/BdIiBSmlxDvfL+ ue5xrKH8R8UpcyZ39sOsY0VqcfQSpRtJ73JyFMFZYUznuxDLl2hT8hALI545y/ABU6IV r3cGaxvVeRhJSyca/JVF+m9Lgda4HeJDI+i25l8+ELhtUF7KdFTLYO8/yj/EPmj2ElTC MOITB1SysbTA7RwJHW7TfLmbTrNTub/HQFTYdZiRtYy07kMUVI6l1QSFXONdTqhL0B1C inJIH8l5yKzPzVPcCxo4N7aTJzIUC7Gzm0T3RsvJ2Zf9aELM4RZjHvEcJoBJbfHt5ND5 +ifQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PZZc7TZp; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m17si8744662ilg.130.2021.05.17.07.57.47; Mon, 17 May 2021 07:57:47 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PZZc7TZp; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241906AbhEQO67 (ORCPT + 12 others); Mon, 17 May 2021 10:58:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:49498 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242479AbhEQO45 (ORCPT ); Mon, 17 May 2021 10:56:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B081961463; Mon, 17 May 2021 14:25:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621261532; bh=BJ35vUEDiBDhd/ZrnPZITVgqqOXwO8jiyXXVd9leTyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PZZc7TZpVBDy+W/oj8FCL2+HEOt4EYtV+gqO/frBqPvBvg9GIPm829rkYwKZ2C4Zi 4l8tdIvfwgImJN8wCo0YJqpnHS6XWdKXmMzK2UmNi78H8tgBNiL3GBEBDeHGWza4Qj uM/sad/+cb5O4vgQwSP1lwU/kXXb4F3gf/uC0vFY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhen Lei , Wang Nan , Will Deacon , Russell King , Sasha Levin Subject: [PATCH 5.4 056/141] ARM: 9064/1: hw_breakpoint: Do not directly check the events overflow_handler hook Date: Mon, 17 May 2021 16:01:48 +0200 Message-Id: <20210517140244.652010639@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140242.729269392@linuxfoundation.org> References: <20210517140242.729269392@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit a506bd5756290821a4314f502b4bafc2afcf5260 ] The commit 1879445dfa7b ("perf/core: Set event's default ::overflow_handler()") set a default event->overflow_handler in perf_event_alloc(), and replace the check event->overflow_handler with is_default_overflow_handler(), but one is missing. Currently, the bp->overflow_handler can not be NULL. As a result, enable_single_step() is always not invoked. Comments from Zhen Lei: https://patchwork.kernel.org/project/linux-arm-kernel/patch/20210207105934.2001-1-thunder.leizhen@huawei.com/ Fixes: 1879445dfa7b ("perf/core: Set event's default ::overflow_handler()") Signed-off-by: Zhen Lei Cc: Wang Nan Acked-by: Will Deacon Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/kernel/hw_breakpoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c index 7021ef0b4e71..b06d9ea07c84 100644 --- a/arch/arm/kernel/hw_breakpoint.c +++ b/arch/arm/kernel/hw_breakpoint.c @@ -883,7 +883,7 @@ static void breakpoint_handler(unsigned long unknown, struct pt_regs *regs) info->trigger = addr; pr_debug("breakpoint fired: address = 0x%x\n", addr); perf_bp_event(bp, regs); - if (!bp->overflow_handler) + if (is_default_overflow_handler(bp)) enable_single_step(bp, addr); goto unlock; }