[PATCH bpf-next v2 05/11] net: sched: cls_u32: propagate extack support for filter offload

[Jakub Kicinski]

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

Propagate the extack pointer from the `->change()` classifier operation
to the function used for filter replacement in cls_u32, and feed it to
tc_cls_common_offload_init(). This makes it possible to use netlink
extack messages in the future at replacement time for this filter,
although it is not used at this point.

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

diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 8127b15d8d50..ef1b746de80b 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -501,7 +501,7 @@ static void u32_clear_hw_hnode(struct tcf_proto *tp, struct 
tc_u_hnode *h)
 }
 
 static int u32_replace_hw_hnode(struct tcf_proto *tp, struct tc_u_hnode *h,
-                               u32 flags)
+                               u32 flags, struct netlink_ext_ack *extack)
 {
        struct tcf_block *block = tp->chain->block;
        struct tc_cls_u32_offload cls_u32 = {};
@@ -509,7 +509,7 @@ static int u32_replace_hw_hnode(struct tcf_proto *tp, 
struct tc_u_hnode *h,
        bool offloaded = false;
        int err;
 
-       tc_cls_common_offload_init(&cls_u32.common, tp, NULL);
+       tc_cls_common_offload_init(&cls_u32.common, tp, extack);
        cls_u32.command = TC_CLSU32_NEW_HNODE;
        cls_u32.hnode.divisor = h->divisor;
        cls_u32.hnode.handle = h->handle;
@@ -542,14 +542,14 @@ static void u32_remove_hw_knode(struct tcf_proto *tp, u32 
handle)
 }
 
 static int u32_replace_hw_knode(struct tcf_proto *tp, struct tc_u_knode *n,
-                               u32 flags)
+                               u32 flags, struct netlink_ext_ack *extack)
 {
        struct tcf_block *block = tp->chain->block;
        struct tc_cls_u32_offload cls_u32 = {};
        bool skip_sw = tc_skip_sw(flags);
        int err;
 
-       tc_cls_common_offload_init(&cls_u32.common, tp, NULL);
+       tc_cls_common_offload_init(&cls_u32.common, tp, extack);
        cls_u32.command = TC_CLSU32_REPLACE_KNODE;
        cls_u32.knode.handle = n->handle;
        cls_u32.knode.fshift = n->fshift;
@@ -943,7 +943,7 @@ static int u32_change(struct net *net, struct sk_buff 
*in_skb,
                        return err;
                }
 
-               err = u32_replace_hw_knode(tp, new, flags);
+               err = u32_replace_hw_knode(tp, new, flags, extack);
                if (err) {
                        u32_destroy_key(tp, new, false);
                        return err;
@@ -990,7 +990,7 @@ static int u32_change(struct net *net, struct sk_buff 
*in_skb,
                ht->prio = tp->prio;
                idr_init(&ht->handle_idr);
 
-               err = u32_replace_hw_hnode(tp, ht, flags);
+               err = u32_replace_hw_hnode(tp, ht, flags, extack);
                if (err) {
                        idr_remove_ext(&tp_c->handle_idr, handle);
                        kfree(ht);
@@ -1088,7 +1088,7 @@ static int u32_change(struct net *net, struct sk_buff 
*in_skb,
                struct tc_u_knode __rcu **ins;
                struct tc_u_knode *pins;
 
-               err = u32_replace_hw_knode(tp, n, flags);
+               err = u32_replace_hw_knode(tp, n, flags, extack);
                if (err)
                        goto errhw;
 
-- 
2.15.1