mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
net/sched: add get_fill_size() to the five actions that lack one
act_simple, act_mpls, act_nat, act_skbmod and act_connmark each have a tcf_*_dump but no .get_fill_size callback, so tcf_action_fill_size budgets only the shared attributes and omits the per-action TCA_*_PARMS and option bytes the dump emits. Add a callback to each, sized from the attributes its dump emits. Size every optional attribute unconditionally: reading the current flags to size it conditionally would race a concurrent replace, which can flip the attributes between sizing and dumping. Reported-by: Sashiko <sashiko-bot@kernel.org> Link: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260824153903.4143642-1-victor@mojatatu.com Co-developed-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: Victor Nogueira <victor@mojatatu.com> Link: https://patch.msgid.link/QDISC-RYTB.v1.20260918093205@mojatatu.com.2 Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
parent
f09db8b83e
commit
4ba61bfd49
|
|
@ -236,12 +236,18 @@ static void tcf_connmark_cleanup(struct tc_action *a)
|
|||
kfree_rcu(parms, rcu);
|
||||
}
|
||||
|
||||
static size_t tcf_connmark_get_fill_size(const struct tc_action *act)
|
||||
{
|
||||
return nla_total_size(sizeof(struct tc_connmark)); /* TCA_CONNMARK_PARMS */
|
||||
}
|
||||
|
||||
static struct tc_action_ops act_connmark_ops = {
|
||||
.kind = "connmark",
|
||||
.id = TCA_ID_CONNMARK,
|
||||
.owner = THIS_MODULE,
|
||||
.act = tcf_connmark_act,
|
||||
.dump = tcf_connmark_dump,
|
||||
.get_fill_size = tcf_connmark_get_fill_size,
|
||||
.init = tcf_connmark_init,
|
||||
.cleanup = tcf_connmark_cleanup,
|
||||
.size = sizeof(struct tcf_connmark_info),
|
||||
|
|
|
|||
|
|
@ -438,12 +438,23 @@ static int tcf_mpls_offload_act_setup(struct tc_action *act, void *entry_data,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static size_t tcf_mpls_get_fill_size(const struct tc_action *act)
|
||||
{
|
||||
return nla_total_size(sizeof(struct tc_mpls)) /* TCA_MPLS_PARMS */
|
||||
+ nla_total_size(sizeof(u32)) /* TCA_MPLS_LABEL */
|
||||
+ nla_total_size(sizeof(u8)) /* TCA_MPLS_TC */
|
||||
+ nla_total_size(sizeof(u8)) /* TCA_MPLS_TTL */
|
||||
+ nla_total_size(sizeof(u8)) /* TCA_MPLS_BOS */
|
||||
+ nla_total_size(sizeof(u16)); /* TCA_MPLS_PROTO */
|
||||
}
|
||||
|
||||
static struct tc_action_ops act_mpls_ops = {
|
||||
.kind = "mpls",
|
||||
.id = TCA_ID_MPLS,
|
||||
.owner = THIS_MODULE,
|
||||
.act = tcf_mpls_act,
|
||||
.dump = tcf_mpls_dump,
|
||||
.get_fill_size = tcf_mpls_get_fill_size,
|
||||
.init = tcf_mpls_init,
|
||||
.cleanup = tcf_mpls_cleanup,
|
||||
.offload_act_setup = tcf_mpls_offload_act_setup,
|
||||
|
|
|
|||
|
|
@ -313,12 +313,18 @@ static void tcf_nat_cleanup(struct tc_action *a)
|
|||
kfree_rcu(parms, rcu);
|
||||
}
|
||||
|
||||
static size_t tcf_nat_get_fill_size(const struct tc_action *act)
|
||||
{
|
||||
return nla_total_size(sizeof(struct tc_nat)); /* TCA_NAT_PARMS */
|
||||
}
|
||||
|
||||
static struct tc_action_ops act_nat_ops = {
|
||||
.kind = "nat",
|
||||
.id = TCA_ID_NAT,
|
||||
.owner = THIS_MODULE,
|
||||
.act = tcf_nat_act,
|
||||
.dump = tcf_nat_dump,
|
||||
.get_fill_size = tcf_nat_get_fill_size,
|
||||
.init = tcf_nat_init,
|
||||
.cleanup = tcf_nat_cleanup,
|
||||
.size = sizeof(struct tcf_nat),
|
||||
|
|
|
|||
|
|
@ -79,6 +79,12 @@ static int reset_policy(struct tc_action *a, const struct nlattr *defdata,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static size_t tcf_simp_get_fill_size(const struct tc_action *act)
|
||||
{
|
||||
return nla_total_size(sizeof(struct tc_defact)) /* TCA_DEF_PARMS */
|
||||
+ nla_total_size(SIMP_MAX_DATA); /* TCA_DEF_DATA */
|
||||
}
|
||||
|
||||
static const struct nla_policy simple_policy[TCA_DEF_MAX + 1] = {
|
||||
[TCA_DEF_PARMS] = { .len = sizeof(struct tc_defact) },
|
||||
[TCA_DEF_DATA] = { .type = NLA_STRING, .len = SIMP_MAX_DATA },
|
||||
|
|
@ -204,6 +210,7 @@ static struct tc_action_ops act_simp_ops = {
|
|||
.owner = THIS_MODULE,
|
||||
.act = tcf_simp_act,
|
||||
.dump = tcf_simp_dump,
|
||||
.get_fill_size = tcf_simp_get_fill_size,
|
||||
.cleanup = tcf_simp_release,
|
||||
.init = tcf_simp_init,
|
||||
.size = sizeof(struct tcf_defact),
|
||||
|
|
|
|||
|
|
@ -279,12 +279,21 @@ static int tcf_skbmod_dump(struct sk_buff *skb, struct tc_action *a,
|
|||
return -1;
|
||||
}
|
||||
|
||||
static size_t tcf_skbmod_get_fill_size(const struct tc_action *act)
|
||||
{
|
||||
return nla_total_size(sizeof(struct tc_skbmod)) /* TCA_SKBMOD_PARMS */
|
||||
+ nla_total_size(ETH_ALEN) /* TCA_SKBMOD_DMAC */
|
||||
+ nla_total_size(ETH_ALEN) /* TCA_SKBMOD_SMAC */
|
||||
+ nla_total_size(sizeof(u16)); /* TCA_SKBMOD_ETYPE */
|
||||
}
|
||||
|
||||
static struct tc_action_ops act_skbmod_ops = {
|
||||
.kind = "skbmod",
|
||||
.id = TCA_ACT_SKBMOD,
|
||||
.owner = THIS_MODULE,
|
||||
.act = tcf_skbmod_act,
|
||||
.dump = tcf_skbmod_dump,
|
||||
.get_fill_size = tcf_skbmod_get_fill_size,
|
||||
.init = tcf_skbmod_init,
|
||||
.cleanup = tcf_skbmod_cleanup,
|
||||
.size = sizeof(struct tcf_skbmod),
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user