diff mbox series

[iproute2-next] bpf: support map offload

Message ID 20180117075054.21899-1-jakub.kicinski@netronome.com
State Accepted, archived
Delegated to: David Ahern
Headers show
Series [iproute2-next] bpf: support map offload | expand

Commit Message

Jakub Kicinski Jan. 17, 2018, 7:50 a.m. UTC 
When program is loaded with a specified ifindex, use that
ifindex also when creating maps.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---
 lib/bpf.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Daniel Borkmann Jan. 17, 2018, 9:09 a.m. UTC | #1 
On 01/17/2018 08:50 AM, Jakub Kicinski wrote:
> When program is loaded with a specified ifindex, use that
> ifindex also when creating maps.
> 
> Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>

Acked-by: Daniel Borkmann <daniel@iogearbox.net>
David Ahern Jan. 19, 2018, 8:36 p.m. UTC | #2 
On 1/16/18 11:50 PM, Jakub Kicinski wrote:
> When program is loaded with a specified ifindex, use that
> ifindex also when creating maps.
> 
> Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
> ---
>  lib/bpf.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 

applied to iproute2-next
diff mbox series

Patch

diff --git a/lib/bpf.c b/lib/bpf.c
index d32f1b808180..2db151e4dd3c 100644
--- a/lib/bpf.c
+++ b/lib/bpf.c
@@ -1208,7 +1208,7 @@  static int bpf_log_realloc(struct bpf_elf_ctx *ctx)
 
 static int bpf_map_create(enum bpf_map_type type, uint32_t size_key,
 			  uint32_t size_value, uint32_t max_elem,
-			  uint32_t flags, int inner_fd)
+			  uint32_t flags, int inner_fd, uint32_t ifindex)
 {
 	union bpf_attr attr = {};
 
@@ -1218,6 +1218,7 @@  static int bpf_map_create(enum bpf_map_type type, uint32_t size_key,
 	attr.max_entries = max_elem;
 	attr.map_flags = flags;
 	attr.inner_map_fd = inner_fd;
+	attr.map_ifindex = ifindex;
 
 	return bpf(BPF_MAP_CREATE, &attr, sizeof(attr));
 }
@@ -1632,7 +1633,9 @@  static int bpf_map_attach(const char *name, struct bpf_elf_ctx *ctx,
 
 	errno = 0;
 	fd = bpf_map_create(map->type, map->size_key, map->size_value,
-			    map->max_elem, map->flags, map_inner_fd);
+			    map->max_elem, map->flags, map_inner_fd,
+			    ctx->ifindex);
+
 	if (fd < 0 || ctx->verbose) {
 		bpf_map_report(fd, name, map, ctx, map_inner_fd);
 		if (fd < 0)