Skip to content

net: dsa: move skb reallocation to dsa_slave_xmit

Christian Eggers lkml netdev 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 7 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3net: dsa: don't pass cloned skb's to drivers xmit functionnet/dsa/dsa_priv.h net/dsa/slave.c+41 -06 replies
2/3net: dsa: tag_ksz: don't allocate additional memory for padding/taggingnet/dsa/tag_ksz.c+9 -640 replies
3/3net: dsa: trailer: don't allocate additional memory for padding/taggingnet/dsa/tag_trailer.c+2 -290 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/3] 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_BYTES is 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_SLOB must 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 (and ETH_ZLEN?). Would moving the "else" clause from ksz_common_xmit() to dsa_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.c driver (for a 1588 switch with tail tags) is copied from tag_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_tailroom on 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