From patchwork Fri Jan 12 04:29:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 859487 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="FTsG+K5H"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHqXg71JDz9t3p for ; Fri, 12 Jan 2018 15:29:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933149AbeALE3y (ORCPT ); Thu, 11 Jan 2018 23:29:54 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:41327 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932976AbeALE3t (ORCPT ); Thu, 11 Jan 2018 23:29:49 -0500 Received: by mail-pf0-f195.google.com with SMTP id j3so3542039pfh.8 for ; Thu, 11 Jan 2018 20:29:48 -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=UMZcZClT/kcZI0n2OscQ+OP3sAduVJr5fuc3Ly/Lf3w=; b=FTsG+K5Hv7qxtG3xFh26O82cK6FmdUgzAQ7cXan7sw7SOQZQvL43F0/4phUmLYNMLd Jf0c34cctyjrZj32brViQGgajFIuuMwz+iepI2IjgSslvVrwo+cS2DoEuSAMuJbAPuci C7nVX/iUrJmWnPlFWVcmObzBdhtMcMJqJnRq6zXT2qopyl95MVrGd7vc8WsJ9cp7nUb/ oREhhL/1famX7vDN9N1CpawxFYL7z+A0C62MrXbWgt0tK9wEgX8fvFMD+c+suA6jjHtZ 3N1JBG0Ldbv8QzJfm97wFJswxH8r5LE/AfUSOQFtMVxPtKgk6ydqJL6J2sIwHBwjw9Ew eXkw== 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=UMZcZClT/kcZI0n2OscQ+OP3sAduVJr5fuc3Ly/Lf3w=; b=jjv2Gf9EbjKVfnVhKxNtV9dQuvmEhxIqqNE26L2w8IEUjbrA6s6rqV4ynm0/Ii1yH3 F6CCmQJGbmguXwBBmrC9h7ew9Ov+v3om5ZVgwcPTSpDyZhgYPom2AaaxUfK7y6wTUeAy mQIToS+OddliFrB3NkzYzmZSceeIRC7W86liFVDU59TnfkY5Z2VbMhgF5fjx1auXCEDr eGEAKD0iZVGGGAGMB/6yas/Cgq0OkOZOA+/KOkVD9npLtYZKehdJ6iXpfYcNd+wd6+PT 9ZNctZhNs1bRj1WzShTd59faPEl27ncNa1h57uuwTeijevF1mjFg8x5UmJJmxEubLPhJ MnLA== X-Gm-Message-State: AKGB3mLuj9ny6lWXkz/vcleGQj9P8oe3TArlhBmy+jsQrFg1IBBVxlYv Z4/6d65rpllVyHjOCXZzzIkZ+mrW X-Google-Smtp-Source: ACJfBosdzRBajmWfrSSqElK1RlEMH3AYNqm/jvNrDLfiwWO8/PoQ6I7SPGr08VhQvbLqrkitD7VPTA== X-Received: by 10.84.129.1 with SMTP id 1mr24992755plb.42.1515731388630; Thu, 11 Jan 2018 20:29:48 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id e8sm45863875pfk.6.2018.01.11.20.29.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Jan 2018 20:29:48 -0800 (PST) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net, davem@davemloft.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, tehnerd@fb.com, Jakub Kicinski Subject: [PATCH bpf-next v2 05/15] bpf: rename bpf_dev_offload -> bpf_prog_offload Date: Thu, 11 Jan 2018 20:29:07 -0800 Message-Id: <20180112042917.10348-6-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180112042917.10348-1-jakub.kicinski@netronome.com> References: <20180112042917.10348-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org With map offload coming, we need to call program offload structure something less ambiguous. Pure rename, no functional changes. Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet --- drivers/net/ethernet/netronome/nfp/bpf/offload.c | 2 +- include/linux/bpf.h | 4 ++-- kernel/bpf/offload.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c index 320b2250d29a..6590228d3755 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c @@ -237,7 +237,7 @@ int nfp_net_bpf_offload(struct nfp_net *nn, struct bpf_prog *prog, int err; if (prog) { - struct bpf_dev_offload *offload = prog->aux->offload; + struct bpf_prog_offload *offload = prog->aux->offload; if (!offload) return -EINVAL; diff --git a/include/linux/bpf.h b/include/linux/bpf.h index cfbee9f83fbe..0534722ba1d8 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -200,7 +200,7 @@ struct bpf_prog_offload_ops { int insn_idx, int prev_insn_idx); }; -struct bpf_dev_offload { +struct bpf_prog_offload { struct bpf_prog *prog; struct net_device *netdev; void *dev_priv; @@ -230,7 +230,7 @@ struct bpf_prog_aux { #ifdef CONFIG_SECURITY void *security; #endif - struct bpf_dev_offload *offload; + struct bpf_prog_offload *offload; union { struct work_struct work; struct rcu_head rcu; diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index 040d4e0edf3f..001ddfde7874 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c @@ -32,7 +32,7 @@ static LIST_HEAD(bpf_prog_offload_devs); int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr) { - struct bpf_dev_offload *offload; + struct bpf_prog_offload *offload; if (attr->prog_type != BPF_PROG_TYPE_SCHED_CLS && attr->prog_type != BPF_PROG_TYPE_XDP) @@ -72,7 +72,7 @@ int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr) static int __bpf_offload_ndo(struct bpf_prog *prog, enum bpf_netdev_command cmd, struct netdev_bpf *data) { - struct bpf_dev_offload *offload = prog->aux->offload; + struct bpf_prog_offload *offload = prog->aux->offload; struct net_device *netdev; ASSERT_RTNL(); @@ -110,7 +110,7 @@ int bpf_prog_offload_verifier_prep(struct bpf_verifier_env *env) int bpf_prog_offload_verify_insn(struct bpf_verifier_env *env, int insn_idx, int prev_insn_idx) { - struct bpf_dev_offload *offload; + struct bpf_prog_offload *offload; int ret = -ENODEV; down_read(&bpf_devs_lock); @@ -124,7 +124,7 @@ int bpf_prog_offload_verify_insn(struct bpf_verifier_env *env, static void __bpf_prog_offload_destroy(struct bpf_prog *prog) { - struct bpf_dev_offload *offload = prog->aux->offload; + struct bpf_prog_offload *offload = prog->aux->offload; struct netdev_bpf data = {}; data.offload.prog = prog; @@ -242,7 +242,7 @@ static int bpf_offload_notification(struct notifier_block *notifier, ulong event, void *ptr) { struct net_device *netdev = netdev_notifier_info_to_dev(ptr); - struct bpf_dev_offload *offload, *tmp; + struct bpf_prog_offload *offload, *tmp; ASSERT_RTNL();