[bpf-next,v2,08/15] nfp: bpf: add map data structure

Message ID	20180112042917.10348-9-jakub.kicinski@netronome.com
State	Accepted, archived
Delegated to:	BPF Maintainers
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Jakub Kicinski <jakub.kicinski@netronome.com> 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 <jakub.kicinski@netronome.com> Subject: [PATCH bpf-next v2 08/15] nfp: bpf: add map data structure Date: Thu, 11 Jan 2018 20:29:10 -0800 Message-Id: <20180112042917.10348-9-jakub.kicinski@netronome.com> 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
Series	bpf: support creating maps on networking devices \| expand [bpf-next,v2,00/15] bpf: support creating maps on networking devices [bpf-next,v2,01/15] bpf: add map_alloc_check callback [bpf-next,v2,02/15] bpf: hashtab: move attribute validation before allocation [bpf-next,v2,03/15] bpf: hashtab: move checks out of alloc function [bpf-next,v2,04/15] bpf: add helper for copying attrs to struct bpf_map [bpf-next,v2,05/15] bpf: rename bpf_dev_offload -> bpf_prog_offload [bpf-next,v2,06/15] bpf: offload: factor out netdev checking at allocation time [bpf-next,v2,07/15] bpf: offload: add map offload infrastructure [bpf-next,v2,08/15] nfp: bpf: add map data structure [bpf-next,v2,09/15] nfp: bpf: add basic control channel communication [bpf-next,v2,10/15] nfp: bpf: implement helpers for FW map ops [bpf-next,v2,11/15] nfp: bpf: parse function call and map capabilities [bpf-next,v2,12/15] nfp: bpf: add helpers for updating immediate instructions [bpf-next,v2,13/15] nfp: bpf: add verification and codegen for map lookups [bpf-next,v2,14/15] nfp: bpf: add support for reading map memory [bpf-next,v2,15/15] nfp: bpf: implement bpf map offload

Message ID

20180112042917.10348-9-jakub.kicinski@netronome.com

State

Accepted, archived

Delegated to:

BPF Maintainers

Headers

From: Jakub Kicinski <jakub.kicinski@netronome.com>
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 <jakub.kicinski@netronome.com>
Subject: [PATCH bpf-next v2 08/15] nfp: bpf: add map data structure
Date: Thu, 11 Jan 2018 20:29:10 -0800
Message-Id: <20180112042917.10348-9-jakub.kicinski@netronome.com>
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

Series

bpf: support creating maps on networking devices | expand

Commit Message

Jakub Kicinski Jan. 12, 2018, 4:29 a.m. UTC

To be able to split code into reasonable chunks we need to add
the map data structures already.  Later patches will add code
piece by piece.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
---
 drivers/net/ethernet/netronome/nfp/bpf/main.c |  7 ++++++-
 drivers/net/ethernet/netronome/nfp/bpf/main.h | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.c b/drivers/net/ethernet/netronome/nfp/bpf/main.c
index e8cfe300c8c4..c9fd7d417d1a 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.c
@@ -313,6 +313,8 @@  static int nfp_bpf_init(struct nfp_app *app)
 	bpf->app = app;
 	app->priv = bpf;
 
+	INIT_LIST_HEAD(&bpf->map_list);
+
 	err = nfp_bpf_parse_capabilities(app);
 	if (err)
 		goto err_free_bpf;
@@ -326,7 +328,10 @@  static int nfp_bpf_init(struct nfp_app *app)
 
 static void nfp_bpf_clean(struct nfp_app *app)
 {
-	kfree(app->priv);
+	struct nfp_app_bpf *bpf = app->priv;
+
+	WARN_ON(!list_empty(&bpf->map_list));
+	kfree(bpf);
 }
 
 const struct nfp_app_type app_bpf = {
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.h b/drivers/net/ethernet/netronome/nfp/bpf/main.h
index 66381afee2a9..23763b22f8fc 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.h
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.h
@@ -93,6 +93,8 @@  enum pkt_vec {
  * struct nfp_app_bpf - bpf app priv structure
  * @app:		backpointer to the app
  *
+ * @map_list:		list of offloaded maps
+ *
  * @adjust_head:	adjust head capability
  * @flags:		extra flags for adjust head
  * @off_min:		minimal packet offset within buffer required
@@ -103,6 +105,8 @@  enum pkt_vec {
 struct nfp_app_bpf {
 	struct nfp_app *app;
 
+	struct list_head map_list;
+
 	struct nfp_bpf_cap_adjust_head {
 		u32 flags;
 		int off_min;
@@ -112,6 +116,20 @@  struct nfp_app_bpf {
 	} adjust_head;
 };
 
+/**
+ * struct nfp_bpf_map - private per-map data attached to BPF maps for offload
+ * @offmap:	pointer to the offloaded BPF map
+ * @bpf:	back pointer to bpf app private structure
+ * @tid:	table id identifying map on datapath
+ * @l:		link on the nfp_app_bpf->map_list list
+ */
+struct nfp_bpf_map {
+	struct bpf_offloaded_map *offmap;
+	struct nfp_app_bpf *bpf;
+	u32 tid;
+	struct list_head l;
+};
+
 struct nfp_prog;
 struct nfp_insn_meta;
 typedef int (*instr_cb_t)(struct nfp_prog *, struct nfp_insn_meta *);

[bpf-next,v2,08/15] nfp: bpf: add map data structure

Commit Message

Patch