Re: [PATCH net 4/5] net/mlx5e: RX, Fix XDP multi-buf frag counting for striding RQ: manual merge

[Dragos Tatulea]

Hi Matthieu,

On 09.03.26 13:52, Matthieu Baerts wrote:
> Hi Tariq, Dragos,
> 
> +cc: linux-next
> 
> On 05/03/2026 15:26, Tariq Toukan wrote:
>> From: Dragos Tatulea <dtatulea@xxxxxxxxxx>
>>
>> XDP multi-buf programs can modify the layout of the XDP buffer when the
>> program calls bpf_xdp_pull_data() or bpf_xdp_adjust_tail(). The
>> referenced commit in the fixes tag corrected the assumption in the mlx5
>> driver that the XDP buffer layout doesn't change during a program
>> execution. However, this fix introduced another issue: the dropped
>> fragments still need to be counted on the driver side to avoid page
>> fragment reference counting issues.
> 
> FYI, we got a small conflict when merging 'net' in 'net-next' in the
> MPTCP tree due to this patch applied in 'net':
> 
>   db25c42c2e1f ("net/mlx5e: RX, Fix XDP multi-buf frag counting for striding RQ")
> 
> and this one from 'net-next':
> 
>   dff1c3164a69 ("net/mlx5e: SHAMPO, Always calculate page size")
> 
> ----- Generic Message -----
> The best is to avoid conflicts between 'net' and 'net-next' trees but if
> they cannot be avoided when preparing patches, a note about how to fix
> them is much appreciated.
> 
Apologies for this. Will take note next time.

> The conflict has been resolved on our side [1] and the resolution we
> suggest is attached to this email. Please report any issues linked to
> this conflict resolution as it might be used by others. If you worked on
> the mentioned patches, don't hesitate to ACK this conflict resolution.
> ---------------------------
> 
> Rerere cache is available in [2].
> 
> [1] https://github.com/multipath-tcp/mptcp_net-next/commit/9cbb5f8a4a18
Conflict resolution from [1] seems good.

Acked-by: Dragos Tatulea <dtatulea@xxxxxxxxxx>

Thanks,
Dragos