commits

commits@lists.open-mesh.org

1 participants
12401 discussions

[batman-adv] maint's head updated: batman-adv: Don't always reallocate the fragmentation skb head (3e3ff987)
by postmaster＠open-mesh.org 28 Nov '20

28 Nov '20

Repository : ssh://git@diktynna/batman-adv Branch 'maint' now includes: 92064ded batman-adv: Consider fragmentation for needed_headroom 0966d542 batman-adv: Reserve needed_*room for fragments 3e3ff987 batman-adv: Don't always reallocate the fragmentation skb head

1 0

[batman-adv] master: batman-adv: Don't always reallocate the fragmentation skb head (3e3ff987)
by postmaster＠open-mesh.org 28 Nov '20

28 Nov '20

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 3e3ff987876d3be70d928561acbefe5a48ab1654 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Nov 26 18:24:49 2020 +0100 batman-adv: Don't always reallocate the fragmentation skb head When a packet is fragmented by batman-adv, the original batman-adv header is not modified. Only a new fragmentation is inserted between the original one and the ethernet header. The code must therefore make sure that it has a writable region of this size in the skbuff head. But it is not useful to always reallocate the skbuff by this size even when there would be more than enough headroom still in the skb. The reallocation is just to costly during in this codepath. Fixes: db56e4ecf5c2 ("batman-adv: Fragment and send skbs larger than mtu") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 3e3ff987876d3be70d928561acbefe5a48ab1654 net/batman-adv/fragmentation.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 8de1fb56..1f1f5b08 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -527,13 +527,14 @@ int batadv_frag_send_packet(struct sk_buff *skb, frag_header.no++; } - /* Make room for the fragment header. */ - if (batadv_skb_head_push(skb, header_size) < 0 || - pskb_expand_head(skb, header_size + ETH_HLEN, 0, GFP_ATOMIC) < 0) { - ret = -ENOMEM; + /* make sure that there is at least enough head for the fragmentation + * and ethernet headers + */ + ret = skb_cow_head(skb, ETH_HLEN + header_size); + if (ret < 0) goto put_primary_if; - } + skb_push(skb, header_size); memcpy(skb->data, &frag_header, header_size); /* Send the last fragment */

1 0

[batman-adv] master: Merge branch 'maint' (ae5bde29)
by postmaster＠open-mesh.org 28 Nov '20

28 Nov '20

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit ae5bde298fa7d8d24b25544d42d1f5e340b7848c Merge: b7f96ca3 3e3ff987 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Nov 28 21:04:29 2020 +0100 Merge branch 'maint' >--------------------------------------------------------------- ae5bde298fa7d8d24b25544d42d1f5e340b7848c net/batman-adv/fragmentation.c | 26 ++++++++++++++++---------- net/batman-adv/hard-interface.c | 3 +++ 2 files changed, 19 insertions(+), 10 deletions(-)

1 0

[batman-adv] master: batman-adv: Consider fragmentation for needed_headroom (92064ded)
by postmaster＠open-mesh.org 28 Nov '20

28 Nov '20

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 92064deda9b063ca2d5a53b307c6127a9453357c Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Nov 26 18:15:06 2020 +0100 batman-adv: Consider fragmentation for needed_headroom If a batman-adv packets has to be fragmented, then the original batman-adv packet header is not stripped away. Instead, only a new header is added in front of the packet after it was split. This size must be considered to avoid cost intensive reallocations during the transmission through the various device layers. Fixes: e2b4301f4e2d ("batman-adv: Add lower layer needed_(head|tail)room to own ones") Reported-by: Linus L��ssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 92064deda9b063ca2d5a53b307c6127a9453357c net/batman-adv/hard-interface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index dad99641..33904595 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -554,6 +554,9 @@ static void batadv_hardif_recalc_extra_skbroom(struct net_device *soft_iface) needed_headroom = lower_headroom + (lower_header_len - ETH_HLEN); needed_headroom += batadv_max_header_len(); + /* fragmentation headers don't strip the unicast/... header */ + needed_headroom += sizeof(struct batadv_frag_packet); + soft_iface->needed_headroom = needed_headroom; soft_iface->needed_tailroom = lower_tailroom; }

1 0

[batman-adv] master: batman-adv: Reserve needed_*room for fragments (0966d542)
by postmaster＠open-mesh.org 28 Nov '20

28 Nov '20

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 0966d5424bb87e863037301488519ccdd69e4d26 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Nov 25 13:16:43 2020 +0100 batman-adv: Reserve needed_*room for fragments The batadv net_device is trying to propagate the needed_headroom and needed_tailroom from the lower devices. This is needed to avoid cost intensive reallocations using pskb_expand_head during the transmission. But the fragmentation code split the skb's without adding extra room at the end/beginning of the various fragments. This reduced the performance of transmissions over complex scenarios (batadv on vxlan on wireguard) because the lower devices had to perform the reallocations at least once. Fixes: db56e4ecf5c2 ("batman-adv: Fragment and send skbs larger than mtu") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0966d5424bb87e863037301488519ccdd69e4d26 net/batman-adv/fragmentation.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 9a47ef8b..8de1fb56 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -391,6 +391,7 @@ out: /** * batadv_frag_create() - create a fragment from skb + * @net_dev: outgoing device for fragment * @skb: skb to create fragment from * @frag_head: header to use in new fragment * @fragment_size: size of new fragment @@ -401,22 +402,25 @@ out: * * Return: the new fragment, NULL on error. */ -static struct sk_buff *batadv_frag_create(struct sk_buff *skb, +static struct sk_buff *batadv_frag_create(struct net_device *net_dev, + struct sk_buff *skb, struct batadv_frag_packet *frag_head, unsigned int fragment_size) { + unsigned int ll_reserved = LL_RESERVED_SPACE(net_dev); + unsigned int tailroom = net_dev->needed_tailroom; struct sk_buff *skb_fragment; unsigned int header_size = sizeof(*frag_head); unsigned int mtu = fragment_size + header_size; - skb_fragment = netdev_alloc_skb(NULL, mtu + ETH_HLEN); + skb_fragment = dev_alloc_skb(ll_reserved + mtu + tailroom); if (!skb_fragment) goto err; skb_fragment->priority = skb->priority; /* Eat the last mtu-bytes of the skb */ - skb_reserve(skb_fragment, header_size + ETH_HLEN); + skb_reserve(skb_fragment, ll_reserved + header_size); skb_split(skb, skb_fragment, skb->len - fragment_size); /* Add the header */ @@ -439,11 +443,12 @@ int batadv_frag_send_packet(struct sk_buff *skb, struct batadv_orig_node *orig_node, struct batadv_neigh_node *neigh_node) { + struct net_device *net_dev = neigh_node->if_incoming->net_dev; struct batadv_priv *bat_priv; struct batadv_hard_iface *primary_if = NULL; struct batadv_frag_packet frag_header; struct sk_buff *skb_fragment; - unsigned int mtu = neigh_node->if_incoming->net_dev->mtu; + unsigned int mtu = net_dev->mtu; unsigned int header_size = sizeof(frag_header); unsigned int max_fragment_size, num_fragments; int ret; @@ -503,7 +508,7 @@ int batadv_frag_send_packet(struct sk_buff *skb, goto put_primary_if; } - skb_fragment = batadv_frag_create(skb, &frag_header, + skb_fragment = batadv_frag_create(net_dev, skb, &frag_header, max_fragment_size); if (!skb_fragment) { ret = -ENOMEM;

1 0

[linux-merge]linux integration; annotated tag, batadv-net-pullrequest-20201127, created. batadv-net-pullrequest-20201127
by postmaster＠open-mesh.org 27 Nov '20

27 Nov '20

The annotated tag, batadv-net-pullrequest-20201127 has been created at fe0dc6d76928c63f90005be1f41b4c719b969260 (tag) tagging 992b03b88e36254e26e9a4977ab948683e21bd9f (commit) replaces v5.10-rc3 tagged by Simon Wunderlich on Fri Nov 27 18:36:27 2020 +0100 - Shortlog ------------------------------------------------------------ Here are some batman-adv bugfixes: - Fix head/tailroom issues for fragments, by Sven Eckelmann (3 patches) -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl/BORsWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoX+AD/wJYmiGL8beD3eCBQdTjmvJNRbZ MIlzse2LsiSk/4G/UbrEr11M4pc6gFDghH/VXs2MxD2hd6qJsJH7ulAQKMPzTEqD WhwlyJ08O9HIivaN2Ri1ibwmLIDAYlvR2bsWu95weI/hDdE5ups/kIvBudM8b+fC HKQ/e9wGaiB+zUUobvl6bP0Av6u3xPNTHFkXgGTo1shgLISAYFsmEoYQ3yZYrYKy P9ckwLoJwMD6AODMRvWVmW4dzi5QSBWN/84XgQSoqdlZeNklIcTY2P5XWdePo7cv wTnSxm4gJwdU7i8dBXLbtOYzmavzq0JkQHnRcFcKm6RWMbaeNNwfYUwMLp4h4ZtG Mjh0qt4IyuRb5Tf7jkoZ9UR4fIftpuMNMMvE37Cfr7wUZKWtVbG9jHyydU2MZ678 vAF5NigYHa88i+MSdbXq8fPflmhddiHsN05nzI3olzX7tBFWNDf+71P82Gm4zKuM YC4ZlZH7Rrb79C13CJm5xKN0MI5TYGDYJeFLV4Km7hZ9H9EyDJcsuSFPgV0R0hg5 Y5rWIWRrK/lU1aSXPSEuyL1P+tbH5z5xeYxdPUz2WroqNTyre6ycXy+wuoyCw5Ij t91wqD8pNC1/3nynBbI2kcLeGFPjDTEfWYcYN7OE3Ts6AXr3fs8x1XUcUsseAZ1P oxaUxzzfCcDno3abtg== =mORx -----END PGP SIGNATURE----- Sven Eckelmann (3): batman-adv: Consider fragmentation for needed_headroom batman-adv: Reserve needed_*room for fragments batman-adv: Don't always reallocate the fragmentation skb head Taehee Yoo (1): batman-adv: set .owner to THIS_MODULE ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-net-pullrequest-20201124, deleted. v5.10-rc3-1-g14a2e551faea
by postmaster＠open-mesh.org 25 Nov '20

25 Nov '20

The annotated tag, batadv-net-pullrequest-20201124 has been deleted was 00a1980b88d77e038b9a3421394ed5f4fe759589 ----------------------------------------------------------------------- tag batadv-net-pullrequest-20201124 Here is a batman-adv bugfix: - set module owner to THIS_MODULE, by Taehee Yoo -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl+9DbQWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoWlxD/0TOgtU9fVykvjMG3U0rnB6pvp7 rFH1Srqg5hsJ2PNLAF8fr0o4PDTyiAztirdJ4C4+ietug0ozxe4GZARB+/rPEk/3 u558cDMZaqLOo195g70s+8cr0XXPy8Bt4ip/X4uW8DNTluKMiQcKNDrVkc6Cysa/ 5cnT4wf6RftG9eMbtG1wdEzqG/goQpmrP+bo+J1QdBQEycqMwegTWYZyU9behS+m u47FIa20XQ8FmoZx3oooGNb7z9iDHzwVc7PMHw19Xv14bahtz1BwydERdJMde3hP UD4HeAQla6Gl0ZO2pS5MuCQxEu8aphel75a3g+D4XCdyyIl1B3FzK1F+DWdoHlnx g0g7xv0nnfpF2wVhGkgIKfssQXino9YPyIjl/zLJ7YXXrTZCzkOjGiumSvrvXgox mTtvDvbSIOylQksPF5UJtoOo6mWihg7HERyrOwfIV6UxKuqbKhv3e17gUlkZPIcp ec4iFjGheE0H00zSzBkeb+76M0XQmDTbvmjUfOxaxP4o+u5W27QE+HznOTrQ9uBa FrMt++XjxSfmVsiFrpqE4LQyYfcFjO3Ei5yYfR3tYfDx4qegDvqksLbzb3Fkp2G9 Pz9HEc+PYJk/w3N2Q+zSpbDJfUvHjyIPDeqsTdtbbUPUyfkGmghT7F9V+vof2jqm 6pijD3ji8JN1wmh9yw== =Qr0B -----END PGP SIGNATURE----- 14a2e551faea53d45bc11629a9dac88f88950ca7 batman-adv: set .owner to THIS_MODULE ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-net-pullrequest-20201124, created. batadv-net-pullrequest-20201124
by postmaster＠open-mesh.org 24 Nov '20

24 Nov '20

The annotated tag, batadv-net-pullrequest-20201124 has been created at 00a1980b88d77e038b9a3421394ed5f4fe759589 (tag) tagging 14a2e551faea53d45bc11629a9dac88f88950ca7 (commit) replaces v5.10-rc3 tagged by Simon Wunderlich on Tue Nov 24 14:42:12 2020 +0100 - Shortlog ------------------------------------------------------------ Here is a batman-adv bugfix: - set module owner to THIS_MODULE, by Taehee Yoo -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl+9DbQWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoWlxD/0TOgtU9fVykvjMG3U0rnB6pvp7 rFH1Srqg5hsJ2PNLAF8fr0o4PDTyiAztirdJ4C4+ietug0ozxe4GZARB+/rPEk/3 u558cDMZaqLOo195g70s+8cr0XXPy8Bt4ip/X4uW8DNTluKMiQcKNDrVkc6Cysa/ 5cnT4wf6RftG9eMbtG1wdEzqG/goQpmrP+bo+J1QdBQEycqMwegTWYZyU9behS+m u47FIa20XQ8FmoZx3oooGNb7z9iDHzwVc7PMHw19Xv14bahtz1BwydERdJMde3hP UD4HeAQla6Gl0ZO2pS5MuCQxEu8aphel75a3g+D4XCdyyIl1B3FzK1F+DWdoHlnx g0g7xv0nnfpF2wVhGkgIKfssQXino9YPyIjl/zLJ7YXXrTZCzkOjGiumSvrvXgox mTtvDvbSIOylQksPF5UJtoOo6mWihg7HERyrOwfIV6UxKuqbKhv3e17gUlkZPIcp ec4iFjGheE0H00zSzBkeb+76M0XQmDTbvmjUfOxaxP4o+u5W27QE+HznOTrQ9uBa FrMt++XjxSfmVsiFrpqE4LQyYfcFjO3Ei5yYfR3tYfDx4qegDvqksLbzb3Fkp2G9 Pz9HEc+PYJk/w3N2Q+zSpbDJfUvHjyIPDeqsTdtbbUPUyfkGmghT7F9V+vof2jqm 6pijD3ji8JN1wmh9yw== =Qr0B -----END PGP SIGNATURE----- Taehee Yoo (1): batman-adv: set .owner to THIS_MODULE ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v5.10-rc5, created. v5.10-rc5
by postmaster＠open-mesh.org 23 Nov '20

23 Nov '20

The annotated tag, v5.10-rc5 has been created at af69a948d2ce48f8bfe9935958d12f86fb50326b (tag) tagging 418baf2c28f3473039f2f7377760bd8f6897ae18 (commit) replaces v5.10-rc4 tagged by Linus Torvalds on Sun Nov 22 15:36:08 2020 -0800 - Shortlog ------------------------------------------------------------ Linux 5.10-rc5 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl+69egeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGTSYH/ifRBlaxy5UiHFc0 2zdR7pkjWrYfDTTT3sazIAhdlzzcfnkUqgFxOP45F4ZIqeTzunH3sUY+5UlT9IX7 liUgnLxQ/1R9Gx8kPGQfu+tLCey78xVFydGsqJoW9sPRw2R+apMdGGa/lOrk+OXz DXIN+dDnGFqwCCNJpK+rxQQhFf++IPpSI8z6Y23moOFhsDZrEziHuVFy2FGyRM6z prZ/us/tcobE8ptCk1RmOxLoJ1DR6UxpA2vLimTE+JD8siOsSWPbjE0KudnWCnd5 BLqIjrsPJbSxyuzzK3v9dnO5wMv7tMDuMIuYM/MQTXDttNwtsqt/aP6gdnUCym7N 5eHEj5g= =MuO1 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v5.10-rc4, created. v5.10-rc4
by postmaster＠open-mesh.org 16 Nov '20

16 Nov '20

The annotated tag, v5.10-rc4 has been created at a93711503472d4c89977ce2c80dcd4b75e36cc45 (tag) tagging 09162bc32c880a791c6c0668ce0745cf7958f576 (commit) replaces v5.10-rc3 tagged by Linus Torvalds on Sun Nov 15 16:44:31 2020 -0800 - Shortlog ------------------------------------------------------------ Linux 5.10-rc4 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl+xy28eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGAl4H+weJtTIK59po2iVj j8OIoVm2lNwJxd2iCrj/jibpo6NPaATNwKloML3F3tQL5rmn7TknFVDzZJAvIo9+ d+WNBcdFbgkGAPhTXNXpnt7Ah4YlhrBFi/qu0q8t96mxg+gPo+Zi5tIAcOw1FtFO rfuhNgoQG/X6UHI+xW2EMDTzJY/94iF+2uEp6HUDoiJJwq9DAnUm172tPrQdrHPL D9zEHY9v7SrIacOeV0TApVaMnj9XaudY71xwgmvp7f6dypDD+TGnrr3qj6FKgRsR aL4f+JfYbUjnk4yWHpzPljkDe7SrPkKLZeon26M+mfClBgkiG/ktQFNH7r7PCFrv eqC8RUE= =PYO+ -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits