From: Martin KaFai Lau <martin.lau@linux.dev>
To: David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <martin.lau@kernel.org>,
netdev@vger.kernel.org, bpf@vger.kernel.org
Subject: pull-request: bpf-next 2025-05-02
Date: Fri, 2 May 2025 18:07:55 -0700 [thread overview]
Message-ID: <20250503010755.4030524-1-martin.lau@linux.dev> (raw)
Hi David, hi Jakub, hi Paolo, hi Eric,
The following pull-request contains BPF updates for your *net-next* tree.
We've added 14 non-merge commits during the last 10 day(s) which contain
a total of 13 files changed, 740 insertions(+), 121 deletions(-).
The main changes are:
1) Avoid skipping or repeating a sk when using a UDP bpf_iter,
from Jordan Rife.
2) Fixed a crash when a bpf qdisc is set in
the net.core.default_qdisc, from Amery Hung.
3) A few other fixes in the bpf qdisc, from Amery Hung.
- Always call qdisc_watchdog_init() in the .init prologue such that
the .reset/.destroy epilogue can always call qdisc_watchdog_cancel()
without issue.
- bpf_qdisc_init_prologue() was incorrectly returning an error
when the bpf qdisc is set as the default_qdisc and the mq is creating
the default_qdisc. It is now fixed.
Please consider pulling these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git tags/for-netdev
Thanks a lot!
Also thanks to reporters, reviewers and testers of commits in this pull-request:
Kuniyuki Iwashima
----------------------------------------------------------------
The following changes since commit 8ff6175139967cd17b2a62bca4b2de2559942b7e:
bnxt_en: hide CONFIG_DETECT_HUNG_TASK specific code (2025-04-23 14:46:00 -0700)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git tags/for-netdev
for you to fetch changes up to 30190f82a1a9eb555703879cfe835627cff7a0e2:
Merge branch 'fix-bpf-qdisc-bugs-and-clean-up' (2025-05-02 15:51:17 -0700)
----------------------------------------------------------------
bpf-next-for-netdev
----------------------------------------------------------------
Amery Hung (6):
bpf: net_sched: Fix using bpf qdisc as default qdisc
bpf: net_sched: Fix bpf qdisc init prologue when set as default qdisc
selftests/bpf: Test setting and creating bpf qdisc as default qdisc
bpf: net_sched: Make some Qdisc_ops ops mandatory
selftests/bpf: Test attaching a bpf qdisc with incomplete operators
selftests/bpf: Cleanup bpf qdisc selftests
Feng Yang (1):
selftests/bpf: Fix compilation errors
Jordan Rife (7):
bpf: udp: Make mem flags configurable through bpf_iter_udp_realloc_batch
bpf: udp: Make sure iter->batch always contains a full bucket snapshot
bpf: udp: Get rid of st_bucket_done
bpf: udp: Use bpf_udp_iter_batch_item for bpf_udp_iter_state batch items
bpf: udp: Avoid socket skips and repeats during iteration
selftests/bpf: Return socket cookies from sock_iter_batch progs
selftests/bpf: Add tests for bucket resume logic in UDP socket iterators
Martin KaFai Lau (2):
Merge branch 'bpf-udp-exactly-once-socket-iteration'
Merge branch 'fix-bpf-qdisc-bugs-and-clean-up'
include/linux/udp.h | 3 +
net/ipv4/udp.c | 173 +++++---
net/sched/bpf_qdisc.c | 24 +-
net/sched/sch_api.c | 4 +-
net/sched/sch_generic.c | 4 +-
tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c | 119 ++++--
.../selftests/bpf/prog_tests/sock_iter_batch.c | 447 ++++++++++++++++++++-
.../testing/selftests/bpf/progs/bpf_qdisc_common.h | 6 +-
.../bpf/progs/bpf_qdisc_fail__incompl_ops.c | 41 ++
tools/testing/selftests/bpf/progs/bpf_qdisc_fifo.c | 9 +
tools/testing/selftests/bpf/progs/bpf_qdisc_fq.c | 6 +
.../testing/selftests/bpf/progs/bpf_tracing_net.h | 1 +
.../testing/selftests/bpf/progs/sock_iter_batch.c | 24 +-
13 files changed, 740 insertions(+), 121 deletions(-)
create mode 100644 tools/testing/selftests/bpf/progs/bpf_qdisc_fail__incompl_ops.c
next reply other threads:[~2025-05-03 1:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-03 1:07 Martin KaFai Lau [this message]
2025-05-06 0:01 ` pull-request: bpf-next 2025-05-02 patchwork-bot+netdevbpf
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=20250503010755.4030524-1-martin.lau@linux.dev \
--to=martin.lau@linux.dev \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=martin.lau@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@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;
as well as URLs for NNTP newsgroup(s).