Changes in bpf_qdisc.c

f4b369c6fe0ceaba2da2daff8c9eb415f85926dd - Merge branch 'next' into for-linus

Mon, 20 Apr 2026 03:28:57 +0200

Merge branch 'next' into for-linusPrepare input updates for 7.1 merge window. List of files: /linux/net/sched/bpf_qdisc.c

0421ccdfad0d92713a812a5aeb7d07b0ea7213c8 - Merge tag 'v7.0-rc3' into next

Thu, 12 Mar 2026 18:44:42 +0100

Merge tag 'v7.0-rc3' into nextSync up with the mainline to brig up the latest changes, specificallychanges to ALPS driver. List of files: /linux/net/sched/bpf_qdisc.c

42d3b66d4cdbacfc9d120d2301b8de89cc29a914 - Merge drm/drm-next into drm-xe-next

Thu, 12 Mar 2026 15:17:56 +0100

Merge drm/drm-next into drm-xe-nextBackmerging to bring in 7.00-rc3. Important ahead GPU SVM merging THPsupport.Signed-off-by: Matthew Brost List of files: /linux/net/sched/bpf_qdisc.c

f09812b85fa6f41058bcc46e70ac406bf9b0493a - Merge drm/drm-next into drm-intel-next

Wed, 25 Feb 2026 12:23:04 +0100

Merge drm/drm-next into drm-intel-nextSync with v7.0-rc1 which contains a few treewide changes affecting i915.Signed-off-by: Jani Nikula List of files: /linux/net/sched/bpf_qdisc.c

8b85987d3cf50178f67618122d9f3bb202f62f42 - Merge drm/drm-next into drm-misc-next

Mon, 23 Feb 2026 11:48:20 +0100

Merge drm/drm-next into drm-misc-nextLet's merge 7.0-rc1 to start the new drm-misc-next windowSigned-off-by: Maxime Ripard List of files: /linux/net/sched/bpf_qdisc.c

c17ee635fd3a482b2ad2bf5e269755c2eae5f25e - Merge drm/drm-fixes into drm-misc-fixes

Mon, 23 Feb 2026 10:09:45 +0100

Merge drm/drm-fixes into drm-misc-fixes7.0-rc1 was just released, let's merge it to kick the new release cycle.Signed-off-by: Maxime Ripard List of files: /linux/net/sched/bpf_qdisc.c

f17b474e36647c23801ef8fdaf2255ab66dd2973 - Merge tag 'bpf-next-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Tue, 10 Feb 2026 20:26:21 +0100

Merge tag 'bpf-next-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextPull bpf updates from Alexei Starovoitov: - Support associating BPF program with struct_ops (Amery Hung) - Switch BPF local storage to rqspinlock and remove recursion detection counters which were causing false positives (Amery Hung) - Fix live registers marking for indirect jumps (Anton Protopopov) - Introduce execution context detection BPF helpers (Changwoo Min) - Improve verifier precision for 32bit sign extension pattern (Cupertino Miranda) - Optimize BTF type lookup by sorting vmlinux BTF and doing binary search (Donglin Peng) - Allow states pruning for misc/invalid slots in iterator loops (Eduard Zingerman) - In preparation for ASAN support in BPF arenas teach libbpf to move global BPF variables to the end of the region and enable arena kfuncs while holding locks (Emil Tsalapatis) - Introduce support for implicit arguments in kfuncs and migrate a number of them to new API. This is a prerequisite for cgroup sub-schedulers in sched-ext (Ihor Solodrai) - Fix incorrect copied_seq calculation in sockmap (Jiayuan Chen) - Fix ORC stack unwind from kprobe_multi (Jiri Olsa) - Speed up fentry attach by using single ftrace direct ops in BPF trampolines (Jiri Olsa) - Require frozen map for calculating map hash (KP Singh) - Fix lock entry creation in TAS fallback in rqspinlock (Kumar Kartikeya Dwivedi) - Allow user space to select cpu in lookup/update operations on per-cpu array and hash maps (Leon Hwang) - Make kfuncs return trusted pointers by default (Matt Bobrowski) - Introduce "fsession" support where single BPF program is executed upon entry and exit from traced kernel function (Menglong Dong) - Allow bpf_timer and bpf_wq use in all programs types (Mykyta Yatsenko, Andrii Nakryiko, Kumar Kartikeya Dwivedi, Alexei Starovoitov) - Make KF_TRUSTED_ARGS the default for all kfuncs and clean up their definition across the tree (Puranjay Mohan) - Allow BPF arena calls from non-sleepable context (Puranjay Mohan) - Improve register id comparison logic in the verifier and extend linked registers with negative offsets (Puranjay Mohan) - In preparation for BPF-OOM introduce kfuncs to access memcg events (Roman Gushchin) - Use CFI compatible destructor kfunc type (Sami Tolvanen) - Add bitwise tracking for BPF_END in the verifier (Tianci Cao) - Add range tracking for BPF_DIV and BPF_MOD in the verifier (Yazhou Tang) - Make BPF selftests work with 64k page size (Yonghong Song)* tag 'bpf-next-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next: (268 commits) selftests/bpf: Fix outdated test on storage->smap selftests/bpf: Choose another percpu variable in bpf for btf_dump test selftests/bpf: Remove test_task_storage_map_stress_lookup selftests/bpf: Update task_local_storage/task_storage_nodeadlock test selftests/bpf: Update task_local_storage/recursion test selftests/bpf: Update sk_storage_omem_uncharge test bpf: Switch to bpf_selem_unlink_nofail in bpf_local_storage_{map_free, destroy} bpf: Support lockless unlink when freeing map or local storage bpf: Prepare for bpf_selem_unlink_nofail() bpf: Remove unused percpu counter from bpf_local_storage_map_free bpf: Remove cgroup local storage percpu counter bpf: Remove task local storage percpu counter bpf: Change local_storage->lock and b->lock to rqspinlock bpf: Convert bpf_selem_unlink to failable bpf: Convert bpf_selem_link_map to failable bpf: Convert bpf_selem_unlink_map to failable bpf: Select bpf_local_storage_map_bucket based on bpf_local_storage selftests/xsk: fix number of Tx frags in invalid packet selftests/xsk: properly handle batch ending in the middle of a packet bpf: Prevent reentrance into call_rcu_tasks_trace() ... List of files: /linux/net/sched/bpf_qdisc.c

9c1a3525fd64839d71e0c1a21170003a4621e6e8 - Merge branch 'use-correct-destructor-kfunc-types'

Tue, 13 Jan 2026 03:53:57 +0100

Merge branch 'use-correct-destructor-kfunc-types'Sami Tolvanen says:====================While running BPF self-tests with CONFIG_CFI (Control FlowIntegrity) enabled, I ran into a couple of failures inbpf_obj_free_fields() caused by type mismatches between thebtf_dtor_kfunc_t function pointer type and the registereddestructor functions.It looks like we can't change the argument type for thesefunctions to match btf_dtor_kfunc_t because the verifier doesn'tlike void pointer arguments for functions used in BPF programs,so this series fixes the issue by adding stubs with correct typesto use as destructors for each instance of this I found in thekernel tree.The last patch changes btf_check_dtor_kfuncs() to enforce thefunction type when CFI is enabled, so we don't end up registeringdestructors that panic the kernel.v5:- Rebased on bpf-next/master again.v4: https://lore.kernel.org/bpf/20251126221724.897221-6-samitolvanen@google.com/- Rebased on bpf-next/master.- Renamed CONFIG_CFI_CLANG to CONFIG_CFI.- Picked up Acked/Tested-by tags.v3: https://lore.kernel.org/bpf/20250728202656.559071-6-samitolvanen@google.com/- Renamed the functions and went back to __bpf_kfunc based on review feedback.v2: https://lore.kernel.org/bpf/20250725214401.1475224-6-samitolvanen@google.com/- Annotated the stubs with CFI_NOSEAL to fix issues with IBT sealing on x86.- Changed __bpf_kfunc to explicit __used __retain.v1: https://lore.kernel.org/bpf/20250724223225.1481960-6-samitolvanen@google.com/====================Acked-by: Martin KaFai Lau Link: https://patch.msgid.link/20260110082548.113748-6-samitolvanen@google.comSigned-off-by: Alexei Starovoitov List of files: /linux/net/sched/bpf_qdisc.c

c99d97b46631c4bea0c14b7581b7a59214601e63 - bpf: net_sched: Use the correct destructor kfunc type

Sat, 10 Jan 2026 09:25:51 +0100

bpf: net_sched: Use the correct destructor kfunc typeWith CONFIG_CFI enabled, the kernel strictly enforces that indirectfunction calls use a function pointer type that matches thetarget function. As bpf_kfree_skb() signature differs from thebtf_dtor_kfunc_t pointer type used for the destructor calls inbpf_obj_free_fields(), add a stub function with the correct type tofix the type mismatch.Signed-off-by: Sami Tolvanen Acked-by: Yonghong Song Link: https://lore.kernel.org/r/20260110082548.113748-8-samitolvanen@google.comSigned-off-by: Alexei Starovoitov List of files: /linux/net/sched/bpf_qdisc.c

e40030a46acc07bb956068e59c614f1a17459a18 - Merge branch 'bpf-make-kf_trusted_args-default'

Fri, 02 Jan 2026 21:04:29 +0100

Merge branch 'bpf-make-kf_trusted_args-default'Puranjay Mohan says:====================bpf: Make KF_TRUSTED_ARGS defaultv2: https://lore.kernel.org/all/20251231171118.1174007-1-puranjay@kernel.org/Changes in v2->v3:- Fix documentation: add a new section for kfunc parameters (Eduard)- Remove all occurances of KF_TRUSTED from comments, etc. (Eduard)- Fix the netfilter kfuncs to drop dead NULL checks.- Fix selftest for netfilter kfuncs to check for verification failures and remove the runtime failure that are not possible after this changesv1: https://lore.kernel.org/all/20251224192448.3176531-1-puranjay@kernel.org/Changes in v1->v2:- Update kfunc_dynptr_param selftest to use a real pointer that is not ptr_to_stack and not CONST_PTR_TO_DYNPTR rather than casting 1 (Alexei)- Thoroughly review all kfuncs in the to find regressions or missing annotations. (Eduard)- Fix kfuncs found from the above step.This series makes trusted arguments the default requirement for all BPFkfuncs, inverting the current opt-in model. Instead of requiringexplicit KF_TRUSTED_ARGS flags, kfuncs now require trusted arguments bydefault and must explicitly opt-out using __nullable/__opt annotationsor the KF_RCU flag.This improves security and type safety by preventing BPF programs frompassing untrusted or NULL pointers to kernel functions at verificationtime, while maintaining flexibility for the small number of kfuncs thatlegitimately need to accept NULL or RCU pointers.MOTIVATIONThe current opt-in model is error-prone and inconsistent. Most kfuncs alreadyrequire trusted pointers from sources like KF_ACQUIRE, struct_ops callbacks, ortracepoints. Making trusted arguments the default:- Prevents NULL pointer dereferences at verification time- Reduces defensive NULL checks in kernel code- Provides better error messages for invalid BPF programs- Aligns with existing patterns (context pointers, struct_ops already trusted)IMPACT ANALYSISComprehensive analysis of all 304+ kfuncs across 37 kernel files found:- Most kfuncs (299/304) are already safe and require no changes- Only 4 kfuncs required fixes (all included in this series)- 0 regressions found in independent verificationAll bpf selftests are passing. The hid_bpf tests are also passing:# PASSED: 20 / 20 tests passed.# Totals: pass:20 fail:0 xfail:0 xpass:0 skip:0 error:0bpf programs in drivers/hid/bpf/progs/ show no regression as shown byveristat:Done. Processed 24 files, 62 programs. Skipped 0 files, 0 programs.TECHNICAL DETAILSThe verifier now validates kfunc arguments in this order:1. NULL check (runs first): Rejects NULL unless parameter has __nullable/__opt2. Trusted check: Rejects untrusted pointers unless kfunc has KF_RCUSpecial cases that bypass trusted checking:- Context pointers (xdp_md, __sk_buff): Handled via KF_ARG_PTR_TO_CTX- Struct_ops callbacks: Pre-marked as PTR_TRUSTED during initialization- KF_RCU kfuncs: Have separate validation path for RCU pointersBACKWARD COMPATIBILITYThis affects BPF program verification, not runtime:- Valid programs passing trusted pointers: Continue to work- Programs with bugs: May now fail verification (preventing runtime crashes)This series introduces two intentional breaking changes to the BPFverifier's kfunc handling:1. NULL pointer rejection timing: Kfuncs that previously accepted NULLpointers without KF_TRUSTED_ARGS will now reject NULL at verificationtime instead of returning runtime errors. This affects netfilterconnection tracking functions (bpf_xdp_ct_lookup, bpf_skb_ct_lookup,bpf_xdp_ct_alloc, bpf_skb_ct_alloc), which now enforce their documented"Cannot be NULL" requirements at load time rather than returning -EINVALat runtime.2. Fentry/fexit program restrictions: BPF programs using fentry/fexitattachment points can no longer pass their callback arguments directlyto kfuncs, as these arguments are not marked as trusted by default.Programs requiring trusted argument semantics should migrate to tp_btf(tracepoint with BTF) attachment points where arguments are guaranteedtrusted by the verifier.Both changes strengthen the verifier's safety guarantees by catchingerrors earlier in the development cycle and are accompanied bycomprehensive test updates demonstrating the new expected behaviors.====================Link: https://patch.msgid.link/20260102180038.2708325-1-puranjay@kernel.orgSigned-off-by: Alexei Starovoitov List of files: /linux/net/sched/bpf_qdisc.c

7646c7afd9a95db0b0cb4ad066ed90f6024da67d - bpf: Remove redundant KF_TRUSTED_ARGS flag from all kfuncs

Fri, 02 Jan 2026 19:00:28 +0100

bpf: Remove redundant KF_TRUSTED_ARGS flag from all kfuncsNow that KF_TRUSTED_ARGS is the default for all kfuncs, remove theexplicit KF_TRUSTED_ARGS flag from all kfunc definitions and remove theflag itself.Acked-by: Eduard Zingerman Reviewed-by: Emil Tsalapatis Signed-off-by: Puranjay Mohan Link: https://lore.kernel.org/r/20260102180038.2708325-3-puranjay@kernel.orgSigned-off-by: Alexei Starovoitov List of files: /linux/net/sched/bpf_qdisc.c

cb9f145f638d7afa633632a9290d6ad06caeb8ee - Merge remote-tracking branch 'drm/drm-next' into msm-next-robclark

Sat, 01 Nov 2025 13:47:30 +0100

Merge remote-tracking branch 'drm/drm-next' into msm-next-robclarkBack-merge drm-next to get caught up.Signed-off-by: Rob Clark List of files: /linux/net/sched/bpf_qdisc.c

f088104d837a991c65e51fa30bb4196169b3244d - Merge drm/drm-next into drm-intel-gt-next

Tue, 16 Sep 2025 12:53:20 +0200

Merge drm/drm-next into drm-intel-gt-nextBackmerge in order to get the commit: 048832a3f400 ("drm/i915: Refactor shmem_pwrite() to use kiocb and write_iter")To drm-intel-gt-next as there are followup fixes to be applied.Signed-off-by: Joonas Lahtinen List of files: /linux/net/sched/bpf_qdisc.c

a53d0cf7f1cb3182ad533ff5cacfa5fd29c419ad - Merge commit 'linus' into core/bugs, to resolve conflicts

Tue, 05 Aug 2025 11:15:34 +0200

Merge commit 'linus' into core/bugs, to resolve conflictsResolve conflicts with this commit that was developed in parallelduring the merge window: 8c8efa93db68 ("x86/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust") Conflicts: arch/riscv/include/asm/bug.h arch/x86/include/asm/bug.hSigned-off-by: Ingo Molnar List of files: /linux/net/sched/bpf_qdisc.c

8b87f67b4c87452e21721887fa8dec1f4c6b2b7c - Merge branch 'next' into for-linus

Wed, 08 Oct 2025 06:53:13 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.18 merge window. List of files: /linux/net/sched/bpf_qdisc.c

4b051897df2375414587a245ecb9bb1a4d26b3b8 - Merge tag 'v6.17-rc2' into HEAD

Thu, 21 Aug 2025 20:46:49 +0200

Merge tag 'v6.17-rc2' into HEADSync up with mainline to bring in changes to include/linux/sprintf.h List of files: /linux/net/sched/bpf_qdisc.c

b4d90dbc4c1bc4bd3eb2d2989330af0eb95c98e8 - Merge drm/drm-next into drm-misc-next-fixes

Mon, 15 Sep 2025 10:23:28 +0200

Merge drm/drm-next into drm-misc-next-fixesBackmerging to drm-misc-next-fixes to get features and fixes fromv6.17-rc6.Signed-off-by: Thomas Zimmermann List of files: /linux/net/sched/bpf_qdisc.c

702fdf3513b045f596f836d9a4b8672c76f11834 - Merge drm/drm-next into drm-intel-next

Wed, 10 Sep 2025 14:01:42 +0200

Merge drm/drm-next into drm-intel-nextCatching up with some display dependencies.Signed-off-by: Rodrigo Vivi List of files: /linux/net/sched/bpf_qdisc.c

ca994e8922f25f7fed2075098f185cf198109eaa - Merge drm/drm-next into drm-xe-next

Tue, 12 Aug 2025 14:58:37 +0200

Merge drm/drm-next into drm-xe-nextBring v6.17-rc1 to propagate commits from other subsystems, particularlyPCI, which has some new functions needed for SR-IOV integration.Signed-off-by: Lucas De Marchi List of files: /linux/net/sched/bpf_qdisc.c

08c51f5bddc81c8c97c1eb11861b0dc009e5ccd8 - Merge drm/drm-next into drm-misc-n

Mon, 11 Aug 2025 14:37:45 +0200

Merge drm/drm-next into drm-misc-nUpdating drm-misc-next to the state of v6.17-rc1. Begins a new releasecycle.Signed-off-by: Thomas Zimmermann List of files: /linux/net/sched/bpf_qdisc.c