lede/target/linux/generic/pending-5.10/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch

27 lines
904 B
Diff
Raw Normal View History

From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 8 Jul 2021 07:08:29 +0200
Subject: [PATCH] net: ethernet: mtk_eth_soc: avoid creating duplicate offload
entries
Sometimes multiple CLS_REPLACE calls are issued for the same connection.
rhashtable_insert_fast does not check for these duplicates, so multiple
hardware flow entries can be created.
Fix this by checking for an existing entry early
Fixes: 502e84e2382d ("net: ethernet: mtk_eth_soc: add flow offloading support")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
net: ethernet:drop duplicate patches (#9098) 重复的如下: https://github.com/coolsnowwolf/lede/blob/ee9e1531054c6f75ce5d77716e3cd9865c4db897/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L3-L10 https://github.com/coolsnowwolf/lede/blob/a5d4d89136fd9078ceee6c378f84c65351c95197/target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L3-L10 --- https://github.com/coolsnowwolf/lede/blob/ee9e1531054c6f75ce5d77716e3cd9865c4db897/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L11-L22 https://github.com/coolsnowwolf/lede/blob/a5d4d89136fd9078ceee6c378f84c65351c95197/target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L11-L22 --- https://github.com/coolsnowwolf/lede/blob/ee9e1531054c6f75ce5d77716e3cd9865c4db897/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L23-L37 https://github.com/coolsnowwolf/lede/blob/a5d4d89136fd9078ceee6c378f84c65351c95197/target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L23-L37 --- https://github.com/coolsnowwolf/lede/blob/ee9e1531054c6f75ce5d77716e3cd9865c4db897/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L68-L77 https://github.com/coolsnowwolf/lede/blob/a5d4d89136fd9078ceee6c378f84c65351c95197/target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L38-L47 --- https://github.com/coolsnowwolf/lede/blob/ee9e1531054c6f75ce5d77716e3cd9865c4db897/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L78-L95 https://github.com/coolsnowwolf/lede/blob/a5d4d89136fd9078ceee6c378f84c65351c95197/target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L48-L65
2022-03-19 19:43:16 +08:00
@@ -224,6 +224,9 @@ mtk_flow_offload_replace(struct mtk_eth
int hash;
int i;
+ if (rhashtable_lookup(&eth->flow_table, &f->cookie, mtk_flow_ht_params))
+ return -EEXIST;
+
if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_META)) {
struct flow_match_meta match;