From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E574154B2 for ; Tue, 27 Jun 2023 13:43:43 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7115D211B for ; Tue, 27 Jun 2023 06:43:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687873420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=eKtvMyFdz7ytSPlZNbTNVmiVF1bHPaDol8lnLdtDG4M=; b=d/sMbPEOqLSAFhQaQJ+SNtpdBdiOgYLR+ESeZ8hnIcdjusWP2KeO3D7nwHJNYoWeQ0qFsy YB6b656Fxsm2U2DVIxTFa5F6LywIhmfflqpMGuagQvEYO0GE1v5ykru0nlMj/o+WJPc0h0 Sbc54mB4qLl8nWx+v+ncZzPlKlsGhh0= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-439-Yh4FBcEuOB2UxT-IdKbQoA-1; Tue, 27 Jun 2023 09:43:37 -0400 X-MC-Unique: Yh4FBcEuOB2UxT-IdKbQoA-1 Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-635e822b49eso15185126d6.2 for ; Tue, 27 Jun 2023 06:43:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687873417; x=1690465417; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=eKtvMyFdz7ytSPlZNbTNVmiVF1bHPaDol8lnLdtDG4M=; b=QdedGcD0qefyXh5bmL/iiTa5Z7/69FrFhF9ZrqTajgRraeldPlgySPXoPhwopFh7MA 5B7hZhNcDizKH6TJhsdgF4ptzIftMd4BFUVfmo+pR1+0EBATCFuIMBP4F70ANuJ34+74 a/4OOroqr5a30wXBlOF6QNw/7nYwFfwA3pqEkTMh8z1xzoPEMKCRccVjH9FvZn21FIV4 m+unlZC7RReRBG0jBB/szk3lDy3lEQg+sYNz9oaTpFgqzYiTuxCn8igUSRIYhS7n3DbY xUbBm7dvUuRU3oRbWOcdd4GFp07+Jp+p5knKx1+NmIE0pMBYR98uZfP03WaEnh0kUQEz 9f4Q== X-Gm-Message-State: AC+VfDxLri7pDA0+2V+dv+zt+MDxi5Vz0qZKXD94w7T7yFAuB/sdJzxw kbJqNRjPEFJ9Z+sk7iPOAPQt3+ylvBg119YxW+NG59MlG37KecSTM64HyuM2k8GeJDI0kRTJTOZ TVAce+sfNyaFtMjkt X-Received: by 2002:a05:6214:230c:b0:635:de52:8383 with SMTP id gc12-20020a056214230c00b00635de528383mr7298752qvb.59.1687873416796; Tue, 27 Jun 2023 06:43:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7yzq+WKACyKjBe6uuP12DNMwrt3sBtU0HrpKMYx7jmZ5Iz5joiWs7UE81/o+a8rL0OzUkGqA== X-Received: by 2002:a05:6214:230c:b0:635:de52:8383 with SMTP id gc12-20020a056214230c00b00635de528383mr7298733qvb.59.1687873416536; Tue, 27 Jun 2023 06:43:36 -0700 (PDT) Received: from localhost ([37.163.11.144]) by smtp.gmail.com with ESMTPSA id ew13-20020a0562140aad00b0062168714c8fsm4544808qvb.120.2023.06.27.06.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 06:43:36 -0700 (PDT) Date: Tue, 27 Jun 2023 15:43:30 +0200 From: Andrea Claudi To: Matthieu Baerts Cc: netdev@vger.kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mptcp@lists.linux.dev, martineau@kernel.org, geliang.tang@suse.com Subject: Re: [PATCH net 2/2] selftests: mptcp: join: fix 'implicit EP' test Message-ID: References: <70e1c8044096af86ed19ee5b4068dd8ce15aad30.1687522138.git.aclaudi@redhat.com> <30ecb04c-47b1-fdf8-d695-e9b9b2198319@tessares.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <30ecb04c-47b1-fdf8-d695-e9b9b2198319@tessares.net> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net On Mon, Jun 26, 2023 at 01:32:17PM +0200, Matthieu Baerts wrote: > Hi Andrea, > > On 23/06/2023 14:19, Andrea Claudi wrote: > > mptcp_join '001 implicit EP' test currently fails because of two > > reasons: > > Same as on patch 1/2: can you remove "001" and mention it is only > failing when using "ip mptcp" ("-i" option) please? > Sure, no problem. > > - iproute v6.3.0 does not support the implicit flag, fixed with > > iproute2-next commit 3a2535a41854 ("mptcp: add support for implicit > > flag") > > Thank you for that! > > Out of curiosity: why is it in iproute2-next (following net-next tree, > for v6.5) and not in iproute2 tree (following -net / Linus tree: for v6.4)? > I usually target fixes to iproute2 and new stuff to iproute2-next, no other reason than that. But I see your point here, having this on -net may end up in the commit not landing in the same release cycle. Should I send v2 for this series to mptcp-next, then? Andrea > > - pm_nl_check_endpoint wrongly expects the ip address to be repeated two > > times in iproute output, and does not account for a final whitespace > > in it. > > > > This fixes the issue trimming the whitespace in the output string and > > removing the double address in the expected string. > > > > Fixes: 69c6ce7b6eca ("selftests: mptcp: add implicit endpoint test case") > > Signed-off-by: Andrea Claudi > > --- > > tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh > > index 5424dcacfffa..6c3525e42273 100755 > > --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh > > +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh > > @@ -768,10 +768,11 @@ pm_nl_check_endpoint() > > fi > > > > if [ $ip_mptcp -eq 1 ]; then > > + # get line and trim trailing whitespace > > line=$(ip -n $ns mptcp endpoint show $id) > > + line="${line% }" > > # the dump order is: address id flags port dev > > - expected_line="$addr" > > - [ -n "$addr" ] && expected_line="$expected_line $addr" > > + [ -n "$addr" ] && expected_line="$addr" > > expected_line="$expected_line $id" > > [ -n "$_flags" ] && expected_line="$expected_line ${_flags//","/" "}" > > [ -n "$dev" ] && expected_line="$expected_line $dev" > > It looks good, no need to change anything here but later (not for -net > anyway), we should probably parse the JSON output of "ip -j mptcp" instead. > > Cheers, > Matt > -- > Tessares | Belgium | Hybrid Access Solutions > www.tessares.net >