From patchwork Wed Feb 22 04:20:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lu Wei X-Patchwork-Id: 60321 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp355953wrd; Tue, 21 Feb 2023 19:11:56 -0800 (PST) X-Google-Smtp-Source: AK7set/P3kmaVHaO/DUhYMY91CWWotCp5HRJ7Zv/ia2IWT4UJ3ACctiN5f+OnX10LQSObmldEbXx X-Received: by 2002:a05:6a20:938a:b0:cb:27a7:9d42 with SMTP id x10-20020a056a20938a00b000cb27a79d42mr9297930pzh.61.1677035516326; Tue, 21 Feb 2023 19:11:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677035516; cv=none; d=google.com; s=arc-20160816; b=wYUY99pe3267Mb3ojACMHJDnllVli2Vu1b4RvJ0f9CK1fVD9oPt+1Zeo5bFAQCO0pP ZIzil9uWFgOH6ixvaFbdO4Bk/yXA3Hsa6+drM/tcdNlq7BuQBpFgAvjlBw0j14ZVWaKB mn9Ag16HcqvD4cHRPFFCeE/iI3eFcLls0yaiX8EvSrVGa+mLE7HTGPk5u+4C9rt5KEqG 9Y4xmLpH225O01FfMJGOnBtduEf2kvpMi5q10+hrlBuou7VoI8wAtsf+42ccYlo7ZaXt GMEhN8ZU8zhMlbHELBqYv63qIVu8e6SQdaTYoalvkJoJ9WRL52nnGmNzi0GiNhouTKiJ XT5A== 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=XBFE4hZJ7JQnLq92vWPGcxWUBmaDAjziMdvNKVl2zHhi2qi/9fPwa8Pg4EgiNMpKwS zo7POKYwQ7cqANOjxpJ5HkTwiV0d3aRIGfGkSylXdQZR78HNFViRVCwXImdr+GoMPQlG 6PrKHh75J1F5nTihDZb6qvELEzY4/0HNdQIJ19WBlTDvc68BoIXS3FLIn+nfYgW8QuVw ZrCgS3jp+ROSCVwINM/lvHjviCnJRuAOSoJfrLVrQog5w5NcOAcfZ1i29NZGuCymlmYv g2s132xVKl5wc7lBrJxOuXzd5Ju1Xt65JT9Npu2CRpRmEGa3/eJZ1+tMwiXjmkpLSr7w X/kg== 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 w63-20020a638242000000b005004b2acf6fsi7162687pgd.428.2023.02.21.19.11.43; Tue, 21 Feb 2023 19:11:56 -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 S232329AbjBVDLe (ORCPT + 99 others); Tue, 21 Feb 2023 22:11:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231820AbjBVDLa (ORCPT ); Tue, 21 Feb 2023 22:11:30 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 714B52B637; Tue, 21 Feb 2023 19:11:28 -0800 (PST) Received: from kwepemi500015.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PM1MW0jzgznWSC; Wed, 22 Feb 2023 11:08:55 +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; Wed, 22 Feb 2023 11:11:24 +0800 From: Lu Wei To: , , , , , , Subject: [PATCH net,v3,1/2] ipv6: Add lwtunnel encap size of all siblings in nexthop calculation Date: Wed, 22 Feb 2023 12:20:50 +0800 Message-ID: <20230222042051.325307-2-luwei32@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230222042051.325307-1-luwei32@huawei.com> References: <20230222042051.325307-1-luwei32@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) 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?1758499193417621257?= X-GMAIL-MSGID: =?utf-8?q?1758499193417621257?= 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 --- 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 Wed Feb 22 04:20:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lu Wei X-Patchwork-Id: 60322 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp356022wrd; Tue, 21 Feb 2023 19:12:05 -0800 (PST) X-Google-Smtp-Source: AK7set/e64LSFIVDtw75VFm/9eE1h9iY8BBkRRim0vyTLoBfwiFTTvW4O/VywcqxcF4/i5nImhI+ X-Received: by 2002:a17:902:eccc:b0:19a:74c7:dcda with SMTP id a12-20020a170902eccc00b0019a74c7dcdamr9031370plh.15.1677035525580; Tue, 21 Feb 2023 19:12:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677035525; cv=none; d=google.com; s=arc-20160816; b=rTnm5T/NBQ1KPbbcEHgl01Av8rMlCrv51J/3H2b/+NEsihnpp+2GCKpe4rxVQMbgvE necsXQe6PYiun0I0iKPkCudEP2NzZDhigvPW6HqFgsi1ms75Hy470REB072DlnQjfCEs +QDQkdRjkeU0RRQ914k1msIeA3XoX8RTnbpkB+gMxVM/RPT/SBHuCaq5dUODH+3EgMf0 mKBoy3ghlRvuS40Y+JLTATy+J1IZGfkfRmAZm6xA1dHVkOGeBT7qJWwhVEz+vpoduS/+ dm9JNUk8T7NqXdd2IuuIQZo9N2FxVjiF4+klOWcaJUE1Qt7dnKqqefvVznBHnT9ZVNqU ZJxA== 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=uI0c1XwEJ3IvAW0XdX0nHNZ8O/u+4GN9xuFeKj3r/5o=; b=fP070ssghMXJKVInkIBVevTuxBdwK9nP0V0tusU4lRgqJjSWO1XK+R4Sl3YL4ZgLhc rJNW0EUKoNrUFTB7wOauRmFOd8ClS+gnXUGDAjHeeDdOaNZWB+bdOCdKLqygonq3Aa/1 0CSoWoWOEYnPBdQGu3ngh/TFtnV6TIyT8bKwXAhlrU1zPcc3pvSfsFeIo5ZkQlGHxinF HcSOtXglnprMlONBaH/1qXhN4+79DQv8uLzMMA8uU+t9QNF78xmsH75HZRND8pquJwvj 2LGJuTAnZFfFzY0mLViD5U7Ep01pra4362VFl0zqRnji461J7DTulevh+sGzuISXaVB5 l09w== 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 q9-20020a170902bd8900b0019a96d3b45fsi12355830pls.490.2023.02.21.19.11.52; Tue, 21 Feb 2023 19:12:05 -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 S231794AbjBVDLi (ORCPT + 99 others); Tue, 21 Feb 2023 22:11:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231837AbjBVDLa (ORCPT ); Tue, 21 Feb 2023 22:11:30 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53BFB29425; Tue, 21 Feb 2023 19:11:28 -0800 (PST) Received: from kwepemi500015.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4PM1Jp4W6DzKmSn; Wed, 22 Feb 2023 11:06:34 +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; Wed, 22 Feb 2023 11:11:25 +0800 From: Lu Wei To: , , , , , , Subject: [PATCH net,v3,2/2] selftests: fib_tests: Add test cases for IPv4/IPv6 in route notify Date: Wed, 22 Feb 2023 12:20:51 +0800 Message-ID: <20230222042051.325307-3-luwei32@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230222042051.325307-1-luwei32@huawei.com> References: <20230222042051.325307-1-luwei32@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) 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?1758499202985649889?= X-GMAIL-MSGID: =?utf-8?q?1758499202985649889?= 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 | 97 +++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh index 5637b5dadabd..c1aeb9836904 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,99 @@ 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 address add 2001:$i::1/64 dev dummy_$i + done + + $IP -6 route add 2001::/64 \ + nexthop encap ip6 dst 2002::10 via 2001:10::2 dev dummy_10 \ + nexthop encap ip6 dst 2002::20 via 2001:20::2 dev dummy_20 \ + nexthop encap ip6 dst 2002::30 via 2001:30::2 dev dummy_30 \ + nexthop encap ip6 dst 2002::40 via 2001:40::2 dev dummy_40 \ + nexthop encap ip6 dst 2002::50 via 2001:50::2 dev dummy_50 \ + nexthop encap ip6 dst 2002::60 via 2001:60::2 dev dummy_60 + + set +e + + $NS_EXEC ip monitor route &> errors.txt & + + sleep 2 + $IP -6 route append 2001::/64 via 2001:70::2 dev dummy_70 + + 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 address add 20.20.$i.2/24 dev dummy_$i + done + + $NS_EXEC ip monitor route &> errors.txt & + sleep 2 + + $IP route add 10.0.0.0/24 \ + nexthop encap ip dst 192.168.10.10 via 20.20.10.1 dev dummy_10 \ + nexthop encap ip dst 192.168.10.20 via 20.20.20.1 dev dummy_20 \ + nexthop encap ip dst 192.168.10.30 via 20.20.30.1 dev dummy_30 \ + nexthop encap ip dst 192.168.10.40 via 20.20.40.1 dev dummy_40 \ + nexthop encap ip dst 192.168.10.50 via 20.20.50.1 dev dummy_50 \ + nexthop encap ip dst 192.168.10.60 via 20.20.60.1 dev dummy_60 \ + nexthop via 20.20.70.1 dev dummy_70 + + set +e + + 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 +2202,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;;