All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: Alexei Starovoitov <ast@kernel.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>
Cc: <linux-kernel@vger.kernel.org>,
	Brendan Gregg <brendan.d.gregg@gmail.com>,
	He Kuang <hekuang@huawei.com>, Jiri Olsa <jolsa@kernel.org>,
	Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
	Namhyung Kim <namhyung@kernel.org>, <pi3orama@163.com>,
	Wang Nan <wangnan0@huawei.com>, Zefan Li <lizefan@huawei.com>
Subject: [PATCH 1/4 fix] perf core: Introduce new ioctl options to pause and resume ring buffer
Date: Tue, 29 Mar 2016 02:05:07 +0000	[thread overview]
Message-ID: <1459217107-244486-1-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <20160329002724.GB31198@ast-mbp.thefacebook.com>

Add new ioctl() to pause/resume ring-buffer output.

In some situations we want to read from ring buffer only when we
ensure nothing can write to the ring buffer during reading. Without
this patch we have to turn off all events attached to this ring buffer
to achieve this.

This patch is for supporting overwrite ring buffer. Following
commits will introduce new methods support reading from overwrite ring
buffer. Before reading, caller must ensure the ring buffer is frozen, or
the reading is unreliable.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
---
 include/uapi/linux/perf_event.h |  1 +
 kernel/events/core.c            | 13 +++++++++++++
 kernel/events/internal.h        | 11 +++++++++++
 kernel/events/ring_buffer.c     |  7 ++++++-
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 1afe962..a3c1903 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -401,6 +401,7 @@ struct perf_event_attr {
 #define PERF_EVENT_IOC_SET_FILTER	_IOW('$', 6, char *)
 #define PERF_EVENT_IOC_ID		_IOR('$', 7, __u64 *)
 #define PERF_EVENT_IOC_SET_BPF		_IOW('$', 8, __u32)
+#define PERF_EVENT_IOC_PAUSE_OUTPUT	_IOW('$', 9, __u32)
 
 enum perf_event_ioc_flags {
 	PERF_IOC_FLAG_GROUP		= 1U << 0,
diff --git a/kernel/events/core.c b/kernel/events/core.c
index de24fbc..a1636d3 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -4341,6 +4341,19 @@ static long _perf_ioctl(struct perf_event *event, unsigned int cmd, unsigned lon
 	case PERF_EVENT_IOC_SET_BPF:
 		return perf_event_set_bpf_prog(event, arg);
 
+	case PERF_EVENT_IOC_PAUSE_OUTPUT: {
+		struct ring_buffer *rb;
+
+		rcu_read_lock();
+		rb = rcu_dereference(event->rb);
+		if (!rb) {
+			rcu_read_unlock();
+			return -EINVAL;
+		}
+		rb_toggle_paused(rb, !!arg);
+		rcu_read_unlock();
+		return 0;
+	}
 	default:
 		return -ENOTTY;
 	}
diff --git a/kernel/events/internal.h b/kernel/events/internal.h
index 2bbad9c..6a93d1b 100644
--- a/kernel/events/internal.h
+++ b/kernel/events/internal.h
@@ -18,6 +18,7 @@ struct ring_buffer {
 #endif
 	int				nr_pages;	/* nr of data pages  */
 	int				overwrite;	/* can overwrite itself */
+	int				paused;		/* can write into ring buffer */
 
 	atomic_t			poll;		/* POLL_ for wakeups */
 
@@ -65,6 +66,16 @@ static inline void rb_free_rcu(struct rcu_head *rcu_head)
 	rb_free(rb);
 }
 
+static inline void
+rb_toggle_paused(struct ring_buffer *rb,
+		 bool pause)
+{
+	if (!pause && rb->nr_pages)
+		rb->paused = 0;
+	else
+		rb->paused = 1;
+}
+
 extern struct ring_buffer *
 rb_alloc(int nr_pages, long watermark, int cpu, int flags);
 extern void perf_event_wakeup(struct perf_event *event);
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index c61f0cb..17de83b 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -125,8 +125,11 @@ int perf_output_begin(struct perf_output_handle *handle,
 	if (unlikely(!rb))
 		goto out;
 
-	if (unlikely(!rb->nr_pages))
+	if (unlikely(rb->paused)) {
+		if (rb->nr_pages)
+			local_inc(&rb->lost);
 		goto out;
+	}
 
 	handle->rb    = rb;
 	handle->event = event;
@@ -244,6 +247,8 @@ ring_buffer_init(struct ring_buffer *rb, long watermark, int flags)
 	INIT_LIST_HEAD(&rb->event_list);
 	spin_lock_init(&rb->event_lock);
 	init_irq_work(&rb->irq_work, rb_irq_work);
+
+	rb->paused = rb->nr_pages ? 0 : 1;
 }
 
 static void ring_buffer_put_async(struct ring_buffer *rb)
-- 
1.8.3.4

  parent reply	other threads:[~2016-03-29  2:06 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-28  6:41 [PATCH 0/4] perf core: Support reading from overwritable ring buffer Wang Nan
2016-03-28  6:41 ` [PATCH 1/4] perf core: Introduce new ioctl options to pause and resume " Wang Nan
2016-03-28 10:15   ` [PATCH][manpages 1/2] perf_event_open.2: Document PERF_EVENT_IOC_PAUSE_OUTPUT Wang Nan
2016-03-28 10:15     ` Wang Nan
2016-10-21  8:56     ` Michael Kerrisk (man-pages)
2016-10-21  8:56       ` Michael Kerrisk (man-pages)
2016-10-21 14:37       ` Vince Weaver
2016-10-21 14:37         ` Vince Weaver
2016-10-21 14:49         ` Michael Kerrisk (man-pages)
2016-10-21 14:49           ` Michael Kerrisk (man-pages)
2016-03-29  0:27   ` [PATCH 1/4] perf core: Introduce new ioctl options to pause and resume ring buffer Alexei Starovoitov
2016-03-29  1:10     ` Wangnan (F)
2016-03-29  2:05     ` Wang Nan [this message]
2016-03-29  4:39       ` [PATCH 1/4 fix] " Alexei Starovoitov
2016-03-29 12:54   ` [PATCH 1/4] " Peter Zijlstra
2016-03-29 12:55     ` Peter Zijlstra
2016-03-30  1:57     ` Wangnan (F)
2016-03-30  6:46       ` Peter Zijlstra
2016-03-31  9:26   ` [tip:perf/core] perf/ring_buffer: Introduce new ioctl options to pause and resume the ring-buffer tip-bot for Wang Nan
2016-03-28  6:41 ` [PATCH 2/4] perf core: Set event's default overflow_handler Wang Nan
2016-03-31  9:26   ` [tip:perf/core] perf/core: Set event's default ::overflow_handler() tip-bot for Wang Nan
2016-03-28  6:41 ` [PATCH 3/4] perf core: Prepare writing into ring buffer from end Wang Nan
2016-03-29  0:25   ` Alexei Starovoitov
2016-03-31  9:26   ` [tip:perf/core] perf/ring_buffer: Prepare writing into the ring-buffer from the end tip-bot for Wang Nan
2016-03-28  6:41 ` [PATCH 4/4] perf core: Add backward attribute to perf event Wang Nan
2016-03-28 10:16   ` [PATCH][manpages 2/2] perf_event_open.2: Document write_backward Wang Nan
2016-03-28 10:16     ` Wang Nan
2016-10-21  8:57     ` Michael Kerrisk (man-pages)
2016-03-29  0:28   ` [PATCH 4/4] perf core: Add backward attribute to perf event Alexei Starovoitov
2016-03-29  2:01   ` Wangnan (F)
2016-03-29  4:59     ` Alexei Starovoitov
2016-03-29  5:59       ` Wangnan (F)
2016-03-29 14:04   ` Peter Zijlstra
2016-03-30  2:28     ` Wangnan (F)
2016-03-30  2:38       ` Wangnan (F)
2016-04-05 14:05         ` Wangnan (F)
2016-04-07  9:45     ` Wangnan (F)

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=1459217107-244486-1-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=acme@redhat.com \
    --cc=ast@kernel.org \
    --cc=brendan.d.gregg@gmail.com \
    --cc=hekuang@huawei.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=pi3orama@163.com \
    /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.