Skip to contentSkip to conversation

bpf: net_sched: Fix using bpf qdisc as default qdisc

PATCH Applied Amery Hung 2 participants 2 messages Apr 29, 2025

Subsystems (4)
lore
Share & tools
lore

Amery Hung

author
#0 lore raw

PATCH v2 1/1 bpf: net_sched: Fix using bpf qdisc as default qdisc

Use bpf_try_module_get()/bpf_module_put() instead of try_module_get()/ module_put() when handling default qdisc since users can assign a bpf qdisc to it.

To trigger the bug:

$ bpftool struct_ops register bpf_qdisc_fq.bpf.o /sys/fs/bpf
$ echo bpf_fq > /proc/sys/net/core/default_qdisc
Fixes c8240344956e ("bpf: net_sched: Support implementation of Qdisc_ops in bpf")
---
 net/sched/sch_api.c     | 4 ++--
 net/sched/sch_generic.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
net/sched/sch_api.c +2 -2
index db6330258dda..c5e3673aadbe 100644
@@ -208,7 +208,7 @@ static struct Qdisc_ops *qdisc_lookup_default(const char *name)
 
 	for (q = qdisc_base; q; q = q->next) {
 		if (!strcmp(name, q->id)) {
-			if (!try_module_get(q->owner))
+			if (!bpf_try_module_get(q, q->owner))
 				q = NULL;
 			break;
 		}
@@ -238,7 +238,7 @@ int qdisc_set_default(const char *name)
 
 	if (ops) {
 		/* Set new default */
-		module_put(default_qdisc_ops->owner);
+		bpf_module_put(default_qdisc_ops, default_qdisc_ops->owner);
 		default_qdisc_ops = ops;
 	}
 	write_unlock(&qdisc_mod_lock);
net/sched/sch_generic.c +2 -2
index e6fda9f20272..7d2836d66043 100644
@@ -1002,14 +1002,14 @@ struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue,
 {
 	struct Qdisc *sch;
 
-	if (!try_module_get(ops->owner)) {
+	if (!bpf_try_module_get(ops, ops->owner)) {
 		NL_SET_ERR_MSG(extack, "Failed to increase module reference counter");
 		return NULL;
 	}
 
 	sch = qdisc_alloc(dev_queue, ops, extack);
 	if (IS_ERR(sch)) {
-		module_put(ops->owner);
+		bpf_module_put(ops, ops->owner);
 		return NULL;
 	}
 	sch->parent = parentid;
Signature · 1 line
2.47.1
#1 lore raw
This patch was applied to bpf/bpf-next.git (net) by Martin KaFai Lau <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (net)
by Martin KaFai Lau <[email protected]>:

Quoted 9 lines · On Tue, 29 Apr 2025 12:21:28 -0700 you wrote:

Use bpf_try_module_get()/bpf_module_put() instead of try_module_get()/ module_put() when handling default qdisc since users can assign a bpf qdisc to it.

To trigger the bug:

$ bpftool struct_ops register bpf_qdisc_fq.bpf.o /sys/fs/bpf
$ echo bpf_fq > /proc/sys/net/core/default_qdisc

[...]

Here is the summary with links:
- [bpf-next/net,v2,1/1] bpf: net_sched: Fix using bpf qdisc as default qdisc

    https://git.kernel.org/bpf/bpf-next/c/7625645e6945

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html