From patchwork Thu Feb 16 04:26:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lu Wei X-Patchwork-Id: 57824 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp80465wrn; Wed, 15 Feb 2023 19:23:01 -0800 (PST) X-Google-Smtp-Source: AK7set+2q0j8sK/x2Jbu7OuNLgU+vicTUQqfmCuRYm0FAfyBKYXYH7WKEJKyNjTTVQFr8F7RLdtE X-Received: by 2002:a50:ee19:0:b0:4ac:c12b:8ef8 with SMTP id g25-20020a50ee19000000b004acc12b8ef8mr4042585eds.26.1676517781093; Wed, 15 Feb 2023 19:23:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676517781; cv=none; d=google.com; s=arc-20160816; b=O30Pa9RjIE+OXmmQ7S3l/vLDZCbNP7ZrrnnqCHhLXpPzihIAR2gB6X+eoZioARcCU7 ZIdIaq5iFfwtfI5E9mbWPGsNz0uCHhWbbCF0MQ+/K6EXmJoJjKbmnn56l4VXeLAxMz+F 5Fy+b+TN5jidaeU/Ojekc6s+qAdpnlqzRWb7wAeRVDfkATw5Si1Qh4ke3zmaAJMFA8Fd 9IwNQDiyD/nx0cj9w/1kdcjXy0KOxMjW1bOZojkPvLi3Y7ZZD/QJyL6UJ4CvQ+607H6Q VJ6dLqCpaXo8QcLxOKP7FKHNNmbklSewAFtJPJfHUoQGqylwnSoHDyO4T3cx8iGcTCOY i4JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from; bh=13OKndcLgo4IxpcmJPhGN6Z/dGqs4Fczaj9d9yBFK7M=; b=Ne6HppAnqV+CqYvm37AZKDimbwvMQRVZ+tJoUb8cSK8lD7Bbuiysxfy37FDlqcVMVy TBZvXyuYWWJysxn85IKDXMG2eSovOATx/Q6x99TqYaLh1b2LffD2sAX4IDGM/I9nAu3R LwRJfuJVYfSvWmWVl0Vd8W4m/13KYPkRPCQZjxAKQVyjGHkPcYliaEmUQgdHDL+qa36S tTRDufaJOESHp3DrWLGpJXShyFOJXgIwLsf/1gDvLSyzbA8HQsnl6JpcOTcwRu+vhmVP bftLq1ghloQHFyNiwQGkXteYNnDnvFrhPt7pjVXQVoM7N3WsC9NAJ1hs/W/r+ty8k9vB 4N3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u15-20020aa7d0cf000000b004ace62d6eb0si694820edo.528.2023.02.15.19.22.38; Wed, 15 Feb 2023 19:23:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229739AbjBPDQ6 (ORCPT + 99 others); Wed, 15 Feb 2023 22:16:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229588AbjBPDQz (ORCPT ); Wed, 15 Feb 2023 22:16:55 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93B773524B; Wed, 15 Feb 2023 19:16:54 -0800 (PST) Received: from kwepemi500015.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PHKpz5BKyzrRxZ; Thu, 16 Feb 2023 11:16:27 +0800 (CST) Received: from huawei.com (10.175.101.6) by kwepemi500015.china.huawei.com (7.221.188.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Thu, 16 Feb 2023 11:16:52 +0800 From: Lu Wei To: , , , , , , Subject: [PATCH net,v2,1/2] ipv6: Add lwtunnel encap size of all siblings in nexthop calculation Date: Thu, 16 Feb 2023 12:26:23 +0800 Message-ID: <20230216042624.4069910-2-luwei32@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230216042624.4069910-1-luwei32@huawei.com> References: <20230216042624.4069910-1-luwei32@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemi500015.china.huawei.com (7.221.188.92) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757956308902273451?= X-GMAIL-MSGID: =?utf-8?q?1757956308902273451?= In function rt6_nlmsg_size(), the length of nexthop is calculated by multipling the nexthop length of fib6_info and the number of siblings. However if the fib6_info has no lwtunnel but the siblings have lwtunnels, the nexthop length is less than it should be, and it will trigger a warning in inet6_rt_notify() as follows: WARNING: CPU: 0 PID: 6082 at net/ipv6/route.c:6180 inet6_rt_notify+0x120/0x130 ...... Call Trace: fib6_add_rt2node+0x685/0xa30 fib6_add+0x96/0x1b0 ip6_route_add+0x50/0xd0 inet6_rtm_newroute+0x97/0xa0 rtnetlink_rcv_msg+0x156/0x3d0 netlink_rcv_skb+0x5a/0x110 netlink_unicast+0x246/0x350 netlink_sendmsg+0x250/0x4c0 sock_sendmsg+0x66/0x70 ___sys_sendmsg+0x7c/0xd0 __sys_sendmsg+0x5d/0xb0 do_syscall_64+0x3f/0x90 entry_SYSCALL_64_after_hwframe+0x72/0xdc This bug can be reproduced by script: ip -6 addr add 2002::2/64 dev ens2 ip -6 route add 100::/64 via 2002::1 dev ens2 metric 100 for i in 10 20 30 40 50 60 70; do ip link add link ens2 name ipv_$i type ipvlan ip -6 addr add 2002::$i/64 dev ipv_$i ifconfig ipv_$i up done for i in 10 20 30 40 50 60; do ip -6 route append 100::/64 encap ip6 dst 2002::$i via 2002::1 dev ipv_$i metric 100 done ip -6 route append 100::/64 via 2002::1 dev ipv_70 metric 100 This patch fixes it by adding nexthop_len of every siblings using rt6_nh_nlmsg_size(). Fixes: beb1afac518d ("net: ipv6: Add support to dump multipath routes via RTA_MULTIPATH attribute") Signed-off-by: Lu Wei Reviewed-by: David Ahern --- net/ipv6/route.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index e74e0361fd92..a6983a13dd20 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -5540,16 +5540,17 @@ static size_t rt6_nlmsg_size(struct fib6_info *f6i) nexthop_for_each_fib6_nh(f6i->nh, rt6_nh_nlmsg_size, &nexthop_len); } else { + struct fib6_info *sibling, *next_sibling; struct fib6_nh *nh = f6i->fib6_nh; nexthop_len = 0; if (f6i->fib6_nsiblings) { - nexthop_len = nla_total_size(0) /* RTA_MULTIPATH */ - + NLA_ALIGN(sizeof(struct rtnexthop)) - + nla_total_size(16) /* RTA_GATEWAY */ - + lwtunnel_get_encap_size(nh->fib_nh_lws); + rt6_nh_nlmsg_size(nh, &nexthop_len); - nexthop_len *= f6i->fib6_nsiblings; + list_for_each_entry_safe(sibling, next_sibling, + &f6i->fib6_siblings, fib6_siblings) { + rt6_nh_nlmsg_size(sibling->fib6_nh, &nexthop_len); + } } nexthop_len += lwtunnel_get_encap_size(nh->fib_nh_lws); } From patchwork Thu Feb 16 04:26:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lu Wei X-Patchwork-Id: 57825 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp80630wrn; Wed, 15 Feb 2023 19:23:31 -0800 (PST) X-Google-Smtp-Source: AK7set97SdiWTkzY2sz7AoIwiTL01Tel8ddQLzpJIELj9O28OBrkIQpJkwdupMerVMxKuGlXniE/ X-Received: by 2002:a17:906:71d0:b0:8ae:f73e:233f with SMTP id i16-20020a17090671d000b008aef73e233fmr5542751ejk.32.1676517810869; Wed, 15 Feb 2023 19:23:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676517810; cv=none; d=google.com; s=arc-20160816; b=xQqZ3rUSPwT3TdWSshJjZ6gYS0moXpTycoUUzEDfjXZb2QnEIcQ0v6qHQirfQN5YAo y/c52hv9IyGv8wGRdCdgTs1ngF3BrMyLWhgRabBLEe6lB1zjtGuwy/rcHLoCVKlOChiL iIu9FGQn0IKQ89py4I8S8Wqp4Y5HcbfdvC8u+xdgnY72Hn8fDEPjpei9ls+2RrSKu08Y rvEvqh7ITzbo1iWHAuXx/pRICrIAtQDgok5aFnMjyz7y7FqZr4GYCj3E/ETqOE02Qtec 9JPHgvHycj8kft3CB7TmmXg6TsNBJXCfeOnO/8bcWx6yfrufZzm6Y8sPcbKXSlpKNHCT hh7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from; bh=CMUlMcOdiFJr5vYDxo13rEYUWAeqCBS8KyJ/J8ca8U0=; b=x4ZgGIRiADK5Jp4/ec/Hw9raDpId7Elz9KdSxkvX/uomns7AwMl+cCrfSDrTjRpUO9 c92MkWplBQ23TJhMi58T9SgCbVfrZ+6WPclvxCFiaEWNb5eY0ayxFqd36Al3aiXWvbIH CgZpUkK4jPHUpYybJXQTTwdLdwt/sn0kY+24N00wRqD6QSSaakW5IhNwBNYEgE80m+oQ UbyE/BX+hDwijKpwBc1p5KOMwpFF08GLfzRvvjtj5pOCQiaDcFJA8W6N2aNu2EemBNFu sTgF53YOwwv4h0cUuUKttWGA5Dh5reJ+eqNrI4rpnyvFWNeVUYQmZHGAfNg62U8OxSiX 19eg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gj21-20020a170907741500b008b13c32c5cesi525523ejc.689.2023.02.15.19.23.07; Wed, 15 Feb 2023 19:23:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229746AbjBPDRA (ORCPT + 99 others); Wed, 15 Feb 2023 22:17:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229729AbjBPDQ4 (ORCPT ); Wed, 15 Feb 2023 22:16:56 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B14C36473; Wed, 15 Feb 2023 19:16:55 -0800 (PST) Received: from kwepemi500015.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4PHKk06592zFqRh; Thu, 16 Feb 2023 11:12:08 +0800 (CST) Received: from huawei.com (10.175.101.6) by kwepemi500015.china.huawei.com (7.221.188.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Thu, 16 Feb 2023 11:16:52 +0800 From: Lu Wei To: , , , , , , Subject: [PATCH net,v2,2/2] selftests: fib_tests: Add test cases for IPv4/IPv6 in route notify Date: Thu, 16 Feb 2023 12:26:24 +0800 Message-ID: <20230216042624.4069910-3-luwei32@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230216042624.4069910-1-luwei32@huawei.com> References: <20230216042624.4069910-1-luwei32@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemi500015.china.huawei.com (7.221.188.92) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757956340339349970?= X-GMAIL-MSGID: =?utf-8?q?1757956340339349970?= Add tests to check whether the total fib info length is calculated corretly in route notify process. Signed-off-by: Lu Wei --- tools/testing/selftests/net/fib_tests.sh | 92 +++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh index 5637b5dadabd..4e48154bd195 100755 --- a/tools/testing/selftests/net/fib_tests.sh +++ b/tools/testing/selftests/net/fib_tests.sh @@ -9,7 +9,7 @@ ret=0 ksft_skip=4 # all tests in this script. Can be overridden with -t option -TESTS="unregister down carrier nexthop suppress ipv6_rt ipv4_rt ipv6_addr_metric ipv4_addr_metric ipv6_route_metrics ipv4_route_metrics ipv4_route_v6_gw rp_filter ipv4_del_addr ipv4_mangle ipv6_mangle ipv4_bcast_neigh" +TESTS="unregister down carrier nexthop suppress ipv6_notify ipv4_notify ipv6_rt ipv4_rt ipv6_addr_metric ipv4_addr_metric ipv6_route_metrics ipv4_route_metrics ipv4_route_v6_gw rp_filter ipv4_del_addr ipv4_mangle ipv6_mangle ipv4_bcast_neigh" VERBOSE=0 PAUSE_ON_FAIL=no @@ -655,6 +655,94 @@ fib_nexthop_test() cleanup } +fib6_notify_test() +{ + setup + + echo + echo "Fib6 info length calculation in route notify test" + set -e + + for i in 10 20 30 40 50 60 70; + do + $IP link add dummy$i type dummy + $IP link set dev dummy$i up + $IP -6 addr add 2002::$i/64 dev dummy$i + done + + for i in 10 20 30 40 50 60; + do + $IP -6 route append 100::/64 encap ip6 dst 2002::$i via \ + 2002::1 dev dummy$i metric 100 + done + + set +e + + $NS_EXEC ip monitor route 2> errors.txt & + + $IP -6 route append 100::/64 via 2002::1 dev dummy70 metric 100 + + err=`cat errors.txt |grep "Message too long"` + if [ -z "$err" ];then + ret=0 + else + ret=1 + fi + + log_test $ret 0 "ipv6 route add notify" + + { kill %% && wait %%; } 2>/dev/null + + rm errors.txt + + cleanup &> /dev/null +} + + +fib_notify_test() +{ + setup + + echo + echo "Fib4 info length calculation in route notify test" + + set -e + + for i in 10 20 30 40 50 60 70; + do + $IP link add dummy$i type dummy + $IP link set dev dummy$i up + $IP addr add 192.168.100.$i/24 dev dummy$i + done + + for i in 10 20 30 40 50 60; + do + $IP route append 10.0.0.0/24 encap ip dst 192.168.100.$i via \ + 192.168.100.1 dev dummy$i metric 100 + done + + $NS_EXEC ip monitor route 2> errors.txt & + + set +e + + $IP route append 10.0.0.0/24 via 192.168.100.1 dev dummy70 metric 100 + + err=`cat errors.txt |grep "Message too long"` + if [ -z "$err" ];then + ret=0 + else + ret=1 + fi + + log_test $ret 0 "ipv4 route add notify" + + { kill %% && wait %%; } 2>/dev/null + + rm errors.txt + + cleanup &> /dev/null +} + fib_suppress_test() { echo @@ -2109,6 +2197,8 @@ do fib_carrier_test|carrier) fib_carrier_test;; fib_rp_filter_test|rp_filter) fib_rp_filter_test;; fib_nexthop_test|nexthop) fib_nexthop_test;; + fib_notify_test|ipv4_notify) fib_notify_test;; + fib6_notify_test|ipv6_notify) fib6_notify_test;; fib_suppress_test|suppress) fib_suppress_test;; ipv6_route_test|ipv6_rt) ipv6_route_test;; ipv4_route_test|ipv4_rt) ipv4_route_test;;