From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Jakub Sitnicki <jakub@cloudflare.com>
Cc: netdev@vger.kernel.org, davem@davemloft.net, ast@kernel.org,
brouer@redhat.com, daniel@iogearbox.net, toke@redhat.com,
lorenzo.bianconi@redhat.com, dsahern@kernel.org,
andrii.nakryiko@gmail.com, bpf@vger.kernel.org
Subject: Re: [PATCH v7 bpf-next 0/9] introduce support for XDP programs in CPUMAP
Date: Fri, 17 Jul 2020 21:12:59 +0200 [thread overview]
Message-ID: <20200717191259.GB633625@localhost.localdomain> (raw)
In-Reply-To: <20200717171333.3fe979e6@toad>
[-- Attachment #1: Type: text/plain, Size: 1368 bytes --]
> On Fri, 17 Jul 2020 13:01:36 +0200
> Lorenzo Bianconi <lorenzo@kernel.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:
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2020-07-17 19:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 13:56 [PATCH v7 bpf-next 0/9] introduce support for XDP programs in CPUMAP Lorenzo Bianconi
2020-07-14 13:56 ` [PATCH v7 bpf-next 1/9] cpumap: use non-locked version __ptr_ring_consume_batched Lorenzo Bianconi
2020-07-14 13:56 ` [PATCH v7 bpf-next 2/9] net: refactor xdp_convert_buff_to_frame Lorenzo Bianconi
2020-07-14 13:56 ` [PATCH v7 bpf-next 3/9] samples/bpf: xdp_redirect_cpu_user: do not update bpf maps in option loop Lorenzo Bianconi
2020-07-14 13:56 ` [PATCH v7 bpf-next 4/9] cpumap: formalize map value as a named struct Lorenzo Bianconi
2020-07-14 13:56 ` [PATCH v7 bpf-next 5/9] bpf: cpumap: add the possibility to attach an eBPF program to cpumap Lorenzo Bianconi
2020-07-14 13:56 ` [PATCH v7 bpf-next 6/9] bpf: cpumap: implement XDP_REDIRECT for eBPF programs attached to map entries Lorenzo Bianconi
2020-07-14 13:56 ` [PATCH v7 bpf-next 7/9] libbpf: add SEC name for xdp programs attached to CPUMAP Lorenzo Bianconi
2020-07-14 13:56 ` [PATCH v7 bpf-next 8/9] samples/bpf: xdp_redirect_cpu: load a eBPF program on cpumap Lorenzo Bianconi
2020-07-14 13:56 ` [PATCH v7 bpf-next 9/9] selftest: add tests for XDP programs in CPUMAP entries Lorenzo Bianconi
2020-07-14 15:19 ` [PATCH v7 bpf-next 0/9] introduce support for XDP programs in CPUMAP Alexei Starovoitov
2020-07-14 15:35 ` Lorenzo Bianconi
2020-07-16 16:27 ` Daniel Borkmann
2020-07-17 10:00 ` Jakub Sitnicki
2020-07-17 10:08 ` Jakub Sitnicki
2020-07-17 11:06 ` Lorenzo Bianconi
2020-07-17 11:01 ` Lorenzo Bianconi
2020-07-17 15:13 ` Jakub Sitnicki
2020-07-17 16:31 ` Lorenzo Bianconi
2020-07-17 19:12 ` Lorenzo Bianconi [this message]
2020-07-17 23:13 ` Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200717191259.GB633625@localhost.localdomain \
--to=lorenzo@kernel.org \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=jakub@cloudflare.com \
--cc=lorenzo.bianconi@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=toke@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox