From patchwork Wed Jul 7 08:15:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangbin Liu X-Patchwork-Id: 12362013 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3492EC07E9B for ; Wed, 7 Jul 2021 08:16:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1ACF661C73 for ; Wed, 7 Jul 2021 08:16:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230126AbhGGITB (ORCPT ); Wed, 7 Jul 2021 04:19:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229949AbhGGITB (ORCPT ); Wed, 7 Jul 2021 04:19:01 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79E29C061574 for ; Wed, 7 Jul 2021 01:16:20 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id g24so1074114pji.4 for ; Wed, 07 Jul 2021 01:16:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v7HcyF9w9I5AYnUxNpnBtVLS3vGIbX+eJKxfWCMSUIY=; b=FNA666qKc5cjULDCKnfePWxNH+Go+r38KsirzIN9cXWH23vK4Ca7KGEzUkfpHMJEmK IoF+2HIhqfhUmRcrf3AzF1VKx1UoIY2m9oKamNXRxWUm6ot2VyYpgpNLXfpnUN2g9Lds PmtCh3kTlIC+XfRyoGbKhDIdddEbC790UkohdwliGecNlF7H3dvHoZbiEMnzFhgtL0py EEw7XJHvdIVh19s6X8lGlNBK0Ui4FRSYdQyib4nGNir8Pa9mYs/KWTWtx/hjPoX/2nHL QzYWLq8atWtzVJgNfkQMTiac5UXfCAp71T1Boghdc+ACsf/DartZY843Cp8Px7h5+lgp gCSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v7HcyF9w9I5AYnUxNpnBtVLS3vGIbX+eJKxfWCMSUIY=; b=mUem6RMgYNrSuF0LZdB+bNJk18yxPBlG765VI7gWQXGBFdCLkpqqN30pPp0VxOZGuV 9m4gWJeRfRSj0fTm4PSRRp6kNMdyK1TVRe9oPlhD/FrKngrqC6cLQ4F8dVo0LDcaDdc/ QveCBWOBoIAXpiYwGIWJXXLE3s7x6EEgdWRrniwXFT1lYVh8RTG1pXv9jnW34CU5JwU1 G/cIUVYAwHabwHchN4o9+S2YiM62zs9y66u3HJm1FLzzqDMjxrRWfmXfgRb+3hih28jv VsQHzAD5aKb9988+lzKE+f1VjDZnOU6IJUXON8oekhS0EY5y7/06p0NgOiNl/Wpm59C0 b9MA== X-Gm-Message-State: AOAM533w9RfxbwGDHsU3uWyYjRLsKLVjXORWXrVEjx79rfYqHcNggmuC WKVK5S7MvXastop0vDMeGJagcJhHtl5fz1kR X-Google-Smtp-Source: ABdhPJzFExJJe6+HKZ2DWvc3A2L6PMpbUtWzssRqe/PawpRTzu4vBdnJ9uBdPrzZzBZ1dJw3jgAn1Q== X-Received: by 2002:a17:90a:cc7:: with SMTP id 7mr5057045pjt.20.1625645779945; Wed, 07 Jul 2021 01:16:19 -0700 (PDT) Received: from Laptop-X1.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id u40sm15476365pfg.19.2021.07.07.01.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 01:16:19 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: David Ahern , Hangbin Liu Subject: [PATCH net 1/2] selftests: icmp_redirect: remove from checking for IPv6 route get Date: Wed, 7 Jul 2021 16:15:29 +0800 Message-Id: <20210707081530.1107289-2-liuhangbin@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210707081530.1107289-1-liuhangbin@gmail.com> References: <20210707081530.1107289-1-liuhangbin@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org If the kernel doesn't enable option CONFIG_IPV6_SUBTREES, the RTA_SRC info will not be exported to userspace in rt6_fill_node(). And ip cmd will not print "from ::" to the route output. So remove this check. Fixes: ec8105352869 ("selftests: Add redirect tests") Signed-off-by: Hangbin Liu Reviewed-by: David Ahern --- tools/testing/selftests/net/icmp_redirect.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/icmp_redirect.sh b/tools/testing/selftests/net/icmp_redirect.sh index c19ecc6a8614..3a111ac1edc3 100755 --- a/tools/testing/selftests/net/icmp_redirect.sh +++ b/tools/testing/selftests/net/icmp_redirect.sh @@ -315,7 +315,7 @@ check_exception() if [ "$with_redirect" = "yes" ]; then ip -netns h1 -6 ro get ${H1_VRF_ARG} ${H2_N2_IP6} | \ - grep -q "${H2_N2_IP6} from :: via ${R2_LLADDR} dev br0.*${mtu}" + grep -q "${H2_N2_IP6} .*via ${R2_LLADDR} dev br0.*${mtu}" elif [ -n "${mtu}" ]; then ip -netns h1 -6 ro get ${H1_VRF_ARG} ${H2_N2_IP6} | \ grep -q "${mtu}" From patchwork Wed Jul 7 08:15:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangbin Liu X-Patchwork-Id: 12362015 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0B8CC07E95 for ; Wed, 7 Jul 2021 08:16:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B589561C82 for ; Wed, 7 Jul 2021 08:16:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230324AbhGGITG (ORCPT ); Wed, 7 Jul 2021 04:19:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229949AbhGGITC (ORCPT ); Wed, 7 Jul 2021 04:19:02 -0400 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C73C1C061574 for ; Wed, 7 Jul 2021 01:16:22 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id g22so1425069pgl.7 for ; Wed, 07 Jul 2021 01:16:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ab+XUpH/sh8gx3EPEeKlEwvD2Buq3wd3nop02wDBVlU=; b=LVKXWCqvpxXZwEyU0CIe9VCUHK6gmg64QIMWWv8gSAtJzWzoH3X8OhGqHLW3SNnj/H xW6XQgOBrEeaLmdWlIALE2bmo7lKIfa3ypQmm7Sk1J4y+8pzHR5UhlSksZuHh9J3w/P+ KbqblumSBHlIDerp/lWU6fRgL9VNO4LRQX+n6aJLJQXPsKixnrN8MB5OBuwLBdyMqVt3 /SWKMD5lmHAolOg7fpg6i0RNyIvfv1eDYV2laMqqbR1TqMCEfVWpA4qwXSAACOwwwoG5 EG0NwQNrwXLVKqzCEGMno0YA49tELfTu4MjiyMoVDDSFkpiPPvnDkQJd50CNyJT4yQlL rwzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ab+XUpH/sh8gx3EPEeKlEwvD2Buq3wd3nop02wDBVlU=; b=Ai9z1B4850YVwPQCPxWIh5GGpNMQxuuXDEUIlkt0TjoEGgXTdXDqBZvum/eRNTZDNs OQu/krrXvwdHheqos4onC6XOfy2Y8Ta8la4mVEES7gRWIw9AfjB96Nc8HppQz/t5JodF ZIqHffdxu3km6o8YWqiqpEAo+V4W89GMK7O4+qsNPAw9TJ4+WW7LxqPiAdkJIr0BoF3A 4ME7Z9keGLTvIA+pXdAdbRIuum8G5NI0pQrUYljvnjX+Xf5a7hkMlYb90HrqR1tnuVhq dJtQc/DHD5EkMfJPn+Skq6im/GTLFXsjAGa2yfSTqevba2clHa5yrCwJ9aBx/TC9AIh5 Rh8g== X-Gm-Message-State: AOAM530+N8JV+iqMd9Sj7J0Uf+5J7trk14ZNDFU44QbsggRKFAasljc4 sKBOBToKLbRq5gJlRtHsLcUeb/+capfgzfBv X-Google-Smtp-Source: ABdhPJxfEYOx4yJAOkntJ5DiqWa+PUdMGjbvHS+waK4nxkK//JTzwdmfwIlgjiulBIZxueT0lR0zfA== X-Received: by 2002:a05:6a00:21c7:b029:2ec:2bfa:d0d1 with SMTP id t7-20020a056a0021c7b02902ec2bfad0d1mr24421751pfj.14.1625645782257; Wed, 07 Jul 2021 01:16:22 -0700 (PDT) Received: from Laptop-X1.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id u40sm15476365pfg.19.2021.07.07.01.16.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 01:16:21 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: David Ahern , Hangbin Liu Subject: [PATCH net 2/2] selftests: icmp_redirect: IPv6 PMTU info should be cleared after redirect Date: Wed, 7 Jul 2021 16:15:30 +0800 Message-Id: <20210707081530.1107289-3-liuhangbin@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210707081530.1107289-1-liuhangbin@gmail.com> References: <20210707081530.1107289-1-liuhangbin@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org After redirecting, it's already a new path. So the old PMTU info should be cleared. The IPv6 test "mtu exception plus redirect" should only has redirect info without old PMTU. The IPv4 test can not be changed because of legacy. Fixes: ec8105352869 ("selftests: Add redirect tests") Signed-off-by: Hangbin Liu Reviewed-by: David Ahern --- tools/testing/selftests/net/icmp_redirect.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/icmp_redirect.sh b/tools/testing/selftests/net/icmp_redirect.sh index 3a111ac1edc3..ecbf57f264ed 100755 --- a/tools/testing/selftests/net/icmp_redirect.sh +++ b/tools/testing/selftests/net/icmp_redirect.sh @@ -313,9 +313,10 @@ check_exception() fi log_test $? 0 "IPv4: ${desc}" - if [ "$with_redirect" = "yes" ]; then + # No PMTU info for test "redirect" and "mtu exception plus redirect" + if [ "$with_redirect" = "yes" ] && [ "$desc" != "redirect exception plus mtu" ]; then ip -netns h1 -6 ro get ${H1_VRF_ARG} ${H2_N2_IP6} | \ - grep -q "${H2_N2_IP6} .*via ${R2_LLADDR} dev br0.*${mtu}" + grep -v "mtu" | grep -q "${H2_N2_IP6} .*via ${R2_LLADDR} dev br0" elif [ -n "${mtu}" ]; then ip -netns h1 -6 ro get ${H1_VRF_ARG} ${H2_N2_IP6} | \ grep -q "${mtu}"