From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yonghong Song 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 Message-ID: <20171023175805.2898366-2-yhs@fb.com> References: <20171023175805.2898366-1-yhs@fb.com> Mime-Version: 1.0 Content-Type: text/plain Cc: To: , , , , , Return-path: Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:49954 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932143AbdJWR6I (ORCPT ); Mon, 23 Oct 2017 13:58:08 -0400 Received: from pps.filterd (m0001255.ppops.net [127.0.0.1]) by mx0b-00082601.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v9NHuYwF024995 for ; Mon, 23 Oct 2017 10:58:08 -0700 Received: from mail.thefacebook.com ([199.201.64.23]) by mx0b-00082601.pphosted.com with ESMTP id 2dr22cw89v-4 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Mon, 23 Oct 2017 10:58:08 -0700 In-Reply-To: <20171023175805.2898366-1-yhs@fb.com> Sender: netdev-owner@vger.kernel.org List-ID: 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 Acked-by: Alexei Starovoitov Acked-by: Martin KaFai Lau --- 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