fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ebpf: Make ebpf_rss_load() return value consistent with @errp

Browse source 
ebpf_rss_load() returns false for failure without setting an Error
when its @ctx argument already has an eBPF program loaded.  This is
wrong.  Fortunately, it is only called @ctx has a program.  Replace
the incorrect error check by an assertion.

The return value is now obviously reliable.  Change the caller to use
it, because it's more concise.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20251118154718.3969982-4-armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Markus Armbruster 2025-11-18 16:47:18 +01:00 • committed by Philippe Mathieu-Daudé
parent 6cb4cd503b
commit de285aa907
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ebpf/ebpf_rss.c
View file

@ -106,9 +106,7 @@ bool ebpf_rss_load(struct EBPFRSSContext *ctx, Error **errp)
{ {
struct rss_bpf *rss_bpf_ctx; struct rss_bpf *rss_bpf_ctx;
if (ebpf_rss_is_loaded(ctx)) { g_assert(!ebpf_rss_is_loaded(ctx));
return false;
}
rss_bpf_ctx = rss_bpf__open(); rss_bpf_ctx = rss_bpf__open();
if (rss_bpf_ctx == NULL) { if (rss_bpf_ctx == NULL) {

4
hw/net/virtio-net.c
View file

@ -1363,9 +1363,7 @@ static bool virtio_net_load_ebpf(VirtIONet *n, Error **errp)
return virtio_net_load_ebpf_fds(n, errp); return virtio_net_load_ebpf_fds(n, errp);
} }
ebpf_rss_load(&n->ebpf_rss, &err); if (!ebpf_rss_load(&n->ebpf_rss, &err)) {
/* Beware, ebpf_rss_load() can return false with @err unset */
if (err) {
warn_report_err(err); warn_report_err(err);
} }
return true; return true;