Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp2908490ybx; Fri, 8 Nov 2019 11:07:17 -0800 (PST) X-Google-Smtp-Source: APXvYqyP6t1NA5dpV9v/wjVJKDUHrarD7rCizD1IZIn+FGxfQT1tu9RWUusJaTMIa9W941ViH/Uw X-Received: by 2002:a50:a2c5:: with SMTP id 63mr12376941edm.48.1573240037029; Fri, 08 Nov 2019 11:07:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573240037; cv=none; d=google.com; s=arc-20160816; b=GS2/i921Rlm47t4SRVOTVvGdzbsS0e+Bpi8OKc6BiRFnP/h13p0XpWBg/IWVDJh3+T dVCzfVFgaDCkd70uKCX89XyhDDu77Xl1boK/fnT5TXr2npA95oPn1ALfBNGu5cFGPEB5 OAUnik79QjwmgLKY7ZW262S8qEmJ/EoYJ0kEonAEzdFKGUrVxU/s2uH/NaiWdgdUm5e/ Mm1Hm7pqYk5NNyt5oRN8ydnU/XBLbRH/vLmt4NwE27n72z+VaJ2q06VDgL5VGKUCAESK H9nzkeR1RUAon9wWpHs7AdKT/fnM8LddIabLelg+uw9eZO1ub3OP//GI8UyXNZ9LhRcJ T7Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=P0xhngkSLMD7BXcd/8sIx9S4FO3mb8iKsry/UuvYmZg=; b=KfvQU/oH4skPOhCVaRexhI19HYbjO36SOTR7dCO8U+MQ1O6X4do/Bj9ApeVlg0Ottd 7BxI3B1/SsJqf2+Ut+t0zeMrUk/cjs7Luxacq7obkm9Vje2Ej+1wMrW3lIUARkGy0PeU kE5evXWkV66pSKOx8vkr4YY2PbAGSckTp7EX0m7w0xliSpHnKAP8IaQE9m6rCNPyphx3 IVEp7PhFjtvUrSPWflnpnGu65w4kfOzV0MGaHcveL1zVbT26Mb2vkoeHrQq5JS/fK9GA IpLIjtt0z0/QJE5fBoF018UEh0Goh3CVy05N3dl+6LBNOxRwtvNpmWDTQmAjDIk8+hyj NzmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=U1vFOhFJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x21si4845017eda.366.2019.11.08.11.06.51; Fri, 08 Nov 2019 11:07:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=U1vFOhFJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390702AbfKHTDI (ORCPT + 99 others); Fri, 8 Nov 2019 14:03:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:60928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729833AbfKHTDF (ORCPT ); Fri, 8 Nov 2019 14:03:05 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 31F81215EA; Fri, 8 Nov 2019 19:03:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573239784; bh=caerxxbWsm1Pp5Wd/RgLWcj1/JZ4KMfdap7er8g7ap0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U1vFOhFJ0yqjhwMrUn94AGOpZ2cCOjWYWKOCrudUK+cGgdHYh27Z/V/Nt+k5LO6mw oPMwOLyBXpMk3QuK9WTH+fN71llP63UpFDeMGC+ysseZa/jjiJeMNhrU10DPC4s3m9 BQyx8SWBI6c+1k7jf9ey5cEVrzI64X8rwBqvjBe4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Ahern , Paolo Abeni , "David S. Miller" Subject: [PATCH 4.19 60/79] selftests: fib_tests: add more tests for metric update Date: Fri, 8 Nov 2019 19:50:40 +0100 Message-Id: <20191108174820.075150796@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174745.495640141@linuxfoundation.org> References: <20191108174745.495640141@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Paolo Abeni [ Upstream commit 37de3b354150450ba12275397155e68113e99901 ] This patch adds two more tests to ipv4_addr_metric_test() to explicitly cover the scenarios fixed by the previous patch. Suggested-by: David Ahern Signed-off-by: Paolo Abeni Reviewed-by: David Ahern Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/net/fib_tests.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) --- a/tools/testing/selftests/net/fib_tests.sh +++ b/tools/testing/selftests/net/fib_tests.sh @@ -1301,6 +1301,27 @@ ipv4_addr_metric_test() fi log_test $rc 0 "Prefix route with metric on link up" + # explicitly check for metric changes on edge scenarios + run_cmd "$IP addr flush dev dummy2" + run_cmd "$IP addr add dev dummy2 172.16.104.0/24 metric 259" + run_cmd "$IP addr change dev dummy2 172.16.104.0/24 metric 260" + rc=$? + if [ $rc -eq 0 ]; then + check_route "172.16.104.0/24 dev dummy2 proto kernel scope link src 172.16.104.0 metric 260" + rc=$? + fi + log_test $rc 0 "Modify metric of .0/24 address" + + run_cmd "$IP addr flush dev dummy2" + run_cmd "$IP addr add dev dummy2 172.16.104.1/32 peer 172.16.104.2 metric 260" + run_cmd "$IP addr change dev dummy2 172.16.104.1/32 peer 172.16.104.2 metric 261" + rc=$? + if [ $rc -eq 0 ]; then + check_route "172.16.104.2 dev dummy2 proto kernel scope link src 172.16.104.1 metric 261" + rc=$? + fi + log_test $rc 0 "Modify metric of address with peer route" + $IP li del dummy1 $IP li del dummy2 cleanup