Re: [PATCHv3 net 2/2] selftests: bonding: add ipsec offload test: manual merge

[Matthieu Baerts <matttbe@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 2908 bytes --]

Hello,

On 25/09/2025 04:33, Hangbin Liu wrote:
> This introduces a test for IPSec offload over bonding, utilizing netdevsim
> for the testing process, as veth interfaces do not support IPSec offload.
> The test will ensure that the IPSec offload functionality remains operational
> even after a failover event occurs in the bonding configuration.
> 
> Here is the test result:
> 
> TEST: bond_ipsec_offload (active_slave eth0)                        [ OK ]
> TEST: bond_ipsec_offload (active_slave eth1)                        [ OK ]
> 
> Reviewed-by: Petr Machata <petrm@nvidia.com>
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
> ---
> v3: fix shellcheck errors
> v2: rebase to latest net, no code update
> ---
>  .../selftests/drivers/net/bonding/Makefile    |   3 +-
>  .../drivers/net/bonding/bond_ipsec_offload.sh | 156 ++++++++++++++++++
>  .../selftests/drivers/net/bonding/config      |   4 +
>  3 files changed, 162 insertions(+), 1 deletion(-)
>  create mode 100755 tools/testing/selftests/drivers/net/bonding/bond_ipsec_offload.sh
> 
> diff --git a/tools/testing/selftests/drivers/net/bonding/Makefile b/tools/testing/selftests/drivers/net/bonding/Makefile
> index 44b98f17f8ff..c13ef40e7db1 100644
> --- a/tools/testing/selftests/drivers/net/bonding/Makefile
> +++ b/tools/testing/selftests/drivers/net/bonding/Makefile
> @@ -11,7 +11,8 @@ TEST_PROGS := \
>  	bond_options.sh \
>  	bond-eth-type-change.sh \
>  	bond_macvlan_ipvlan.sh \
> -	bond_passive_lacp.sh
> +	bond_passive_lacp.sh \
> +	bond_ipsec_offload.sh

FYI, we got a small conflict when merging 'net' in 'net-next' in the
MPTCP tree due to this patch applied in 'net':

  99e4c35eada9 ("selftests: bonding: add ipsec offload test")

and this one from 'net-next':

  c2377f1763e9 ("selftests: bonding: add test for LACP actor port priority")

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

Regarding this conflict, I simply added the new files from both trees:

  bond_passive_lacp.sh \
  bond_ipsec_offload.sh \
  bond_lacp_prio.sh

Note: A way to reduce such conflicts in the future is to sort each entry
by alphabetical order instead of adding new ones at the end. Same in the
'config' file that is also modified in this patch.

Rerere cache is available in [2].

1: https://github.com/multipath-tcp/mptcp_net-next/commit/f6c62892b853
2: https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/65a75

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

[-- Attachment #2: f6c62892b853cd5ddc6d4ceb41e732bc2e0d0c12.patch --]
[-- Type: text/x-patch, Size: 461 bytes --]

diff --cc tools/testing/selftests/drivers/net/bonding/Makefile
index 3462783ed3ac,c13ef40e7db1..f984d7dbba0a
--- a/tools/testing/selftests/drivers/net/bonding/Makefile
+++ b/tools/testing/selftests/drivers/net/bonding/Makefile
@@@ -12,7 -12,7 +12,8 @@@ TEST_PROGS := 
  	bond-eth-type-change.sh \
  	bond_macvlan_ipvlan.sh \
  	bond_passive_lacp.sh \
 -	bond_ipsec_offload.sh
++	bond_ipsec_offload.sh \
 +	bond_lacp_prio.sh
  
  TEST_FILES := \
  	lag_lib.sh \