From patchwork Fri Oct 23 21:58:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 535290 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3500F1401AD for ; Sat, 24 Oct 2015 08:58:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752031AbbJWV6Z (ORCPT ); Fri, 23 Oct 2015 17:58:25 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:33661 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750869AbbJWV6X (ORCPT ); Fri, 23 Oct 2015 17:58:23 -0400 Received: by pabrc13 with SMTP id rc13so128384527pab.0 for ; Fri, 23 Oct 2015 14:58:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TXvZkKzTUFk9srGWsWkOoU7noVRaCPNjpZZ6eNLLSOI=; b=Te2ZvHigjARWJq+5Z3CZiW8ayaWt2AWlgbvHgBmLWJy6zX3LmsSHak4CyGjV523T6X SHB81rrCEq7nFNWWI4FCT7Y3OUWOd1Lx0bHay6aq+P2snn/xbNDwIkRIFVIzAVI0zu+h yrAyQKgy0Iah4gKe9T1nghkofEAE8zs2TgDLKqWlEz4Mjw2DQ9dL5615ddRcYsfLq6VK oTylD/g91Kn6VCnTQpFP80yIP7B2IZGEG97Oas5TbTEvN3fbn+Oyc5gHF1G21EJCh+3W 9LWI+IZ5zbdtmNrqSuePaPFgI/8J2SklWuwmn29NfzhW2TM0oe1xqGXgk15+kx0YnvNE ETmw== X-Gm-Message-State: ALoCoQkOk0ozExWSmyXmfSFAOcEo0DGI4JNLoAsXFvILIZYtV9NPBmr5bAvE/sAyL+hdoISbV/aC X-Received: by 10.68.68.134 with SMTP id w6mr26866554pbt.61.1445637503316; Fri, 23 Oct 2015 14:58:23 -0700 (PDT) Received: from localhost.localdomain ([12.97.19.195]) by smtp.gmail.com with ESMTPSA id w8sm20675633pbs.87.2015.10.23.14.58.21 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Oct 2015 14:58:22 -0700 (PDT) From: Alexei Starovoitov X-Google-Original-From: Alexei Starovoitov To: "David S. Miller" Cc: Ingo Molnar , Peter Zijlstra , Wang Nan , He Kuang , Kaixu Xia , Daniel Borkmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] bpf: make tracing helpers gpl only Date: Fri, 23 Oct 2015 14:58:19 -0700 Message-Id: <1445637499-11146-1-git-send-email-ast@kernel.org> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org exported perf symbols are GPL only, mark eBPF helper functions used in tracing as GPL only as well. Suggested-by: Peter Zijlstra Signed-off-by: Alexei Starovoitov --- this is on top of this patch that touches the same file: http://patchwork.ozlabs.org/patch/534664/ kernel/trace/bpf_trace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 003df3887287..4228fd3682c3 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -214,7 +214,7 @@ static u64 bpf_perf_event_read(u64 r1, u64 index, u64 r3, u64 r4, u64 r5) static const struct bpf_func_proto bpf_perf_event_read_proto = { .func = bpf_perf_event_read, - .gpl_only = false, + .gpl_only = true, .ret_type = RET_INTEGER, .arg1_type = ARG_CONST_MAP_PTR, .arg2_type = ARG_ANYTHING, @@ -255,7 +255,7 @@ static u64 bpf_perf_event_output(u64 r1, u64 r2, u64 index, u64 r4, u64 size) static const struct bpf_func_proto bpf_perf_event_output_proto = { .func = bpf_perf_event_output, - .gpl_only = false, + .gpl_only = true, .ret_type = RET_INTEGER, .arg1_type = ARG_PTR_TO_CTX, .arg2_type = ARG_CONST_MAP_PTR,