mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-12 05:48:39 +08:00
net: sched: prepare for reimplementation of tc_cls_common_offload_init()
Rename the tc_cls_common_offload_init() helper function to tc_cls_common_offload_init_deprecated() and add a new implementation which also takes flags argument. We will only set extack if flags indicate that offload is forced (skip_sw) otherwise driver errors should be ignored, as they don't influence the overall filter installation. Note that we need the tc_skip_hw() helper for new version, therefore it is added later in the file. Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by: Simon Horman <simon.horman@netronome.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
715df5ecab
commit
34832e1c70
@ -606,9 +606,9 @@ struct tc_cls_common_offload {
|
||||
};
|
||||
|
||||
static inline void
|
||||
tc_cls_common_offload_init(struct tc_cls_common_offload *cls_common,
|
||||
const struct tcf_proto *tp,
|
||||
struct netlink_ext_ack *extack)
|
||||
tc_cls_common_offload_init_deprecated(struct tc_cls_common_offload *cls_common,
|
||||
const struct tcf_proto *tp,
|
||||
struct netlink_ext_ack *extack)
|
||||
{
|
||||
cls_common->chain_index = tp->chain->index;
|
||||
cls_common->protocol = tp->protocol;
|
||||
@ -694,6 +694,18 @@ static inline bool tc_in_hw(u32 flags)
|
||||
return (flags & TCA_CLS_FLAGS_IN_HW) ? true : false;
|
||||
}
|
||||
|
||||
static inline void
|
||||
tc_cls_common_offload_init(struct tc_cls_common_offload *cls_common,
|
||||
const struct tcf_proto *tp, u32 flags,
|
||||
struct netlink_ext_ack *extack)
|
||||
{
|
||||
cls_common->chain_index = tp->chain->index;
|
||||
cls_common->protocol = tp->protocol;
|
||||
cls_common->prio = tp->prio;
|
||||
if (tc_skip_sw(flags))
|
||||
cls_common->extack = extack;
|
||||
}
|
||||
|
||||
enum tc_fl_command {
|
||||
TC_CLSFLOWER_REPLACE,
|
||||
TC_CLSFLOWER_DESTROY,
|
||||
|
@ -159,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, extack);
|
||||
tc_cls_common_offload_init_deprecated(&cls_bpf.common, tp, extack);
|
||||
cls_bpf.command = TC_CLSBPF_OFFLOAD;
|
||||
cls_bpf.exts = &obj->exts;
|
||||
cls_bpf.prog = prog ? prog->filter : NULL;
|
||||
@ -227,7 +227,7 @@ static void cls_bpf_offload_update_stats(struct tcf_proto *tp,
|
||||
struct tcf_block *block = tp->chain->block;
|
||||
struct tc_cls_bpf_offload cls_bpf = {};
|
||||
|
||||
tc_cls_common_offload_init(&cls_bpf.common, tp, NULL);
|
||||
tc_cls_common_offload_init_deprecated(&cls_bpf.common, tp, NULL);
|
||||
cls_bpf.command = TC_CLSBPF_STATS;
|
||||
cls_bpf.exts = &prog->exts;
|
||||
cls_bpf.prog = prog->filter;
|
||||
|
@ -223,7 +223,7 @@ static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f)
|
||||
struct tc_cls_flower_offload cls_flower = {};
|
||||
struct tcf_block *block = tp->chain->block;
|
||||
|
||||
tc_cls_common_offload_init(&cls_flower.common, tp, NULL);
|
||||
tc_cls_common_offload_init_deprecated(&cls_flower.common, tp, NULL);
|
||||
cls_flower.command = TC_CLSFLOWER_DESTROY;
|
||||
cls_flower.cookie = (unsigned long) f;
|
||||
|
||||
@ -243,7 +243,7 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
|
||||
bool skip_sw = tc_skip_sw(f->flags);
|
||||
int err;
|
||||
|
||||
tc_cls_common_offload_init(&cls_flower.common, tp, extack);
|
||||
tc_cls_common_offload_init_deprecated(&cls_flower.common, tp, extack);
|
||||
cls_flower.command = TC_CLSFLOWER_REPLACE;
|
||||
cls_flower.cookie = (unsigned long) f;
|
||||
cls_flower.dissector = dissector;
|
||||
@ -272,7 +272,7 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f)
|
||||
struct tc_cls_flower_offload cls_flower = {};
|
||||
struct tcf_block *block = tp->chain->block;
|
||||
|
||||
tc_cls_common_offload_init(&cls_flower.common, tp, NULL);
|
||||
tc_cls_common_offload_init_deprecated(&cls_flower.common, tp, NULL);
|
||||
cls_flower.command = TC_CLSFLOWER_STATS;
|
||||
cls_flower.cookie = (unsigned long) f;
|
||||
cls_flower.exts = &f->exts;
|
||||
|
@ -76,7 +76,7 @@ static void mall_destroy_hw_filter(struct tcf_proto *tp,
|
||||
struct tc_cls_matchall_offload cls_mall = {};
|
||||
struct tcf_block *block = tp->chain->block;
|
||||
|
||||
tc_cls_common_offload_init(&cls_mall.common, tp, NULL);
|
||||
tc_cls_common_offload_init_deprecated(&cls_mall.common, tp, NULL);
|
||||
cls_mall.command = TC_CLSMATCHALL_DESTROY;
|
||||
cls_mall.cookie = cookie;
|
||||
|
||||
@ -94,7 +94,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
|
||||
bool skip_sw = tc_skip_sw(head->flags);
|
||||
int err;
|
||||
|
||||
tc_cls_common_offload_init(&cls_mall.common, tp, extack);
|
||||
tc_cls_common_offload_init_deprecated(&cls_mall.common, tp, extack);
|
||||
cls_mall.command = TC_CLSMATCHALL_REPLACE;
|
||||
cls_mall.exts = &head->exts;
|
||||
cls_mall.cookie = cookie;
|
||||
|
@ -491,7 +491,7 @@ static void u32_clear_hw_hnode(struct tcf_proto *tp, struct tc_u_hnode *h)
|
||||
struct tcf_block *block = tp->chain->block;
|
||||
struct tc_cls_u32_offload cls_u32 = {};
|
||||
|
||||
tc_cls_common_offload_init(&cls_u32.common, tp, NULL);
|
||||
tc_cls_common_offload_init_deprecated(&cls_u32.common, tp, NULL);
|
||||
cls_u32.command = TC_CLSU32_DELETE_HNODE;
|
||||
cls_u32.hnode.divisor = h->divisor;
|
||||
cls_u32.hnode.handle = h->handle;
|
||||
@ -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, extack);
|
||||
tc_cls_common_offload_init_deprecated(&cls_u32.common, tp, extack);
|
||||
cls_u32.command = TC_CLSU32_NEW_HNODE;
|
||||
cls_u32.hnode.divisor = h->divisor;
|
||||
cls_u32.hnode.handle = h->handle;
|
||||
@ -534,7 +534,7 @@ static void u32_remove_hw_knode(struct tcf_proto *tp, struct tc_u_knode *n)
|
||||
struct tcf_block *block = tp->chain->block;
|
||||
struct tc_cls_u32_offload cls_u32 = {};
|
||||
|
||||
tc_cls_common_offload_init(&cls_u32.common, tp, NULL);
|
||||
tc_cls_common_offload_init_deprecated(&cls_u32.common, tp, NULL);
|
||||
cls_u32.command = TC_CLSU32_DELETE_KNODE;
|
||||
cls_u32.knode.handle = n->handle;
|
||||
|
||||
@ -550,7 +550,7 @@ static int u32_replace_hw_knode(struct tcf_proto *tp, struct tc_u_knode *n,
|
||||
bool skip_sw = tc_skip_sw(flags);
|
||||
int err;
|
||||
|
||||
tc_cls_common_offload_init(&cls_u32.common, tp, extack);
|
||||
tc_cls_common_offload_init_deprecated(&cls_u32.common, tp, extack);
|
||||
cls_u32.command = TC_CLSU32_REPLACE_KNODE;
|
||||
cls_u32.knode.handle = n->handle;
|
||||
cls_u32.knode.fshift = n->fshift;
|
||||
|
Loading…
Reference in New Issue
Block a user