In some cases, the subflow-level's copied_seq counter was incorrectly
increased, leading to an unexpected subflow reset.
Patch 1/2 fixes the RCVPRUNED MIB counter that was attached to the wrong
event since its introduction in v5.14, backported to v5.11.
Patch 2/2 fixes the copied_seq counter issues, is present since v5.10.
Signed-off-by: Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
---
Paolo Abeni (2):
mptcp: fix bad RCVPRUNED mib accounting
mptcp: fix duplicate data handling
net/mptcp/protocol.c | 8 ++++----
net/mptcp/subflow.c | 16 ++++++++++++----
2 files changed, 16 insertions(+), 8 deletions(-)
---
base-commit: 0bf50cead4c4710d9f704778c32ab8af47ddf070
change-id: 20240731-upstream-net-20240731-mptcp-dup-data-f922353130af
Best regards,
--
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
These igc bug fixes are sent as a patch series because:
1. The two patches below remove the reliance on using the qbv_count field.
"igc: Fix qbv_config_change_errors logics"
"igc: Fix reset adapter logics when tx mode change"
qbv_count field will be removed in future patch via iwl-next.
2. The patch "igc: Fix qbv tx latency by setting gtxoffset" reuse the
function igc_tsn_will_tx_mode_change() which was created in the patch:
"igc: Fix reset adapter logics when tx mode change"
v1: https://patchwork.kernel.org/project/netdevbpf/cover/20240702040926.3327530…
Changelog:
v1 -> v2
- Instead of casting to bool, use !! (Simon)
- Simplify new functions created. Instead of if.. return true, else return false,
use single return. (Simon)
- Remove patch "igc: Remove unused qbv_coun" from this series which is targeting
to iwl-net. This patch will be sent to iwl-next. (Simon)
Faizal Rahim (3):
igc: Fix qbv_config_change_errors logics
igc: Fix reset adapter logics when tx mode change
igc: Fix qbv tx latency by setting gtxoffset
drivers/net/ethernet/intel/igc/igc_main.c | 8 +++--
drivers/net/ethernet/intel/igc/igc_tsn.c | 41 ++++++++++++++++-------
drivers/net/ethernet/intel/igc/igc_tsn.h | 1 +
3 files changed, 36 insertions(+), 14 deletions(-)
--
2.25.1
Peter Zijlstra <peterz(a)infradead.org> writes:
> On Tue, Jul 30, 2024 at 08:36:13PM -0400, matoro wrote:
>> On 2024-07-30 09:50, John David Anglin wrote:
>> > On 2024-07-30 9:41 a.m., John David Anglin wrote:
>> > > On 2024-07-29 7:11 p.m., matoro wrote:
>> > > > Hi all, just bumped to the newest mainline starting with 6.10.2
>> > > > and immediately ran into a crash on boot. Fully reproducible,
>> > > > reverting back to last known good (6.9.8) resolves the issue.
>> > > > Any clue what's going on here?
>> > > > I can provide full boot logs, start bisecting, etc if needed...
>> > > 6.10.2 built and booted okay on my c8000 with the attached config.
>> > > You could start
>> > > with it and incrementally add features to try to identify the one
>> > > that causes boot failure.
>> > Oh, I have an experimental clocksource patch installed. You will need
>> > to regenerate config
>> > with "make oldconfig" to use the current timer code. Probably, this
>> > would happen automatically.
>> > >
>> > > Your config would be needed to duplicate. Full boot log would also help.
>> >
>> > Dave
>>
>> Hi Dave, bisecting quickly revealed the cause here.
>
> https://lkml.kernel.org/r/20240731105557.GY33588@noisy.programming.kicks-as…
Greg, I see tglx's jump_label fix is queued for 6.10.3 but this one
isn't as it came too late. Is there any chance of chucking it in? It's
pretty nasty.
thanks,
sam