netdev - Re: [PATCH v2] net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry

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: <6cb6893b-4921-a068-4c30-1109795110bb@tessares.net>
Date:   Mon, 3 Oct 2022 14:59:32 +0200
From:   Matthieu Baerts <matthieu.baerts@...sares.net>
To:     Daniel Golle <daniel@...rotopia.org>,
        Jakub Kicinski <kuba@...nel.org>
Cc:     linux-mediatek@...ts.infradead.org, netdev@...r.kernel.org,
        Lorenzo Bianconi <lorenzo@...nel.org>,
        Sujuan Chen <sujuan.chen@...iatek.com>,
        Bo Jiao <Bo.Jiao@...iatek.com>, Felix Fietkau <nbd@....name>,
        John Crispin <john@...ozen.org>,
        Sean Wang <sean.wang@...iatek.com>,
        Mark Lee <Mark-MC.Lee@...iatek.com>,
        "David S. Miller" <davem@...emloft.net>,
        Eric Dumazet <edumazet@...gle.com>,
        Paolo Abeni <pabeni@...hat.com>,
        Matthias Brugger <matthias.bgg@...il.com>,
        Chen Minqiang <ptpt52@...il.com>,
        Thomas Hühn <thomas.huehn@...nordhausen.de>
Subject: Re: [PATCH v2] net: ethernet: mtk_eth_soc: fix state in
 __mtk_foe_entry_clear: manual merge

Hello,

On 30/09/2022 02:56, Daniel Golle wrote:
> Setting ib1 state to MTK_FOE_STATE_UNBIND in __mtk_foe_entry_clear
> routine as done by commit 0e80707d94e4c8 ("net: ethernet: mtk_eth_soc:
> fix typo in __mtk_foe_entry_clear") breaks flow offloading, at least
> on older MTK_NETSYS_V1 SoCs, OpenWrt users have confirmed the bug on
> MT7622 and MT7621 systems.
> Felix Fietkau suggested to use MTK_FOE_STATE_INVALID instead which
> works well on both, MTK_NETSYS_V1 and MTK_NETSYS_V2.
> 
> Tested on MT7622 (Linksys E8450) and MT7986 (BananaPi BPI-R3).
> 
> Suggested-by: Felix Fietkau <nbd@....name>
> Fixes: 0e80707d94e4c8 ("net: ethernet: mtk_eth_soc: fix typo in __mtk_foe_entry_clear")
> Fixes: 33fc42de33278b ("net: ethernet: mtk_eth_soc: support creating mac address based offload entries")
> Signed-off-by: Daniel Golle <daniel@...rotopia.org>
> ---
> v2: rebased on top of netdev/net.git;main

FYI and as expected when reading this email thread, we got a small
conflict when merging -net in net-next in the MPTCP tree due to this
patch applied in -net:

  ae3ed15da588 ("net: ethernet: mtk_eth_soc: fix state in
__mtk_foe_entry_clear")

and this one from net-next:

  9d8cb4c096ab ("net: ethernet: mtk_eth_soc: add foe_entry_size to
mtk_eth_soc")

The conflict has been resolved on our side[1] inspired by Daniel's v1.
The resolution we suggest is attached to this email.

Cheers,
Matt

[1] https://github.com/multipath-tcp/mptcp_net-next/commit/7af5fac658ba
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
View attachment "7af5fac658ba05d4f5ba19fa7e054aa4ef917128.patch" of type "text/x-patch" (786 bytes)