redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

sch_dsmark: improve memory locality

Browse source 
Memory placement in sch_dsmark is silly : Better place mask/value
in the same cache line.

Also, we can embed small arrays in the first cache line and
remove a potential cache miss.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2015-09-17 16:37:13 -07:00 committed by David S. Miller
parent 25354001d0
commit 47bbbb30b4
1 changed files with 33 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
net/sched/sch_dsmark.c
View file

@ -35,14 +35,20 @@
#define NO_DEFAULT_INDEX (1 << 16) #define NO_DEFAULT_INDEX (1 << 16)
struct mask_value {
u8 mask;
u8 value;
};
struct dsmark_qdisc_data { struct dsmark_qdisc_data {
struct Qdisc *q; struct Qdisc *q;
struct tcf_proto __rcu *filter_list; struct tcf_proto __rcu *filter_list;
u8 *mask; /* "owns" the array */ struct mask_value *mv;
u8 *value;
u16 indices; u16 indices;
u8 set_tc_index;
u32 default_index; /* index range is 0...0xffff */ u32 default_index; /* index range is 0...0xffff */
int set_tc_index; #define DSMARK_EMBEDDED_SZ 16
struct mask_value embedded[DSMARK_EMBEDDED_SZ];
}; };
static inline int dsmark_valid_index(struct dsmark_qdisc_data *p, u16 index) static inline int dsmark_valid_index(struct dsmark_qdisc_data *p, u16 index)
@ -116,7 +122,6 @@ static int dsmark_change(struct Qdisc *sch, u32 classid, u32 parent,
struct nlattr *opt = tca[TCA_OPTIONS]; struct nlattr *opt = tca[TCA_OPTIONS];
struct nlattr *tb[TCA_DSMARK_MAX + 1]; struct nlattr *tb[TCA_DSMARK_MAX + 1];
int err = -EINVAL; int err = -EINVAL;
u8 mask = 0;
pr_debug("%s(sch %p,[qdisc %p],classid %x,parent %x), arg 0x%lx\n", pr_debug("%s(sch %p,[qdisc %p],classid %x,parent %x), arg 0x%lx\n",
__func__, sch, p, classid, parent, *arg); __func__, sch, p, classid, parent, *arg);
@ -133,14 +138,11 @@ static int dsmark_change(struct Qdisc *sch, u32 classid, u32 parent,
if (err < 0) if (err < 0)
goto errout; goto errout;
if (tb[TCA_DSMARK_MASK])
mask = nla_get_u8(tb[TCA_DSMARK_MASK]);
if (tb[TCA_DSMARK_VALUE]) if (tb[TCA_DSMARK_VALUE])
p->value[*arg - 1] = nla_get_u8(tb[TCA_DSMARK_VALUE]); p->mv[*arg - 1].value = nla_get_u8(tb[TCA_DSMARK_VALUE]);
if (tb[TCA_DSMARK_MASK]) if (tb[TCA_DSMARK_MASK])
p->mask[*arg - 1] = mask; p->mv[*arg - 1].mask = nla_get_u8(tb[TCA_DSMARK_MASK]);
err = 0; err = 0;
@ -155,8 +157,8 @@ static int dsmark_delete(struct Qdisc *sch, unsigned long arg)
if (!dsmark_valid_index(p, arg)) if (!dsmark_valid_index(p, arg))
return -EINVAL; return -EINVAL;
p->mask[arg - 1] = 0xff; p->mv[arg - 1].mask = 0xff;
p->value[arg - 1] = 0; p->mv[arg - 1].value = 0;
return 0; return 0;
} }
@ -173,7 +175,7 @@ static void dsmark_walk(struct Qdisc *sch, struct qdisc_walker *walker)
return; return;
for (i = 0; i < p->indices; i++) { for (i = 0; i < p->indices; i++) {
if (p->mask[i] == 0xff && !p->value[i]) if (p->mv[i].mask == 0xff && !p->mv[i].value)
goto ignore; goto ignore;
if (walker->count >= walker->skip) { if (walker->count >= walker->skip) {
if (walker->fn(sch, i + 1, walker) < 0) { if (walker->fn(sch, i + 1, walker) < 0) {
@ -291,12 +293,12 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
switch (tc_skb_protocol(skb)) { switch (tc_skb_protocol(skb)) {
case htons(ETH_P_IP): case htons(ETH_P_IP):
ipv4_change_dsfield(ip_hdr(skb), p->mask[index], ipv4_change_dsfield(ip_hdr(skb), p->mv[index].mask,
p->value[index]); p->mv[index].value);
break; break;
case htons(ETH_P_IPV6): case htons(ETH_P_IPV6):
ipv6_change_dsfield(ipv6_hdr(skb), p->mask[index], ipv6_change_dsfield(ipv6_hdr(skb), p->mv[index].mask,
p->value[index]); p->mv[index].value);
break; break;
default: default:
/* /*
@ -304,7 +306,7 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
* This way, we can send non-IP traffic through dsmark * This way, we can send non-IP traffic through dsmark
* and don't need yet another qdisc as a bypass. * and don't need yet another qdisc as a bypass.
*/ */
if (p->mask[index] != 0xff || p->value[index]) if (p->mv[index].mask != 0xff || p->mv[index].value)
pr_warn("%s: unsupported protocol %d\n", pr_warn("%s: unsupported protocol %d\n",
__func__, ntohs(tc_skb_protocol(skb))); __func__, ntohs(tc_skb_protocol(skb)));
break; break;
@ -346,7 +348,7 @@ static int dsmark_init(struct Qdisc *sch, struct nlattr *opt)
int err = -EINVAL; int err = -EINVAL;
u32 default_index = NO_DEFAULT_INDEX; u32 default_index = NO_DEFAULT_INDEX;
u16 indices; u16 indices;
u8 *mask; int i;
pr_debug("%s(sch %p,[qdisc %p],opt %p)\n", __func__, sch, p, opt); pr_debug("%s(sch %p,[qdisc %p],opt %p)\n", __func__, sch, p, opt);
@ -366,18 +368,18 @@ static int dsmark_init(struct Qdisc *sch, struct nlattr *opt)
if (tb[TCA_DSMARK_DEFAULT_INDEX]) if (tb[TCA_DSMARK_DEFAULT_INDEX])
default_index = nla_get_u16(tb[TCA_DSMARK_DEFAULT_INDEX]); default_index = nla_get_u16(tb[TCA_DSMARK_DEFAULT_INDEX]);
mask = kmalloc(indices * 2, GFP_KERNEL); if (indices <= DSMARK_EMBEDDED_SZ)
if (mask == NULL) { p->mv = p->embedded;
else
p->mv = kmalloc_array(indices, sizeof(*p->mv), GFP_KERNEL);
if (!p->mv) {
err = -ENOMEM; err = -ENOMEM;
goto errout; goto errout;
} }
for (i = 0; i < indices; i++) {
p->mask = mask; p->mv[i].mask = 0xff;
memset(p->mask, 0xff, indices); p->mv[i].value = 0;
}
p->value = p->mask + indices;
memset(p->value, 0, indices);
p->indices = indices; p->indices = indices;
p->default_index = default_index; p->default_index = default_index;
p->set_tc_index = nla_get_flag(tb[TCA_DSMARK_SET_TC_INDEX]); p->set_tc_index = nla_get_flag(tb[TCA_DSMARK_SET_TC_INDEX]);
@ -410,7 +412,8 @@ static void dsmark_destroy(struct Qdisc *sch)
tcf_destroy_chain(&p->filter_list); tcf_destroy_chain(&p->filter_list);
qdisc_destroy(p->q); qdisc_destroy(p->q);
kfree(p->mask); if (p->mv != p->embedded)
kfree(p->mv);
} }
static int dsmark_dump_class(struct Qdisc *sch, unsigned long cl, static int dsmark_dump_class(struct Qdisc *sch, unsigned long cl,
@ -430,8 +433,8 @@ static int dsmark_dump_class(struct Qdisc *sch, unsigned long cl,
opts = nla_nest_start(skb, TCA_OPTIONS); opts = nla_nest_start(skb, TCA_OPTIONS);
if (opts == NULL) if (opts == NULL)
goto nla_put_failure; goto nla_put_failure;
if (nla_put_u8(skb, TCA_DSMARK_MASK, p->mask[cl - 1]) || if (nla_put_u8(skb, TCA_DSMARK_MASK, p->mv[cl - 1].mask) ||
nla_put_u8(skb, TCA_DSMARK_VALUE, p->value[cl - 1])) nla_put_u8(skb, TCA_DSMARK_VALUE, p->mv[cl - 1].value))
goto nla_put_failure; goto nla_put_failure;
return nla_nest_end(skb, opts); return nla_nest_end(skb, opts);