[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200717191259.GB633625@localhost.localdomain>
Date: Fri, 17 Jul 2020 21:12:59 +0200
From: Lorenzo Bianconi <lorenzo@...nel.org>
To: Jakub Sitnicki <jakub@...udflare.com>
Cc: netdev@...r.kernel.org, davem@...emloft.net, ast@...nel.org,
brouer@...hat.com, daniel@...earbox.net, toke@...hat.com,
lorenzo.bianconi@...hat.com, dsahern@...nel.org,
andrii.nakryiko@...il.com, bpf@...r.kernel.org
Subject: Re: [PATCH v7 bpf-next 0/9] introduce support for XDP programs in
CPUMAP
> On Fri, 17 Jul 2020 13:01:36 +0200
> Lorenzo Bianconi <lorenzo@...nel.org> wrote:
>
[...]
>
> HTH,
> -jkbs
Hi Jakub,
can you please test the patch below when you have some free cycles? It fixes
the issue in my setup.
Regards,
Lorenzo
diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c
index 4c95d0615ca2..f1c46529929b 100644
--- a/kernel/bpf/cpumap.c
+++ b/kernel/bpf/cpumap.c
@@ -453,24 +453,27 @@ __cpu_map_entry_alloc(struct bpf_cpumap_val *value, u32 cpu, int map_id)
rcpu->map_id = map_id;
rcpu->value.qsize = value->qsize;
+ if (fd > 0 && __cpu_map_load_bpf_program(rcpu, fd))
+ goto free_ptr_ring;
+
/* Setup kthread */
rcpu->kthread = kthread_create_on_node(cpu_map_kthread_run, rcpu, numa,
"cpumap/%d/map:%d", cpu, map_id);
if (IS_ERR(rcpu->kthread))
- goto free_ptr_ring;
+ goto free_prog;
get_cpu_map_entry(rcpu); /* 1-refcnt for being in cmap->cpu_map[] */
get_cpu_map_entry(rcpu); /* 1-refcnt for kthread */
- if (fd > 0 && __cpu_map_load_bpf_program(rcpu, fd))
- goto free_ptr_ring;
-
/* Make sure kthread runs on a single CPU */
kthread_bind(rcpu->kthread, cpu);
wake_up_process(rcpu->kthread);
return rcpu;
+free_prog:
+ if (rcpu->prog)
+ bpf_prog_put(rcpu->prog);
free_ptr_ring:
ptr_ring_cleanup(rcpu->queue, NULL);
free_queue:
Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)
Powered by blists - more mailing lists