1 From: Pablo Neira Ayuso <pablo@netfilter.org>
2 Date: Sun, 18 Apr 2021 23:11:44 +0200
3 Subject: [PATCH] net: ethernet: mtk_eth_soc: missing mutex
5 Patch 2ed37183abb7 ("netfilter: flowtable: separate replace, destroy and
6 stats to different workqueues") splits the workqueue per event type. Add
7 a mutex to serialize updates.
9 Fixes: 502e84e2382d ("net: ethernet: mtk_eth_soc: add flow offloading support")
10 Reported-by: Frank Wunderlich <frank-w@public-files.de>
11 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
12 Signed-off-by: David S. Miller <davem@davemloft.net>
15 --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
16 +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
17 @@ -392,6 +392,8 @@ mtk_flow_offload_stats(struct mtk_eth *e
21 +static DEFINE_MUTEX(mtk_flow_offload_mutex);
24 mtk_eth_setup_tc_block_cb(enum tc_setup_type type, void *type_data, void *cb_priv)
26 @@ -399,6 +401,7 @@ mtk_eth_setup_tc_block_cb(enum tc_setup_
27 struct net_device *dev = cb_priv;
28 struct mtk_mac *mac = netdev_priv(dev);
29 struct mtk_eth *eth = mac->hw;
32 if (!tc_can_offload(dev))
34 @@ -406,18 +409,24 @@ mtk_eth_setup_tc_block_cb(enum tc_setup_
35 if (type != TC_SETUP_CLSFLOWER)
38 + mutex_lock(&mtk_flow_offload_mutex);
39 switch (cls->command) {
40 case FLOW_CLS_REPLACE:
41 - return mtk_flow_offload_replace(eth, cls);
42 + err = mtk_flow_offload_replace(eth, cls);
44 case FLOW_CLS_DESTROY:
45 - return mtk_flow_offload_destroy(eth, cls);
46 + err = mtk_flow_offload_destroy(eth, cls);
49 - return mtk_flow_offload_stats(eth, cls);
50 + err = mtk_flow_offload_stats(eth, cls);
57 + mutex_unlock(&mtk_flow_offload_mutex);