Skip to content

Commit eef50d4

Browse files
davem330davem330
committed
Merge branch 'switchdev-callback'
Vivien Didelot says: ==================== net: switchdev: use specific switchdev_obj_* This patchset changes switchdev add, del, dump operations from this: int (*switchdev_port_obj_add)(struct net_device *dev, struct switchdev_obj *obj, struct switchdev_trans *trans); int (*switchdev_port_obj_del)(struct net_device *dev, struct switchdev_obj *obj); int (*switchdev_port_obj_dump)(struct net_device *dev, struct switchdev_obj *obj); to something similar to the notifier_call callback of a notifier_block: int (*switchdev_port_obj_add)(struct net_device *dev, enum switchdev_obj_id id, const void *obj, struct switchdev_trans *trans); int (*switchdev_port_obj_del)(struct net_device *dev, enum switchdev_obj_id id, const void *obj); int (*switchdev_port_obj_dump)(struct net_device *dev, enum switchdev_obj_id id, void *obj, int (*cb)(void *obj)); This allows the caller to pass and expect back a specific switchdev_obj_* structure (e.g. switchdev_obj_fdb) instead of the generic switchdev_obj one. This will simplify pushing the callback function down to the drivers. The first 3 patches get rid of the dev parameter of the dump callback, since it is not always neeeded (e.g. vlan_dump) and some drivers (such as DSA drivers) may not have easy access to it. Patches 4 and 5 implement the change in the switchdev operations and its users. Patch 6 extracts the inner switchdev_obj_* structures from switchdev_obj and removes this last one. v2: fix error spotted by kbuild (extra ';' inline switchdev_port_obj_dump). ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 79b0eb2 + 44bbcf5 commit eef50d4

File tree

6 files changed

+186
-201
lines changed

6 files changed

+186
-201
lines changed

‎drivers/net/ethernet/rocker/rocker.c‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4437,26 +4437,25 @@ static int rocker_port_fdb_add(struct rocker_port *rocker_port,
44374437
}
44384438

44394439
static int rocker_port_obj_add(struct net_device *dev,
4440-
struct switchdev_obj *obj,
4440+
enum switchdev_obj_id id, const void *obj,
44414441
struct switchdev_trans *trans)
44424442
{
44434443
struct rocker_port *rocker_port = netdev_priv(dev);
44444444
const struct switchdev_obj_ipv4_fib *fib4;
44454445
int err = 0;
44464446

4447-
switch (obj->id) {
4447+
switch (id) {
44484448
case SWITCHDEV_OBJ_PORT_VLAN:
4449-
err = rocker_port_vlans_add(rocker_port, trans,
4450-
&obj->u.vlan);
4449+
err = rocker_port_vlans_add(rocker_port, trans, obj);
44514450
break;
44524451
case SWITCHDEV_OBJ_IPV4_FIB:
4453-
fib4 = &obj->u.ipv4_fib;
4452+
fib4 = obj;
44544453
err = rocker_port_fib_ipv4(rocker_port, trans,
44554454
htonl(fib4->dst), fib4->dst_len,
44564455
fib4->fi, fib4->tb_id, 0);
44574456
break;
44584457
case SWITCHDEV_OBJ_PORT_FDB:
4459-
err = rocker_port_fdb_add(rocker_port, trans, &obj->u.fdb);
4458+
err = rocker_port_fdb_add(rocker_port, trans, obj);
44604459
break;
44614460
default:
44624461
err = -EOPNOTSUPP;
@@ -4509,25 +4508,25 @@ static int rocker_port_fdb_del(struct rocker_port *rocker_port,
45094508
}
45104509

45114510
static int rocker_port_obj_del(struct net_device *dev,
4512-
struct switchdev_obj *obj)
4511+
enum switchdev_obj_id id, const void *obj)
45134512
{
45144513
struct rocker_port *rocker_port = netdev_priv(dev);
45154514
const struct switchdev_obj_ipv4_fib *fib4;
45164515
int err = 0;
45174516

4518-
switch (obj->id) {
4517+
switch (id) {
45194518
case SWITCHDEV_OBJ_PORT_VLAN:
4520-
err = rocker_port_vlans_del(rocker_port, &obj->u.vlan);
4519+
err = rocker_port_vlans_del(rocker_port, obj);
45214520
break;
45224521
case SWITCHDEV_OBJ_IPV4_FIB:
4523-
fib4 = &obj->u.ipv4_fib;
4522+
fib4 = obj;
45244523
err = rocker_port_fib_ipv4(rocker_port, NULL,
45254524
htonl(fib4->dst), fib4->dst_len,
45264525
fib4->fi, fib4->tb_id,
45274526
ROCKER_OP_FLAG_REMOVE);
45284527
break;
45294528
case SWITCHDEV_OBJ_PORT_FDB:
4530-
err = rocker_port_fdb_del(rocker_port, NULL, &obj->u.fdb);
4529+
err = rocker_port_fdb_del(rocker_port, NULL, obj);
45314530
break;
45324531
default:
45334532
err = -EOPNOTSUPP;
@@ -4538,10 +4537,10 @@ static int rocker_port_obj_del(struct net_device *dev,
45384537
}
45394538

45404539
static int rocker_port_fdb_dump(const struct rocker_port *rocker_port,
4541-
struct switchdev_obj *obj)
4540+
struct switchdev_obj_fdb *fdb,
4541+
int (*cb)(void *obj))
45424542
{
45434543
struct rocker *rocker = rocker_port->rocker;
4544-
struct switchdev_obj_fdb *fdb = &obj->u.fdb;
45454544
struct rocker_fdb_tbl_entry *found;
45464545
struct hlist_node *tmp;
45474546
unsigned long lock_flags;
@@ -4556,7 +4555,7 @@ static int rocker_port_fdb_dump(const struct rocker_port *rocker_port,
45564555
fdb->ndm_state = NUD_REACHABLE;
45574556
fdb->vid = rocker_port_vlan_to_vid(rocker_port,
45584557
found->key.vlan_id);
4559-
err = obj->cb(rocker_port->dev, obj);
4558+
err = cb(fdb);
45604559
if (err)
45614560
break;
45624561
}
@@ -4566,9 +4565,9 @@ static int rocker_port_fdb_dump(const struct rocker_port *rocker_port,
45664565
}
45674566

45684567
static int rocker_port_vlan_dump(const struct rocker_port *rocker_port,
4569-
struct switchdev_obj *obj)
4568+
struct switchdev_obj_vlan *vlan,
4569+
int (*cb)(void *obj))
45704570
{
4571-
struct switchdev_obj_vlan *vlan = &obj->u.vlan;
45724571
u16 vid;
45734572
int err = 0;
45744573

@@ -4579,7 +4578,7 @@ static int rocker_port_vlan_dump(const struct rocker_port *rocker_port,
45794578
if (rocker_vlan_id_is_internal(htons(vid)))
45804579
vlan->flags |= BRIDGE_VLAN_INFO_PVID;
45814580
vlan->vid_begin = vlan->vid_end = vid;
4582-
err = obj->cb(rocker_port->dev, obj);
4581+
err = cb(vlan);
45834582
if (err)
45844583
break;
45854584
}
@@ -4588,17 +4587,18 @@ static int rocker_port_vlan_dump(const struct rocker_port *rocker_port,
45884587
}
45894588

45904589
static int rocker_port_obj_dump(struct net_device *dev,
4591-
struct switchdev_obj *obj)
4590+
enum switchdev_obj_id id, void *obj,
4591+
int (*cb)(void *obj))
45924592
{
45934593
const struct rocker_port *rocker_port = netdev_priv(dev);
45944594
int err = 0;
45954595

4596-
switch (obj->id) {
4596+
switch (id) {
45974597
case SWITCHDEV_OBJ_PORT_FDB:
4598-
err = rocker_port_fdb_dump(rocker_port, obj);
4598+
err = rocker_port_fdb_dump(rocker_port, obj, cb);
45994599
break;
46004600
case SWITCHDEV_OBJ_PORT_VLAN:
4601-
err = rocker_port_vlan_dump(rocker_port, obj);
4601+
err = rocker_port_vlan_dump(rocker_port, obj, cb);
46024602
break;
46034603
default:
46044604
err = -EOPNOTSUPP;

‎include/net/switchdev.h‎

Lines changed: 44 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -64,30 +64,29 @@ enum switchdev_obj_id {
6464
SWITCHDEV_OBJ_PORT_FDB,
6565
};
6666

67-
struct switchdev_obj {
68-
enum switchdev_obj_id id;
69-
int (*cb)(struct net_device *dev, struct switchdev_obj *obj);
70-
union {
71-
struct switchdev_obj_vlan { /* PORT_VLAN */
72-
u16 flags;
73-
u16 vid_begin;
74-
u16 vid_end;
75-
} vlan;
76-
struct switchdev_obj_ipv4_fib { /* IPV4_FIB */
77-
u32 dst;
78-
int dst_len;
79-
struct fib_info *fi;
80-
u8 tos;
81-
u8 type;
82-
u32 nlflags;
83-
u32 tb_id;
84-
} ipv4_fib;
85-
struct switchdev_obj_fdb { /* PORT_FDB */
86-
const unsigned char *addr;
87-
u16 vid;
88-
u16 ndm_state;
89-
} fdb;
90-
} u;
67+
/* SWITCHDEV_OBJ_PORT_VLAN */
68+
struct switchdev_obj_vlan {
69+
u16 flags;
70+
u16 vid_begin;
71+
u16 vid_end;
72+
};
73+
74+
/* SWITCHDEV_OBJ_IPV4_FIB */
75+
struct switchdev_obj_ipv4_fib {
76+
u32 dst;
77+
int dst_len;
78+
struct fib_info *fi;
79+
u8 tos;
80+
u8 type;
81+
u32 nlflags;
82+
u32 tb_id;
83+
};
84+
85+
/* SWITCHDEV_OBJ_PORT_FDB */
86+
struct switchdev_obj_fdb {
87+
const unsigned char *addr;
88+
u16 vid;
89+
u16 ndm_state;
9190
};
9291

9392
void switchdev_trans_item_enqueue(struct switchdev_trans *trans,
@@ -102,11 +101,11 @@ void *switchdev_trans_item_dequeue(struct switchdev_trans *trans);
102101
*
103102
* @switchdev_port_attr_set: Set a port attribute (see switchdev_attr).
104103
*
105-
* @switchdev_port_obj_add: Add an object to port (see switchdev_obj).
104+
* @switchdev_port_obj_add: Add an object to port (see switchdev_obj_*).
106105
*
107-
* @switchdev_port_obj_del: Delete an object from port (see switchdev_obj).
106+
* @switchdev_port_obj_del: Delete an object from port (see switchdev_obj_*).
108107
*
109-
* @switchdev_port_obj_dump: Dump port objects (see switchdev_obj).
108+
* @switchdev_port_obj_dump: Dump port objects (see switchdev_obj_*).
110109
*/
111110
struct switchdev_ops {
112111
int (*switchdev_port_attr_get)(struct net_device *dev,
@@ -115,12 +114,15 @@ struct switchdev_ops {
115114
struct switchdev_attr *attr,
116115
struct switchdev_trans *trans);
117116
int (*switchdev_port_obj_add)(struct net_device *dev,
118-
struct switchdev_obj *obj,
117+
enum switchdev_obj_id id,
118+
const void *obj,
119119
struct switchdev_trans *trans);
120120
int (*switchdev_port_obj_del)(struct net_device *dev,
121-
struct switchdev_obj *obj);
121+
enum switchdev_obj_id id,
122+
const void *obj);
122123
int (*switchdev_port_obj_dump)(struct net_device *dev,
123-
struct switchdev_obj *obj);
124+
enum switchdev_obj_id id, void *obj,
125+
int (*cb)(void *obj));
124126
};
125127

126128
enum switchdev_notifier_type {
@@ -150,9 +152,12 @@ int switchdev_port_attr_get(struct net_device *dev,
150152
struct switchdev_attr *attr);
151153
int switchdev_port_attr_set(struct net_device *dev,
152154
struct switchdev_attr *attr);
153-
int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj);
154-
int switchdev_port_obj_del(struct net_device *dev, struct switchdev_obj *obj);
155-
int switchdev_port_obj_dump(struct net_device *dev, struct switchdev_obj *obj);
155+
int switchdev_port_obj_add(struct net_device *dev, enum switchdev_obj_id id,
156+
const void *obj);
157+
int switchdev_port_obj_del(struct net_device *dev, enum switchdev_obj_id id,
158+
const void *obj);
159+
int switchdev_port_obj_dump(struct net_device *dev, enum switchdev_obj_id id,
160+
void *obj, int (*cb)(void *obj));
156161
int register_switchdev_notifier(struct notifier_block *nb);
157162
int unregister_switchdev_notifier(struct notifier_block *nb);
158163
int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
@@ -197,19 +202,22 @@ static inline int switchdev_port_attr_set(struct net_device *dev,
197202
}
198203

199204
static inline int switchdev_port_obj_add(struct net_device *dev,
200-
struct switchdev_obj *obj)
205+
enum switchdev_obj_id id,
206+
const void *obj)
201207
{
202208
return -EOPNOTSUPP;
203209
}
204210

205211
static inline int switchdev_port_obj_del(struct net_device *dev,
206-
struct switchdev_obj *obj)
212+
enum switchdev_obj_id id,
213+
const void *obj)
207214
{
208215
return -EOPNOTSUPP;
209216
}
210217

211218
static inline int switchdev_port_obj_dump(struct net_device *dev,
212-
struct switchdev_obj *obj)
219+
enum switchdev_obj_id id, void *obj,
220+
int (*cb)(void *obj))
213221
{
214222
return -EOPNOTSUPP;
215223
}

‎net/bridge/br_fdb.c‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,12 @@ static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr)
133133

134134
static void fdb_del_external_learn(struct net_bridge_fdb_entry *f)
135135
{
136-
struct switchdev_obj obj = {
137-
.id = SWITCHDEV_OBJ_PORT_FDB,
138-
.u.fdb = {
139-
.addr = f->addr.addr,
140-
.vid = f->vlan_id,
141-
},
136+
struct switchdev_obj_fdb fdb = {
137+
.addr = f->addr.addr,
138+
.vid = f->vlan_id,
142139
};
143140

144-
switchdev_port_obj_del(f->dst->dev, &obj);
141+
switchdev_port_obj_del(f->dst->dev, SWITCHDEV_OBJ_PORT_FDB, &fdb);
145142
}
146143

147144
static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f)

‎net/bridge/br_vlan.c‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,13 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br,
8080
if (ops->ndo_vlan_rx_add_vid) {
8181
err = vlan_vid_add(dev, br->vlan_proto, vid);
8282
} else {
83-
struct switchdev_obj vlan_obj = {
84-
.id = SWITCHDEV_OBJ_PORT_VLAN,
85-
.u.vlan = {
86-
.flags = flags,
87-
.vid_begin = vid,
88-
.vid_end = vid,
89-
},
83+
struct switchdev_obj_vlan v = {
84+
.flags = flags,
85+
.vid_begin = vid,
86+
.vid_end = vid,
9087
};
9188

92-
err = switchdev_port_obj_add(dev, &vlan_obj);
89+
err = switchdev_port_obj_add(dev, SWITCHDEV_OBJ_PORT_VLAN, &v);
9390
if (err == -EOPNOTSUPP)
9491
err = 0;
9592
}
@@ -132,15 +129,12 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
132129
if (ops->ndo_vlan_rx_kill_vid) {
133130
vlan_vid_del(dev, br->vlan_proto, vid);
134131
} else {
135-
struct switchdev_obj vlan_obj = {
136-
.id = SWITCHDEV_OBJ_PORT_VLAN,
137-
.u.vlan = {
138-
.vid_begin = vid,
139-
.vid_end = vid,
140-
},
132+
struct switchdev_obj_vlan v = {
133+
.vid_begin = vid,
134+
.vid_end = vid,
141135
};
142136

143-
err = switchdev_port_obj_del(dev, &vlan_obj);
137+
err = switchdev_port_obj_del(dev, SWITCHDEV_OBJ_PORT_VLAN, &v);
144138
if (err == -EOPNOTSUPP)
145139
err = 0;
146140
}

0 commit comments

Comments
 (0)