From patchwork Thu May 20 09:22:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 443212 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2162499jac; Thu, 20 May 2021 03:38:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOKlr0tBBI1CdWm8dDY500b18/rBWkiogTb+owDNyhsfdP3MAXEZRnj+7phj1FWw6/2IS4 X-Received: by 2002:a17:906:4c82:: with SMTP id q2mr4156438eju.80.1621507131810; Thu, 20 May 2021 03:38:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621507131; cv=none; d=google.com; s=arc-20160816; b=zIZDLcuGKIgTF0+9+6g5u4508UYtpszLTOiq2yu4GagmhuTwQ6sVqonY152j1deIqp rou/dDTPCvBisqVtvxXKfVUg4UHIWR4WYgwirVzCXQYSZhzGakKCItq2zr2Of86gRxgF rorI2ZFyQmFXG+Xm4jZXL+C8UoXQTBxitX/rS6LzfSnrxv7dwI/aw89x682MOSLQdAPo xPCqPOLTSn3CQozCm10PK2JAo48D4B+gwLGcll1jh7A2p7Bt1rn7M6BZlpGWnN/O5gx8 M5HchwBUIMqlMGnj6NNJP1r8ICTLLZgLgOWSBzIQQwoLnIQ/PXGk68kqhdYMcTAoYU1X jzQQ== 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=V/gbVCGQAaoYzONbGaNaG4x7j46N+Ex2sfosPF4/sXQ=; b=oOptF9nHlpGAPrllk5b7k5AG64PwjaZOGcM5PQQMTkCxqvX6iNZJdzTBHbVM3dwpW3 1AZHk1614jzeId8cL9bHTDeQE4ChdQf9yURduft1GurCFaxEKP0HoDgnrXPjzOGbFwk4 g8xP6iUU/d/VYNttT4mLI19L2Ip96LsyZatXcvTY3rQ+f7+zGxkMEE2sRZDg+/bQwHfr 1a/NxSHjOZbeA4FjNxVM+HAV1oD0AnaIBnyBpTpzFXyAaS2bPUFHI5TGg8RA/mbfSi2e 7gVuez/dK1vu3+sFcNosYyz6lq6n/CwdkntsuL1ea3n+U8Adotb3AJIA3MZ5e5DkG4LX EvCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FCsDaC+3; 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 t26si1865555edf.425.2021.05.20.03.38.51; Thu, 20 May 2021 03:38:51 -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=FCsDaC+3; 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 S235717AbhETKjw (ORCPT + 12 others); Thu, 20 May 2021 06:39:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:39830 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237035AbhETKhi (ORCPT ); Thu, 20 May 2021 06:37:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AD1BB61028; Thu, 20 May 2021 09:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621504473; bh=pGu03cSKt+WyMW0tlmj5EazWyMjrwqviDqV+5VjWCuI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FCsDaC+3OrlG5NZUgfQwE8p3ysx2ZAcwfpAN4coSZw16W1v4RB9TZ5TYrHXb9yIsR qhuvIlS4sPOrPp0RxkWpzzSF2CCKFhp+K8WLWHxBDVFLe4RsoX0ofMWEr8+PEbET/R R34fx6wk7SR5D9yjZ/TBlubcEk45ObYRD0pg0qps= 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 4.14 261/323] ARM: 9064/1: hw_breakpoint: Do not directly check the events overflow_handler hook Date: Thu, 20 May 2021 11:22:33 +0200 Message-Id: <20210520092129.159877833@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092120.115153432@linuxfoundation.org> References: <20210520092120.115153432@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 e61697fb7efe..a8783964ebde 100644 --- a/arch/arm/kernel/hw_breakpoint.c +++ b/arch/arm/kernel/hw_breakpoint.c @@ -891,7 +891,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; }