Skip to content

Commit 4072d97

Browse files
francoismichelkuba-moo
authored andcommitted
netem: add prng attribute to netem_sched_data
Add prng attribute to struct netem_sched_data and allows setting the seed of the PRNG through netlink using the new TCA_NETEM_PRNG_SEED attribute. The PRNG attribute is not actually used yet. Signed-off-by: François Michel <francois.michel@uclouvain.be> Reviewed-by: Simon Horman <horms@kernel.org> Acked-by: Stephen Hemminger <stephen@networkplumber.org> Link: https://lore.kernel.org/r/20230815092348.1449179-2-francois.michel@uclouvain.be Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent a5e5b2c commit 4072d97

2 files changed

Lines changed: 17 additions & 0 deletions

File tree

include/uapi/linux/pkt_sched.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,7 @@ enum {
603603
TCA_NETEM_JITTER64,
604604
TCA_NETEM_SLOT,
605605
TCA_NETEM_SLOT_DIST,
606+
TCA_NETEM_PRNG_SEED,
606607
__TCA_NETEM_MAX,
607608
};
608609

net/sched/sch_netem.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ struct netem_sched_data {
105105
u32 rho;
106106
} delay_cor, loss_cor, dup_cor, reorder_cor, corrupt_cor;
107107

108+
struct prng {
109+
u64 seed;
110+
struct rnd_state prng_state;
111+
} prng;
112+
108113
struct disttable *delay_dist;
109114

110115
enum {
@@ -922,6 +927,7 @@ static const struct nla_policy netem_policy[TCA_NETEM_MAX + 1] = {
922927
[TCA_NETEM_LATENCY64] = { .type = NLA_S64 },
923928
[TCA_NETEM_JITTER64] = { .type = NLA_S64 },
924929
[TCA_NETEM_SLOT] = { .len = sizeof(struct tc_netem_slot) },
930+
[TCA_NETEM_PRNG_SEED] = { .type = NLA_U64 },
925931
};
926932

927933
static int parse_attr(struct nlattr *tb[], int maxtype, struct nlattr *nla,
@@ -1040,6 +1046,12 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt,
10401046
/* capping jitter to the range acceptable by tabledist() */
10411047
q->jitter = min_t(s64, abs(q->jitter), INT_MAX);
10421048

1049+
if (tb[TCA_NETEM_PRNG_SEED])
1050+
q->prng.seed = nla_get_u64(tb[TCA_NETEM_PRNG_SEED]);
1051+
else
1052+
q->prng.seed = get_random_u64();
1053+
prandom_seed_state(&q->prng.prng_state, q->prng.seed);
1054+
10431055
unlock:
10441056
sch_tree_unlock(sch);
10451057

@@ -1203,6 +1215,10 @@ static int netem_dump(struct Qdisc *sch, struct sk_buff *skb)
12031215
goto nla_put_failure;
12041216
}
12051217

1218+
if (nla_put_u64_64bit(skb, TCA_NETEM_PRNG_SEED, q->prng.seed,
1219+
TCA_NETEM_PAD))
1220+
goto nla_put_failure;
1221+
12061222
return nla_nest_end(skb, nla);
12071223

12081224
nla_put_failure:

0 commit comments

Comments
 (0)