Re: [PATCH net-next 2/2] selftests: drv-net: rss: Generate unique ports for RSS context tests: manual merge

[Matthieu Baerts <matttbe@kernel.org>]

Hello,

On 24/02/2026 23:46, Dimitri Daskalakis wrote:
> The RSS ctx tests rely on NFC rules with unique ports to steer packets
> to the correct ctx. This updates the test to use the new rand_ports()
> helper to guarantee the ports are unique.
> 
> Manual testing shows that generating 32 ports with the existing method
> would result in at least one duplicate 4% of the time.
FYI, we got a small conflict when merging 'net' in 'net-next' in the
MPTCP tree due to this patch applied in 'net':

  ce5a0f4612db ("selftests: drv-net: rss_ctx: test RSS contexts persist after ifdown/up")

and this one from 'net-next':

  19c3a2a81d2b ("selftests: drv-net: rss: Generate unique ports for RSS context tests")

----- 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.

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.
---------------------------

This conflict was in the context: modifying one line here in 'net-next',
and the ones around in 'net'

Rerere cache is available:

 https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/8e4747e

Cheers,
Matt

1: https://github.com/multipath-tcp/mptcp_net-next/commit/098b2437f100

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

--------------------- 8< ---------------------
diff --cc tools/testing/selftests/drivers/net/hw/rss_ctx.py
index b9b7527c2c6b,cbeb3a38fdfe..9a1fba247708
--- a/tools/testing/selftests/drivers/net/hw/rss_ctx.py
+++ b/tools/testing/selftests/drivers/net/hw/rss_ctx.py
@@@ -10,9 -9,8 +10,9 @@@ from lib.py import ksft_eq, ksft_ne, ks
  from lib.py import NetDrvEpEnv
  from lib.py import EthtoolFamily, NetdevFamily
  from lib.py import KsftSkipEx, KsftFailEx
 +from lib.py import ksft_disruptive
- from lib.py import rand_port
+ from lib.py import rand_port, rand_ports
 -from lib.py import ethtool, ip, defer, GenerateTraffic, CmdExitFailure
 +from lib.py import cmd, ethtool, ip, defer, GenerateTraffic, CmdExitFailure, wait_file
  
  
  def _rss_key_str(key):
--------------------- 8< ---------------------