From patchwork Fri Mar 20 01:59:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 452421 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 20AAA14007F for ; Fri, 20 Mar 2015 13:02:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751475AbbCTCAF (ORCPT ); Thu, 19 Mar 2015 22:00:05 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:34345 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751286AbbCTB75 (ORCPT ); Thu, 19 Mar 2015 21:59:57 -0400 Received: by pdbni2 with SMTP id ni2so93644616pdb.1 for ; Thu, 19 Mar 2015 18:59:56 -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:in-reply-to :references; bh=hbzkatepSagSTX8Pdle5nskRoNqQHTOkMn9X3/oNDFI=; b=hcNGnA5hBc5PAncVqeZraC9x22W8KmSzw84c5QzIceERrfw898PEkPGFYXPEgICJSP iCFTh3ZqHyWtzgEyzihECqG6yBgZ0JpVIraz0GQHTe8WE9voCP5TT/f39Si/eVWBEEp4 b7DEQfIHSAeVDWzoX57DyCFNStgeZXzCDMWZB15Et7xKabPlK+neTBubtlB+HYtLrgu4 HpJ7jMvjHQAMqgMbVp2qoWDVjXnyRcawst7V3kLvtGHRq9mgbPNFUajmk1ykBwiWHq4Z nwzJd4q7SxCi/7BkmRLothr5pBpUZn9561OKjCwGTqthwbU6PjHZT8pVb7rbUm+qrjKd agGQ== X-Gm-Message-State: ALoCoQmKjv1xxua2oTDj7MWqyzkYGo+vIw7QWX6dDRXWzFXujO710l+eIB+OHFji5QYrGrduNjN5 X-Received: by 10.66.141.231 with SMTP id rr7mr178246096pab.72.1426816796625; Thu, 19 Mar 2015 18:59:56 -0700 (PDT) Received: from localhost.localdomain ([12.229.56.227]) by mx.google.com with ESMTPSA id x1sm5171494pdr.17.2015.03.19.18.59.55 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Mar 2015 18:59:55 -0700 (PDT) From: Alexei Starovoitov To: Ingo Molnar Cc: Steven Rostedt , Namhyung Kim , Arnaldo Carvalho de Melo , Jiri Olsa , Masami Hiramatsu , "David S. Miller" , Daniel Borkmann , Peter Zijlstra , linux-api@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 tip 1/9] bpf: make internal bpf API independent of CONFIG_BPF_SYSCALL ifdefs Date: Thu, 19 Mar 2015 18:59:39 -0700 Message-Id: <1426816787-5001-2-git-send-email-ast@plumgrid.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1426816787-5001-1-git-send-email-ast@plumgrid.com> References: <1426816787-5001-1-git-send-email-ast@plumgrid.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Daniel Borkmann Socket filter code and other subsystems with upcoming eBPF support should not need to deal with the fact that we have CONFIG_BPF_SYSCALL defined or not. Having the bpf syscall as a config option is a nice thing and I'd expect it to stay that way for expert users (I presume one day the default setting of it might change, though), but code making use of it should not care if it's actually enabled or not. Instead, hide this via header files and let the rest deal with it. Signed-off-by: Daniel Borkmann Signed-off-by: Alexei Starovoitov --- include/linux/bpf.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index bbfceb756452..c2e21113ecc0 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -113,8 +113,6 @@ struct bpf_prog_type_list { enum bpf_prog_type type; }; -void bpf_register_prog_type(struct bpf_prog_type_list *tl); - struct bpf_prog; struct bpf_prog_aux { @@ -129,11 +127,25 @@ struct bpf_prog_aux { }; #ifdef CONFIG_BPF_SYSCALL +void bpf_register_prog_type(struct bpf_prog_type_list *tl); + void bpf_prog_put(struct bpf_prog *prog); +struct bpf_prog *bpf_prog_get(u32 ufd); #else -static inline void bpf_prog_put(struct bpf_prog *prog) {} +static inline void bpf_register_prog_type(struct bpf_prog_type_list *tl) +{ +} + +static inline struct bpf_prog *bpf_prog_get(u32 ufd) +{ + return ERR_PTR(-EOPNOTSUPP); +} + +static inline void bpf_prog_put(struct bpf_prog *prog) +{ +} #endif -struct bpf_prog *bpf_prog_get(u32 ufd); + /* verify correctness of eBPF program */ int bpf_check(struct bpf_prog *fp, union bpf_attr *attr);