net: dsa: move skb reallocation to dsa_slave_xmit
cover net: dsa: move skb reallocation to dsa_slave_xmit
This series moves the reallocation of a skb which may be required due to tail tagging or padding, from the tag_trailer and tag_ksz drivers to dsa_slave_xmit. Additionally it prevents a skb_panic in a very special corner case described here:
https://patchwork.ozlabs.org/project/netdev/patch/[email protected]/#2554896
This series has been tested with KSZ9563 and my preliminary PTP patches.
Quoted 6 lines · Vladimir Oltean
Quoted 4 lines · Christian Eggers
Machine:
- ARMv7 (i.MX6ULL),SMP_CACHE_BYTESis 64
- DSA device: Microchip KSZ9563 (I am currently working on time stamping support)I have a board very similar to this on which I am going to test.
hopefully you are not just developing on PTP support for KSZ9563 ;-) Which hardware do you exactly own? The problem I described to (link above) can only be reproduced with my (not yes published) PTP patches.
Quoted 3 lines
Quoted 1 line
Last,
CONFIG_SLOBmust be selected.Interesting, do you know why?
Yes. The other allocaters will actually allocate 512 byte instead of 320 if 64+256 bytes are requested. This will then be reported by ksize() and let to more skb tailroom. The SLOB allocator will really allocate only 320 byte in this case, so that the skb will be run out of tail room when tail tagging...
Quoted 10 lines
Quoted 3 lines
3. "Manually" unsharing in
dsa_slave_xmit(), reserving enough tailroom for the tail tag (andETH_ZLEN?). Would moving the "else" clause fromksz_common_xmit()todsa_slave_xmit()do the job correctly?I was thinking about something like that, indeed. DSA knows everything about the tagger: its overhead, whether it's a tail tag or not. The xmit callback of the tagger should only be there to populate the tag where it needs to be. But reallocation, padding, etc etc, should all be dealt with by the common DSA xmit procedure. We want the taggers to be simple and reuse as much logic as possible, not to be bloated.
This series is the first draft for it. Some additional changes my be done later:
1. All xmit() function now return either the supplied skb or NULL. No reallocation will be done anymore. Maybe the type of the return value may be changed to reflect this (e.g. to bool).
2. There is no path left which calls __skb_put_padto()/skb_pad() with free_on_error set to false. So the following commit may be reverted in order to simply the code:
cd0a137acbb6 ("net: core: Specify skb_pad()/skb_put_padto() SKB freeing")
Quoted 2 lines · Vladimir Oltean
Kurt is asking, and rightfully so, because his
tag_hellcreek.cdriver (for a 1588 switch with tail tags) is copied fromtag_ksz.c.
@Kurt: If this series (or a later version) is accepted, please update your tagging driver. Ensure that your dsa_device_ops::overhead contains the "maximum" possible tail tag len for xmit and that dsa_device_ops::tail_tag is set to true.
Quoted 2 lines · Jakub Kicinski
FWIW if you want to avoid the reallocs you may want to set
needed_tailroomon the netdev.
I haven't looked for this yet. If this can really solve the tagging AND padding problem, I would like to do this in a follow up patch.
Wishing a nice weekend for netdev.
Christian
PATCH 1/3 net: dsa: don't pass cloned skb's to drivers xmit function
Ensure that the skb is not cloned and has enough tail room for the tail tag. This code will be removed from the drivers in the next commits.
--- net/dsa/dsa_priv.h | 3 +++ net/dsa/slave.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+)
net/dsa/dsa_priv.h +3 -0
@@ -77,6 +77,9 @@ struct dsa_slave_priv {/* Copy of CPU port xmit for faster access in slave transmit hot path */ struct sk_buff * (*xmit)(struct sk_buff *skb,struct net_device *dev); +/* same for tail_tag and overhead */ +bool tail_tag; +unsigned int overhead;struct pcpu_sw_netstats __percpu *stats64;
net/dsa/slave.c +38 -0
@@ -553,6 +553,7 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev)struct dsa_slave_priv *p =netdev_priv (dev);struct pcpu_sw_netstats *s;struct sk_buff *nskb; +int padlen; s =this_cpu_ptr (p->stats64);u64_stats_update_begin (&s->syncp);
@@ -567,6 +568,41 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev)*/ dsa_skb_tx_timestamp (p, skb); +/* We have to pad he packet to the minimum Ethernet frame size, +* if necessary, before adding the trailer (tail tagging only). +*/ + padlen = (skb->len >=ETH_ZLEN ) ?0 :ETH_ZLEN - skb->len; + +/* To keep the slave's xmit() methods simple, don't pass cloned skbs to +* them. Additionally ensure, that suitable room for tail tagging is +* available. +*/ +if (skb_cloned (skb) || + (p->tail_tag &&skb_tailroom (skb) < (padlen + p->overhead))) { +struct sk_buff *nskb; + + nskb =alloc_skb (NET_IP_ALIGN + skb->len + + padlen + p->overhead,GFP_ATOMIC ); +if (!nskb) { +kfree_skb (skb); +return NETDEV_TX_OK ; + } +skb_reserve (nskb,NET_IP_ALIGN ); + +skb_reset_mac_header (nskb); +skb_set_network_header (nskb, +skb_network_header (skb) - skb->head); +skb_set_transport_header (nskb, +skb_transport_header (skb) - skb->head); +skb_copy_and_csum_dev (skb,skb_put (nskb, skb->len)); +consume_skb (skb); + +if (padlen) +skb_put_zero (nskb, padlen); + + skb = nskb; + } +/* Transmit function may have to reallocate the original SKB, * in which case it must have freed it. Only free it here on error. */
@@ -1814,6 +1850,8 @@ int dsa_slave_create(struct dsa_port *port) p->dp = port;INIT_LIST_HEAD (&p->mall_tc_list); p->xmit = cpu_dp->tag_ops->xmit; + p->tail_tag = cpu_dp->tag_ops->tail_tag; + p->overhead = cpu_dp->tag_ops->overhead; port->slave = slave_dev;rtnl_lock ();
Signature · 8 lines
Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
Vladimir Oltean
maintainerRe: [PATCH net-next 1/3] net: dsa: don't pass cloned skb's to drivers xmit function
Quoted 5 lines · Christian Eggers
Ensure that the skb is not cloned and has enough tail room for the tail tag. This code will be removed from the drivers in the next commits.
Signed-off-by Christian Eggers <[email protected]>---
Does 1588 work for you using this change, or you haven't finished implementing it yet? If you haven't, I would suggest finishing that part first.
The post-reallocation skb looks nothing like the one before.
Before:
skb len=68 headroom=2 headlen=68 tailroom=186 mac=(2,14) net=(16,-1) trans=-1 shinfo(txflags=1 nr_frags=0 gso(size=0 type=0 segs=0)) csum(0x0 ip_summed=0 complete_sw=0 valid=0 level=0) hash(0x9d6927ec sw=1 l4=0) proto=0x88f7 pkttype=0 iif=0 dev name=swp2 feat=0x0x0002000000005020
sk family=17 type=3 proto=0
After:
skb len=68 headroom=2 headlen=68 tailroom=186 mac=(2,16) net=(18,-17) trans=1 shinfo(txflags=0 nr_frags=0 gso(size=0 type=0 segs=0)) csum(0x0 ip_summed=0 complete_sw=0 valid=0 level=0) hash(0x0 sw=0 l4=0) proto=0x0000 pkttype=0 iif=0
Notice how you've changed shinfo(txflags), among other things.
Which proves that you can't just copy&paste whatever you found in tag_trailer.c.
I am not yet sure whether there is any helper that can be used instead of this crazy open-coding. Right now, not having tested anything yet, my candidates of choice would be pskb_expand_head or __pskb_pull_tail. You should probably also try to cater here for the potential reallocation done in the skb_cow_head() of non-tail taggers. Which would lean the balance towards pskb_expand_head(), I believe.
Also, if the result is going to be longer than ~20 lines of code, I strongly suggest moving the reallocation to a separate function so you don't clutter dsa_slave_xmit.
Also, please don't redeclare struct sk_buff *nskb, you don't need to.
Re: [PATCH net-next 1/3] net: dsa: don't pass cloned skb's to drivers xmit function
Hi Vladimir,
Quoted 10 lines · Vladimir Oltean
Quoted 5 lines · Christian Eggers
Ensure that the skb is not cloned and has enough tail room for the tail tag. This code will be removed from the drivers in the next commits.
Signed-off-by Christian Eggers <[email protected]>---
Does 1588 work for you using this change, or you haven't finished implementing it yet? If you haven't, I would suggest finishing that part first.
Yes it does. Just after finishing this topic, I would to sent the patches for PTP. Maybe I'll do it in parallel, anything but the combination of L2/E2E/SLOB seems to work.
Quoted 11 lines
The post-reallocation skb looks nothing like the one before.
Before:
skb len=68 headroom=2 headlen=68 tailroom=186 mac=(2,14) net=(16,-1) trans=-1shinfo(txflags=1 nr_frags=0 gso(size=0 type=0 segs=0))csum(0x0 ip_summed=0 complete_sw=0 valid=0 level=0)hash(0x9d6927ec sw=1 l4=0) proto=0x88f7 pkttype=0 iif=0 dev name=swp2 feat=0x0x0002000000005020
sk family=17 type=3 proto=0
Quoted 8 lines
After:
skb len=68 headroom=2 headlen=68 tailroom=186 mac=(2,16) net=(18,-17) trans=1shinfo(txflags=0 nr_frags=0 gso(size=0 type=0 segs=0))csum(0x0 ip_summed=0 complete_sw=0 valid=0 level=0)hash(0x0 sw=0 l4=0) proto=0x0000 pkttype=0 iif=0Notice how you've changed shinfo(txflags), among other things.
I get a similar output when placing the two skb_dump() calls in the current ksz_common_xmit() code:
[ 5052.662168] old:skb len=58 headroom=2 headlen=58 tailroom=68 [ 5052.662168] mac=(2,14) net=(16,-1) trans=-1 [ 5052.662168] shinfo(txflags=1 nr_frags=0 gso(size=0 type=0 segs=0)) [ 5052.662168] csum(0x0 ip_summed=0 complete_sw=0 valid=0 level=0) [ 5052.662168] hash(0x0 sw=0 l4=0) proto=0x88f7 pkttype=0 iif=0 [ 5052.676360] old:dev name=lan0 feat=0x0x0002000000005220 [ 5052.679001] old:sk family=17 type=3 proto=0 [ 5052.681140] old:skb linear: 00000000: 01 1b 19 00 00 00 52 d9 a9 5d a1 40 88 f7 01 02 [ 5052.685236] old:skb linear: 00000010: 00 2c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 5052.689342] old:skb linear: 00000020: 00 00 52 d9 a9 ff fe 5d a1 40 00 01 00 00 01 7f [ 5052.693418] old:skb linear: 00000030: 00 00 00 00 00 00 00 00 00 00 [ 5052.696843] new:skb len=65 headroom=2 headlen=65 tailroom=61 [ 5052.696843] mac=(2,16) net=(18,-17) trans=1 [ 5052.696843] shinfo(txflags=0 nr_frags=0 gso(size=0 type=0 segs=0)) [ 5052.696843] csum(0x0 ip_summed=0 complete_sw=0 valid=0 level=0) [ 5052.696843] hash(0x0 sw=0 l4=0) proto=0x0000 pkttype=0 iif=0 [ 5052.711215] new:skb linear: 00000000: 01 1b 19 00 00 00 52 d9 a9 5d a1 40 88 f7 01 02 [ 5052.715305] new:skb linear: 00000010: 00 2c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 5052.719407] new:skb linear: 00000020: 00 00 52 d9 a9 ff fe 5d a1 40 00 01 00 00 01 7f [ 5052.723484] new:skb linear: 00000030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 5052.727587] new:skb linear: 00000040: 00
Note that whilst some skb members differ, the two hexdumps look correct.
Quoted 2 lines
Which proves that you can't just copy&paste whatever you found in
tag_trailer.c.
I did. tag_trailer and tag_ksz are quite similar here, so I took a combination of them.
Quoted 6 lines
I am not yet sure whether there is any helper that can be used instead of this crazy open-coding. Right now, not having tested anything yet, my candidates of choice would be
pskb_expand_heador__pskb_pull_tail. You should probably also try to cater here for the potential reallocation done in theskb_cow_head()of non-tail taggers. Which would lean the balance towardspskb_expand_head(), I believe.
The "open coding" is from the existing code (which doesn't say that it is correct). I will investigate why the copied skb is different and whether psk_expand_head can do better.
I don't like to touch the non-tail taggers, this is too much out of the scope of my current work.
Quoted 3 lines
Also, if the result is going to be longer than ~20 lines of code, I strongly suggest moving the reallocation to a separate function so you don't clutter
dsa_slave_xmit.
As Florian requested I'll likely put the code into a separate function in slave.c and call it from the individual tail-taggers in order not to put extra conditionals in dsa_slave_xmit.
regards
Christian
Vladimir Oltean
maintainerRe: [PATCH net-next 1/3] net: dsa: don't pass cloned skb's to drivers xmit function
Quoted 6 lines · Christian Eggers
Quoted 3 lines
Does 1588 work for you using this change, or you haven't finished implementing it yet? If you haven't, I would suggest finishing that part first.
Yes it does. Just after finishing this topic, I would to sent the patches for PTP. Maybe I'll do it in parallel, anything but the combination of L2/E2E/SLOB seems to work.
2 aspects:
- net-next is closed for this week and the next one, due to the merge window. You'll have to wait until it reopens.
- Actually I was asking you this because sja1105 PTP no longer works after this change, due to the change of txflags.
Quoted 2 lines
I don't like to touch the non-tail taggers, this is too much out of the scope of my current work.
Do you want me to try and send a version using pskb_expand_head and you can test if it works for your tail-tagging switch?
Quoted 6 lines
Quoted 3 lines
Also, if the result is going to be longer than ~20 lines of code, I strongly suggest moving the reallocation to a separate function so you don't clutter
dsa_slave_xmit.As Florian requested I'll likely put the code into a separate function in
slave.cand call it from the individual tail-taggers in order not to put extra conditionals indsa_slave_xmit.
I think it would be best to use the unlikely(tail_tag) approach though. The reallocation function should still be in the common code path. Even for a non-1588 switch, there are other code paths that clone packets on TX. For example, the bridge does that, when flooding packets. Currently, DSA ensures that the header area is writable by calling skb_cow_head, as far as I can see. But the point is, maybe we can do TX reallocation centrally.
Re: [PATCH net-next 1/3] net: dsa: don't pass cloned skb's to drivers xmit function
Quoted 5 lines · Vladimir Oltean
Quoted 4 lines · Christian Eggers
Quoted 3 lines
Does 1588 work for you using this change, or you haven't finished implementing it yet? If you haven't, I would suggest finishing that part first.
Quoted 7 lines
Quoted 3 lines
Yes it does. Just after finishing this topic, I would to sent the patches for PTP. Maybe I'll do it in parallel, anything but the combination of L2/E2E/SLOB seems to work.
2 aspects:
- net-next is closed for this week and the next one, due to the merge window. You'll have to wait until it reopens.
The status page seems to be out of date:
http://vger.kernel.org/~davem/net-next.html
The FAQ says: "Do not send new net-next content to netdev...". So there is no possibility for code review, is it?
Quoted 2 lines
- Actually I was asking you this because sja1105 PTP no longer works after this change, due to the change of txflags.
The tail taggers seem to be immune against this change.
Quoted 5 lines
Quoted 2 lines
I don't like to touch the non-tail taggers, this is too much out of the scope of my current work.
Do you want me to try and send a version using
pskb_expand_headand you can test if it works for your tail-tagging switch?
I already wanted to ask... My 2nd try (checking for !skb_cloned()) was already sufficient (for me). Hacking linux-net is very interesting, but I have many other items open... Testing would be no problem.
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
Also, if the result is going to be longer than ~20 lines of code, I strongly suggest moving the reallocation to a separate function so you don't clutter
dsa_slave_xmit.
Quoted 8 lines
Quoted 3 lines
As Florian requested I'll likely put the code into a separate function in
slave.cand call it from the individual tail-taggers in order not to put extra conditionals indsa_slave_xmit.I think it would be best to use the
unlikely(tail_tag)approach though. The reallocation function should still be in the common code path. Even for a non-1588 switch, there are other code paths that clone packets on TX. For example, the bridge does that, when flooding packets.
You already mentioned that you don't want to pass cloned packets to the tag drivers xmit() functions. I've no experience with the problems caused by cloned packets, but would cloned packets work anyway? Or must cloned packets not be changed (e.g. by tail-tagging)? Is there any value in first cloning in dsa_skb_tx_timestamp() and then unsharing in dsa_slave_xmit a few lines later? The issue I currently have only affects a very minor number of packets (cloned AND < ETH_ZLEN AND CONFIG_SLOB), so only these packets would need a copying.
Quoted 3 lines
Currently, DSA ensures that the header area is writable by calling
skb_cow_head, as far as I can see. But the point is, maybe we can do TX reallocation centrally.
regards
Christian
Vladimir Oltean
maintainerRe: [PATCH net-next 1/3] net: dsa: don't pass cloned skb's to drivers xmit function
Quoted 2 lines · Christian Eggers
The status page seems to be out of date:
http://vger.kernel.org/~davem/net-next.html
Yeah, it can do that sometimes. Extremely rarely, but it happens. But net-next is still closed, nonetheless.
Quoted 2 lines
The FAQ says: "Do not send new net-next content to netdev...". So there is no possibility for code review, is it?
You can always send patches as RFC (Request For Comments). In fact that's what I'm going to do right now.
Quoted 3 lines
Quoted 2 lines
- Actually I was asking you this because sja1105 PTP no longer works after this change, due to the change of txflags.
The tail taggers seem to be immune against this change.
How?
Quoted 5 lines
Quoted 2 lines
Do you want me to try and send a version using
pskb_expand_headand you can test if it works for your tail-tagging switch?I already wanted to ask... My 2nd try (checking for !skb_cloned()) was already sufficient (for me). Hacking linux-net is very interesting, but I have many other items open... Testing would be no problem.
Ok, incoming.....
Quoted 11 lines
Quoted 4 lines
I think it would be best to use the
unlikely(tail_tag)approach though. The reallocation function should still be in the common code path. Even for a non-1588 switch, there are other code paths that clone packets on TX. For example, the bridge does that, when flooding packets.You already mentioned that you don't want to pass cloned packets to the tag drivers
xmit()functions. I've no experience with the problems caused by cloned packets, but would cloned packets work anyway? Or must cloned packets not be changed (e.g. by tail-tagging)? Is there any value in first cloning indsa_skb_tx_timestamp()and then unsharing indsa_slave_xmita few lines later? The issue I currently have only affects a very minor number of packets (cloned AND <ETH_ZLENANDCONFIG_SLOB), so only these packets would need a copying.
Yes, we need to clone and then unshare immediately afterwards because sja1105_xmit calls sja1105_defer_xmit, which schedules a workqueue. The sja1105 driver assumes that the skb has already been cloned by then. So basically, the sja1105 driver introduces a strict ordering requirement that dsa_skb_tx_timestamp needs to be first, then p->xmit second. So we necessarily must reallocate freshly cloned skbs, as things stand now. I'll think about avoiding that, but not now. We were always reallocating those frames before, using skb_cow_head. The only difference now is that the skb, as it is passed to the tagger's xmit() function, is directly writable. You'll see...
Re: [PATCH net-next 1/3] net: dsa: don't pass cloned skb's to drivers xmit function
In reply to Christian EggersQuoted 5 lines · Christian Eggers
Ensure that the skb is not cloned and has enough tail room for the tail tag. This code will be removed from the drivers in the next commits.
Signed-off-by Christian Eggers <[email protected]>---
[snip]
Quoted 24 lines
net/dsa/slave.c +24
-0+/* We have to pad he packet to the minimum Ethernet frame size, +* if necessary, before adding the trailer (tail tagging only). +*/ + padlen = (skb->len >=ETH_ZLEN ) ?0 :ETH_ZLEN - skb->len; + +/* To keep the slave's xmit() methods simple, don't pass cloned skbs to +* them. Additionally ensure, that suitable room for tail tagging is +* available. +*/ +if (skb_cloned (skb) || + (p->tail_tag &&skb_tailroom (skb) < (padlen + p->overhead))) { +struct sk_buff *nskb; + + nskb =alloc_skb (NET_IP_ALIGN + skb->len + + padlen + p->overhead,GFP_ATOMIC ); +if (!nskb) { +kfree_skb (skb); +return NETDEV_TX_OK ; + } +skb_reserve (nskb,NET_IP_ALIGN ); + +skb_reset_mac_header (nskb); +skb_set_network_header (nskb, +skb_network_header (skb) - skb->head);
net/dsa/slave.c static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev) · line 604
Quoted 10 lines
net/dsa/slave.c +10
-0+skb_set_transport_header (nskb, +skb_transport_header (skb) - skb->head); +skb_copy_and_csum_dev (skb,skb_put (nskb, skb->len)); +consume_skb (skb); + +if (padlen) +skb_put_zero (nskb, padlen); + + skb = nskb; + }
Given the low number of tail taggers, maybe this should be a helper function that is used by them where applicable? If nothing else you may want to sprinkle unlikely() conditions to sort of hing the processor that these are unlikely conditions.
Signature · 1 line
Florian
PATCH 2/3 net: dsa: tag_ksz: don't allocate additional memory for padding/tagging
In reply to Christian EggersThe caller (dsa_slave_xmit) guarantees that the frame length is at least ETH_ZLEN and that enough memory for tail tagging is available.
--- net/dsa/tag_ksz.c | 73 ++++++----------------------------------------- 1 file changed, 9 insertions(+), 64 deletions(-)
net/dsa/tag_ksz.c +9 -64
@@ -14,46 +14,6 @@#define KSZ_EGRESS_TAG_LEN 1#define KSZ_INGRESS_TAG_LEN 1 -static struct sk_buff *ksz_common_xmit (struct sk_buff *skb, -struct net_device *dev,int len) -{ -struct sk_buff *nskb; -int padlen; - - padlen = (skb->len >=ETH_ZLEN ) ?0 :ETH_ZLEN - skb->len; - -if (skb_tailroom (skb) >= padlen + len) { -/* Let dsa_slave_xmit() free skb */ -if (__skb_put_padto (skb, skb->len + padlen, false)) -return NULL ; - - nskb = skb; - }else { - nskb =alloc_skb (NET_IP_ALIGN + skb->len + - padlen + len,GFP_ATOMIC ); -if (!nskb) -return NULL ; -skb_reserve (nskb,NET_IP_ALIGN ); - -skb_reset_mac_header (nskb); -skb_set_network_header (nskb, -skb_network_header (skb) - skb->head); -skb_set_transport_header (nskb, -skb_transport_header (skb) - skb->head); -skb_copy_and_csum_dev (skb,skb_put (nskb, skb->len)); - -/* Let skb_put_padto() free nskb, and let dsa_slave_xmit() free -* skb -*/ -if (skb_put_padto (nskb, nskb->len + padlen)) -return NULL ; - -consume_skb (skb); - } - -return nskb; -} -static struct sk_buff *ksz_common_rcv (struct sk_buff *skb,struct net_device *dev,unsigned int port,unsigned int len)
@@ -90,23 +50,18 @@ static struct sk_buff *ksz_common_rcv(struct sk_buff *skb,static struct sk_buff *ksz8795_xmit (struct sk_buff *skb,struct net_device *dev) {struct dsa_port *dp =dsa_slave_to_port (dev); -struct sk_buff *nskb;u8 *tag;u8 *addr; - nskb =ksz_common_xmit (skb, dev,KSZ_INGRESS_TAG_LEN ); -if (!nskb) -return NULL ; -/* Tag encoding */ - tag =skb_put (nskb,KSZ_INGRESS_TAG_LEN ); - addr =skb_mac_header (nskb); + tag =skb_put (skb,KSZ_INGRESS_TAG_LEN ); + addr =skb_mac_header (skb); *tag =1 << dp->index;if (is_link_local_ether_addr (addr)) *tag |=KSZ8795_TAIL_TAG_OVERRIDE ; -return nskb; +return skb; } static struct sk_buff *ksz8795_rcv(struct sk_buff *skb, struct net_device *dev,
@@ -156,18 +111,13 @@ static struct sk_buff *ksz9477_xmit(struct sk_buff *skb, struct net_device *dev) {struct dsa_port *dp =dsa_slave_to_port (dev); -struct sk_buff *nskb;__be16 *tag;u8 *addr;u16 val; - nskb =ksz_common_xmit (skb, dev,KSZ9477_INGRESS_TAG_LEN ); -if (!nskb) -return NULL ; -/* Tag encoding */ - tag =skb_put (nskb,KSZ9477_INGRESS_TAG_LEN ); - addr =skb_mac_header (nskb); + tag =skb_put (skb,KSZ9477_INGRESS_TAG_LEN ); + addr =skb_mac_header (skb); val =BIT (dp->index);
@@ -176,7 +126,7 @@ static struct sk_buff *ksz9477_xmit(struct sk_buff *skb, *tag =cpu_to_be16 (val); -return nskb; +return skb; } static struct sk_buff *ksz9477_rcv(struct sk_buff *skb, struct net_device *dev,
@@ -213,24 +163,19 @@ static struct sk_buff *ksz9893_xmit(struct sk_buff *skb, struct net_device *dev) {struct dsa_port *dp =dsa_slave_to_port (dev); -struct sk_buff *nskb;u8 *addr;u8 *tag; - nskb =ksz_common_xmit (skb, dev,KSZ_INGRESS_TAG_LEN ); -if (!nskb) -return NULL ; -/* Tag encoding */ - tag =skb_put (nskb,KSZ_INGRESS_TAG_LEN ); - addr =skb_mac_header (nskb); + tag =skb_put (skb,KSZ_INGRESS_TAG_LEN ); + addr =skb_mac_header (skb); *tag =BIT (dp->index);if (is_link_local_ether_addr (addr)) *tag |=KSZ9893_TAIL_TAG_OVERRIDE ; -return nskb; +return skb; }static const struct dsa_device_ops ksz9893_netdev_ops = {
Signature · 8 lines
Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
PATCH 3/3 net: dsa: trailer: don't allocate additional memory for padding/tagging
In reply to Christian EggersThe caller (dsa_slave_xmit) guarantees that the frame length is at least ETH_ZLEN and that enough memory for tail tagging is available.
--- net/dsa/tag_trailer.c | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-)
net/dsa/tag_trailer.c +2 -29
@@ -13,42 +13,15 @@static struct sk_buff *trailer_xmit (struct sk_buff *skb,struct net_device *dev) {struct dsa_port *dp =dsa_slave_to_port (dev); -struct sk_buff *nskb; -int padlen;u8 *trailer; -/* -* We have to make sure that the trailer ends up as the very -* last 4 bytes of the packet. This means that we have to pad -* the packet to the minimum ethernet frame size, if necessary, -* before adding the trailer. -*/ - padlen =0 ; -if (skb->len <60 ) - padlen =60 - skb->len; - - nskb =alloc_skb (NET_IP_ALIGN + skb->len + padlen +4 ,GFP_ATOMIC ); -if (!nskb) -return NULL ; -skb_reserve (nskb,NET_IP_ALIGN ); - -skb_reset_mac_header (nskb); -skb_set_network_header (nskb,skb_network_header (skb) - skb->head); -skb_set_transport_header (nskb,skb_transport_header (skb) - skb->head); -skb_copy_and_csum_dev (skb,skb_put (nskb, skb->len)); -consume_skb (skb); - -if (padlen) { -skb_put_zero (nskb, padlen); - } - - trailer =skb_put (nskb,4 ); + trailer =skb_put (skb,4 ); trailer[0 ] =0x80 ; trailer[1 ] =1 << dp->index; trailer[2 ] =0x10 ; trailer[3 ] =0x00 ; -return nskb; +return skb; } static struct sk_buff *trailer_rcv(struct sk_buff *skb, struct net_device *dev,
Signature · 8 lines
Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
On 10/16/2020 1:02 PM, Christian Eggers wrote:
[snip]
Quoted 5 lines · Jakub Kicinski
Quoted 2 lines
FWIW if you want to avoid the reallocs you may want to set
needed_tailroomon the netdev.I haven't looked for this yet. If this can really solve the tagging AND padding problem, I would like to do this in a follow up patch.
The comment in netdevice.h says:
* @needed_headroom: Extra headroom the hardware may need, but
not in all
* cases can this be guaranteed
* @needed_tailroom: Extra tailroom the hardware may need, but
not in all
* cases can this be guaranteed. Some cases
also use
* LL_MAX_HEADER instead to allocate the skb
and while I have never seen a reallocation occur while pushing a descriptor status block in front of a frame on transmit after setting the correct needed_headroom, it was not exercised in a very complicated way either, just TCP or UDP over IPv4 or IPv6. This makes me think that the comment is cautionary about more complicated transmit scenarios with stacked devices, tunneling etc.
Quoted 2 lines
Wishing a nice weekend for netdev.
Likewise!
Signature · 1 line
Florian