All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	sunliming <sunliming@kylinos.cn>,
	Beau Belgrave <beaub@linux.microsoft.com>
Subject: [for-linus][PATCH 1/3] tracing/user_events: Fix incorrect return value for writing operation when events are disabled
Date: Thu, 22 Jun 2023 21:31:53 -0400	[thread overview]
Message-ID: <20230623013335.974523605@goodmis.org> (raw)
In-Reply-To: 20230623013152.037225511@goodmis.org

From: sunliming <sunliming@kylinos.cn>

The writing operation return the count of writes regardless of whether events
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-sunliming@kylinos.cn

Signed-off-by: sunliming <sunliming@kylinos.cn>
Acked-by: Beau Belgrave <beaub@linux.microsoft.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 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_user.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 *file, struct iov_iter *i)
 
 		if (unlikely(faulted))
 			return -EFAULT;
-	}
+	} else
+		return 0;
 
 	return ret;
 }
-- 
2.39.2

  reply	other threads:[~2023-06-23  1:33 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-23  1:31 [for-linus][PATCH 0/3] tracing: Final updates for 6.4 Steven Rostedt
2023-06-23  1:31 ` Steven Rostedt [this message]
2023-06-23  1:31 ` [for-linus][PATCH 2/3] selftests/user_events: Enable the event before write_fault test in ftrace self-test Steven Rostedt
2023-06-23  1:31 ` [for-linus][PATCH 3/3] selftests/user_events: Add test cases when event is disabled Steven Rostedt
  -- strict thread matches above, loose matches on Subject: below --
2023-06-28 12:54 [for-linus][PATCH 0/3] tracing: Final updates for 6.4+ Steven Rostedt
2023-06-28 12:54 ` [for-linus][PATCH 1/3] tracing/user_events: Fix incorrect return value for writing operation when events are disabled Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230623013335.974523605@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=akpm@linux-foundation.org \
    --cc=beaub@linux.microsoft.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mhiramat@kernel.org \
    --cc=sunliming@kylinos.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.