Re: [PATCH net v2 3/3] selftests: net: test for lwtunnel dst ref loops: manual merge

[Matthieu Baerts <matttbe@kernel.org>]

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

Hi Justin,

On 14/03/2025 13:00, Justin Iurman wrote:
> As recently specified by commit 0ea09cbf8350 ("docs: netdev: add a note
> on selftest posting") in net-next, the selftest is therefore shipped in
> this series. However, this selftest does not really test this series. It
> needs this series to avoid crashing the kernel. What it really tests,
> thanks to kmemleak, is what was fixed by the following commits:
> - commit c71a192976de ("net: ipv6: fix dst refleaks in rpl, seg6 and
> ioam6 lwtunnels")
> - commit 92191dd10730 ("net: ipv6: fix dst ref loops in rpl, seg6 and
> ioam6 lwtunnels")
> - commit c64a0727f9b1 ("net: ipv6: fix dst ref loop on input in seg6
> lwt")
> - commit 13e55fbaec17 ("net: ipv6: fix dst ref loop on input in rpl
> lwt")
> - commit 0e7633d7b95b ("net: ipv6: fix dst ref loop in ila lwtunnel")
> - commit 5da15a9c11c1 ("net: ipv6: fix missing dst ref drop in ila
> lwtunnel")
> 
> Signed-off-by: Justin Iurman <justin.iurman@uliege.be>
> ---
> Cc: Shuah Khan <shuah@kernel.org>
> Cc: linux-kselftest@vger.kernel.org
> ---
>  tools/testing/selftests/net/Makefile          |   1 +
>  tools/testing/selftests/net/config            |   2 +
>  .../selftests/net/lwt_dst_cache_ref_loop.sh   | 246 ++++++++++++++++++
>  3 files changed, 249 insertions(+)
>  create mode 100755 tools/testing/selftests/net/lwt_dst_cache_ref_loop.sh
> 
> diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile
> index 5916f3b81c39..843ab747645d 100644
> --- a/tools/testing/selftests/net/Makefile
> +++ b/tools/testing/selftests/net/Makefile
> @@ -101,6 +101,7 @@ TEST_PROGS += vlan_bridge_binding.sh
>  TEST_PROGS += bpf_offload.py
>  TEST_PROGS += ipv6_route_update_soft_lockup.sh
>  TEST_PROGS += busy_poll_test.sh
> +TEST_PROGS += lwt_dst_cache_ref_loop.sh
>  
>  # YNL files, must be before "include ..lib.mk"
>  YNL_GEN_FILES := busy_poller netlink-dumps
> diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config
> index 5b9baf708950..61e5116987f3 100644
> --- a/tools/testing/selftests/net/config
> +++ b/tools/testing/selftests/net/config
> @@ -107,3 +107,5 @@ CONFIG_XFRM_INTERFACE=m
>  CONFIG_XFRM_USER=m
>  CONFIG_IP_NF_MATCH_RPFILTER=m
>  CONFIG_IP6_NF_MATCH_RPFILTER=m
> +CONFIG_IPV6_ILA=m
> +CONFIG_IPV6_RPL_LWTUNNEL=y

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

 3ed61b8938c6 ("selftests: net: test for lwtunnel dst ref loops")

and these ones from 'net-next':

 03544faad761 ("selftest: net: add proc_net_pktgen")
 85cb3711acb8 ("selftests: net: Add test cases for link and peer netns")

----- 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 these conflicts, that's because the new test and configs have
been added at the end. It is usually recommended to avoid that for long
list, e.g. inserting new entries at the right place if the list is
sorted by alphabetical order (not the case here), grouping by theme, or
keeping the same order as in the .config, etc. For the resolutions here,
I simply kept the new tests and configs from both sides at the same
place, adding the new ones from net at the end.

Rerere cache is available in [2].

Cheers,
Matt

[1] https://github.com/multipath-tcp/mptcp_net-next/commit/89220b9164c7
[2] https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/d240

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

[-- Attachment #2: 89220b9164c70f7aa2d3fafab261bb196f8f3335.patch --]
[-- Type: text/x-patch, Size: 1596 bytes --]

diff --cc tools/testing/selftests/net/Makefile
index f03a0399e7a3,8f32b4f01aee..6d718b478ed8
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@@ -31,15 -31,11 +31,14 @@@ TEST_PROGS += veth.s
  TEST_PROGS += ioam6.sh
  TEST_PROGS += gro.sh
  TEST_PROGS += gre_gso.sh
- TEST_PROGS += gre_ipv6_lladdr.sh
  TEST_PROGS += cmsg_so_mark.sh
  TEST_PROGS += cmsg_so_priority.sh
 -TEST_PROGS += cmsg_time.sh cmsg_ipv6.sh
 +TEST_PROGS += test_so_rcv.sh
 +TEST_PROGS += cmsg_time.sh cmsg_ip.sh
  TEST_PROGS += netns-name.sh
 +TEST_PROGS += link_netns.py
  TEST_PROGS += nl_netdev.py
 +TEST_PROGS += rtnetlink.py
  TEST_PROGS += srv6_end_dt46_l3vpn_test.sh
  TEST_PROGS += srv6_end_dt4_l3vpn_test.sh
  TEST_PROGS += srv6_end_dt6_l3vpn_test.sh
@@@ -105,7 -100,7 +104,8 @@@ TEST_PROGS += vlan_bridge_binding.s
  TEST_PROGS += bpf_offload.py
  TEST_PROGS += ipv6_route_update_soft_lockup.sh
  TEST_PROGS += busy_poll_test.sh
 +TEST_GEN_PROGS += proc_net_pktgen
+ TEST_PROGS += lwt_dst_cache_ref_loop.sh
  
  # YNL files, must be before "include ..lib.mk"
  YNL_GEN_FILES := busy_poller netlink-dumps
diff --cc tools/testing/selftests/net/config
index b0d0eda829d0,61e5116987f3..130d532b7e67
--- a/tools/testing/selftests/net/config
+++ b/tools/testing/selftests/net/config
@@@ -109,9 -107,5 +109,11 @@@ CONFIG_XFRM_INTERFACE=
  CONFIG_XFRM_USER=m
  CONFIG_IP_NF_MATCH_RPFILTER=m
  CONFIG_IP6_NF_MATCH_RPFILTER=m
 +CONFIG_IPVLAN=m
 +CONFIG_CAN=m
 +CONFIG_CAN_DEV=m
 +CONFIG_CAN_VXCAN=m
 +CONFIG_NETKIT=y
 +CONFIG_NET_PKTGEN=m
+ CONFIG_IPV6_ILA=m
+ CONFIG_IPV6_RPL_LWTUNNEL=y