From nobody Sun Feb 8 18:15:49 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7D4EEB64DA for ; Thu, 15 Jun 2023 13:36:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245731AbjFONg3 (ORCPT ); Thu, 15 Jun 2023 09:36:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344753AbjFONfY (ORCPT ); Thu, 15 Jun 2023 09:35:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E36CD30F8 for ; Thu, 15 Jun 2023 06:34:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B75636371C for ; Thu, 15 Jun 2023 13:34:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32EC1C433C9; Thu, 15 Jun 2023 13:34:17 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1q9n7A-000Tob-0r; Thu, 15 Jun 2023 09:34:16 -0400 Message-ID: <20230615133416.089967064@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 15 Jun 2023 09:05:38 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Beau Belgrave , sunliming Subject: [for-linus][PATCH 07/15] selftests/user_events: Clear the events after perf self-test References: <20230615130531.200384328@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: sunliming When the self test is completed, perf self-test left the user events not to be cleared. Clear the events by unregister and delete the event. Link: https://lkml.kernel.org/r/20230606062027.1008398-4-sunliming@kylinos.= cn Acked-by: Beau Belgrave Acked-by: Masami Hiramatsu (Google) Signed-off-by: sunliming Signed-off-by: Steven Rostedt (Google) --- .../testing/selftests/user_events/perf_test.c | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tools/testing/selftests/user_events/perf_test.c b/tools/testin= g/selftests/user_events/perf_test.c index a070258d4449..e97f24ab6e2f 100644 --- a/tools/testing/selftests/user_events/perf_test.c +++ b/tools/testing/selftests/user_events/perf_test.c @@ -81,6 +81,32 @@ static int get_offset(void) return offset; } =20 +static int clear(int *check) +{ + struct user_unreg unreg =3D {0}; + + unreg.size =3D sizeof(unreg); + unreg.disable_bit =3D 31; + unreg.disable_addr =3D (__u64)check; + + int fd =3D open(data_file, O_RDWR); + + if (fd =3D=3D -1) + return -1; + + if (ioctl(fd, DIAG_IOCSUNREG, &unreg) =3D=3D -1) + if (errno !=3D ENOENT) + return -1; + + if (ioctl(fd, DIAG_IOCSDEL, "__test_event") =3D=3D -1) + if (errno !=3D ENOENT) + return -1; + + close(fd); + + return 0; +} + FIXTURE(user) { int data_fd; int check; @@ -93,6 +119,9 @@ FIXTURE_SETUP(user) { =20 FIXTURE_TEARDOWN(user) { close(self->data_fd); + + if (clear(&self->check) !=3D 0) + printf("WARNING: Clear didn't work!\n"); } =20 TEST_F(user, perf_write) { --=20 2.39.2