netdev - Re: [PATCH v2 1/3] net: ethernet: mtk_eth_soc: fix flow block refcounting logic

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <ZB2Vrq3TK8MmK9ah@corigine.com>
Date:   Fri, 24 Mar 2023 13:21:02 +0100
From:   Simon Horman <simon.horman@...igine.com>
To:     Felix Fietkau <nbd@....name>
Cc:     netdev@...r.kernel.org
Subject: Re: [PATCH v2 1/3] net: ethernet: mtk_eth_soc: fix flow block
 refcounting logic

On Thu, Mar 23, 2023 at 02:08:13PM +0100, Felix Fietkau wrote:
> Since we call flow_block_cb_decref on FLOW_BLOCK_UNBIND, we also need to
> call flow_block_cb_incref for a newly allocated cb.
> Also fix the accidentally inverted refcount check on unbind.
> 
> Fixes: 502e84e2382d ("net: ethernet: mtk_eth_soc: add flow offloading support")
> Signed-off-by: Felix Fietkau <nbd@....name>

Reviewed-by: Simon Horman <simon.horman@...igine.com>

I'm guessing that this series is for 'net'.
But it seems that patchwork had a tough time figuring that out
and gave up. So CI type things haven't run there.

https://patchwork.kernel.org/project/netdevbpf/patch/20230323130815.7753-1-nbd@nbd.name/

Also, there is a merge conflict when merging net-next into net
with this series applied.

momiji ~/projects/linux/linux git diff drivers/net/ethernet/mediatek/mtk_ppe.c
diff --cc drivers/net/ethernet/mediatek/mtk_ppe.c
index fd07d6e14273,c099e8736716..000000000000
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
@@@ -459,7 -500,13 +501,17 @@@ __mtk_foe_entry_clear(struct mtk_ppe *p
                hwe->ib1 &= ~MTK_FOE_IB1_STATE;
                hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_INVALID);
                dma_wmb();
++<<<<<<< HEAD
 +              mtk_ppe_cache_clear(ppe);
++=======
+               if (ppe->accounting) {
+                       struct mtk_foe_accounting *acct;
+ 
+                       acct = ppe->acct_table + entry->hash * sizeof(*acct);
+                       acct->packets = 0;
+                       acct->bytes = 0;
+               }
++>>>>>>> net-next/main
        }
        entry->hash = 0xffff;