[PATCH bpf-next v2 06/11] net: sched: cls_bpf: plumb extack support in filter for hardware offload

[Jakub Kicinski]

From: Quentin Monnet <quentin.mon...@netronome.com>

Pass the extack pointer obtained in the `->change()` filter operation to
cls_bpf_offload() and then to cls_bpf_offload_cmd(), where it can be
used to initialize the new field of tc_cls_common_offload passed to the
callback for offload. This makes it possible to use this extack pointer
in drivers offloading BPF programs in a future patch.

Signed-off-by: Quentin Monnet <quentin.mon...@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicin...@netronome.com>
---
 net/sched/cls_bpf.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index b8729124d209..d15ef9ab7243 100644
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -147,7 +147,8 @@ static bool cls_bpf_is_ebpf(const struct cls_bpf_prog *prog)
 }
 
 static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog,
-                              struct cls_bpf_prog *oldprog)
+                              struct cls_bpf_prog *oldprog,
+                              struct netlink_ext_ack *extack)
 {
        struct tcf_block *block = tp->chain->block;
        struct tc_cls_bpf_offload cls_bpf = {};
@@ -158,7 +159,7 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct 
cls_bpf_prog *prog,
        skip_sw = prog && tc_skip_sw(prog->gen_flags);
        obj = prog ?: oldprog;
 
-       tc_cls_common_offload_init(&cls_bpf.common, tp, NULL);
+       tc_cls_common_offload_init(&cls_bpf.common, tp, extack);
        cls_bpf.command = TC_CLSBPF_OFFLOAD;
        cls_bpf.exts = &obj->exts;
        cls_bpf.prog = prog ? prog->filter : NULL;
@@ -170,7 +171,7 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct 
cls_bpf_prog *prog,
        err = tc_setup_cb_call(block, NULL, TC_SETUP_CLSBPF, &cls_bpf, skip_sw);
        if (prog) {
                if (err < 0) {
-                       cls_bpf_offload_cmd(tp, oldprog, prog);
+                       cls_bpf_offload_cmd(tp, oldprog, prog, extack);
                        return err;
                } else if (err > 0) {
                        prog->gen_flags |= TCA_CLS_FLAGS_IN_HW;
@@ -184,7 +185,8 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct 
cls_bpf_prog *prog,
 }
 
 static int cls_bpf_offload(struct tcf_proto *tp, struct cls_bpf_prog *prog,
-                          struct cls_bpf_prog *oldprog)
+                          struct cls_bpf_prog *oldprog,
+                          struct netlink_ext_ack *extack)
 {
        if (prog && oldprog && prog->gen_flags != oldprog->gen_flags)
                return -EINVAL;
@@ -196,7 +198,7 @@ static int cls_bpf_offload(struct tcf_proto *tp, struct 
cls_bpf_prog *prog,
        if (!prog && !oldprog)
                return 0;
 
-       return cls_bpf_offload_cmd(tp, prog, oldprog);
+       return cls_bpf_offload_cmd(tp, prog, oldprog, extack);
 }
 
 static void cls_bpf_stop_offload(struct tcf_proto *tp,
@@ -204,7 +206,7 @@ static void cls_bpf_stop_offload(struct tcf_proto *tp,
 {
        int err;
 
-       err = cls_bpf_offload_cmd(tp, NULL, prog);
+       err = cls_bpf_offload_cmd(tp, NULL, prog, NULL);
        if (err)
                pr_err("Stopping hardware offload failed: %d\n", err);
 }
@@ -501,7 +503,7 @@ static int cls_bpf_change(struct net *net, struct sk_buff 
*in_skb,
        if (ret < 0)
                goto errout_idr;
 
-       ret = cls_bpf_offload(tp, prog, oldprog);
+       ret = cls_bpf_offload(tp, prog, oldprog, extack);
        if (ret)
                goto errout_parms;
 
-- 
2.15.1