net: dsa: Remove indirect function call for flow dissection
Subsystems (10)
RFC v2 1/1 net: dsa: Remove indirect function call for flow dissection
We only need "static" information to be given for DSA flow dissection, so replace the expensive call to .flow_dissect() with an integer given us the offset into the packet that we must de-reference to obtain the protocol number. The overhead was alreayd available from the dsa_device_ops structure so use that directly.
The presence of a flow_dissect callback used to indicate that the DSA tagger supported returning that information,we now encode this with a negative proto_off if the tagger does not support providing that information.
---
Changes in v2:
- update all taggers to indicate a valid/invalid protocol offset where applicable
include/net/dsa.h | 3 +-- net/core/flow_dissector.c | 14 +++++++++----- net/dsa/tag_brcm.c | 2 ++ net/dsa/tag_dsa.c | 10 +--------- net/dsa/tag_edsa.c | 10 +--------- net/dsa/tag_gswip.c | 1 + net/dsa/tag_ksz.c | 3 +++ net/dsa/tag_lan9303.c | 1 + net/dsa/tag_mtk.c | 11 +---------- net/dsa/tag_ocelot.c | 1 + net/dsa/tag_qca.c | 11 +---------- net/dsa/tag_sja1105.c | 1 + 12 files changed, 23 insertions(+), 45 deletions(-)
include/net/dsa.h +1 -2
@@ -72,14 +72,13 @@ struct dsa_device_ops {struct sk_buff *(*xmit)(struct sk_buff *skb,struct net_device *dev);struct sk_buff *(*rcv)(struct sk_buff *skb,struct net_device *dev,struct packet_type *pt); -int (*flow_dissect)(const struct sk_buff *skb,__be16 *proto, -int *offset);/* Used to determine which traffic should match the DSA filter in * eth_type_trans, and which, if any, should bypass it and be processed * as regular on the master net device. */ bool (*filter)(const struct sk_buff *skb,struct net_device *dev);unsigned int overhead; +int proto_off;const char *name;enum dsa_tag_protocol proto; };
net/core/flow_dissector.c +9 -5
@@ -972,13 +972,17 @@ bool __skb_flow_dissect(const struct net *net,if (unlikely (skb->dev &&netdev_uses_dsa (skb->dev) && proto ==htons (ETH_P_XDSA ))) {const struct dsa_device_ops *ops; -int offset =0 ; +unsigned int overhead; +int proto_off; ops = skb->dev->dsa_ptr->tag_ops; -if (ops->flow_dissect && - !ops->flow_dissect (skb, &proto, &offset)) { - hlen -= offset; - nhoff += offset; + overhead = ops->overhead; + proto_off = ops->proto_off; +if (likely (overhead && proto_off >=0 && + proto_off < skb->len)) { + hlen -= overhead; + nhoff += overhead; + proto = ((__be16 *)skb->data)[proto_off]; } }#endif
net/dsa/tag_brcm.c +2 -0
@@ -177,6 +177,7 @@ static const struct dsa_device_ops brcm_netdev_ops = { .xmit = brcm_tag_xmit, .rcv = brcm_tag_rcv, .overhead = BRCM_TAG_LEN, + .proto_off = -1, };DSA_TAG_DRIVER (brcm_netdev_ops);
@@ -205,6 +206,7 @@ static const struct dsa_device_ops brcm_prepend_netdev_ops = { .xmit = brcm_tag_xmit_prepend, .rcv = brcm_tag_rcv_prepend, .overhead = BRCM_TAG_LEN, + .proto_off = -1, };DSA_TAG_DRIVER (brcm_prepend_netdev_ops);
net/dsa/tag_dsa.c +1 -9
@@ -142,21 +142,13 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev,return skb; } -static int dsa_tag_flow_dissect (const struct sk_buff *skb,__be16 *proto, -int *offset) -{ - *offset =4 ; - *proto = ((__be16 *)skb->data)[1 ]; -return 0 ; -} -static const struct dsa_device_ops dsa_netdev_ops = { .name ="dsa" , .proto =DSA_TAG_PROTO_DSA , .xmit = dsa_xmit, .rcv = dsa_rcv, - .flow_dissect = dsa_tag_flow_dissect, .overhead =DSA_HLEN , + .proto_off =1 , };MODULE_LICENSE ("GPL" );
net/dsa/tag_edsa.c +1 -9
@@ -161,21 +161,13 @@ static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev,return skb; } -static int edsa_tag_flow_dissect (const struct sk_buff *skb,__be16 *proto, -int *offset) -{ - *offset =8 ; - *proto = ((__be16 *)skb->data)[3 ]; -return 0 ; -} -static const struct dsa_device_ops edsa_netdev_ops = { .name ="edsa" , .proto =DSA_TAG_PROTO_EDSA , .xmit = edsa_xmit, .rcv = edsa_rcv, - .flow_dissect = edsa_tag_flow_dissect, .overhead =EDSA_HLEN , + .proto_off =3 , };MODULE_LICENSE ("GPL" );
net/dsa/tag_gswip.c +1 -0
@@ -109,6 +109,7 @@ static const struct dsa_device_ops gswip_netdev_ops = { .xmit = gswip_tag_xmit, .rcv = gswip_tag_rcv, .overhead = GSWIP_RX_HEADER_LEN, + .proto_off = -1, };MODULE_LICENSE ("GPL" );
net/dsa/tag_ksz.c +3 -0
@@ -123,6 +123,7 @@ static const struct dsa_device_ops ksz8795_netdev_ops = { .xmit = ksz8795_xmit, .rcv = ksz8795_rcv, .overhead = KSZ_INGRESS_TAG_LEN, + .proto_off = -1, };DSA_TAG_DRIVER (ksz8795_netdev_ops);
@@ -198,6 +199,7 @@ static const struct dsa_device_ops ksz9477_netdev_ops = { .xmit = ksz9477_xmit, .rcv = ksz9477_rcv, .overhead = KSZ9477_INGRESS_TAG_LEN, + .proto_off = -1, };DSA_TAG_DRIVER (ksz9477_netdev_ops);
@@ -236,6 +238,7 @@ static const struct dsa_device_ops ksz9893_netdev_ops = { .xmit = ksz9893_xmit, .rcv = ksz9477_rcv, .overhead = KSZ_INGRESS_TAG_LEN, + .proto_off = -1, };DSA_TAG_DRIVER (ksz9893_netdev_ops);
net/dsa/tag_lan9303.c +1 -0
@@ -134,6 +134,7 @@ static const struct dsa_device_ops lan9303_netdev_ops = { .xmit = lan9303_xmit, .rcv = lan9303_rcv, .overhead = LAN9303_TAG_LEN, + .proto_off = -1, };MODULE_LICENSE ("GPL" );
net/dsa/tag_mtk.c +1 -10
@@ -89,22 +89,13 @@ static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev,return skb; } -static int mtk_tag_flow_dissect (const struct sk_buff *skb,__be16 *proto, -int *offset) -{ - *offset =4 ; - *proto = ((__be16 *)skb->data)[1 ]; - -return 0 ; -} -static const struct dsa_device_ops mtk_netdev_ops = { .name ="mtk" , .proto =DSA_TAG_PROTO_MTK , .xmit = mtk_tag_xmit, .rcv = mtk_tag_rcv, - .flow_dissect = mtk_tag_flow_dissect, .overhead =MTK_HDR_LEN , + .proto_off =1 , };MODULE_LICENSE ("GPL" );
net/dsa/tag_ocelot.c +1 -0
@@ -233,6 +233,7 @@ static struct dsa_device_ops ocelot_netdev_ops = { .xmit = ocelot_xmit, .rcv = ocelot_rcv, .overhead = OCELOT_TAG_LEN + OCELOT_LONG_PREFIX_LEN, + .proto_off = -1, };MODULE_LICENSE ("GPL v2" );
net/dsa/tag_qca.c +1 -10
@@ -90,22 +90,13 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,return skb; } -static int qca_tag_flow_dissect (const struct sk_buff *skb,__be16 *proto, -int *offset) -{ - *offset =QCA_HDR_LEN ; - *proto = ((__be16 *)skb->data)[0 ]; - -return 0 ; -} -static const struct dsa_device_ops qca_netdev_ops = { .name ="qca" , .proto =DSA_TAG_PROTO_QCA , .xmit = qca_tag_xmit, .rcv = qca_tag_rcv, - .flow_dissect = qca_tag_flow_dissect, .overhead =QCA_HDR_LEN , + .proto_offset =0 , };MODULE_LICENSE ("GPL" );
net/dsa/tag_sja1105.c +1 -0
@@ -300,6 +300,7 @@ static struct dsa_device_ops sja1105_netdev_ops = { .rcv = sja1105_rcv, .filter = sja1105_filter, .overhead = VLAN_HLEN, + .proto_off = -1, };MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.17.1
kbuild test robot
build bot[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please…
Hi Florian,
[FYI, it's a private test report for your RFC patch.]
[auto build test ERROR on net-next/master]
[also build test ERROR on net/master v5.5-rc4]
[cannot apply to ipvs/master next-20191220]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Florian-Fainelli/net-dsa-Remove-indirect-function-call-for-flow-dissection/20191231-032422 base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 1a1fda57b400160c79287479dc05d8b8b3f7113d config: c6x-allyesconfig (attached as .config) compiler: c6x-elf-gcc (GCC) 7.5.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.5.0 make.cross ARCH=c6x
If you fix the issue, kindly add following tag
All errors (new ones prefixed by >>):
>> net//dsa/tag_qca.c:99:3: error: 'const struct dsa_device_ops' has no member named 'proto_offset'; did you mean 'proto_off'?
.proto_offset = 0,
^~~~~~~~~~~~
proto_offvim +99 net//dsa/tag_qca.c
92
93 static const struct dsa_device_ops qca_netdev_ops = {
94 .name = "qca",
95 .proto = DSA_TAG_PROTO_QCA,
96 .xmit = qca_tag_xmit,
97 .rcv = qca_tag_rcv,
98 .overhead = QCA_HDR_LEN,
> 99 .proto_offset = 0, 100 };
101
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org Intel Corporation