From nobody Sun Dec 14 19:15:55 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D51E1AC45C for ; Thu, 4 Jul 2024 08:58:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720083524; cv=none; b=VDM88aqpCzAkVKAuVw3py+685WZh6Xz5NreJDrJNAfPbOFGu8m1/DqNk4OeEeC2/P8sna2e9PW8PEzAMXNXxWSR6pJXeH6Ob6+/0EFSDalPRvG4A/JE8DYA6FcKH1dR7PT+L9HAEXRSCfLFZoxtkd9dG+zZfq6QrWO3gYgkRCPw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720083524; c=relaxed/simple; bh=gXYyJAtFATkjz93RgGVL4XAb3nglHPwb/RYHBs1Zbbg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WfWJFz5zeO4ud9MDWGGttgOsJnlWU4SzufiAMyzIvivEONU2yaNRwnnIFLK71GY4tUsD68kpqNSxqu7SMesj1kJrkyDTEJV+Liaudur/flknu3WbS6QeuzKM1uo2F5J88eMXFhr0ASruGhRePC1hP+E3gs0LDUNXVp85LKlldkE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=VthO5z7u; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VthO5z7u" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720083521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8jeNLSBugI0M1dRtmXMBFqt3/bH4xQpzUzLsQB473u4=; b=VthO5z7uIxlsQCR3c9f3Eqa6359NdGnilxSvGW1qo5HTcr5pweWaDUspc2wfswuvHM5UvS 8lpRGTz4Tg4LBl6nWrnnqDzG0lXpK+1AxmLqdGbf07BA+8MtXKmZi6BfN3tTBK/2vSZTI0 x91ogQAErgePWWoOUVbbqk/7ULrHlq8= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-632-SANUMPCfOAOWJcs0yXUfFA-1; Thu, 04 Jul 2024 04:58:36 -0400 X-MC-Unique: SANUMPCfOAOWJcs0yXUfFA-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 360E019560BA; Thu, 4 Jul 2024 08:58:34 +0000 (UTC) Received: from antares.redhat.com (unknown [10.39.194.59]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A8C26195605A; Thu, 4 Jul 2024 08:58:29 +0000 (UTC) From: Adrian Moreno To: netdev@vger.kernel.org Cc: aconole@redhat.com, echaudro@redhat.com, horms@kernel.org, i.maximets@ovn.org, dev@openvswitch.org, Adrian Moreno , Pravin B Shelar , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v9 10/10] selftests: openvswitch: add psample test Date: Thu, 4 Jul 2024 10:57:01 +0200 Message-ID: <20240704085710.353845-11-amorenoz@redhat.com> In-Reply-To: <20240704085710.353845-1-amorenoz@redhat.com> References: <20240704085710.353845-1-amorenoz@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Content-Type: text/plain; charset="utf-8" Add a test to verify sampling packets via psample works. In order to do that, create a subcommand in ovs-dpctl.py to listen to on the psample multicast group and print samples. Reviewed-by: Aaron Conole Tested-by: Ilya Maximets Signed-off-by: Adrian Moreno --- .../selftests/net/openvswitch/openvswitch.sh | 115 +++++++++++++++++- .../selftests/net/openvswitch/ovs-dpctl.py | 73 ++++++++++- 2 files changed, 182 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/openvswitch/openvswitch.sh b/tools= /testing/selftests/net/openvswitch/openvswitch.sh index 531951086d9c..bc71dbc18b21 100755 --- a/tools/testing/selftests/net/openvswitch/openvswitch.sh +++ b/tools/testing/selftests/net/openvswitch/openvswitch.sh @@ -20,7 +20,8 @@ tests=3D" nat_related_v4 ip4-nat-related: ICMP related matches work with SNAT netlink_checks ovsnl: validate netlink attrs and settings upcall_interfaces ovs: test the upcall interfaces - drop_reason drop: test drop reasons are emitted" + drop_reason drop: test drop reasons are emitted + psample psample: Sampling packets with psample" =20 info() { [ "${ovs_dir}" !=3D "" ] && @@ -105,12 +106,21 @@ ovs_netns_spawn_daemon() { shift netns=3D$1 shift - info "spawning cmd: $*" - ip netns exec $netns $* >> $ovs_dir/stdout 2>> $ovs_dir/stderr & + if [ "$netns" =3D=3D "_default" ]; then + $* >> $ovs_dir/stdout 2>> $ovs_dir/stderr & + else + ip netns exec $netns $* >> $ovs_dir/stdout 2>> $ovs_dir/stderr & + fi pid=3D$! ovs_sbx "$sbx" on_exit "kill -TERM $pid 2>/dev/null" } =20 +ovs_spawn_daemon() { + sbx=3D$1 + shift + ovs_netns_spawn_daemon $sbx "_default" $* +} + ovs_add_netns_and_veths () { info "Adding netns attached: sbx:$1 dp:$2 {$3, $4, $5}" ovs_sbx "$1" ip netns add "$3" || return 1 @@ -173,6 +183,19 @@ ovs_drop_reason_count() return `echo "$perf_output" | grep "$pattern" | wc -l` } =20 +ovs_test_flow_fails () { + ERR_MSG=3D"Flow actions may not be safe on all matching packets" + + PRE_TEST=3D$(dmesg | grep -c "${ERR_MSG}") + ovs_add_flow $@ &> /dev/null $@ && return 1 + POST_TEST=3D$(dmesg | grep -c "${ERR_MSG}") + + if [ "$PRE_TEST" =3D=3D "$POST_TEST" ]; then + return 1 + fi + return 0 +} + usage() { echo echo "$0 [OPTIONS] [TEST]..." @@ -187,6 +210,92 @@ usage() { exit 1 } =20 + +# psample test +# - use psample to observe packets +test_psample() { + sbx_add "test_psample" || return $? + + # Add a datapath with per-vport dispatching. + ovs_add_dp "test_psample" psample -V 2:1 || return 1 + + info "create namespaces" + ovs_add_netns_and_veths "test_psample" "psample" \ + client c0 c1 172.31.110.10/24 -u || return 1 + ovs_add_netns_and_veths "test_psample" "psample" \ + server s0 s1 172.31.110.20/24 -u || return 1 + + # Check if psample actions can be configured. + ovs_add_flow "test_psample" psample \ + 'in_port(1),eth(),eth_type(0x0806),arp()' 'psample(group=3D1)' &> /dev/nu= ll + if [ $? =3D=3D 1 ]; then + info "no support for psample - skipping" + ovs_exit_sig + return $ksft_skip + fi + + ovs_del_flows "test_psample" psample + + # Test action verification. + OLDIFS=3D$IFS + IFS=3D'*' + min_key=3D'in_port(1),eth(),eth_type(0x0800),ipv4()' + for testcase in \ + "cookie to large"*"psample(group=3D1,cookie=3D16151413121110090807060504= 03020100)" \ + "no group with cookie"*"psample(cookie=3Dabcd)" \ + "no group"*"psample()"; + do + set -- $testcase; + ovs_test_flow_fails "test_psample" psample $min_key $2 + if [ $? =3D=3D 1 ]; then + info "failed - $1" + return 1 + fi + done + IFS=3D$OLDIFS + + ovs_del_flows "test_psample" psample + # Allow ARP + ovs_add_flow "test_psample" psample \ + 'in_port(1),eth(),eth_type(0x0806),arp()' '2' || return 1 + ovs_add_flow "test_psample" psample \ + 'in_port(2),eth(),eth_type(0x0806),arp()' '1' || return 1 + + # Sample first 14 bytes of all traffic. + ovs_add_flow "test_psample" psample \ + "in_port(1),eth(),eth_type(0x0800),ipv4()" \ + "trunc(14),psample(group=3D1,cookie=3Dc0ffee),2" + + # Sample all traffic. In this case, use a sample() action with both + # psample and an upcall emulating simultaneous local sampling and + # sFlow / IPFIX. + nlpid=3D$(grep -E "listening on upcall packet handler" \ + $ovs_dir/s0.out | cut -d ":" -f 2 | tr -d ' ') + + ovs_add_flow "test_psample" psample \ + "in_port(2),eth(),eth_type(0x0800),ipv4()" \ + "sample(sample=3D100%,actions(psample(group=3D2,cookie=3Deeff0= c),userspace(pid=3D${nlpid},userdata=3Deeff0c))),1" + + # Record psample data. + ovs_spawn_daemon "test_psample" python3 $ovs_base/ovs-dpctl.py psample-ev= ents + + # Send a single ping. + sleep 1 + ovs_sbx "test_psample" ip netns exec client ping -I c1 172.31.110.20 -c 1= || return 1 + sleep 1 + + # We should have received one userspace action upcall and 2 psample packe= ts. + grep -E "userspace action command" $ovs_dir/s0.out >/dev/null 2>&1 || ret= urn 1 + + # client -> server samples should only contain the first 14 bytes of the = packet. + grep -E "rate:4294967295,group:1,cookie:c0ffee data:[0-9a-f]{28}$" \ + $ovs_dir/stdout >/dev/null 2>&1 || return 1 + grep -E "rate:4294967295,group:2,cookie:eeff0c" \ + $ovs_dir/stdout >/dev/null 2>&1 || return 1 + + return 0 +} + # drop_reason test # - drop packets and verify the right drop reason is reported test_drop_reason() { diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/t= esting/selftests/net/openvswitch/ovs-dpctl.py index e8dc9af10d4d..1e15b0818074 100644 --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py @@ -28,8 +28,10 @@ try: from pyroute2.netlink import genlmsg from pyroute2.netlink import nla from pyroute2.netlink import nlmsg_atoms + from pyroute2.netlink.event import EventSocket from pyroute2.netlink.exceptions import NetlinkError from pyroute2.netlink.generic import GenericNetlinkSocket + from pyroute2.netlink.nlsocket import Marshal import pyroute2 import pyroute2.iproute =20 @@ -2460,10 +2462,70 @@ class OvsFlow(GenericNetlinkSocket): print("MISS upcall[%d/%s]: %s" % (seq, pktpres, keystr), flush=3DT= rue) =20 def execute(self, packetmsg): - print("userspace execute command") + print("userspace execute command", flush=3DTrue) =20 def action(self, packetmsg): - print("userspace action command") + print("userspace action command", flush=3DTrue) + + +class psample_sample(genlmsg): + nla_map =3D ( + ("PSAMPLE_ATTR_IIFINDEX", "none"), + ("PSAMPLE_ATTR_OIFINDEX", "none"), + ("PSAMPLE_ATTR_ORIGSIZE", "none"), + ("PSAMPLE_ATTR_SAMPLE_GROUP", "uint32"), + ("PSAMPLE_ATTR_GROUP_SEQ", "none"), + ("PSAMPLE_ATTR_SAMPLE_RATE", "uint32"), + ("PSAMPLE_ATTR_DATA", "array(uint8)"), + ("PSAMPLE_ATTR_GROUP_REFCOUNT", "none"), + ("PSAMPLE_ATTR_TUNNEL", "none"), + ("PSAMPLE_ATTR_PAD", "none"), + ("PSAMPLE_ATTR_OUT_TC", "none"), + ("PSAMPLE_ATTR_OUT_TC_OCC", "none"), + ("PSAMPLE_ATTR_LATENCY", "none"), + ("PSAMPLE_ATTR_TIMESTAMP", "none"), + ("PSAMPLE_ATTR_PROTO", "none"), + ("PSAMPLE_ATTR_USER_COOKIE", "array(uint8)"), + ) + + def dpstr(self): + fields =3D [] + data =3D "" + for (attr, value) in self["attrs"]: + if attr =3D=3D "PSAMPLE_ATTR_SAMPLE_GROUP": + fields.append("group:%d" % value) + if attr =3D=3D "PSAMPLE_ATTR_SAMPLE_RATE": + fields.append("rate:%d" % value) + if attr =3D=3D "PSAMPLE_ATTR_USER_COOKIE": + value =3D "".join(format(x, "02x") for x in value) + fields.append("cookie:%s" % value) + if attr =3D=3D "PSAMPLE_ATTR_DATA" and len(value) > 0: + data =3D "data:%s" % "".join(format(x, "02x") for x in val= ue) + + return ("%s %s" % (",".join(fields), data)).strip() + + +class psample_msg(Marshal): + PSAMPLE_CMD_SAMPLE =3D 0 + PSAMPLE_CMD_GET_GROUP =3D 1 + PSAMPLE_CMD_NEW_GROUP =3D 2 + PSAMPLE_CMD_DEL_GROUP =3D 3 + PSAMPLE_CMD_SET_FILTER =3D 4 + msg_map =3D {PSAMPLE_CMD_SAMPLE: psample_sample} + + +class PsampleEvent(EventSocket): + genl_family =3D "psample" + mcast_groups =3D ["packets"] + marshal_class =3D psample_msg + + def read_samples(self): + while True: + try: + for msg in self.get(): + print(msg.dpstr(), flush=3DTrue) + except NetlinkError as ne: + raise ne =20 =20 def print_ovsdp_full(dp_lookup_rep, ifindex, ndb=3DNDB(), vpl=3DOvsVport()= ): @@ -2530,7 +2592,7 @@ def main(argv): help=3D"Increment 'verbose' output counter.", default=3D0, ) - subparsers =3D parser.add_subparsers() + subparsers =3D parser.add_subparsers(dest=3D"subcommand") =20 showdpcmd =3D subparsers.add_parser("show") showdpcmd.add_argument( @@ -2605,6 +2667,8 @@ def main(argv): delfscmd =3D subparsers.add_parser("del-flows") delfscmd.add_argument("flsbr", help=3D"Datapath name") =20 + subparsers.add_parser("psample-events") + args =3D parser.parse_args() =20 if args.verbose > 0: @@ -2619,6 +2683,9 @@ def main(argv): =20 sys.setrecursionlimit(100000) =20 + if args.subcommand =3D=3D "psample-events": + PsampleEvent().read_samples() + if hasattr(args, "showdp"): found =3D False for iface in ndb.interfaces: --=20 2.45.2