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

net: dsa: allocate ports on touch 

Allocate the struct dsa_port the first time it is accessed with
dsa_port_touch, and remove the static dsa_port array from the
dsa_switch structure.

Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
alistair/sunxi64-5.5-dsi
Vivien Didelot 2019-10-21 16:51:29 -04:00 committed by Jakub Kicinski
parent d5a619bf60
commit 05f294a852
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/dsa.h
View File

@ -277,9 +277,7 @@ struct dsa_switch {
*/
bool vlan_filtering;
/* Dynamically allocated ports, keep last */
size_t num_ports;
struct dsa_port ports[];
};
static inline struct dsa_port *dsa_to_port(struct dsa_switch *ds, int p)

16
net/dsa/dsa2.c
View File

@ -588,7 +588,13 @@ static struct dsa_port *dsa_port_touch(struct dsa_switch *ds, int index)
struct dsa_switch_tree *dst = ds->dst;
struct dsa_port *dp;
dp = &ds->ports[index];
list_for_each_entry(dp, &dst->ports, list)
if (dp->ds == ds && dp->index == index)
return dp;
dp = kzalloc(sizeof(*dp), GFP_KERNEL);
if (!dp)
return NULL;
dp->ds = ds;
dp->index = index;
@ -857,7 +863,7 @@ struct dsa_switch *dsa_switch_alloc(struct device *dev, size_t n)
{
struct dsa_switch *ds;
ds = devm_kzalloc(dev, struct_size(ds, ports, n), GFP_KERNEL);
ds = devm_kzalloc(dev, sizeof(*ds), GFP_KERNEL);
if (!ds)
return NULL;
@ -885,6 +891,12 @@ static void dsa_switch_remove(struct dsa_switch *ds)
{
struct dsa_switch_tree *dst = ds->dst;
unsigned int index = ds->index;
struct dsa_port *dp, *next;
list_for_each_entry_safe(dp, next, &dst->ports, list) {
list_del(&dp->list);
kfree(dp);
}
dsa_tree_remove_switch(dst, index);
}