Commit 64d6e3b9 authored by Amery Hung's avatar Amery Hung Committed by Martin KaFai Lau
Browse files

bpf: net_sched: Make some Qdisc_ops ops mandatory 



The patch makes all currently supported Qdisc_ops (i.e., .enqueue,
.dequeue, .init, .reset, and .destroy) mandatory.

Make .init, .reset and .destroy mandatory as bpf qdisc relies on prologue
and epilogue to check attach points and correctly initialize/cleanup
resources. The prologue/epilogue will only be generated for an struct_ops
operator only if users implement the operator.

Make .enqueue and .dequeue mandatory as bpf qdisc infra does not provide
a default data path.

Fixes: c8240344 ("bpf: net_sched: Support implementation of Qdisc_ops in bpf")
Signed-off-by: default avatarAmery Hung <ameryhung@gmail.com>
Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent 6d080362

net/sched/bpf_qdisc.c

+12 −0
Original line number Diff line number Diff line
@@ -395,6 +395,17 @@ static void bpf_qdisc_unreg(void *kdata, struct bpf_link *link) 
	return unregister_qdisc(kdata);

}



static int bpf_qdisc_validate(void *kdata)

{

	struct Qdisc_ops *ops = (struct Qdisc_ops *)kdata;



	if (!ops->enqueue || !ops->dequeue || !ops->init ||

	    !ops->reset || !ops->destroy)

		return -EINVAL;



	return 0;

}



static int Qdisc_ops__enqueue(struct sk_buff *skb__ref, struct Qdisc *sch,

			      struct sk_buff **to_free)

{
@@ -432,6 +443,7 @@ static struct bpf_struct_ops bpf_Qdisc_ops = { 
	.verifier_ops = &bpf_qdisc_verifier_ops,

	.reg = bpf_qdisc_reg,

	.unreg = bpf_qdisc_unreg,

	.validate = bpf_qdisc_validate,

	.init_member = bpf_qdisc_init_member,

	.init = bpf_qdisc_init,

	.name = "Qdisc_ops",