From patchwork Thu Jan 12 09:15:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 121883 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7952D423B5; Thu, 12 Jan 2023 10:15:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 73A9242BB1; Thu, 12 Jan 2023 10:15:29 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 7911E400EF for ; Thu, 12 Jan 2023 10:15:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673514927; x=1705050927; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+YqokHGKI6GIjGO4b3YmorU0xAAyqb9UZEFtDtUduMA=; b=DwpSCkR3EwzGBmyZ7aqp11G2v6WXtVt9j4Sb1EGIvoILXoYTSooNr4PO TOIlq8Gm/D+kwxvcKvURnQ9QyYzEvaffgiyN5Z45VtaCvYoMTHKeQ3Tov ygztJFEgiMIoYD+mBjCLJs+rQRYKxLgut6wMCC3A3HmaOZ/YMo37B5vj1 YgsBKhE3HP3piolwnfhIuJALU5eWVbCkOBOttcXDrOkCYA21q9GeBaMgW BXrNKeKk5eJwHgTZvEL3YhKYc73Ovk+9wiEadgR6dlt6Rg/uRkilzScv1 PS0ttJ3uUR+pgQoMJMHfifNn+nm93rdTgu1I8iNwhEGaqtWr9PucLD7hc g==; X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="303356073" X-IronPort-AV: E=Sophos;i="5.96,319,1665471600"; d="scan'208";a="303356073" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 01:15:27 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="659710229" X-IronPort-AV: E=Sophos;i="5.96,319,1665471600"; d="scan'208";a="659710229" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 01:15:25 -0800 From: Weiyuan Li To: dts@dpdk.org Cc: Weiyuan Li Subject: [dts][PATCH V1 2/2] tests/mac_filter: add the vlan filter check after setting multicast filter Date: Thu, 12 Jan 2023 17:15:19 +0800 Message-Id: <20230112091519.29607-2-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230112091519.29607-1-weiyuanx.li@intel.com> References: <20230112091519.29607-1-weiyuanx.li@intel.com> MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Add the vlan filter check after setting multicast filter. 1. Enable vlan filter and add vlan id. Send a packet with multicast dst mac and vlan tag can receive packet. 2. Disable vlan filter and remove vlan id. Send a packet with multicast dst mac can receive packet. Signed-off-by: Weiyuan Li Acked-by: Lijuan Tu --- tests/TestSuite_mac_filter.py | 45 +++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_mac_filter.py b/tests/TestSuite_mac_filter.py index a0ba65c7..afd99080 100644 --- a/tests/TestSuite_mac_filter.py +++ b/tests/TestSuite_mac_filter.py @@ -8,6 +8,7 @@ Test the support of Allowlist Features by Poll Mode Drivers """ import operator +import random import time import framework.utils as utils @@ -15,6 +16,8 @@ from framework.packet import Packet from framework.pmd_output import PmdOutput from framework.test_case import TestCase +MAX_VLAN = 4095 + class TestMacFilter(TestCase): def set_up_all(self): @@ -56,7 +59,9 @@ class TestMacFilter(TestCase): out, "Maximum number of MAC addresses: ([0-9]+)" ) - def allowlist_send_packet(self, portid, destMac="00:11:22:33:44:55", count=-1): + def allowlist_send_packet( + self, portid, destMac="00:11:22:33:44:55", count=-1, pkt_type="UDP", vlan="" + ): """ Send 1 packet to portid. """ @@ -65,8 +70,13 @@ class TestMacFilter(TestCase): count = self.frames_to_send itf = self.tester.get_interface(self.tester.get_local_port(portid)) - pkt = Packet(pkt_type="UDP") - pkt.config_layer("ether", {"src": "52:00:00:00:00:00", "dst": destMac}) + if pkt_type == "VLAN_UDP" and vlan is not None: + pkt = Packet(pkt_type="VLAN_UDP") + pkt.config_layer("vlan", {"vlan": vlan}) + pkt.config_layer("ether", {"dst": destMac}) + else: + pkt = Packet(pkt_type="UDP") + pkt.config_layer("ether", {"src": "52:00:00:00:00:00", "dst": destMac}) pkt.send_pkt(self.tester, tx_port=itf, count=count) def test_add_remove_mac_address(self): @@ -188,6 +198,7 @@ class TestMacFilter(TestCase): Remove mac address and check packet can't received """ # initialise first port without promiscuous mode + random_vlan = random.randint(1, MAX_VLAN) mcast_addr = "01:00:5E:00:00:00" portid = self.dutPorts[0] self.dut.send_expect(f"set promisc {portid:d} off", "testpmd> ") @@ -201,7 +212,33 @@ class TestMacFilter(TestCase): "received" in out, "Packet has not been received when it should have on a broadcast address", ) - + # enable vlan filter + self.dut.send_expect("vlan set filter on 0", "testpmd> ") + self.dut.send_expect("rx_vlan add %d 0" % random_vlan, "testpmd> ") + # passed vlan id + self.allowlist_send_packet( + portid, destMac=mcast_addr, pkt_type="VLAN_UDP", vlan=random_vlan + ) + out = self.dut.get_session_output() + self.verify("received" in out, "Not receive vlan packet with multicast mac!!!") + # wrong vlan id + self.allowlist_send_packet( + portid, destMac=mcast_addr, pkt_type="VLAN_UDP", vlan=random_vlan - 1 + ) + out = self.dut.get_session_output() + self.verify( + "received" not in out, + "Wrong vlan packet can't receive with multicast mac!!!", + ) + # disbale vlan filter and remove vlan id + self.dut.send_expect("rx_vlan rm %d 0" % random_vlan, "testpmd> ") + self.dut.send_expect("vlan set filter off 0", "testpmd> ") + self.allowlist_send_packet(portid, mcast_addr, count=1) + out = self.dut.get_session_output() + self.verify( + "received" in out, + "Packet has not been received when it should have on a broadcast address", + ) self.dut.send_expect(f"mcast_addr remove {portid:d} {mcast_addr}", "testpmd>") self.allowlist_send_packet(portid, mcast_addr, count=1) time.sleep(1)