Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kernel: fix mtk dsa tag padding

Browse source 
The padding intended to avoid corrupted non-zero padding payload was
accidentally adding too many padding bytes, tripping up some setups.
Fix this by using eth_skb_pad instead.
Fixes #11942.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2023-03-02 12:58:16 +01:00
parent 23b46b1c61
commit 9307c27539
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
target/linux/generic/pending-5.10/705-net-dsa-tag_mtk-add-padding-for-tx-packets.patch
View file

@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/dsa/tag_mtk.c --- a/net/dsa/tag_mtk.c
+++ b/net/dsa/tag_mtk.c +++ b/net/dsa/tag_mtk.c
@@ -25,6 +25,14 @@ static struct sk_buff *mtk_tag_xmit(stru @@ -25,6 +25,13 @@ static struct sk_buff *mtk_tag_xmit(stru
u8 xmit_tpid; u8 xmit_tpid;
u8 *mtk_tag; u8 *mtk_tag;
@ -21,8 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ * corrupted. With tags enabled, we need to make sure that packets are + * corrupted. With tags enabled, we need to make sure that packets are
+ * at least 68 bytes (including FCS and tag). + * at least 68 bytes (including FCS and tag).
+ */ + */
+ if (__skb_put_padto(skb, ETH_ZLEN + MTK_HDR_LEN, false)) + eth_skb_pad(skb);
+ return NULL;
+ +
/* Build the special tag after the MAC Source Address. If VLAN header /* Build the special tag after the MAC Source Address. If VLAN header
* is present, it's required that VLAN header and special tag is * is present, it's required that VLAN header and special tag is

5
target/linux/generic/pending-5.15/705-net-dsa-tag_mtk-add-padding-for-tx-packets.patch
View file

@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/dsa/tag_mtk.c --- a/net/dsa/tag_mtk.c
+++ b/net/dsa/tag_mtk.c +++ b/net/dsa/tag_mtk.c
@@ -25,6 +25,14 @@ static struct sk_buff *mtk_tag_xmit(stru @@ -25,6 +25,13 @@ static struct sk_buff *mtk_tag_xmit(stru
u8 xmit_tpid; u8 xmit_tpid;
u8 *mtk_tag; u8 *mtk_tag;
@ -21,8 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ * corrupted. With tags enabled, we need to make sure that packets are + * corrupted. With tags enabled, we need to make sure that packets are
+ * at least 68 bytes (including FCS and tag). + * at least 68 bytes (including FCS and tag).
+ */ + */
+ if (__skb_put_padto(skb, ETH_ZLEN + MTK_HDR_LEN, false)) + eth_skb_pad(skb);
+ return NULL;
+ +
/* Build the special tag after the MAC Source Address. If VLAN header /* Build the special tag after the MAC Source Address. If VLAN header
* is present, it's required that VLAN header and special tag is * is present, it's required that VLAN header and special tag is

6
target/linux/generic/pending-5.15/732-05-net-dsa-tag_mtk-assign-per-port-queues.patch
View file

@ -9,9 +9,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/dsa/tag_mtk.c --- a/net/dsa/tag_mtk.c
+++ b/net/dsa/tag_mtk.c +++ b/net/dsa/tag_mtk.c
@@ -33,6 +33,8 @@ static struct sk_buff *mtk_tag_xmit(stru @@ -32,6 +32,8 @@ static struct sk_buff *mtk_tag_xmit(stru
if (__skb_put_padto(skb, ETH_ZLEN + MTK_HDR_LEN, false)) */
return NULL; eth_skb_pad(skb);
+ skb_set_queue_mapping(skb, dp->index); + skb_set_queue_mapping(skb, dp->index);
+ +