Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3416569pxf; Mon, 29 Mar 2021 01:24:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4V0gaA3rPiInP7KRp4erx/JuoDcrQwWWHp0jDGZgEPtUyrY2U8O3JkCeLy/WW8ThvaWZl X-Received: by 2002:a17:906:27c7:: with SMTP id k7mr27709674ejc.13.1617006273764; Mon, 29 Mar 2021 01:24:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617006273; cv=none; d=google.com; s=arc-20160816; b=OQ/xbGVLwjpYutIgEL0wpO+peVuaG5gt+H+Eip6vn21jdP9gE7pb6G7nUScQtGHH3E hYCWwiCcCil680cLrzabMmv0/g/3/G9Wfs4ipq2Ly90b00ht2K9zkkU2ad7qYoJBmbXF yz+Y7ob5vzBKfZmHk6h2c6coKpdl2i0LkENNgN6QTyThUPvIlneFdDYeZfUtKftct1DC G9QLuOiiszLz3sj7AstZOMOZXhCHR9jGxovj/ypHPVw1U+jACcQ+JKLwXidWAFsN8Jwk eteDOBj166hGjCf7E9GamXrZtwBJqQyIdjGbw7nOBvuOZotV0qHLrGsiuS+si05LYIVU ydQw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hH+cWcRPa0tkNepL7yhjT5HXIZNKU4rmWUxVe9ns/aU=; b=ue29ugMrAi62OWOT/i42MQUNJ/3AGd3UbjLpalw2lcj3kC6x0L5ZsLhPOrhH499IbJ iWCdbTZuLgXUMn7F9KeMWZqpWwyBerpB4cKMZewgFNZn3cfPxabhL6DuXDICD746/3/g tgGK7lRI/SpLSMFrg/kkKfQyxXbq8CfMpJaLidZpdkOUyoAideIQ8J7CUvaVVgeTPIQh C1oq1bqH5g6OvxpG1AtOV0nw4Ti+e1zpszfHvwUsvCWPdpMQ5dN+HuFiXx8u0Git8Ocp Fq1rbeqZLaSqyvmhLXWXUGLY37U8PF4ATIHwIreztPRm2KUG9FhzJSoiJjf2yxth+nVP t/qA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="qAiyiG/L"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a1si12124768eds.169.2021.03.29.01.24.11; Mon, 29 Mar 2021 01:24:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="qAiyiG/L"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231753AbhC2IXM (ORCPT + 99 others); Mon, 29 Mar 2021 04:23:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:59086 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232953AbhC2IO5 (ORCPT ); Mon, 29 Mar 2021 04:14:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0F8F461613; Mon, 29 Mar 2021 08:14:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617005696; bh=iBauD/YwGNRCek8/X8z7f22gVG1rUIanDYdTEaY0FK4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qAiyiG/LsYzWF42rwHYJ2elcmWCIzqVMovGsxIBGnsTKdFIqkfCU42tzAymXnZpoX q8GQQ3ZrghLUam+UdTFbMMBio6lHiqep51JcRduKCK0SRGMI0fDXhm335xMqatzlLS H+kzbxoIiVm2vQ2j2Xk7R21T5ru3SNv06cokS8ro= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hangbin Liu , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 085/111] selftests: forwarding: vxlan_bridge_1d: Fix vxlan ecn decapsulate value Date: Mon, 29 Mar 2021 09:58:33 +0200 Message-Id: <20210329075618.046531793@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210329075615.186199980@linuxfoundation.org> References: <20210329075615.186199980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hangbin Liu [ Upstream commit 5aa3c334a449bab24519c4967f5ac2b3304c8dcf ] The ECN bit defines ECT(1) = 1, ECT(0) = 2. So inner 0x02 + outer 0x01 should be inner ECT(0) + outer ECT(1). Based on the description of __INET_ECN_decapsulate, the final decapsulate value should be ECT(1). So fix the test expect value to 0x01. Before the fix: TEST: VXLAN: ECN decap: 01/02->0x02 [FAIL] Expected to capture 10 packets, got 0. After the fix: TEST: VXLAN: ECN decap: 01/02->0x01 [ OK ] Fixes: a0b61f3d8ebf ("selftests: forwarding: vxlan_bridge_1d: Add an ECN decap test") Signed-off-by: Hangbin Liu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh b/tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh index ce6bea9675c0..0ccb1dda099a 100755 --- a/tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh +++ b/tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh @@ -658,7 +658,7 @@ test_ecn_decap() # In accordance with INET_ECN_decapsulate() __test_ecn_decap 00 00 0x00 __test_ecn_decap 01 01 0x01 - __test_ecn_decap 02 01 0x02 + __test_ecn_decap 02 01 0x01 __test_ecn_decap 01 03 0x03 __test_ecn_decap 02 03 0x03 test_ecn_decap_error -- 2.30.1