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>,
        Mark Rutland <mark.rutland@arm.com>,
        Russell King <linux@armlinux.org.uk>,
        Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>
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: AQHYz4xNSRmGp4l1PUKwAHNo0kfo465AaXSAgBQ5MQCAAxHJAIAAFUKA
Date:   Wed, 30 Nov 2022 12:08:05 +0000
Message-ID: <Y4dHocXjElVzTOms@tnovak-mbp.dhcp.thefacebook.com>
References: <20220923203644.2731604-1-tnovak@fb.com>
 <Y3OrsU9M+X2UUcRG@arm.com> <Y4SiohG4P7nX0GWb@tnovak-mbp.dhcp.thefacebook.com>
 <Y4c1zOZYi3sCxzo9@arm.com>
In-Reply-To: <Y4c1zOZYi3sCxzo9@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?0hvGsWffbitqHW7L6ypV7mBJVIKtp5jrwa3kkVeDiLtWI/r2Is68cSDXJUIQ?=
 =?us-ascii?Q?QN9LyCnUrVvja8zho9qmSxL7KnDiMOvggpCmckl1MLRqRpG04+oslYi4uYyi?=
 =?us-ascii?Q?N1iDxgz728j0mY8vrQZVLkAXnLYZUybBbDdC58TzLUf9EO4SrIG3Eu+23sYo?=
 =?us-ascii?Q?aPho3+pF3AbScEmITFp3BPbwBQ37ftB282fobixwOLfJ6ysdGH/llcjjHP1e?=
 =?us-ascii?Q?AAlZdBYoZHsUxWGD8rL6OxUasrNgy9eJ7v+OrTzlbRgJ5ZHfNolp4C1UAqdF?=
 =?us-ascii?Q?sao6eyqqL47qIy+nVYn19JzpixQNkeOhQuBLD+2+eta93f7Y5K0d8ULZDQwf?=
 =?us-ascii?Q?3dks2FLB3yzuvHVZfZjvOSXIwO8IJh1YIXCgpYC4YmmGkEC80tmOf3ZvJmjx?=
 =?us-ascii?Q?PCQzGqdPlGWvl8YfnEWiodavIxCKWwY2q7mLLvVLTWw5Fen+madpWjySkK+c?=
 =?us-ascii?Q?lAQLA3JWquMfShm5Ail8R42yFySyU7E0OOiv/RurRC/u5M73SJiKwBz2QXkj?=
 =?us-ascii?Q?8jMSgLmIXbomd3wj9y8+EqnoV4bs04n/4n6LM8teCrqeVETKrhUzL/gnlUhg?=
 =?us-ascii?Q?46aUB9YCxViNPgQVUpUL7EZFVSb5hZyrXjNtyW+F31PLIRAKfuBv9wew+p+A?=
 =?us-ascii?Q?NmiSGbf3gi9EqiWlN/n43/Ck9PDU5q18sn5BIOdtB19DjLHnldoAInj6G011?=
 =?us-ascii?Q?UPZ54D5vzMUmS+SkEG1ZFjsehyIXN3MMeBdoJBPywB68HGNMYvDfvXv1OcX2?=
 =?us-ascii?Q?q4AAU+dqmdQnVcX4He+DIgMrP6vrSlgAFlhrGO7Y9bhvGChXn91EB0CoqWmU?=
 =?us-ascii?Q?APHROT/0ugYo7lM1IHGG+LEJiC00MF6ROyG21vYKztOf37PxWdbR1LVuNKWP?=
 =?us-ascii?Q?3BTY0dOblQMIjJJANWFU1d/qaa1o7pzStAlbE+B3FZWapNMDoeqCVsc6EOWR?=
 =?us-ascii?Q?xNEiJ1Rluri5KtPLcKwRZknQjOArBrtPRJKoTGyf2XmrJRQZ/t3KW4dl/Mdw?=
 =?us-ascii?Q?u/t2ZSTqNuq+DtSQfja8YIN7SWHzbWZxx7vx0guUXLNjJlnGROxyHLF38VfT?=
 =?us-ascii?Q?QgxPc7sHZ205cA00Chxnhl5hSEOvfrvIQGlzOfAtOOEcS210NS1Upp2TcsqD?=
 =?us-ascii?Q?BUjFKflTmSsw5rR7yVaZ16RVwSACFXMdyzyfa2/ShdejiYcwEK5G0tqTlfEa?=
 =?us-ascii?Q?NrMbOuRuoxc1LM3DJmwYcQTqRf7eHBWIL++hc+rzqWeMi+YFQFj58XYvJjd+?=
 =?us-ascii?Q?CJ3tUEbxvbAZICzSfQqXJIR5UQzJaZEmKkLA8hby3TkEA0iFxcZ/GN/EV33/?=
 =?us-ascii?Q?nzzlwReLjTrIKSgJ0dcCIwP7SGHj8i2xbmGykVkksS4VftpyLJr39Bxlj5E1?=
 =?us-ascii?Q?d7dgwBFXB/VPDWivP9mc47qLgpOfsUQTTj6NWznyxLQNU3nK3Y32NIZ+Whfl?=
 =?us-ascii?Q?YXifcIFQpxSUpyKwtVftL2ElRFz/g1LwOYiBsQUcYD+Ugg5JPXY0JpNsSzjA?=
 =?us-ascii?Q?NkRazafgbqb+ZQSawmGbspDlTzre8SjfpG4wanDxlxad1SLKqo4Vrlfd3MzK?=
 =?us-ascii?Q?vVO9/t+et7Mm1b/4whR0DbdsKZw4AeVWs9F168Q1?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <769DAE826B69074EA165DF465CAE5966@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: 15739534-1f9d-4ce3-d296-08dad2cb89a3
X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Nov 2022 12:08:05.5130
 (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: fbtDyFeYS4Movh6RiHPfd7ExHW3FtGIP7YYyt/7yaU1XL5L8YblggYYaVI0obIC6
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR15MB1711
X-Proofpoint-GUID: bq5bkCpqx1EOFG2oTVxqTN2pJW0YiPW5
X-Proofpoint-ORIG-GUID: bq5bkCpqx1EOFG2oTVxqTN2pJW0YiPW5
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-30_04,2022-11-30_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 Wed, Nov 30, 2022 at 10:51:56AM +0000, Catalin Marinas wrote:
> On Mon, Nov 28, 2022 at 11:59:37AM +0000, Tomislav Novak wrote:
> > 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?
> 
> Actually, arch/arm*/kernel/hw_breakpoint.c come under the ARM PMU
> profiling, so no need to split the patch. It may need an ack from the
> generic perf maintainers for include/linux/perf.h.

Good point! I realized I've neglected to CC perf_event maintainers (sorry!),
doing so now.

-- 
T.