From nobody Sun Feb 8 06:54:46 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 C05CFEB64DC for ; Thu, 15 Jun 2023 13:36:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344443AbjFONgl (ORCPT ); Thu, 15 Jun 2023 09:36:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344171AbjFONfb (ORCPT ); Thu, 15 Jun 2023 09:35:31 -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 37B492729 for ; Thu, 15 Jun 2023 06:35:01 -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 EB8E86399E for ; Thu, 15 Jun 2023 13:34:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 684D8C433CA; Thu, 15 Jun 2023 13:34:18 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1q9n7B-000Ts1-1Z; Thu, 15 Jun 2023 09:34:17 -0400 Message-ID: <20230615133417.304604444@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 15 Jun 2023 09:05:44 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Beau Belgrave Subject: [for-linus][PATCH 13/15] selftests/user_events: Ensure auto cleanup works as expected 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: Beau Belgrave User events now auto cleanup upon the last reference put. Update ftrace_test to ensure this works as expected. Ensure EBUSY delays while event is being deleted do not cause transient failures by waiting and re-attempting. Link: https://lkml.kernel.org/r/20230614163336.5797-5-beaub@linux.microsoft= .com Signed-off-by: Beau Belgrave Signed-off-by: Steven Rostedt (Google) --- .../selftests/user_events/ftrace_test.c | 49 ++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/test= ing/selftests/user_events/ftrace_test.c index abfb49558a26..eb6904d89f14 100644 --- a/tools/testing/selftests/user_events/ftrace_test.c +++ b/tools/testing/selftests/user_events/ftrace_test.c @@ -102,30 +102,56 @@ static int get_print_fmt(char *buffer, int len) return -1; } =20 +static bool wait_for_delete(void) +{ + int i; + + for (i =3D 0; i < 1000; ++i) { + int fd =3D open(enable_file, O_RDONLY); + + if (fd =3D=3D -1) + return true; + + close(fd); + usleep(1000); + } + + return false; +} + static int clear(int *check) { struct user_unreg unreg =3D {0}; + int fd; =20 unreg.size =3D sizeof(unreg); unreg.disable_bit =3D 31; unreg.disable_addr =3D (__u64)check; =20 - int fd =3D open(data_file, O_RDWR); + fd =3D open(data_file, O_RDWR); =20 if (fd =3D=3D -1) return -1; =20 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; + goto fail; + + if (ioctl(fd, DIAG_IOCSDEL, "__test_event") =3D=3D -1) { + if (errno =3D=3D EBUSY) { + if (!wait_for_delete()) + goto fail; + } else if (errno !=3D ENOENT) + goto fail; + } =20 close(fd); =20 return 0; +fail: + close(fd); + + return -1; } =20 static int check_print_fmt(const char *event, const char *expected, int *c= heck) @@ -155,9 +181,8 @@ static int check_print_fmt(const char *event, const cha= r *expected, int *check) /* Register should work */ ret =3D ioctl(fd, DIAG_IOCSREG, ®); =20 - close(fd); - if (ret !=3D 0) { + close(fd); printf("Reg failed in fmt\n"); return ret; } @@ -165,6 +190,8 @@ static int check_print_fmt(const char *event, const cha= r *expected, int *check) /* Ensure correct print_fmt */ ret =3D get_print_fmt(print_fmt, sizeof(print_fmt)); =20 + close(fd); + if (ret !=3D 0) return ret; =20 @@ -256,10 +283,10 @@ TEST_F(user, register_events) { unreg.disable_bit =3D 30; ASSERT_EQ(0, ioctl(self->data_fd, DIAG_IOCSUNREG, &unreg)); =20 - /* Delete should work only after close and unregister */ + /* Delete should have been auto-done after close and unregister */ close(self->data_fd); - self->data_fd =3D open(data_file, O_RDWR); - ASSERT_EQ(0, ioctl(self->data_fd, DIAG_IOCSDEL, "__test_event")); + + ASSERT_EQ(true, wait_for_delete()); } =20 TEST_F(user, write_events) { --=20 2.39.2