From nobody Mon Feb 9 07:19:28 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 C1CADEB64DC for ; Fri, 23 Jun 2023 01:33:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230270AbjFWBdt (ORCPT ); Thu, 22 Jun 2023 21:33:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230008AbjFWBdj (ORCPT ); Thu, 22 Jun 2023 21:33:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CED01FE9 for ; Thu, 22 Jun 2023 18:33:38 -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 F044261949 for ; Fri, 23 Jun 2023 01:33:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51067C433C8; Fri, 23 Jun 2023 01:33:37 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qCVg8-002M7B-0W; Thu, 22 Jun 2023 21:33:36 -0400 Message-ID: <20230623013335.974523605@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 22 Jun 2023 21:31:53 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , sunliming , Beau Belgrave Subject: [for-linus][PATCH 1/3] tracing/user_events: Fix incorrect return value for writing operation when events are disabled References: <20230623013152.037225511@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 The writing operation return the count of writes regardless of whether even= ts are enabled or disabled. Switch it to return 0 to indicates that the event is disabled. Link: https://lore.kernel.org/linux-trace-kernel/20230621060827.151564-2-su= nliming@kylinos.cn Signed-off-by: sunliming Acked-by: Beau Belgrave Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_u= ser.c index 8df0550415e7..902cae005df4 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -2096,7 +2096,8 @@ static ssize_t user_events_write_core(struct file *fi= le, struct iov_iter *i) =20 if (unlikely(faulted)) return -EFAULT; - } + } else + return 0; =20 return ret; } --=20 2.39.2 From nobody Mon Feb 9 07:19:28 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 39D4CEB64DA for ; Fri, 23 Jun 2023 01:33:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230143AbjFWBdo (ORCPT ); Thu, 22 Jun 2023 21:33:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230038AbjFWBdj (ORCPT ); Thu, 22 Jun 2023 21:33:39 -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 A88492107 for ; Thu, 22 Jun 2023 18:33:38 -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 2A9276194A for ; Fri, 23 Jun 2023 01:33:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90C05C433CC; Fri, 23 Jun 2023 01:33:37 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qCVg8-002M7j-1C; Thu, 22 Jun 2023 21:33:36 -0400 Message-ID: <20230623013336.182046869@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 22 Jun 2023 21:31:54 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , sunliming , Beau Belgrave Subject: [for-linus][PATCH 2/3] selftests/user_events: Enable the event before write_fault test in ftrace self-test References: <20230623013152.037225511@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 The user_event has not been enabled in write_fault test in ftrace self-test, Just enable it. Link: https://lkml.kernel.org/r/20230621063438.154271-1-sunliming@kylinos.cn Signed-off-by: sunliming Acked-by: Beau Belgrave Signed-off-by: Steven Rostedt (Google) --- tools/testing/selftests/user_events/ftrace_test.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/test= ing/selftests/user_events/ftrace_test.c index eb6904d89f14..88898749e5b7 100644 --- a/tools/testing/selftests/user_events/ftrace_test.c +++ b/tools/testing/selftests/user_events/ftrace_test.c @@ -400,6 +400,10 @@ TEST_F(user, write_fault) { ASSERT_EQ(0, ioctl(self->data_fd, DIAG_IOCSREG, ®)); ASSERT_EQ(0, reg.write_index); =20 + /* Enable event */ + self->enable_fd =3D open(enable_file, O_RDWR); + ASSERT_NE(-1, write(self->enable_fd, "1", sizeof("1"))) + /* Write should work normally */ ASSERT_NE(-1, writev(self->data_fd, (const struct iovec *)io, 2)); =20 --=20 2.39.2 From nobody Mon Feb 9 07:19:28 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 29144EB64DA for ; Fri, 23 Jun 2023 01:33:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230203AbjFWBdr (ORCPT ); Thu, 22 Jun 2023 21:33:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230010AbjFWBdj (ORCPT ); Thu, 22 Jun 2023 21:33:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9DCF210A for ; Thu, 22 Jun 2023 18:33:38 -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 599CF61941 for ; Fri, 23 Jun 2023 01:33:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE3FFC433CD; Fri, 23 Jun 2023 01:33:37 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qCVg8-002M8H-1q; Thu, 22 Jun 2023 21:33:36 -0400 Message-ID: <20230623013336.387000756@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 22 Jun 2023 21:31:55 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , sunliming , Beau Belgrave Subject: [for-linus][PATCH 3/3] selftests/user_events: Add test cases when event is disabled References: <20230623013152.037225511@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 user_events are disabled, its write operation should return zero. Add this test cases. Link: https://lkml.kernel.org/r/20230621063502.154378-1-sunliming@kylinos.cn Signed-off-by: sunliming Acked-by: Beau Belgrave Signed-off-by: Steven Rostedt (Google) --- tools/testing/selftests/user_events/ftrace_test.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/test= ing/selftests/user_events/ftrace_test.c index 88898749e5b7..f42a20520175 100644 --- a/tools/testing/selftests/user_events/ftrace_test.c +++ b/tools/testing/selftests/user_events/ftrace_test.c @@ -324,6 +324,9 @@ TEST_F(user, write_events) { io[0].iov_base =3D ®.write_index; io[0].iov_len =3D sizeof(reg.write_index); =20 + /* Write should return zero when event is not enabled */ + ASSERT_EQ(0, writev(self->data_fd, (const struct iovec *)io, 3)); + /* Enable event */ self->enable_fd =3D open(enable_file, O_RDWR); ASSERT_NE(-1, write(self->enable_fd, "1", sizeof("1"))) --=20 2.39.2