From: Felix Fietkau <nbd@nbd.name>
To: Daniel Golle <daniel@makrotopia.org>,
John Crispin <john@phrozen.org>,
Sean Wang <sean.wang@mediatek.com>,
Mark Lee <Mark-MC.Lee@mediatek.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] net: ethernet: mediatek: ppe: add support for flow accounting
Date: Tue, 1 Nov 2022 20:38:59 +0100 [thread overview]
Message-ID: <5d8e00d4-830d-19ff-a3cb-59bd81618903@nbd.name> (raw)
In-Reply-To: <Y2FvtampxpDGua2p@makrotopia.org>
On 01.11.22 20:12, Daniel Golle wrote:
> The PPE units found in MT7622 and newer support packet and byte
> accounting of hw-offloaded flows. Add support for reading those
> counters as found in MediaTek's SDK[1].
>
> [1]: https://git01.mediatek.com/plugins/gitiles/openwrt/feeds/mtk-openwrt-feeds/+/bc6a6a375c800dc2b80e1a325a2c732d1737df92
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
> ---
> drivers/net/ethernet/mediatek/mtk_eth_soc.c | 11 +-
> drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 +
> drivers/net/ethernet/mediatek/mtk_ppe.c | 122 +++++++++++++++++-
> drivers/net/ethernet/mediatek/mtk_ppe.h | 23 +++-
> .../net/ethernet/mediatek/mtk_ppe_debugfs.c | 9 +-
> .../net/ethernet/mediatek/mtk_ppe_offload.c | 7 +
> drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 14 ++
> 7 files changed, 178 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> index 789268b15106ec..5fcd66fca7a089 100644
> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> @@ -4221,6 +4223,7 @@ static const struct mtk_soc_data mt2701_data = {
> .hw_features = MTK_HW_FEATURES,
> .required_clks = MT7623_CLKS_BITMAP,
> .required_pctl = true,
> + .has_accounting = false,
> .txrx = {
> .txd_size = sizeof(struct mtk_tx_dma),
> .rxd_size = sizeof(struct mtk_rx_dma),
> @@ -4239,6 +4242,7 @@ static const struct mtk_soc_data mt7621_data = {
> .required_pctl = false,
> .offload_version = 2,
> .hash_offset = 2,
> + .has_accounting = false,
> .foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
> .txrx = {
> .txd_size = sizeof(struct mtk_tx_dma),
> @@ -4259,6 +4263,7 @@ static const struct mtk_soc_data mt7622_data = {
> .required_pctl = false,
> .offload_version = 2,
> .hash_offset = 2,
> + .has_accounting = true,
> .foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
> .txrx = {
> .txd_size = sizeof(struct mtk_tx_dma),
> @@ -4278,6 +4283,7 @@ static const struct mtk_soc_data mt7623_data = {
> .required_pctl = true,
> .offload_version = 2,
> .hash_offset = 2,
> + .has_accounting = false,
> .foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
> .txrx = {
> .txd_size = sizeof(struct mtk_tx_dma),
> @@ -4296,6 +4302,7 @@ static const struct mtk_soc_data mt7629_data = {
> .hw_features = MTK_HW_FEATURES,
> .required_clks = MT7629_CLKS_BITMAP,
> .required_pctl = false,
> + .has_accounting = true,
> .txrx = {
> .txd_size = sizeof(struct mtk_tx_dma),
> .rxd_size = sizeof(struct mtk_rx_dma),
> @@ -4315,6 +4322,7 @@ static const struct mtk_soc_data mt7986_data = {
> .required_pctl = false,
> .hash_offset = 4,
> .foe_entry_size = sizeof(struct mtk_foe_entry),
> + .has_accounting = true,
> .txrx = {
> .txd_size = sizeof(struct mtk_tx_dma_v2),
> .rxd_size = sizeof(struct mtk_rx_dma_v2),
> @@ -4331,6 +4339,7 @@ static const struct mtk_soc_data rt5350_data = {
> .hw_features = MTK_HW_FEATURES_MT7628,
> .required_clks = MT7628_CLKS_BITMAP,
> .required_pctl = false,
> + .has_accounting = false,
> .txrx = {
> .txd_size = sizeof(struct mtk_tx_dma),
> .rxd_size = sizeof(struct mtk_rx_dma),
You can leave out the .has_accounting = false assignments.
> diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c
> index 2d8ca99f2467ff..bc4660da28451b 100644
> --- a/drivers/net/ethernet/mediatek/mtk_ppe.c
> +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
> @@ -545,6 +592,16 @@ __mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_foe_entry *entry,
> wmb();
> hwe->ib1 = entry->ib1;
>
> + if (ppe->accounting) {
> + int type;
> +
> + type = FIELD_GET(MTK_FOE_IB1_PACKET_TYPE, entry->ib1);
> + if (type >= MTK_PPE_PKT_TYPE_IPV4_DSLITE)
> + hwe->ipv6.ib2 |= MTK_FOE_IB2_MIB_CNT;
> + else
> + hwe->ipv4.ib2 |= MTK_FOE_IB2_MIB_CNT;
> + }
Use mtk_foe_entry_ib2() here.
> @@ -654,11 +711,8 @@ void __mtk_ppe_check_skb(struct mtk_ppe *ppe, struct sk_buff *skb, u16 hash)
> continue;
> }
>
> - if (found || !mtk_flow_entry_match(ppe->eth, entry, hwe)) {
> - if (entry->hash != 0xffff)
> - entry->hash = 0xffff;
> + if (found || !mtk_flow_entry_match(ppe->eth, entry, hwe))
> continue;
> - }
What is the reason for this change?
- Felix
next prev parent reply other threads:[~2022-11-01 19:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-01 19:12 Daniel Golle
2022-11-01 19:17 ` Denis Kirjanov
2022-11-01 19:33 ` Daniel Golle
2022-11-01 19:38 ` Felix Fietkau [this message]
2022-11-01 22:05 ` Daniel Golle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5d8e00d4-830d-19ff-a3cb-59bd81618903@nbd.name \
--to=nbd@nbd.name \
--cc=Mark-MC.Lee@mediatek.com \
--cc=daniel@makrotopia.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=john@phrozen.org \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sean.wang@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®