From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 308FA45903; Wed, 4 Sep 2024 17:28:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96684427A1; Wed, 4 Sep 2024 17:28:48 +0200 (CEST) Received: from mail-il1-f225.google.com (mail-il1-f225.google.com [209.85.166.225]) by mails.dpdk.org (Postfix) with ESMTP id C42414279E for ; Wed, 4 Sep 2024 17:28:46 +0200 (CEST) Received: by mail-il1-f225.google.com with SMTP id e9e14a558f8ab-37636c3872bso25559695ab.3 for ; Wed, 04 Sep 2024 08:28:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1725463726; x=1726068526; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UFU/aqyU6Gc9vvexzk+m7xOq3L4t5ydz0ng4t6n83c0=; b=aDa6ZBRSkafCot/GICkCzsp14Vy59nB62dcqU+i2Xw5CNu9RLi7TqMNFhyHb8b2qVt AVbLVEPoWPHEEu+oISF5xcEAIZEDfsb0TQmnahpGIQn2SUcrNWX1bRGCP59wnXMw4EBf JgPUmLTkrTKCTpNJxCCrjzRvebrBXcQpog2bE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725463726; x=1726068526; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UFU/aqyU6Gc9vvexzk+m7xOq3L4t5ydz0ng4t6n83c0=; b=hG4oeDjWyHKm/94tyrFvrtgJ99cco01kv91RHCuI/o5mu3gNqMj3X5JVf+YXDcDjlH dfEk7tzvYqXWif57r8EnTagh80+B7GZbZSeGUqBvWTTOtj7SiBKr5VQPK/asdh6f0l9M krmKY/zdBDSL/YI+Vnr2GmkucpNgml8Wp8jfgQfjoGEV4Ja3JaMPAx6OEVvf6rN5bzSG 7Muv88uyTC1Qlwki6M7DWpmifYPKICaxWyr8F5ZRL0W2TiH2oN8/0DY0EY1WKNipx942 SfaKgY+GeYnSq9pb813A0nljafDqydUd3sHJycGLVQxmK0s61mb3eN+X4/H9wZI72Xec tBJA== X-Gm-Message-State: AOJu0YyLoTZfzX3zJf97YJ/ImjL6VBb+QbdcaGySsVAoKw/Cv3qQXzid 8PHSDZFCh3eSOYBxBsq9fQos2ZTgQyUxX8kdyeb6vgVxrOxXmgT0z9Zebw3bVBJkC5elSxGQGF0 dG7uuP+7VsG6JWtomRMuqQ4EomQ33yZ7/ X-Google-Smtp-Source: AGHT+IH7KZhNdu+L2YdgLiqJX03ZuEN5gTkddaGod3fxrn1+hKqt+QWr4nWnwYdAKQoAgRZkijHDEDOumQoj X-Received: by 2002:a05:6e02:1747:b0:39d:1b2c:c32b with SMTP id e9e14a558f8ab-39f49a32015mr141853215ab.9.1725463726069; Wed, 04 Sep 2024 08:28:46 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id e9e14a558f8ab-39f3b078729sm4778405ab.50.2024.09.04.08.28.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Sep 2024 08:28:46 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Received: from iol.unh.edu (unknown [IPv6:2606:4100:3880:1257::1083]) by postal.iol.unh.edu (Postfix) with ESMTP id 1D5B56050A6B; Wed, 4 Sep 2024 11:28:45 -0400 (EDT) From: jspewock@iol.unh.edu To: wathsala.vithanage@arm.com, paul.szczepanek@arm.com, thomas@monjalon.net, probb@iol.unh.edu, yoan.picchi@foss.arm.com, Luca.Vizzarro@arm.com, npratte@iol.unh.edu, Honnappa.Nagarahalli@arm.com, alex.chapman@arm.com, juraj.linkes@pantheon.tech Cc: dev@dpdk.org, Jeremy Spewock Subject: [PATCH v1 1/1] dts: add send_packets to test suites and rework packet addressing Date: Wed, 4 Sep 2024 11:28:27 -0400 Message-ID: <20240904152827.11914-2-jspewock@iol.unh.edu> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240904152827.11914-1-jspewock@iol.unh.edu> References: <20240904152827.11914-1-jspewock@iol.unh.edu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Jeremy Spewock Currently the only method provided in the test suite class for sending packets sends a single packet and then captures the results. There is, in some cases, a need to send multiple packets at once while not really needing to capture any traffic received back. The method to do this exists in the traffic generator already, but this patch exposes the method to test suites. This patch also updates the _adjust_addresses method of test suites so that addresses of packets are only modified if the developer did not configure them beforehand. This allows for developers to have more control over the content of their packets when sending them through the framework. Signed-off-by: Jeremy Spewock --- dts/framework/test_suite.py | 87 +++++++++++++++++++------- dts/framework/testbed_model/tg_node.py | 9 +++ 2 files changed, 75 insertions(+), 21 deletions(-) diff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py index 694b2eba65..11aaa0a93a 100644 --- a/dts/framework/test_suite.py +++ b/dts/framework/test_suite.py @@ -199,7 +199,7 @@ def send_packet_and_capture( Returns: A list of received packets. """ - packet = self._adjust_addresses(packet) + packet = self._adjust_addresses([packet])[0] return self.tg_node.send_packet_and_capture( packet, self._tg_port_egress, @@ -208,6 +208,18 @@ def send_packet_and_capture( duration, ) + def send_packets( + self, + packets: list[Packet], + ) -> None: + """Send packets using the traffic generator and do not capture received traffic. + + Args: + packets: Packets to send. + """ + packets = self._adjust_addresses(packets) + self.tg_node.send_packets(packets, self._tg_port_egress) + def get_expected_packet(self, packet: Packet) -> Packet: """Inject the proper L2/L3 addresses into `packet`. @@ -217,41 +229,74 @@ def get_expected_packet(self, packet: Packet) -> Packet: Returns: `packet` with injected L2/L3 addresses. """ - return self._adjust_addresses(packet, expected=True) + return self._adjust_addresses([packet], expected=True)[0] - def _adjust_addresses(self, packet: Packet, expected: bool = False) -> Packet: + def _adjust_addresses(self, packets: list[Packet], expected: bool = False) -> list[Packet]: """L2 and L3 address additions in both directions. + Packets in `packets` will be directly modified in this method. The returned list of packets + however will be copies of the modified packets in order to keep the two lists distinct. + + Only missing addresses are added to packets, existing addresses will not be overridden. If + any packet in `packets` has multiple IP layers (using GRE, for example) only the inner-most + IP layer will have its addresses adjusted. + Assumptions: Two links between SUT and TG, one link is TG -> SUT, the other SUT -> TG. Args: - packet: The packet to modify. + packets: The packets to modify. expected: If :data:`True`, the direction is SUT -> TG, otherwise the direction is TG -> SUT. + + Returns: + A list containing copies of all packets in `packets` after modification. """ - if expected: - # The packet enters the TG from SUT - # update l2 addresses - packet.src = self._sut_port_egress.mac_address - packet.dst = self._tg_port_ingress.mac_address + ret_packets = [] + for packet in packets: + # The fields parameter of a packet does not include fields of the payload, so this can + # only be the Ether src/dst. + pkt_src_is_unset = "src" not in packet.fields + pkt_dst_is_unset = "dst" not in packet.fields + num_ip_layers = packet.layers().count(IP) + + # Update the last IP layer if there are multiple to account for GRE addressing (the + # framework should be modifying the packet address instead of the tunnel). + l3_to_use = packet.getlayer(IP, num_ip_layers) + if num_ip_layers > 0: + ip_src_is_unset = "src" not in l3_to_use.fields + ip_dst_is_unset = "dst" not in l3_to_use.fields + else: + ip_src_is_unset = None + ip_dst_is_unset = None - # The packet is routed from TG egress to TG ingress - # update l3 addresses - packet.payload.src = self._tg_ip_address_egress.ip.exploded - packet.payload.dst = self._tg_ip_address_ingress.ip.exploded - else: - # The packet leaves TG towards SUT # update l2 addresses - packet.src = self._tg_port_egress.mac_address - packet.dst = self._sut_port_ingress.mac_address + # If `expected` is :data:`True`, the packet enters the TG from SUT, otherwise the + # packet leaves the TG towards the SUT + if pkt_src_is_unset: + packet.src = ( + self._sut_port_egress.mac_address + if expected + else self._tg_port_egress.mac_address + ) + if pkt_dst_is_unset: + packet.dst = ( + self._tg_port_ingress.mac_address + if expected + else self._sut_port_ingress.mac_address + ) - # The packet is routed from TG egress to TG ingress # update l3 addresses - packet.payload.src = self._tg_ip_address_egress.ip.exploded - packet.payload.dst = self._tg_ip_address_ingress.ip.exploded + # The packet is routed from TG egress to TG ingress regardless of whether it is + # expected or not. + if ip_src_is_unset: + l3_to_use.src = self._tg_ip_address_egress.ip.exploded + + if ip_dst_is_unset: + l3_to_use.dst = self._tg_ip_address_ingress.ip.exploded + ret_packets.append(Ether(packet.build())) - return Ether(packet.build()) + return ret_packets def verify(self, condition: bool, failure_description: str) -> None: """Verify `condition` and handle failures. diff --git a/dts/framework/testbed_model/tg_node.py b/dts/framework/testbed_model/tg_node.py index 4ee326e99c..758b676258 100644 --- a/dts/framework/testbed_model/tg_node.py +++ b/dts/framework/testbed_model/tg_node.py @@ -83,6 +83,15 @@ def send_packet_and_capture( duration, ) + def send_packets(self, packets: list[Packet], port: Port): + """Send packets without capturing resulting received packets. + + Args: + packets: Packets to send. + port: Port to send the packets on. + """ + self.traffic_generator.send_packets(packets, port) + def close(self) -> None: """Free all resources used by the node. -- 2.46.0