From patchwork Mon Nov 20 04:55:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 839430 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="wQzs7GRJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ygGf02ncXz9s0g for ; Mon, 20 Nov 2017 15:56:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751245AbdKTE4i (ORCPT ); Sun, 19 Nov 2017 23:56:38 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36627 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751147AbdKTE4M (ORCPT ); Sun, 19 Nov 2017 23:56:12 -0500 Received: by mail-pf0-f193.google.com with SMTP id i15so6418290pfa.3 for ; Sun, 19 Nov 2017 20:56:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZYaCVE85XaAXplx8rnxI+MAeCSCAGbRo6CZdHk6J9Mg=; b=wQzs7GRJwGJak7IMU0yfVx8gKJCtZ3ZVqnvdout57prosk18Lhk96VJUxrYUIrUIVe LhBM2ovu4mLzfZsYF8Rx2gUsYatYA09weyJM7DAEQkGpkWaCL+CVNnp0dfXfRj4TsW1t NXXKUXSa+EUmZ+SNv9ydioTV993bj9vT9TVxNvLN+s5aIjSoX+TeWOVzFFOLDA8kJavO VOdrOF6SrpNaF951R+ojTbUktJS2YPte1hs2qCR317qbMkgKT/lMm62PuC5HNhwyH+jL Z2id/Q8XAUV7RffxoGSz3v0XI8vQUt4aKr5r4Fs7eMS07L9Up1Bo5ZEL2fFlwHphSOKl uhiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZYaCVE85XaAXplx8rnxI+MAeCSCAGbRo6CZdHk6J9Mg=; b=L0U1URfPmN648Eb6RuBO8h5uYxRlpAWgZVj6sNwuRdu02QWXEK9SqxsNCyniAUj797 mtgI99+LlhjB81Ta5wxELyO+fCBRg0ZTrL/Q6jMwon4F2xeeSJGkRl9hvj8oD5DVDe/r JAagTr7mOPGfCgHx78kSSpe2EXrg7OZ7geIqfjcimWEQmcDnOyLa6nIuWGffjNmRqubx Rss2RyBm2yyIxX8uo4YlwqRM3V3+kCvCUPE4djSsdaFXv/TJSOF37IUe9FlFvaynoXKr +fhpZFRB0KF8Ci4GDCBNAc+6zBvt0Le+WAHYyJhqsNe/SF0K+q9Hh5DU2vnMjpQ7xUuE mZzg== X-Gm-Message-State: AJaThX4qFkNdtkRqeMo7hUAIDVywWie2Yxg9lJupFg3GXZcXvKDFDLyX NIMJZJAe53skY77YPS4VSY7Kf662 X-Google-Smtp-Source: AGs4zMbj3fqXEK3eHT2Gm/I6BW3difTTmkwQxQRStJaOB9rXwPQgHgnHZcimgUMD+r3l7XXEpMUzIQ== X-Received: by 10.159.197.65 with SMTP id d1mr12650095plo.58.1511153772055; Sun, 19 Nov 2017 20:56:12 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id e8sm17598270pfk.6.2017.11.19.20.56.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Nov 2017 20:56:11 -0800 (PST) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: alexei.starovoitov@gmail.com, daniel@iogearbox.net, Jakub Kicinski Subject: [PATCH net 06/10] bpf: turn bpf_prog_get_type() into a wrapper Date: Sun, 19 Nov 2017 20:55:18 -0800 Message-Id: <20171120045522.2188-7-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171120045522.2188-1-jakub.kicinski@netronome.com> References: <20171120045522.2188-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org bpf_prog_get_type() is identical to bpf_prog_get_type_dev(), with false passed as attach_drv. Instead of keeping it as an exported symbol turn it into static inline wrapper. Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet Acked-by: Alexei Starovoitov Acked-by: Daniel Borkmann --- include/linux/bpf.h | 13 ++++++------- kernel/bpf/syscall.c | 10 ---------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index f82be640731e..37bbab8c0f56 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -334,7 +334,6 @@ extern const struct bpf_verifier_ops tc_cls_act_analyzer_ops; extern const struct bpf_verifier_ops xdp_analyzer_ops; struct bpf_prog *bpf_prog_get(u32 ufd); -struct bpf_prog *bpf_prog_get_type(u32 ufd, enum bpf_prog_type type); struct bpf_prog *bpf_prog_get_type_dev(u32 ufd, enum bpf_prog_type type, bool attach_drv); struct bpf_prog * __must_check bpf_prog_add(struct bpf_prog *prog, int i); @@ -425,12 +424,6 @@ static inline struct bpf_prog *bpf_prog_get(u32 ufd) return ERR_PTR(-EOPNOTSUPP); } -static inline struct bpf_prog *bpf_prog_get_type(u32 ufd, - enum bpf_prog_type type) -{ - return ERR_PTR(-EOPNOTSUPP); -} - static inline struct bpf_prog *bpf_prog_get_type_dev(u32 ufd, enum bpf_prog_type type, bool attach_drv) @@ -514,6 +507,12 @@ static inline int cpu_map_enqueue(struct bpf_cpu_map_entry *rcpu, } #endif /* CONFIG_BPF_SYSCALL */ +static inline struct bpf_prog *bpf_prog_get_type(u32 ufd, + enum bpf_prog_type type) +{ + return bpf_prog_get_type_dev(ufd, type, false); +} + int bpf_prog_offload_compile(struct bpf_prog *prog); void bpf_prog_offload_destroy(struct bpf_prog *prog); u32 bpf_prog_offload_ifindex(struct bpf_prog *prog); diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 38da55905ab0..41509cf825d8 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -1097,16 +1097,6 @@ struct bpf_prog *bpf_prog_get(u32 ufd) return __bpf_prog_get(ufd, NULL, false); } -struct bpf_prog *bpf_prog_get_type(u32 ufd, enum bpf_prog_type type) -{ - struct bpf_prog *prog = __bpf_prog_get(ufd, &type, false); - - if (!IS_ERR(prog)) - trace_bpf_prog_get_type(prog); - return prog; -} -EXPORT_SYMBOL_GPL(bpf_prog_get_type); - struct bpf_prog *bpf_prog_get_type_dev(u32 ufd, enum bpf_prog_type type, bool attach_drv) {