* FAILED: patch "[PATCH] net: libwx: fix multicast packets received count" failed to apply to 6.12-stable tree
@ 2025-07-21 11:01 gregkh
2025-07-22 2:00 ` [PATCH 6.12.y] net: libwx: fix multicast packets received count Jiawen Wu
2025-07-22 6:08 ` Jiawen Wu
0 siblings, 2 replies; 6+ messages in thread
From: gregkh @ 2025-07-21 11:01 UTC (permalink / raw)
To: jiawenwu, horms, kuba; +Cc: stable
The patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 2b30a3d1ec2538a1fd363fde746b9fe1d38abc77
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025072137-disarm-donator-b329@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 2b30a3d1ec2538a1fd363fde746b9fe1d38abc77 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu@trustnetic.com>
Date: Mon, 14 Jul 2025 09:56:56 +0800
Subject: [PATCH] net: libwx: fix multicast packets received count
Multicast good packets received by PF rings that pass ethternet MAC
address filtering are counted for rtnl_link_stats64.multicast. The
counter is not cleared on read. Fix the duplicate counting on updating
statistics.
Fixes: 46b92e10d631 ("net: libwx: support hardware statistics")
Cc: stable@vger.kernel.org
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/DA229A4F58B70E51+20250714015656.91772-1-jiawenwu@trustnetic.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_hw.c b/drivers/net/ethernet/wangxun/libwx/wx_hw.c
index 4cce07a69891..f0823aa1ede6 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_hw.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_hw.c
@@ -2777,6 +2777,8 @@ void wx_update_stats(struct wx *wx)
hwstats->fdirmiss += rd32(wx, WX_RDB_FDIR_MISS);
}
+ /* qmprc is not cleared on read, manual reset it */
+ hwstats->qmprc = 0;
for (i = wx->num_vfs * wx->num_rx_queues_per_pool;
i < wx->mac.max_rx_queues; i++)
hwstats->qmprc += rd32(wx, WX_PX_MPRC(i));
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 6.12.y] net: libwx: fix multicast packets received count
2025-07-21 11:01 FAILED: patch "[PATCH] net: libwx: fix multicast packets received count" failed to apply to 6.12-stable tree gregkh
@ 2025-07-22 2:00 ` Jiawen Wu
2025-07-22 5:37 ` Greg KH
2025-07-23 4:33 ` Sasha Levin
2025-07-22 6:08 ` Jiawen Wu
1 sibling, 2 replies; 6+ messages in thread
From: Jiawen Wu @ 2025-07-22 2:00 UTC (permalink / raw)
To: stable; +Cc: Jiawen Wu, Simon Horman, Jakub Kicinski
Multicast good packets received by PF rings that pass ethternet MAC
address filtering are counted for rtnl_link_stats64.multicast. The
counter is not cleared on read. Fix the duplicate counting on updating
statistics.
Fixes: 46b92e10d631 ("net: libwx: support hardware statistics")
Cc: stable@vger.kernel.org
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/DA229A4F58B70E51+20250714015656.91772-1-jiawenwu@trustnetic.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
drivers/net/ethernet/wangxun/libwx/wx_hw.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_hw.c b/drivers/net/ethernet/wangxun/libwx/wx_hw.c
index deaf670c160e..ac5957d31674 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_hw.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_hw.c
@@ -2356,6 +2356,8 @@ void wx_update_stats(struct wx *wx)
hwstats->fdirmiss += rd32(wx, WX_RDB_FDIR_MISS);
}
+ /* qmprc is not cleared on read, manual reset it */
+ hwstats->qmprc = 0;
for (i = 0; i < wx->mac.max_rx_queues; i++)
hwstats->qmprc += rd32(wx, WX_PX_MPRC(i));
}
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 6.12.y] net: libwx: fix multicast packets received count
2025-07-22 2:00 ` [PATCH 6.12.y] net: libwx: fix multicast packets received count Jiawen Wu
@ 2025-07-22 5:37 ` Greg KH
2025-07-23 4:33 ` Sasha Levin
1 sibling, 0 replies; 6+ messages in thread
From: Greg KH @ 2025-07-22 5:37 UTC (permalink / raw)
To: Jiawen Wu; +Cc: stable, Simon Horman, Jakub Kicinski
On Tue, Jul 22, 2025 at 10:00:37AM +0800, Jiawen Wu wrote:
> Multicast good packets received by PF rings that pass ethternet MAC
> address filtering are counted for rtnl_link_stats64.multicast. The
> counter is not cleared on read. Fix the duplicate counting on updating
> statistics.
>
> Fixes: 46b92e10d631 ("net: libwx: support hardware statistics")
> Cc: stable@vger.kernel.org
> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
> Reviewed-by: Simon Horman <horms@kernel.org>
> Link: https://patch.msgid.link/DA229A4F58B70E51+20250714015656.91772-1-jiawenwu@trustnetic.com
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> drivers/net/ethernet/wangxun/libwx/wx_hw.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/wangxun/libwx/wx_hw.c b/drivers/net/ethernet/wangxun/libwx/wx_hw.c
> index deaf670c160e..ac5957d31674 100644
> --- a/drivers/net/ethernet/wangxun/libwx/wx_hw.c
> +++ b/drivers/net/ethernet/wangxun/libwx/wx_hw.c
> @@ -2356,6 +2356,8 @@ void wx_update_stats(struct wx *wx)
> hwstats->fdirmiss += rd32(wx, WX_RDB_FDIR_MISS);
> }
>
> + /* qmprc is not cleared on read, manual reset it */
> + hwstats->qmprc = 0;
> for (i = 0; i < wx->mac.max_rx_queues; i++)
> hwstats->qmprc += rd32(wx, WX_PX_MPRC(i));
> }
> --
> 2.25.1
>
>
<formletter>
This is not the correct way to submit patches for inclusion in the
stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
</formletter>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 6.12.y] net: libwx: fix multicast packets received count
2025-07-22 2:00 ` [PATCH 6.12.y] net: libwx: fix multicast packets received count Jiawen Wu
2025-07-22 5:37 ` Greg KH
@ 2025-07-23 4:33 ` Sasha Levin
1 sibling, 0 replies; 6+ messages in thread
From: Sasha Levin @ 2025-07-23 4:33 UTC (permalink / raw)
To: stable; +Cc: Sasha Levin
[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected.
No action required from the submitter.
Found matching upstream commit: 2b30a3d1ec2538a1fd363fde746b9fe1d38abc77
Status in newer kernel trees:
6.15.y | Not found
Note: The patch differs from the upstream commit:
---
1: 2b30a3d1ec25 ! 1: e778f2ab1e48 net: libwx: fix multicast packets received count
@@ drivers/net/ethernet/wangxun/libwx/wx_hw.c: void wx_update_stats(struct wx *wx)
+ /* qmprc is not cleared on read, manual reset it */
+ hwstats->qmprc = 0;
- for (i = wx->num_vfs * wx->num_rx_queues_per_pool;
- i < wx->mac.max_rx_queues; i++)
+ for (i = 0; i < wx->mac.max_rx_queues; i++)
hwstats->qmprc += rd32(wx, WX_PX_MPRC(i));
+ }
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| origin/linux-6.12.y | Success | Success |
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 6.12.y] net: libwx: fix multicast packets received count
2025-07-21 11:01 FAILED: patch "[PATCH] net: libwx: fix multicast packets received count" failed to apply to 6.12-stable tree gregkh
2025-07-22 2:00 ` [PATCH 6.12.y] net: libwx: fix multicast packets received count Jiawen Wu
@ 2025-07-22 6:08 ` Jiawen Wu
2025-07-23 4:33 ` Sasha Levin
1 sibling, 1 reply; 6+ messages in thread
From: Jiawen Wu @ 2025-07-22 6:08 UTC (permalink / raw)
To: stable; +Cc: Jiawen Wu, Simon Horman, Jakub Kicinski
commit 2b30a3d1ec2538a1fd363fde746b9fe1d38abc77 upstream.
Multicast good packets received by PF rings that pass ethternet MAC
address filtering are counted for rtnl_link_stats64.multicast. The
counter is not cleared on read. Fix the duplicate counting on updating
statistics.
Fixes: 46b92e10d631 ("net: libwx: support hardware statistics")
Cc: stable@vger.kernel.org
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/DA229A4F58B70E51+20250714015656.91772-1-jiawenwu@trustnetic.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
drivers/net/ethernet/wangxun/libwx/wx_hw.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_hw.c b/drivers/net/ethernet/wangxun/libwx/wx_hw.c
index deaf670c160e..ac5957d31674 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_hw.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_hw.c
@@ -2356,6 +2356,8 @@ void wx_update_stats(struct wx *wx)
hwstats->fdirmiss += rd32(wx, WX_RDB_FDIR_MISS);
}
+ /* qmprc is not cleared on read, manual reset it */
+ hwstats->qmprc = 0;
for (i = 0; i < wx->mac.max_rx_queues; i++)
hwstats->qmprc += rd32(wx, WX_PX_MPRC(i));
}
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 6.12.y] net: libwx: fix multicast packets received count
2025-07-22 6:08 ` Jiawen Wu
@ 2025-07-23 4:33 ` Sasha Levin
0 siblings, 0 replies; 6+ messages in thread
From: Sasha Levin @ 2025-07-23 4:33 UTC (permalink / raw)
To: stable; +Cc: Sasha Levin
[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected.
No action required from the submitter.
The upstream commit SHA1 provided is correct: 2b30a3d1ec2538a1fd363fde746b9fe1d38abc77
Status in newer kernel trees:
6.15.y | Not found
Note: The patch differs from the upstream commit:
---
1: 2b30a3d1ec25 ! 1: b062f4861662 net: libwx: fix multicast packets received count
@@ Metadata
## Commit message ##
net: libwx: fix multicast packets received count
+ commit 2b30a3d1ec2538a1fd363fde746b9fe1d38abc77 upstream.
+
Multicast good packets received by PF rings that pass ethternet MAC
address filtering are counted for rtnl_link_stats64.multicast. The
counter is not cleared on read. Fix the duplicate counting on updating
@@ drivers/net/ethernet/wangxun/libwx/wx_hw.c: void wx_update_stats(struct wx *wx)
+ /* qmprc is not cleared on read, manual reset it */
+ hwstats->qmprc = 0;
- for (i = wx->num_vfs * wx->num_rx_queues_per_pool;
- i < wx->mac.max_rx_queues; i++)
+ for (i = 0; i < wx->mac.max_rx_queues; i++)
hwstats->qmprc += rd32(wx, WX_PX_MPRC(i));
+ }
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| origin/linux-6.12.y | Success | Success |
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-07-23 4:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-21 11:01 FAILED: patch "[PATCH] net: libwx: fix multicast packets received count" failed to apply to 6.12-stable tree gregkh
2025-07-22 2:00 ` [PATCH 6.12.y] net: libwx: fix multicast packets received count Jiawen Wu
2025-07-22 5:37 ` Greg KH
2025-07-23 4:33 ` Sasha Levin
2025-07-22 6:08 ` Jiawen Wu
2025-07-23 4:33 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).