Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Tomislav Novak <tnovak@meta.com>
To:     Catalin Marinas <catalin.marinas@arm.com>
CC:     Alexei Starovoitov <ast@kernel.org>, Will Deacon <will@kernel.org>,
        "bpf@vger.kernel.org" <bpf@vger.kernel.org>,
        "linux-perf-users@vger.kernel.org" <linux-perf-users@vger.kernel.org>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Samuel Gosselin <sgosselin@fb.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Russell King <linux@armlinux.org.uk>
Subject: Re: [PATCH] hw_breakpoint: fix single-stepping when using
 bpf_overflow_handler
Thread-Topic: [PATCH] hw_breakpoint: fix single-stepping when using
 bpf_overflow_handler
Thread-Index: AQHYz4xNSRmGp4l1PUKwAHNo0kfo465AaXSAgBQ5MQA=
Date:   Mon, 28 Nov 2022 11:59:37 +0000
Message-ID: <Y4SiohG4P7nX0GWb@tnovak-mbp.dhcp.thefacebook.com>
References: <20220923203644.2731604-1-tnovak@fb.com>
 <Y3OrsU9M+X2UUcRG@arm.com>
In-Reply-To: <Y3OrsU9M+X2UUcRG@arm.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?IE0YoDUALH0zxMPMNcrtecGarXPy6Q2s4uSHAuYswMF//f9EkqQlGPyqa5DK?=
 =?us-ascii?Q?Cxx38qDoFJK8QtmZsNy8Ea5EgzHAmVFUG/6igEXeyrlnnCJmoBfS3wRsLkWC?=
 =?us-ascii?Q?C1qmwLzWkFK+lCcYKLJzFU5D1mAk0gUolX4xDzrQSZISNuqmrnrlJkm4ugvS?=
 =?us-ascii?Q?0Lbkjb6ssrKQpAiwuDW069qlW8Z4+y1sgwxzrY4Brln0nRkANKSQRqU2Sj4x?=
 =?us-ascii?Q?tzrc8iFmWXsfy/Fzal6A3ZJRuWKyyr0NkyeUY3IFf/zK0K6PPHKDMqEHt0hi?=
 =?us-ascii?Q?wi3+MR0Ss9iWxbT3MQPHsBrKaLMhWytR9fg3m+HwzIySGsawmWenZVURPbsu?=
 =?us-ascii?Q?2D+dmIm4hZM83N7JhUYsAyRQLgXE3XpTG0VBFfLcQ4hmuqG1Qu5OMbtpTIpN?=
 =?us-ascii?Q?QwgiEBmNMYf2jtxXnOsdqkNXLiYYCyPWIPLmlrL5CWZCQqizvnznyjyGXLzj?=
 =?us-ascii?Q?09gkz6mJIzK+rfQXJIiPZYYNomUDLzD+wipzNz8U9aTKPIkgePceChCGkBwT?=
 =?us-ascii?Q?YOfOjjMZj+6u1qjMgHP01X/mg/AzQAkS+kxkpyThly6jGkq4uyPFK4i63NLB?=
 =?us-ascii?Q?DIGWO+Vx/awgq6V+gxK6zA9R1hCD4Q9uaM511vbYayOvGn2N+OOfTfxgwiS3?=
 =?us-ascii?Q?W5UDHJH/mXaTM+ChYkwr+SCy9wTHrStrNv7SLf5u05noDYS36NmDF/rQhyBr?=
 =?us-ascii?Q?lBiGyJrg9SpmKJjds8JyKSA6mOXlcmTgcpOQ3F1I/kULkA3Mp+ZEI9yAzAPe?=
 =?us-ascii?Q?SPQVssR4PJchtbJrePA772eLmuRkcwYoKdJnnaV/x042SiEPiJjSWMyIw7N1?=
 =?us-ascii?Q?q2jM9YhIauBzwpU2trw2jFKPcWSlESQYhYqfse6gU8dV82CIxE8FEK4/nfr/?=
 =?us-ascii?Q?O1XqBu+9394GHtVsrU58m+o6xf50syAUQbNs03jaEDkaTVvRIrfoGJW2vBkb?=
 =?us-ascii?Q?raZ4UgBz1yg/WIfu2wtzgPFDnil79mZcHa0WP0enXDfuhCmPqxt6TPpzykUJ?=
 =?us-ascii?Q?kS7jV7Sg4fogc4kDPhGhPfz074WNfH0vHFtUhHhnRPyoNJRgaPKTppjNGIYW?=
 =?us-ascii?Q?6bE2xxCg7ysJPpKDxKWgMqzBRbBEfXvE6om+WrmXNW2UYYoVD+c205vqX5Nu?=
 =?us-ascii?Q?BnDvX3K3zF8NB8WR4T8Zv4f7LvJVcLCWxeCuUsA/2FHbQott/0yK32EuL3o8?=
 =?us-ascii?Q?EHUeuMbjf+QJLygiOU197DRty/aGnPsEtln7+GIFwR3eo0E2rPd0PcCOXcxx?=
 =?us-ascii?Q?tcVJMZhCzCjuwOJYkwp8UBVyVM2fc4rO0iNZtU0agcyI9vlz2pAdzdaFnSnC?=
 =?us-ascii?Q?n6LTYUEPjnHOUeeQq3uA8rQCKF9z3RM09aKvwKl3UHmBCnCQeTnC1IMRQmDI?=
 =?us-ascii?Q?z3Od7WWRSXZe5MGibtV26hEQwNEg59x8qm4ox/eol9NdhyX0IuFB9P/F5okK?=
 =?us-ascii?Q?6z7xlsT6Cbs/Nza3esK1esIuO8n+BizCreNkXJw1THIQnua1fReeP+emebbR?=
 =?us-ascii?Q?QhVhDNH+ViHUtLJE4UGiAs42pFvgj9EBoKv5UzcaZISMaEx0LNtCjDFSSMF8?=
 =?us-ascii?Q?kn5nrW5i578o30P77yH/jSmIs4MyyrxKg6+690rB?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <2D2BC5EC79B6F24F8882FA278233C15B@namprd15.prod.outlook.com>
MIME-Version: 1.0
X-OriginatorOrg: meta.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: PH0PR15MB5191.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 83b82ed9-0e9b-457a-e7df-08dad1380608
X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Nov 2022 11:59:37.5342
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 2dYGwpxlxXUCnJW7t/sDjLNLoM7EXy4gwC95tL/7vNd7KszF3fR7SsgpR0OOuTmC
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB2728
X-Proofpoint-GUID: V2a1oqfYX_Sk5xPr_l1TFaw1X0iQOpdJ
X-Proofpoint-ORIG-GUID: V2a1oqfYX_Sk5xPr_l1TFaw1X0iQOpdJ
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-11-28_09,2022-11-28_02,2022-06-22_01
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Nov 15, 2022 at 03:09:37PM +0000, Catalin Marinas wrote:
> > On ARM platforms is_default_overflow_handler() is used to determine if
> > hw_breakpoint code should single-step over the watchpoint trigger or
> > let the custom handler deal with it.
> > 
> > Attaching a BPF program to a watchpoint replaces the handler with
> > bpf_overflow_handler, which isn't recognized as a default handler so we
> > never step over the instruction triggering the data abort exception (the
> > watchpoint keeps firing):
> > 
> >   # bpftrace -e 'watchpoint:0x10000000:4:w { printf("hit\n"); }' ./wp_test
> >   Attaching 1 probe...
> >   hit
> >   hit
> >   hit
> >   [...]
> > 
> > (wp_test performs a single 4-byte store to address 0x10000000)
> > 
> > This patch replaces the check with uses_default_overflow_handler(), which
> > accounts for the bpf_overflow_handler() case by also testing if the handler
> > invokes one of the perf_event_output functions via orig_default_handler.
> > 
> > Signed-off-by: Tomislav Novak <tnovak@fb.com>
> > Tested-by: Samuel Gosselin <sgosselin@fb.com> # arm64
> > ---
> >  arch/arm/kernel/hw_breakpoint.c   |  8 ++++----
> >  arch/arm64/kernel/hw_breakpoint.c |  4 ++--
> >  include/linux/perf_event.h        | 22 +++++++++++++++++++---
> >  3 files changed, 25 insertions(+), 9 deletions(-)
> 
> It looks like this slipped through the cracks. I'm fine with the patch
> but could you split the arm and arm64 parts in separate patches? Unless
> rmk acks it and we can take the patch through the arm64 (or perf) tree.

Thanks for reviewing!

Given the changes in the arch-independent perf_event.h, I think merging it
as a single commit may be easiest (assuming rmk acks it).

Alternatively I could move arm changes into a separate patch, keeping arm64
and perf_event.h in this one (possibly splitting out the latter into its own
commit). One that's merged, the arm patch could be submitted to linux-arm.
What would you prefer?

-- 
T.