netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yonghong Song <yhs@fb.com>
To: <peterz@infradead.org>, <rostedt@goodmis.org>, <ast@fb.com>,
	<daniel@iogearbox.net>, <kafai@fb.com>, <netdev@vger.kernel.org>
Cc: <kernel-team@fb.com>
Subject: [PATCH net-next 1/3] bpf: use the same condition in perf event set/free bpf handler
Date: Mon, 23 Oct 2017 10:58:03 -0700	[thread overview]
Message-ID: <20171023175805.2898366-2-yhs@fb.com> (raw)
In-Reply-To: <20171023175805.2898366-1-yhs@fb.com>

This is a cleanup such that doing the same check in
perf_event_free_bpf_prog as we already do in
perf_event_set_bpf_prog step.

Signed-off-by: Yonghong Song <yhs@fb.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Martin KaFai Lau <kafai@fb.com>
---
 kernel/events/core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 31ee304..9f78a682 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -8191,10 +8191,10 @@ static void perf_event_free_bpf_prog(struct perf_event *event)
 {
 	struct bpf_prog *prog;
 
-	perf_event_free_bpf_handler(event);
-
-	if (!event->tp_event)
+	if (event->attr.type != PERF_TYPE_TRACEPOINT) {
+		perf_event_free_bpf_handler(event);
 		return;
+	}
 
 	prog = event->tp_event->prog;
 	if (prog && event->tp_event->bpf_prog_owner == event) {
-- 
2.9.5

  reply	other threads:[~2017-10-23 17:58 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-23 17:58 [PATCH net-next 0/3] bpf: permit multiple bpf attachments for a single perf tracepoint event Yonghong Song
2017-10-23 17:58 ` Yonghong Song [this message]
2017-10-23 17:58 ` [PATCH net-next 2/3] bpf: permit multiple bpf attachments for a single perf event Yonghong Song
2017-10-23 20:52   ` Daniel Borkmann
2017-10-23 21:00     ` Yonghong Song
2017-10-24  4:05   ` kbuild test robot
2017-10-24  4:07   ` kbuild test robot
2017-10-25 16:18   ` [lkp-robot] [bpf] 76cdd39f41: WARNING:trinity-c0_still_has_locks_held kernel test robot
2017-10-30 21:57     ` Yonghong Song
2017-10-26 13:56   ` [PATCH net-next 2/3] bpf: permit multiple bpf attachments for a single perf event Peter Zijlstra
2017-10-26 16:42     ` Yonghong Song
2017-10-23 17:58 ` [PATCH net-next 3/3] bpf: add a test case to test single tp multiple bpf attachment Yonghong Song

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=20171023175805.2898366-2-yhs@fb.com \
    --to=yhs@fb.com \
    --cc=ast@fb.com \
    --cc=daniel@iogearbox.net \
    --cc=kafai@fb.com \
    --cc=kernel-team@fb.com \
    --cc=netdev@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).