From nobody Sun Feb 8 15:35:29 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 E3172171E53 for ; Fri, 21 Jun 2024 10:11:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964699; cv=none; b=XmROGuGJxD9IYJdGceudwd+jRAivR5biCgq09iIA1kHmeAlAyW9mnG++2hK2WFopHMB+Y+2+T3iiMDkF1BVq8rnTbD4ToMo3TZzHNb7ruVmlUSqpng6AQINmaFTM0bMHJW5zpzbao1/oG+SRO7aSkGiKF5wjTvwvUXp9HYCBr/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964699; c=relaxed/simple; bh=crCh8UW+g3vSNQZkd+OnlB81uggju6cqW0B7Qb9p134=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BNQbHukyWLQM1Q+pd2aAfO9+9Ny2S5hyca/wKVW+ppZ3+eLDh2NRpiTekGCuTi/ADY5cK7H911TSHUb8gyab6Ls9c2Dlb3nNqU0RpGmUz2w0dNDF819rbj2vBEAqHnYmA/wsEBq3+V5WyJhdpoZErsjgGknhQ3ziUzeTwZ+QAY0= 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=BLMFDzch; arc=none smtp.client-ip=170.10.129.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="BLMFDzch" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718964696; 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=4hRXyFNecNGwjyZXKmwdc0h55AD23WtosYtHq0OZGQ0=; b=BLMFDzchoEDuJJGXb5w4n+1GPKVrrySi1R1UicoBabU1gEDh00tIrZY6lR2C2LAYBeeGZi uy12RnnaPgI/hKBijb+AkPQEQF+sXhAH7CiGqvF4zI/7HjigGzB2BYIwabAPLS5DEec3A6 dYe6LaZ9U81G2w456cU/ZHmyHK5oT50= Received: from mx-prod-mc-03.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-77-lY_Gt7bBMyCKycPfhdLwsg-1; Fri, 21 Jun 2024 06:11:33 -0400 X-MC-Unique: lY_Gt7bBMyCKycPfhdLwsg-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C0AFF19560B1; Fri, 21 Jun 2024 10:11:31 +0000 (UTC) Received: from antares.redhat.com (unknown [10.39.193.189]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 604EB1956056; Fri, 21 Jun 2024 10:11:27 +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 , Yotam Gigi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 01/10] net: psample: add user cookie Date: Fri, 21 Jun 2024 12:10:53 +0200 Message-ID: <20240621101113.2185308-2-amorenoz@redhat.com> In-Reply-To: <20240621101113.2185308-1-amorenoz@redhat.com> References: <20240621101113.2185308-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.17 Content-Type: text/plain; charset="utf-8" Add a user cookie to the sample metadata so that sample emitters can provide more contextual information to samples. If present, send the user cookie in a new attribute: PSAMPLE_ATTR_USER_COOKIE. Reviewed-by: Simon Horman Signed-off-by: Adrian Moreno --- include/net/psample.h | 2 ++ include/uapi/linux/psample.h | 1 + net/psample/psample.c | 9 ++++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/net/psample.h b/include/net/psample.h index 0509d2d6be67..2ac71260a546 100644 --- a/include/net/psample.h +++ b/include/net/psample.h @@ -25,6 +25,8 @@ struct psample_metadata { out_tc_occ_valid:1, latency_valid:1, unused:5; + const u8 *user_cookie; + u32 user_cookie_len; }; =20 struct psample_group *psample_group_get(struct net *net, u32 group_num); diff --git a/include/uapi/linux/psample.h b/include/uapi/linux/psample.h index e585db5bf2d2..e80637e1d97b 100644 --- a/include/uapi/linux/psample.h +++ b/include/uapi/linux/psample.h @@ -19,6 +19,7 @@ enum { PSAMPLE_ATTR_LATENCY, /* u64, nanoseconds */ PSAMPLE_ATTR_TIMESTAMP, /* u64, nanoseconds */ PSAMPLE_ATTR_PROTO, /* u16 */ + PSAMPLE_ATTR_USER_COOKIE, /* binary, user provided data */ =20 __PSAMPLE_ATTR_MAX }; diff --git a/net/psample/psample.c b/net/psample/psample.c index a5d9b8446f77..b37488f426bc 100644 --- a/net/psample/psample.c +++ b/net/psample/psample.c @@ -386,7 +386,9 @@ void psample_sample_packet(struct psample_group *group,= struct sk_buff *skb, nla_total_size(sizeof(u32)) + /* group_num */ nla_total_size(sizeof(u32)) + /* seq */ nla_total_size_64bit(sizeof(u64)) + /* timestamp */ - nla_total_size(sizeof(u16)); /* protocol */ + nla_total_size(sizeof(u16)) + /* protocol */ + (md->user_cookie_len ? + nla_total_size(md->user_cookie_len) : 0); /* user cookie */ =20 #ifdef CONFIG_INET tun_info =3D skb_tunnel_info(skb); @@ -486,6 +488,11 @@ void psample_sample_packet(struct psample_group *group= , struct sk_buff *skb, } #endif =20 + if (md->user_cookie && md->user_cookie_len && + nla_put(nl_skb, PSAMPLE_ATTR_USER_COOKIE, md->user_cookie_len, + md->user_cookie)) + goto error; + genlmsg_end(nl_skb, data); genlmsg_multicast_netns(&psample_nl_family, group->net, nl_skb, 0, PSAMPLE_NL_MCGRP_SAMPLE, GFP_ATOMIC); --=20 2.45.1 From nobody Sun Feb 8 15:35:29 2026 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 054AF172790 for ; Fri, 21 Jun 2024 10:11:43 +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=1718964705; cv=none; b=jwRG9zChek9zZMMjlzRrO8fz8CEaT9OeC63Xui3MDiIDxaD2+lhpVtHmmrBBOFZD3SEIlswBgjE4tZPfXFmOtLKQ1/LnSFg3xLgN64elzW1JOYJ98KKTun8i+yrL03C/6i+5CHVeAlOG361RR2GsSHJvxBjtRM7FpDO+QRMzjy0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964705; c=relaxed/simple; bh=tQLqrrhieXejhc2zQDIr/lm/fO9IwZHD2PmckuwjCls=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NMHi/8tWJFCUezK7kTaFY6dlZw6M7DpHCW1uj+dMVqBOZxN1jL2eQxPpkO0iV0MMq4VOS0MvJ/dHbZoAZBkMolhYkn7Ym2vgTZeSvGAl69y0LHvh52ikvz8shJqvAG4H7PE1665CU95dBaJx04OAaFXJRSca5UB2HwSsztSWHxU= 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=WO85CKXs; 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="WO85CKXs" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718964703; 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=h0NOprsJcSaID2DYqd51khJk0uqLDdoFanepxFJiHOE=; b=WO85CKXstqSGoSzm+7+UhoII/5swjgevcdtQpqiDz4de/lzxpc+HgFk2VVWXt/L7nLu6S1 2Omg8xvmOpHheYaIHjWmYyP/dprl31RvQiSoMcQCyQpkR8WytnY0CddS59xGh3jZH+hB+W xLCB5lKWQPMEmRs1Du/QaqOOY4CmaHs= Received: from mx-prod-mc-01.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-458-lPzi7fEvNhuo6SFkukA20g-1; Fri, 21 Jun 2024 06:11:39 -0400 X-MC-Unique: lPzi7fEvNhuo6SFkukA20g-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7815919560A0; Fri, 21 Jun 2024 10:11:37 +0000 (UTC) Received: from antares.redhat.com (unknown [10.39.193.189]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4834C1956048; Fri, 21 Jun 2024 10:11:32 +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 , Jamal Hadi Salim , Cong Wang , Jiri Pirko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 02/10] net: sched: act_sample: add action cookie to sample Date: Fri, 21 Jun 2024 12:10:54 +0200 Message-ID: <20240621101113.2185308-3-amorenoz@redhat.com> In-Reply-To: <20240621101113.2185308-1-amorenoz@redhat.com> References: <20240621101113.2185308-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.17 Content-Type: text/plain; charset="utf-8" If the action has a user_cookie, pass it along to the sample so it can be easily identified. Signed-off-by: Adrian Moreno --- net/sched/act_sample.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c index a69b53d54039..2ceb4d141b71 100644 --- a/net/sched/act_sample.c +++ b/net/sched/act_sample.c @@ -167,7 +167,9 @@ TC_INDIRECT_SCOPE int tcf_sample_act(struct sk_buff *sk= b, { struct tcf_sample *s =3D to_sample(a); struct psample_group *psample_group; + u8 cookie_data[TC_COOKIE_MAX_SIZE]; struct psample_metadata md =3D {}; + struct tc_cookie *user_cookie; int retval; =20 tcf_lastuse_update(&s->tcf_tm); @@ -189,6 +191,16 @@ TC_INDIRECT_SCOPE int tcf_sample_act(struct sk_buff *s= kb, if (skb_at_tc_ingress(skb) && tcf_sample_dev_ok_push(skb->dev)) skb_push(skb, skb->mac_len); =20 + rcu_read_lock(); + user_cookie =3D rcu_dereference(a->user_cookie); + if (user_cookie) { + memcpy(cookie_data, user_cookie->data, + user_cookie->len); + md.user_cookie =3D cookie_data; + md.user_cookie_len =3D user_cookie->len; + } + rcu_read_unlock(); + md.trunc_size =3D s->truncate ? s->trunc_size : skb->len; psample_sample_packet(psample_group, skb, s->rate, &md); =20 --=20 2.45.1 From nobody Sun Feb 8 15:35:29 2026 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 3804217556B for ; Fri, 21 Jun 2024 10:11:48 +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=1718964710; cv=none; b=i19FyM/Vw0okMRtROzh5pG2CLPTaZBZ24xwlN81+2DY9p/fMDpFXoONblkKcm5od8WkheJAI3vimJSFqmEvEUCLFeXtOhd3RmxESVsd5l5fJD2aIJEvsztyECNCE2knbh7wIsJ0KrKT1pvEvQxXYqcJbTGh8cmfOy4fTJFNlmU4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964710; c=relaxed/simple; bh=5pAd5l8SzMmlQSEbbBoeGexj0e42jZKo6+z9g7T1oew=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PCKIOT09Mt2FdGzBlcNvTm7GoBHXDW7XGoxyet6Cr+C7nT1AawH2AgEslbdj5h13z4w+JVYIpwR7kNGJ2xhVdi+qVTiOt81oFnv353U/TG31EMPNouG6nCzDBhPc5DKrp2h9+IZ5KwxzNtDyWcQEd1PB9ORfSlL+ZLsMQhY/P84= 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=QXzvR9O1; 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="QXzvR9O1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718964708; 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=maZ9TMPYGbzb/EBP71+0JWLbUHEakzvhjd9HxWMo8cg=; b=QXzvR9O1m5dGpu+LJ8X753iCXMkCj4VRDP/V0d2evl6Ym5TeVtd/JRJenAp0sAoGkTk19M QlHExBqV8bFBYCOJhdvUCANovVJW1rIlkfIO17zSujXZ7BRMT56mEInWgFL8l/BqOwQ7pF WWN+OIWpfqZeB8amPaVCfUe8kz02ZZk= Received: from mx-prod-mc-02.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-210-wzvWEb3TNXqd8jTpVHOmOQ-1; Fri, 21 Jun 2024 06:11:44 -0400 X-MC-Unique: wzvWEb3TNXqd8jTpVHOmOQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 712921956096; Fri, 21 Jun 2024 10:11:42 +0000 (UTC) Received: from antares.redhat.com (unknown [10.39.193.189]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0A06B195605B; Fri, 21 Jun 2024 10:11:37 +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 , Yotam Gigi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 03/10] net: psample: skip packet copy if no listeners Date: Fri, 21 Jun 2024 12:10:55 +0200 Message-ID: <20240621101113.2185308-4-amorenoz@redhat.com> In-Reply-To: <20240621101113.2185308-1-amorenoz@redhat.com> References: <20240621101113.2185308-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.17 Content-Type: text/plain; charset="utf-8" If nobody is listening on the multicast group, generating the sample, which involves copying packet data, seems completely unnecessary. Return fast in this case. Reviewed-by: Simon Horman Signed-off-by: Adrian Moreno --- net/psample/psample.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/psample/psample.c b/net/psample/psample.c index b37488f426bc..1c76f3e48dcd 100644 --- a/net/psample/psample.c +++ b/net/psample/psample.c @@ -376,6 +376,10 @@ void psample_sample_packet(struct psample_group *group= , struct sk_buff *skb, void *data; int ret; =20 + if (!genl_has_listeners(&psample_nl_family, group->net, + PSAMPLE_NL_MCGRP_SAMPLE)) + return; + meta_len =3D (in_ifindex ? nla_total_size(sizeof(u16)) : 0) + (out_ifindex ? nla_total_size(sizeof(u16)) : 0) + (md->out_tc_valid ? nla_total_size(sizeof(u16)) : 0) + --=20 2.45.1 From nobody Sun Feb 8 15:35:29 2026 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 E249D172BD1 for ; Fri, 21 Jun 2024 10:11:54 +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=1718964716; cv=none; b=iTEEL7uMIPE08AtQW0/KaOPIFyKvR6SPd7lr/DfSODIxmY4bTunTfPKdpv7vtslAM68XLKs9uCvlqW/09eze24+9Ykc8VAHCcpvvxvVDn3VkTk3H299Neuneny8ttdNISCvu2QAb14fh5Yd5HndfvOFSd4Szln5COYmDQeIbUMA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964716; c=relaxed/simple; bh=z4Yy+U4uehQ++A/G5l/zIQt9seE0IMgFku5riP5EMjM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oJWWuMtWGK+Zav0NQZAC6nAs3LAKdJfmjbh1MQViXdmOK9+K9zKQHkgOY6H7eQdgP05rALHsMLBvyE18Mreo75a8w8QF1GPqrNUxmiY2X4JdXbbd+PWpfZTMaPIirAbSg+qyTP56PqCW7yCwhuzWBv7mlE8wB8/C+Z9MFxi8O9c= 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=XrzwlnEZ; 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="XrzwlnEZ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718964714; 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=KcxrhhFi5l+NUgOTWEhyXPFPi3rVOzg15nAozasXi0Q=; b=XrzwlnEZj8sKQE4PlNYgmwMa6Kw163UybI6haRdY2+dHJ+UtTOImSlVaWfmfEl/SQhA+cg eav3zEwWKjlcG04SA99WidYtlJRA6kBjmJr5JXKuc72I0LNW4oFSxn6Ol9Ts6we6nXtpHV nnUR8t5FwGbaZ1EvWaRKHj+GG34kU+4= Received: from mx-prod-mc-02.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-520-EPKcm_f8Pl-XGhDp1OuTSA-1; Fri, 21 Jun 2024 06:11:50 -0400 X-MC-Unique: EPKcm_f8Pl-XGhDp1OuTSA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 598B5195608C; Fri, 21 Jun 2024 10:11:48 +0000 (UTC) Received: from antares.redhat.com (unknown [10.39.193.189]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 591941956048; Fri, 21 Jun 2024 10:11:43 +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 , Yotam Gigi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jamal Hadi Salim , Cong Wang , Jiri Pirko , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 04/10] net: psample: allow using rate as probability Date: Fri, 21 Jun 2024 12:10:56 +0200 Message-ID: <20240621101113.2185308-5-amorenoz@redhat.com> In-Reply-To: <20240621101113.2185308-1-amorenoz@redhat.com> References: <20240621101113.2185308-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.17 Content-Type: text/plain; charset="utf-8" Although not explicitly documented in the psample module itself, the definition of PSAMPLE_ATTR_SAMPLE_RATE seems inherited from act_sample. Quoting tc-sample(8): "RATE of 100 will lead to an average of one sampled packet out of every 100 observed." With this semantics, the rates that we can express with an unsigned 32-bits number are very unevenly distributed and concentrated towards "sampling few packets". For example, we can express a probability of 2.32E-8% but we cannot express anything between 100% and 50%. For sampling applications that are capable of sampling a decent amount of packets, this sampling rate semantics is not very useful. Add a new flag to the uAPI that indicates that the sampling rate is expressed in scaled probability, this is: - 0 is 0% probability, no packets get sampled. - U32_MAX is 100% probability, all packets get sampled. Signed-off-by: Adrian Moreno --- include/net/psample.h | 3 ++- include/uapi/linux/psample.h | 10 +++++++++- include/uapi/linux/tc_act/tc_sample.h | 1 + net/psample/psample.c | 3 +++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/net/psample.h b/include/net/psample.h index 2ac71260a546..c52e9ebd88dd 100644 --- a/include/net/psample.h +++ b/include/net/psample.h @@ -24,7 +24,8 @@ struct psample_metadata { u8 out_tc_valid:1, out_tc_occ_valid:1, latency_valid:1, - unused:5; + rate_as_probability:1, + unused:4; const u8 *user_cookie; u32 user_cookie_len; }; diff --git a/include/uapi/linux/psample.h b/include/uapi/linux/psample.h index e80637e1d97b..b765f0e81f20 100644 --- a/include/uapi/linux/psample.h +++ b/include/uapi/linux/psample.h @@ -8,7 +8,11 @@ enum { PSAMPLE_ATTR_ORIGSIZE, PSAMPLE_ATTR_SAMPLE_GROUP, PSAMPLE_ATTR_GROUP_SEQ, - PSAMPLE_ATTR_SAMPLE_RATE, + PSAMPLE_ATTR_SAMPLE_RATE, /* u32, ratio between observed and + * sampled packets or scaled probability + * if PSAMPLE_ATTR_SAMPLE_PROBABILITY + * is set. + */ PSAMPLE_ATTR_DATA, PSAMPLE_ATTR_GROUP_REFCOUNT, PSAMPLE_ATTR_TUNNEL, @@ -20,6 +24,10 @@ enum { PSAMPLE_ATTR_TIMESTAMP, /* u64, nanoseconds */ PSAMPLE_ATTR_PROTO, /* u16 */ PSAMPLE_ATTR_USER_COOKIE, /* binary, user provided data */ + PSAMPLE_ATTR_SAMPLE_PROBABILITY,/* no argument, interpret rate in + * PSAMPLE_ATTR_SAMPLE_RATE as a + * probability scaled 0 - U32_MAX. + */ =20 __PSAMPLE_ATTR_MAX }; diff --git a/include/uapi/linux/tc_act/tc_sample.h b/include/uapi/linux/tc_= act/tc_sample.h index fee1bcc20793..7ee0735e7b38 100644 --- a/include/uapi/linux/tc_act/tc_sample.h +++ b/include/uapi/linux/tc_act/tc_sample.h @@ -18,6 +18,7 @@ enum { TCA_SAMPLE_TRUNC_SIZE, TCA_SAMPLE_PSAMPLE_GROUP, TCA_SAMPLE_PAD, + TCA_SAMPLE_PROBABILITY, __TCA_SAMPLE_MAX }; #define TCA_SAMPLE_MAX (__TCA_SAMPLE_MAX - 1) diff --git a/net/psample/psample.c b/net/psample/psample.c index 1c76f3e48dcd..f48b5b9cd409 100644 --- a/net/psample/psample.c +++ b/net/psample/psample.c @@ -497,6 +497,9 @@ void psample_sample_packet(struct psample_group *group,= struct sk_buff *skb, md->user_cookie)) goto error; =20 + if (md->rate_as_probability) + nla_put_flag(skb, PSAMPLE_ATTR_SAMPLE_PROBABILITY); + genlmsg_end(nl_skb, data); genlmsg_multicast_netns(&psample_nl_family, group->net, nl_skb, 0, PSAMPLE_NL_MCGRP_SAMPLE, GFP_ATOMIC); --=20 2.45.1 From nobody Sun Feb 8 15:35:29 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 C0E70172BD1 for ; Fri, 21 Jun 2024 10:12:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964723; cv=none; b=mN7eIn+gwmQvj6aL59iHzaO9n9BDO0wNNOgclqrIBg26aZm8vF5qK11Q0yVr0GxKj/a3D6TvXzD+Z73ZElkXwk3jbNs8UOsGTiQJz1h+NtUVKYeY73+pTeyO2DTrGB+7x2nqh8mD1eRh2NlnAYWdThnRbvi/OJVCkNLHxc3Z7RY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964723; c=relaxed/simple; bh=MBy7MbKcaMmlZtolk1qmvg52y1Dp0SLBQxkYIw7Dn+s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=coLus5Eu2tW3XywUqNgXhyDCJ3O2pc6fMDJeqBh00FIrWM48p0o+tweNG2EBor+pdVN9Nf9W6xRzKlJdrQP5zqeACIJAmGcdPMl/GWsNlBEKL5FzZkmyb/1FPgmYofAL4A0mMPNe8KStuXLHFNL04T64RJcLETsqGhuX1UyQths= 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=cHs2XnFn; arc=none smtp.client-ip=170.10.129.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="cHs2XnFn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718964720; 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=++IGiPgKZqzgTdH1SlfPcZMAcPTpcgeG6gGJsr+p7fE=; b=cHs2XnFneerg2Ie8w/upfWhV+m+ydVFa4hThWIh8H5NW4YCLGa7Pgj/31lyyU1k4KWjr1P eJ7ukCpq/or2QU6as2saNILWl6ArB9g95MFey6TdCyOb2j2n/SJVwDZPSpgxAo6LGKew6m doE840phgqkskTmpt7Pr0GGJGthxvhA= 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-605-7htj8x5SP0OZk3ZepR7F7A-1; Fri, 21 Jun 2024 06:11:57 -0400 X-MC-Unique: 7htj8x5SP0OZk3ZepR7F7A-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 C9A1519560B7; Fri, 21 Jun 2024 10:11:55 +0000 (UTC) Received: from antares.redhat.com (unknown [10.39.193.189]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 561061956048; Fri, 21 Jun 2024 10:11:51 +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 , Donald Hunter , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Pravin B Shelar , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 05/10] net: openvswitch: add emit_sample action Date: Fri, 21 Jun 2024 12:10:57 +0200 Message-ID: <20240621101113.2185308-6-amorenoz@redhat.com> In-Reply-To: <20240621101113.2185308-1-amorenoz@redhat.com> References: <20240621101113.2185308-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.17 Content-Type: text/plain; charset="utf-8" Add support for a new action: emit_sample. This action accepts a u32 group id and a variable-length cookie and uses the psample multicast group to make the packet available for observability. The maximum length of the user-defined cookie is set to 16, same as tc_cookie, to discourage using cookies that will not be offloadable. Signed-off-by: Adrian Moreno --- Documentation/netlink/specs/ovs_flow.yaml | 17 +++++++++ include/uapi/linux/openvswitch.h | 28 ++++++++++++++ net/openvswitch/Kconfig | 1 + net/openvswitch/actions.c | 45 +++++++++++++++++++++++ net/openvswitch/flow_netlink.c | 33 ++++++++++++++++- 5 files changed, 123 insertions(+), 1 deletion(-) diff --git a/Documentation/netlink/specs/ovs_flow.yaml b/Documentation/netl= ink/specs/ovs_flow.yaml index 4fdfc6b5cae9..a7ab5593a24f 100644 --- a/Documentation/netlink/specs/ovs_flow.yaml +++ b/Documentation/netlink/specs/ovs_flow.yaml @@ -727,6 +727,12 @@ attribute-sets: name: dec-ttl type: nest nested-attributes: dec-ttl-attrs + - + name: emit-sample + type: nest + nested-attributes: emit-sample-attrs + doc: | + Sends a packet sample to psample for external observation. - name: tunnel-key-attrs enum-name: ovs-tunnel-key-attr @@ -938,6 +944,17 @@ attribute-sets: - name: gbp type: u32 + - + name: emit-sample-attrs + enum-name: ovs-emit-sample-attr + name-prefix: ovs-emit-sample-attr- + attributes: + - + name: group + type: u32 + - + name: cookie + type: binary =20 operations: name-prefix: ovs-flow-cmd- diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswi= tch.h index efc82c318fa2..8cfa1b3f6b06 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h @@ -914,6 +914,31 @@ struct check_pkt_len_arg { }; #endif =20 +#define OVS_EMIT_SAMPLE_COOKIE_MAX_SIZE 16 +/** + * enum ovs_emit_sample_attr - Attributes for %OVS_ACTION_ATTR_EMIT_SAMPLE + * action. + * + * @OVS_EMIT_SAMPLE_ATTR_GROUP: 32-bit number to identify the source of the + * sample. + * @OVS_EMIT_SAMPLE_ATTR_COOKIE: A variable-length binary cookie that cont= ains + * user-defined metadata. The maximum length is OVS_EMIT_SAMPLE_COOKIE_MAX= _SIZE + * bytes. + * + * Sends the packet to the psample multicast group with the specified grou= p and + * cookie. It is possible to combine this action with the + * %OVS_ACTION_ATTR_TRUNC action to limit the size of the packet being emi= tted. + */ +enum ovs_emit_sample_attr { + OVS_EMIT_SAMPLE_ATTR_GROUP =3D 1, /* u32 number. */ + OVS_EMIT_SAMPLE_ATTR_COOKIE, /* Optional, user specified cookie. */ + + /* private: */ + __OVS_EMIT_SAMPLE_ATTR_MAX +}; + +#define OVS_EMIT_SAMPLE_ATTR_MAX (__OVS_EMIT_SAMPLE_ATTR_MAX - 1) + /** * enum ovs_action_attr - Action types. * @@ -966,6 +991,8 @@ struct check_pkt_len_arg { * of l3 tunnel flag in the tun_flags field of OVS_ACTION_ATTR_ADD_MPLS * argument. * @OVS_ACTION_ATTR_DROP: Explicit drop action. + * @OVS_ACTION_ATTR_EMIT_SAMPLE: Send a sample of the packet to external + * observers via psample. * * Only a single header can be set with a single %OVS_ACTION_ATTR_SET. No= t all * fields within a header are modifiable, e.g. the IPv4 protocol and fragm= ent @@ -1004,6 +1031,7 @@ enum ovs_action_attr { OVS_ACTION_ATTR_ADD_MPLS, /* struct ovs_action_add_mpls. */ OVS_ACTION_ATTR_DEC_TTL, /* Nested OVS_DEC_TTL_ATTR_*. */ OVS_ACTION_ATTR_DROP, /* u32 error code. */ + OVS_ACTION_ATTR_EMIT_SAMPLE, /* Nested OVS_EMIT_SAMPLE_ATTR_*. */ =20 __OVS_ACTION_ATTR_MAX, /* Nothing past this will be accepted * from userspace. */ diff --git a/net/openvswitch/Kconfig b/net/openvswitch/Kconfig index 29a7081858cd..2535f3f9f462 100644 --- a/net/openvswitch/Kconfig +++ b/net/openvswitch/Kconfig @@ -10,6 +10,7 @@ config OPENVSWITCH (NF_CONNTRACK && ((!NF_DEFRAG_IPV6 || NF_DEFRAG_IPV6) && \ (!NF_NAT || NF_NAT) && \ (!NETFILTER_CONNCOUNT || NETFILTER_CONNCOUNT))) + depends on PSAMPLE || !PSAMPLE select LIBCRC32C select MPLS select NET_MPLS_GSO diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 964225580824..1f555cbba312 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -24,6 +24,11 @@ #include #include #include + +#if IS_ENABLED(CONFIG_PSAMPLE) +#include +#endif + #include =20 #include "datapath.h" @@ -1299,6 +1304,37 @@ static int execute_dec_ttl(struct sk_buff *skb, stru= ct sw_flow_key *key) return 0; } =20 +static void execute_emit_sample(struct datapath *dp, struct sk_buff *skb, + const struct sw_flow_key *key, + const struct nlattr *attr) +{ +#if IS_ENABLED(CONFIG_PSAMPLE) + struct psample_group psample_group =3D {}; + struct psample_metadata md =3D {}; + const struct nlattr *a; + int rem; + + nla_for_each_attr(a, nla_data(attr), nla_len(attr), rem) { + switch (nla_type(a)) { + case OVS_EMIT_SAMPLE_ATTR_GROUP: + psample_group.group_num =3D nla_get_u32(a); + break; + + case OVS_EMIT_SAMPLE_ATTR_COOKIE: + md.user_cookie =3D nla_data(a); + md.user_cookie_len =3D nla_len(a); + break; + } + } + + psample_group.net =3D ovs_dp_get_net(dp); + md.in_ifindex =3D OVS_CB(skb)->input_vport->dev->ifindex; + md.trunc_size =3D skb->len - OVS_CB(skb)->cutlen; + + psample_sample_packet(&psample_group, skb, 0, &md); +#endif +} + /* Execute a list of actions against 'skb'. */ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb, struct sw_flow_key *key, @@ -1502,6 +1538,15 @@ static int do_execute_actions(struct datapath *dp, s= truct sk_buff *skb, ovs_kfree_skb_reason(skb, reason); return 0; } + + case OVS_ACTION_ATTR_EMIT_SAMPLE: + execute_emit_sample(dp, skb, key, a); + OVS_CB(skb)->cutlen =3D 0; + if (nla_is_last(a, rem)) { + consume_skb(skb); + return 0; + } + break; } =20 if (unlikely(err)) { diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index f224d9bcea5e..29c8cdc44433 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c @@ -64,6 +64,7 @@ static bool actions_may_change_flow(const struct nlattr *= actions) case OVS_ACTION_ATTR_TRUNC: case OVS_ACTION_ATTR_USERSPACE: case OVS_ACTION_ATTR_DROP: + case OVS_ACTION_ATTR_EMIT_SAMPLE: break; =20 case OVS_ACTION_ATTR_CT: @@ -2409,7 +2410,7 @@ static void ovs_nla_free_nested_actions(const struct = nlattr *actions, int len) /* Whenever new actions are added, the need to update this * function should be considered. */ - BUILD_BUG_ON(OVS_ACTION_ATTR_MAX !=3D 24); + BUILD_BUG_ON(OVS_ACTION_ATTR_MAX !=3D 25); =20 if (!actions) return; @@ -3157,6 +3158,29 @@ static int validate_and_copy_check_pkt_len(struct ne= t *net, return 0; } =20 +static int validate_emit_sample(const struct nlattr *attr) +{ + static const struct nla_policy policy[OVS_EMIT_SAMPLE_ATTR_MAX + 1] =3D { + [OVS_EMIT_SAMPLE_ATTR_GROUP] =3D { .type =3D NLA_U32 }, + [OVS_EMIT_SAMPLE_ATTR_COOKIE] =3D { + .type =3D NLA_BINARY, + .len =3D OVS_EMIT_SAMPLE_COOKIE_MAX_SIZE, + }, + }; + struct nlattr *a[OVS_EMIT_SAMPLE_ATTR_MAX + 1]; + int err; + + if (!IS_ENABLED(CONFIG_PSAMPLE)) + return -EOPNOTSUPP; + + err =3D nla_parse_nested(a, OVS_EMIT_SAMPLE_ATTR_MAX, attr, policy, + NULL); + if (err) + return err; + + return a[OVS_EMIT_SAMPLE_ATTR_GROUP] ? 0 : -EINVAL; +} + static int copy_action(const struct nlattr *from, struct sw_flow_actions **sfa, bool log) { @@ -3212,6 +3236,7 @@ static int __ovs_nla_copy_actions(struct net *net, co= nst struct nlattr *attr, [OVS_ACTION_ATTR_ADD_MPLS] =3D sizeof(struct ovs_action_add_mpls), [OVS_ACTION_ATTR_DEC_TTL] =3D (u32)-1, [OVS_ACTION_ATTR_DROP] =3D sizeof(u32), + [OVS_ACTION_ATTR_EMIT_SAMPLE] =3D (u32)-1, }; const struct ovs_action_push_vlan *vlan; int type =3D nla_type(a); @@ -3490,6 +3515,12 @@ static int __ovs_nla_copy_actions(struct net *net, c= onst struct nlattr *attr, return -EINVAL; break; =20 + case OVS_ACTION_ATTR_EMIT_SAMPLE: + err =3D validate_emit_sample(a); + if (err) + return err; + break; + default: OVS_NLERR(log, "Unknown Action type %d", type); return -EINVAL; --=20 2.45.1 From nobody Sun Feb 8 15:35:29 2026 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 A92BB176ABB for ; Fri, 21 Jun 2024 10:12:05 +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=1718964727; cv=none; b=XmdmMBa168F1M+4bUPhomHylp+N+ULuRQsCrWWVvDLeK9eZk5k3YcrgY8W147ZdjT8R8TBFfygE3oLaWKHykoasaC1oEqs5azfzwHb1bDsChT9QpI03JyKW7y2SSZ+2AdfDUR8M8te9pxfY9HrFb/8b7v+JQjvP5z8Dp5+YTO3g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964727; c=relaxed/simple; bh=TLgXOsnbMBfw+qAM9TZ7UDAPmwpdBqEG2mHftoCbV6M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=He9rO8fCEILrtmNcbgnwFeBQrFvPzaIEMbxFlOb0hQnoSSWurzyDUHPw4BIlaCUb+4uXOwN62J7QeW6G5G49pf+e+cIJ238gxcq5rIvr/0LpN1SZl6QWt6tVSKYxJKec9/RxNZRuCAt6jTGXpbebs+RvKoLoZSZB8Zmg435EMSs= 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=dg0bOleM; 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="dg0bOleM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718964724; 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=G4tsbBCQ/TpcXkk8fqlOC0aI9jmHAnBjEbttrU1YB00=; b=dg0bOleMBEYpdlzH8FCVhHG8fRtd7wJ3R7cQ8D3usmjW0wTxfNJ77Au6x/GrScbrnlH2Wz SayMPF1CJ9ISVC8Ru8yDxokxgP48i9c0VYAy8ExY7QbsnO8UTHujVD98cb1kcpmzAnGl7r 7t8Qu10Z9i9W0CACYq74tZ2i5lNgoZ0= Received: from mx-prod-mc-05.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-362-_qZ2qVkWNWKHJkLBOamWnA-1; Fri, 21 Jun 2024 06:12:02 -0400 X-MC-Unique: _qZ2qVkWNWKHJkLBOamWnA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9BB3B1956096; Fri, 21 Jun 2024 10:12:00 +0000 (UTC) Received: from antares.redhat.com (unknown [10.39.193.189]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BDD801956048; Fri, 21 Jun 2024 10:11:56 +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 , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 06/10] net: openvswitch: store sampling probability in cb. Date: Fri, 21 Jun 2024 12:10:58 +0200 Message-ID: <20240621101113.2185308-7-amorenoz@redhat.com> In-Reply-To: <20240621101113.2185308-1-amorenoz@redhat.com> References: <20240621101113.2185308-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.17 Content-Type: text/plain; charset="utf-8" When a packet sample is observed, the sampling rate that was used is important to estimate the real frequency of such event. Store the probability of the parent sample action in the skb's cb area and use it in emit_sample to pass it down to psample. Signed-off-by: Adrian Moreno --- include/uapi/linux/openvswitch.h | 3 ++- net/openvswitch/actions.c | 20 +++++++++++++++++--- net/openvswitch/datapath.h | 3 +++ net/openvswitch/vport.c | 1 + 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswi= tch.h index 8cfa1b3f6b06..823f22be1fcc 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h @@ -649,7 +649,8 @@ enum ovs_flow_attr { * Actions are passed as nested attributes. * * Executes the specified actions with the given probability on a per-pack= et - * basis. + * basis. Nested actions will be able to access the probability value of t= he + * parent @OVS_ACTION_ATTR_SAMPLE. */ enum ovs_sample_attr { OVS_SAMPLE_ATTR_UNSPEC, diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 1f555cbba312..85a2ff91379b 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -1048,12 +1048,15 @@ static int sample(struct datapath *dp, struct sk_bu= ff *skb, struct nlattr *sample_arg; int rem =3D nla_len(attr); const struct sample_arg *arg; + u32 init_probability; bool clone_flow_key; + int err; =20 /* The first action is always 'OVS_SAMPLE_ATTR_ARG'. */ sample_arg =3D nla_data(attr); arg =3D nla_data(sample_arg); actions =3D nla_next(sample_arg, &rem); + init_probability =3D OVS_CB(skb)->probability; =20 if ((arg->probability !=3D U32_MAX) && (!arg->probability || get_random_u32() > arg->probability)) { @@ -1062,9 +1065,16 @@ static int sample(struct datapath *dp, struct sk_buf= f *skb, return 0; } =20 + OVS_CB(skb)->probability =3D arg->probability; + clone_flow_key =3D !arg->exec; - return clone_execute(dp, skb, key, 0, actions, rem, last, - clone_flow_key); + err =3D clone_execute(dp, skb, key, 0, actions, rem, last, + clone_flow_key); + + if (!last) + OVS_CB(skb)->probability =3D init_probability; + + return err; } =20 /* When 'last' is true, clone() should always consume the 'skb'. @@ -1312,6 +1322,7 @@ static void execute_emit_sample(struct datapath *dp, = struct sk_buff *skb, struct psample_group psample_group =3D {}; struct psample_metadata md =3D {}; const struct nlattr *a; + u32 rate; int rem; =20 nla_for_each_attr(a, nla_data(attr), nla_len(attr), rem) { @@ -1330,8 +1341,11 @@ static void execute_emit_sample(struct datapath *dp,= struct sk_buff *skb, psample_group.net =3D ovs_dp_get_net(dp); md.in_ifindex =3D OVS_CB(skb)->input_vport->dev->ifindex; md.trunc_size =3D skb->len - OVS_CB(skb)->cutlen; + md.rate_as_probability =3D 1; + + rate =3D OVS_CB(skb)->probability ? OVS_CB(skb)->probability : U32_MAX; =20 - psample_sample_packet(&psample_group, skb, 0, &md); + psample_sample_packet(&psample_group, skb, rate, &md); #endif } =20 diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h index 0cd29971a907..9ca6231ea647 100644 --- a/net/openvswitch/datapath.h +++ b/net/openvswitch/datapath.h @@ -115,12 +115,15 @@ struct datapath { * fragmented. * @acts_origlen: The netlink size of the flow actions applied to this skb. * @cutlen: The number of bytes from the packet end to be removed. + * @probability: The sampling probability that was applied to this skb; 0 = means + * no sampling has occurred; U32_MAX means 100% probability. */ struct ovs_skb_cb { struct vport *input_vport; u16 mru; u16 acts_origlen; u32 cutlen; + u32 probability; }; #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb) =20 diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index 972ae01a70f7..8732f6e51ae5 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -500,6 +500,7 @@ int ovs_vport_receive(struct vport *vport, struct sk_bu= ff *skb, OVS_CB(skb)->input_vport =3D vport; OVS_CB(skb)->mru =3D 0; OVS_CB(skb)->cutlen =3D 0; + OVS_CB(skb)->probability =3D 0; if (unlikely(dev_net(skb->dev) !=3D ovs_dp_get_net(vport->dp))) { u32 mark; =20 --=20 2.45.1 From nobody Sun Feb 8 15:35:29 2026 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 E0567173345 for ; Fri, 21 Jun 2024 10:12:11 +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=1718964733; cv=none; b=kruR5fL3eHNdnurbXd377dm4HDTkvL+caDezUbUdWnogJcMchhq0Yj08L8nHveqj+1vxQgDs6D2kOB7Basv1KwcShO1w9WTxygxfDQJUC39oZVwDFESry9D+nWPjGGIHf5F7n8PerAzdPsgvHTVTWgeF5v4mjIk9jnedgMfwS+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964733; c=relaxed/simple; bh=jvbmoDSmXZXUhfmwWyMgepzh+MSZPYFxCQL2CGaUuNQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dSP/yfhEvO6fJsZRcHi291rIkLq1tP1bRLRPbnLDyVuls9QwIl28Zv8pjGKp4sCKsERJR1eZ3p3BHSdFO7o1UIQew+azD05HB4Ig8QvisPJL4vavj9X0vZW6pAxpeQxzVM8DVQ/Lw/fnIkPl/NVAsyBa52x7ahwQ6xhlEueg204= 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=XMbahAMM; 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="XMbahAMM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718964731; 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=n/SMGESx063UYipOpazaPSJ9WmTp374xvkBv3PVOUbk=; b=XMbahAMM/ZZmK0Dlmg2F/2vKrl01PjRhQaYQqEdlA5S5+6HmlyCSGhbyo4aBCgGzw+5iU1 4uFFt1U6Sq/gnKCZ5EQlD5Hf7OCnnhKx/bDRIWyYrZ92H/RiIZvQHPiNCn+vL7f46KaQ49 zaqimaomZESXeljZQsRKO3WZjJTxyeU= Received: from mx-prod-mc-03.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-582-b810AdYsOEydsUlwyfglYA-1; Fri, 21 Jun 2024 06:12:07 -0400 X-MC-Unique: b810AdYsOEydsUlwyfglYA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 293A319560B0; Fri, 21 Jun 2024 10:12:06 +0000 (UTC) Received: from antares.redhat.com (unknown [10.39.193.189]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5EDE71956048; Fri, 21 Jun 2024 10:12:01 +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 v4 07/10] selftests: openvswitch: add emit_sample action Date: Fri, 21 Jun 2024 12:10:59 +0200 Message-ID: <20240621101113.2185308-8-amorenoz@redhat.com> In-Reply-To: <20240621101113.2185308-1-amorenoz@redhat.com> References: <20240621101113.2185308-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.17 Content-Type: text/plain; charset="utf-8" Add sample and emit_sample action support to ovs-dpctl.py. Refactor common attribute parsing logic into an external function. Signed-off-by: Adrian Moreno --- .../selftests/net/openvswitch/ovs-dpctl.py | 162 +++++++++++++++++- 1 file changed, 161 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/t= esting/selftests/net/openvswitch/ovs-dpctl.py index 9f8dec2f6539..ddf4d999317c 100644 --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py @@ -8,6 +8,7 @@ import argparse import errno import ipaddress import logging +import math import multiprocessing import re import struct @@ -58,6 +59,7 @@ OVS_FLOW_CMD_DEL =3D 2 OVS_FLOW_CMD_GET =3D 3 OVS_FLOW_CMD_SET =3D 4 =20 +UINT32_MAX =3D 0xFFFFFFFF =20 def macstr(mac): outstr =3D ":".join(["%02X" % i for i in mac]) @@ -267,6 +269,75 @@ def parse_extract_field( return str_skipped, data =20 =20 +def parse_attrs(actstr, attr_desc): + """Parses the given action string and returns a list of netlink + attributes based on a list of attribute descriptions. + + Each element in the attribute description list is a tuple such as: + (name, attr_name, parse_func) + where: + name: is the string representing the attribute + attr_name: is the name of the attribute as defined in the uAPI. + parse_func: is a callable accepting a string and returning either + a single object (the parsed attribute value) or a tuple of + two values (the parsed attribute value and the remaining strin= g) + + Returns a list of attributes and the remaining string. + """ + def parse_attr(actstr, key, func): + actstr =3D actstr[len(key) :] + + if not func: + return None, actstr + + delim =3D actstr[0] + actstr =3D actstr[1:] + + if delim =3D=3D "=3D": + pos =3D strcspn(actstr, ",)") + ret =3D func(actstr[:pos]) + else: + ret =3D func(actstr) + + if isinstance(ret, tuple): + (datum, actstr) =3D ret + else: + datum =3D ret + actstr =3D actstr[strcspn(actstr, ",)"):] + + if delim =3D=3D "(": + if not actstr or actstr[0] !=3D ")": + raise ValueError("Action contains unbalanced parentheses") + + actstr =3D actstr[1:] + + actstr =3D actstr[strspn(actstr, ", ") :] + + return datum, actstr + + attrs =3D [] + attr_desc =3D list(attr_desc) + while actstr and actstr[0] !=3D ")" and attr_desc: + found =3D False + for i, (key, attr, func) in enumerate(attr_desc): + if actstr.startswith(key): + datum, actstr =3D parse_attr(actstr, key, func) + attrs.append([attr, datum]) + found =3D True + del attr_desc[i] + + if not found: + raise ValueError("Unknown attribute: '%s'" % actstr) + + actstr =3D actstr[strspn(actstr, ", ") :] + + if actstr[0] !=3D ")": + raise ValueError("Action string contains extra garbage or has " + "unbalanced parenthesis: '%s'" % actstr) + + return attrs, actstr[1:] + + class ovs_dp_msg(genlmsg): # include the OVS version # We need a custom header rather than just being able to rely on @@ -285,7 +356,7 @@ class ovsactions(nla): ("OVS_ACTION_ATTR_SET", "none"), ("OVS_ACTION_ATTR_PUSH_VLAN", "none"), ("OVS_ACTION_ATTR_POP_VLAN", "flag"), - ("OVS_ACTION_ATTR_SAMPLE", "none"), + ("OVS_ACTION_ATTR_SAMPLE", "sample"), ("OVS_ACTION_ATTR_RECIRC", "uint32"), ("OVS_ACTION_ATTR_HASH", "none"), ("OVS_ACTION_ATTR_PUSH_MPLS", "none"), @@ -304,8 +375,85 @@ class ovsactions(nla): ("OVS_ACTION_ATTR_ADD_MPLS", "none"), ("OVS_ACTION_ATTR_DEC_TTL", "none"), ("OVS_ACTION_ATTR_DROP", "uint32"), + ("OVS_ACTION_ATTR_EMIT_SAMPLE", "emit_sample"), ) =20 + class emit_sample(nla): + nla_flags =3D NLA_F_NESTED + + nla_map =3D ( + ("OVS_EMIT_SAMPLE_ATTR_UNSPEC", "none"), + ("OVS_EMIT_SAMPLE_ATTR_GROUP", "uint32"), + ("OVS_EMIT_SAMPLE_ATTR_COOKIE", "array(uint8)"), + ) + + def dpstr(self, more=3DFalse): + args =3D "group=3D%d" % self.get_attr("OVS_EMIT_SAMPLE_ATTR_GR= OUP") + + cookie =3D self.get_attr("OVS_EMIT_SAMPLE_ATTR_COOKIE") + if cookie: + args +=3D ",cookie(%s)" % \ + "".join(format(x, "02x") for x in cookie) + + return "emit_sample(%s)" % args + + def parse(self, actstr): + desc =3D ( + ("group", "OVS_EMIT_SAMPLE_ATTR_GROUP", int), + ("cookie", "OVS_EMIT_SAMPLE_ATTR_COOKIE", + lambda x: list(bytearray.fromhex(x))) + ) + + attrs, actstr =3D parse_attrs(actstr, desc) + + for attr in attrs: + self["attrs"].append(attr) + + return actstr + + class sample(nla): + nla_flags =3D NLA_F_NESTED + + nla_map =3D ( + ("OVS_SAMPLE_ATTR_UNSPEC", "none"), + ("OVS_SAMPLE_ATTR_PROBABILITY", "uint32"), + ("OVS_SAMPLE_ATTR_ACTIONS", "ovsactions"), + ) + + def dpstr(self, more=3DFalse): + args =3D [] + + args.append("sample=3D{:.2f}%".format( + 100 * self.get_attr("OVS_SAMPLE_ATTR_PROBABILITY") / + UINT32_MAX)) + + actions =3D self.get_attr("OVS_SAMPLE_ATTR_ACTIONS") + if actions: + args.append("actions(%s)" % actions.dpstr(more)) + + return "sample(%s)" % ",".join(args) + + def parse(self, actstr): + def parse_nested_actions(actstr): + subacts =3D ovsactions() + parsed_len =3D subacts.parse(actstr) + return subacts, actstr[parsed_len :] + + def percent_to_rate(percent): + percent =3D float(percent.strip('%')) + return int(math.floor(UINT32_MAX * (percent / 100.0) + .5)) + + desc =3D ( + ("sample", "OVS_SAMPLE_ATTR_PROBABILITY", percent_to_rate), + ("actions", "OVS_SAMPLE_ATTR_ACTIONS", parse_nested_action= s), + ) + attrs, actstr =3D parse_attrs(actstr, desc) + + for attr in attrs: + self["attrs"].append(attr) + + return actstr + class ctact(nla): nla_flags =3D NLA_F_NESTED =20 @@ -637,6 +785,18 @@ class ovsactions(nla): self["attrs"].append(["OVS_ACTION_ATTR_CT", ctact]) parsed =3D True =20 + elif parse_starts_block(actstr, "sample(", False): + sampleact =3D self.sample() + actstr =3D sampleact.parse(actstr[len("sample(") : ]) + self["attrs"].append(["OVS_ACTION_ATTR_SAMPLE", sampleact]) + parsed =3D True + + elif parse_starts_block(actstr, "emit_sample(", False): + emitact =3D self.emit_sample() + actstr =3D emitact.parse(actstr[len("emit_sample(") : ]) + self["attrs"].append(["OVS_ACTION_ATTR_EMIT_SAMPLE", emita= ct]) + parsed =3D True + actstr =3D actstr[strspn(actstr, ", ") :] while parencount > 0: parencount -=3D 1 --=20 2.45.1 From nobody Sun Feb 8 15:35:29 2026 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 1FB41178377 for ; Fri, 21 Jun 2024 10:12:17 +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=1718964738; cv=none; b=LyU/OL/f/2kiF2WffTfhdbAPVE1FYli2YdTUebk5TW7u+CW4eqXXrl9VOzkfd5h3SzChexmXAD6kQwwaPqTUUH4LTt/o9aR5dSji7qNtlmO+KTR6zipHeqFuQ7pQGQWHIs+LiStmlA4vWT/3JfWOXRJ+s/Lhqhu0Nh+b03zhxTo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964738; c=relaxed/simple; bh=mtBJ/V1IIRB4mNznMgJ2S7o2Tvjn+KPcNGhQmZODsJo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jCFJefQEwK4eiOHIfW/VvcVN+QD0NRi3rY1JIMCp/+zud65Ld7ODhR2rIRMFaccWbrVTr/G2koiteBxd4XOwPX9qN7jkWqIZn+DQ1BTEzfd9YY/6cqFpFRAJoYzO9mx04VyT3Bi+1uFKGM2y1M9Mga7o//sPuaugr42ApTXVoqU= 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=ddF5RYVA; 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="ddF5RYVA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718964736; 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=zcAs18J6BrHJ+tKKq/UE15hx5Fffl3E+01zCrNA89yQ=; b=ddF5RYVA5tj1hjmeSFDdLZFpUhUqJfwXj57IgxwePGoXlNnaXWFMTEM9hdpC7jeZhLEy1R hJ/NmZrvXA4p4OMEgNyNsgbk45YsZlS3ec6JuiYPLWtElbedSSB2werlipcWJzEuUqclnO W5WLFuF4J1q9UxnilAZxyGXwVYaLplE= Received: from mx-prod-mc-05.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-304-yAFJNqbQOkSMm23m2xdvlA-1; Fri, 21 Jun 2024 06:12:13 -0400 X-MC-Unique: yAFJNqbQOkSMm23m2xdvlA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 788B61956086; Fri, 21 Jun 2024 10:12:11 +0000 (UTC) Received: from antares.redhat.com (unknown [10.39.193.189]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B6E771956048; Fri, 21 Jun 2024 10:12:06 +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 v4 08/10] selftests: openvswitch: add userspace parsing Date: Fri, 21 Jun 2024 12:11:00 +0200 Message-ID: <20240621101113.2185308-9-amorenoz@redhat.com> In-Reply-To: <20240621101113.2185308-1-amorenoz@redhat.com> References: <20240621101113.2185308-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.17 Content-Type: text/plain; charset="utf-8" The userspace action lacks parsing support plus it contains a bug in the name of one of its attributes. This patch makes userspace action work. Signed-off-by: Adrian Moreno --- .../selftests/net/openvswitch/ovs-dpctl.py | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/t= esting/selftests/net/openvswitch/ovs-dpctl.py index ddf4d999317c..071309289cff 100644 --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py @@ -575,13 +575,27 @@ class ovsactions(nla): print_str +=3D "userdata=3D" for f in self.get_attr("OVS_USERSPACE_ATTR_USERDATA"): print_str +=3D "%x." % f - if self.get_attr("OVS_USERSPACE_ATTR_TUN_PORT") is not None: + if self.get_attr("OVS_USERSPACE_ATTR_EGRESS_TUN_PORT") is not = None: print_str +=3D "egress_tun_port=3D%d" % self.get_attr( - "OVS_USERSPACE_ATTR_TUN_PORT" + "OVS_USERSPACE_ATTR_EGRESS_TUN_PORT" ) print_str +=3D ")" return print_str =20 + def parse(self, actstr): + attrs_desc =3D ( + ("pid", "OVS_USERSPACE_ATTR_PID", int), + ("userdata", "OVS_USERSPACE_ATTR_USERDATA", + lambda x: list(bytearray.fromhex(x))), + ("egress_tun_port", "OVS_USERSPACE_ATTR_EGRESS_TUN_PORT", = int) + ) + + attrs, actstr =3D parse_attrs(actstr, attrs_desc) + for attr in attrs: + self["attrs"].append(attr) + + return actstr + def dpstr(self, more=3DFalse): print_str =3D "" =20 @@ -797,6 +811,12 @@ class ovsactions(nla): self["attrs"].append(["OVS_ACTION_ATTR_EMIT_SAMPLE", emita= ct]) parsed =3D True =20 + elif parse_starts_block(actstr, "userspace(", False): + uact =3D self.userspace() + actstr =3D uact.parse(actstr[len("userspace(") : ]) + self["attrs"].append(["OVS_ACTION_ATTR_USERSPACE", uact]) + parsed =3D True + actstr =3D actstr[strspn(actstr, ", ") :] while parencount > 0: parencount -=3D 1 --=20 2.45.1 From nobody Sun Feb 8 15:35:29 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 483B91741E5 for ; Fri, 21 Jun 2024 10:12:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964744; cv=none; b=M5O8wFNmgod8vveDBXTApm4Yu/dQDjufb5bJ+JrFmaigHI7WMW+x912ZCf/wBQOmF2ozUfpgnBXb6FWkdlGOBcoCmJ2H4ga8+4DJsS8qWsprwJCFsf1IssdFesSNsrxcrhQ9O9N6mku7Ygh/VvfD3euODQZock11txIKLtTM2Jw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964744; c=relaxed/simple; bh=s+46G/HTgSaAvzWEPRF8IdXtAuOgoUmoSsA67yBkcHk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uLWyZb+Kplnp+7MlzjvuePapy3SP4yGw+YMz4JhaJ4fe7ni1bDIKsp/6VMTqkPp5ZRtx6669M1zV7dj0PLukuyo0R6jp8rMG2fRUcRDAg9JH80Eu6z5ApXfJnSvTWEOxRghW7bsKQFKD+scIVeIKN3VaDHBD5ed4zt4Fn3PZP/c= 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=AzXtxZnm; arc=none smtp.client-ip=170.10.129.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="AzXtxZnm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718964742; 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=IAes/b2lFjyrQBJvsuBEssQ0NLIE1Z/gUqbX5ekLpT4=; b=AzXtxZnmQRO1IfqRGmvg7FhohCFil9AAq4nPbT4TpOKSvwCaBvtoItz0u1H4B0ZA8LBdQz r6Ms4/2PJ04woC/+xpes08n92uidnTwx2y8sssUIHdHFEvmZytCiDgpb0svVmo7+hWW+cg O29RPbA8BG4OtNrC3szMUdQUG8hHEVU= Received: from mx-prod-mc-01.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-515-2QwlXqyUM0abHmADpQo6Og-1; Fri, 21 Jun 2024 06:12:19 -0400 X-MC-Unique: 2QwlXqyUM0abHmADpQo6Og-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8489219560A1; Fri, 21 Jun 2024 10:12:16 +0000 (UTC) Received: from antares.redhat.com (unknown [10.39.193.189]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 53C3C1956048; Fri, 21 Jun 2024 10:12:11 +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 v4 09/10] selftests: openvswitch: parse trunc action Date: Fri, 21 Jun 2024 12:11:01 +0200 Message-ID: <20240621101113.2185308-10-amorenoz@redhat.com> In-Reply-To: <20240621101113.2185308-1-amorenoz@redhat.com> References: <20240621101113.2185308-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.17 Content-Type: text/plain; charset="utf-8" The trunc action was supported decode-able but not parse-able. Add support for parsing the action string. Signed-off-by: Adrian Moreno --- .../testing/selftests/net/openvswitch/ovs-dpctl.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/t= esting/selftests/net/openvswitch/ovs-dpctl.py index 071309289cff..a3c26ddac42f 100644 --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py @@ -817,6 +817,19 @@ class ovsactions(nla): self["attrs"].append(["OVS_ACTION_ATTR_USERSPACE", uact]) parsed =3D True =20 + elif parse_starts_block(actstr, "trunc(", False): + parencount +=3D 1 + actstr, val =3D parse_extract_field( + actstr, + "trunc(", + r"([0-9]+)", + int, + False, + None, + ) + self["attrs"].append(["OVS_ACTION_ATTR_TRUNC", val]) + parsed =3D True + actstr =3D actstr[strspn(actstr, ", ") :] while parencount > 0: parencount -=3D 1 --=20 2.45.1 From nobody Sun Feb 8 15:35:29 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 317EC17B401 for ; Fri, 21 Jun 2024 10:12:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964748; cv=none; b=Gm4hynmV+6W+nCX9GwJiYnbQ2GqfjP9u5eQH8D8wye6U/xdohzW+OFxnNjR86lUP6lE0f5j9uzjeZZh3y3BN+Rt77Gf9cez2Bij0W0FfCt91gBu3H//yZlW7d9jye6sHvu8WNclAOl8NS1HxhUNz2yxYqEuGPVsM59OUv6I0ttc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718964748; c=relaxed/simple; bh=lrQmBWHEgRZGt3qqWfvkr5wwYpPfCkU6W0Xy+X29MQQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TtkljrngEvK0vZWa1tZfBrEn3Ia1zACWdWJgIiKnS5XQ+0pvq5TZyTHjHu5qzNNDPldajoEZqRsRD2/+gXx2XhHZ3oiI06oDlRATUvzD1VB0ONzIWvs1gP9FqN/kCP2KoJwr8F91Thd5iDETPj9WAEYDzzUCibgUsjs4CxCc2qs= 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=iAU6ESyu; arc=none smtp.client-ip=170.10.129.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="iAU6ESyu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718964746; 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=pTJUxCKffkBrzqCPEFK7LRAjyE3x2giL24jMT6+yDtE=; b=iAU6ESyuiWk2aLheOXoQ0LelwPXYN4yG1x5ZtGtqBOZi1gbVe9CZdrSQmAfQyKF3oIXIRN gEu5528WRbvhbhy81vAQSV4oIu6RnEkrdTXWG8SK9u7YzzRJGDZaCqa/Jv170OXa+As1Xb u5an0UxhSxp60fxidEClTSXJXRSWvD4= Received: from mx-prod-mc-03.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-257-bGiFjcPUNM-D6UlEUelAIQ-1; Fri, 21 Jun 2024 06:12:23 -0400 X-MC-Unique: bGiFjcPUNM-D6UlEUelAIQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 514241956051; Fri, 21 Jun 2024 10:12:21 +0000 (UTC) Received: from antares.redhat.com (unknown [10.39.193.189]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 54C551956048; Fri, 21 Jun 2024 10:12:17 +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 v4 10/10] selftests: openvswitch: add emit_sample test Date: Fri, 21 Jun 2024 12:11:02 +0200 Message-ID: <20240621101113.2185308-11-amorenoz@redhat.com> In-Reply-To: <20240621101113.2185308-1-amorenoz@redhat.com> References: <20240621101113.2185308-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.17 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. Signed-off-by: Adrian Moreno --- .../selftests/net/openvswitch/openvswitch.sh | 110 +++++++++++++++++- .../selftests/net/openvswitch/ovs-dpctl.py | 73 +++++++++++- 2 files changed, 177 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/openvswitch/openvswitch.sh b/tools= /testing/selftests/net/openvswitch/openvswitch.sh index 15bca0708717..a07530ff13ca 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 + emit_sample emit_sample: Sampling packets with psample" =20 info() { [ $VERBOSE =3D 0 ] || echo $* @@ -102,12 +103,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 @@ -170,6 +180,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]..." @@ -184,6 +207,87 @@ usage() { exit 1 } =20 + +# emit_sample test +# - use emit_sample to observe packets +test_emit_sample() { + sbx_add "test_emit_sample" || return $? + + # Add a datapath with per-vport dispatching. + ovs_add_dp "test_emit_sample" emit_sample -V 2:1 || return 1 + + info "create namespaces" + ovs_add_netns_and_veths "test_emit_sample" "emit_sample" \ + client c0 c1 172.31.110.10/24 -u || return 1 + ovs_add_netns_and_veths "test_emit_sample" "emit_sample" \ + server s0 s1 172.31.110.20/24 -u || return 1 + + # Check if emit_sample actions can be configured. + ovs_add_flow "test_emit_sample" emit_sample \ + 'in_port(1),eth(),eth_type(0x0806),arp()' 'emit_sample(group=3D1)' + if [ $? =3D=3D 1 ]; then + info "no support for emit_sample - skipping" + ovs_exit_sig + return $ksft_skip + fi + + ovs_del_flows "test_emit_sample" emit_sample + + # Allow ARP + ovs_add_flow "test_emit_sample" emit_sample \ + 'in_port(1),eth(),eth_type(0x0806),arp()' '2' || return 1 + ovs_add_flow "test_emit_sample" emit_sample \ + 'in_port(2),eth(),eth_type(0x0806),arp()' '1' || return 1 + + # 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"*"emit_sample(group=3D1,cookie=3D1615141312111009080706= 050403020100)" \ + "no group with cookie"*"emit_sample(cookie=3Dabcd)" \ + "no group"*"sample()"; + do + set -- $testcase; + ovs_test_flow_fails "test_emit_sample" emit_sample $min_key $2 + if [ $? =3D=3D 1 ]; then + info "failed - $1" + return 1 + fi + done + IFS=3D$OLDIFS + + # Sample first 14 bytes of all traffic. + ovs_add_flow "test_emit_sample" emit_sample \ + "in_port(1),eth(),eth_type(0x0800),ipv4(src=3D172.31.110.10,proto=3D1),ic= mp()" "trunc(14),emit_sample(group=3D1,cookie=3Dc0ffee),2" + + # Sample all traffic. In this case, use a sample() action with both + # emit_sample 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_emit_sample" emit_sample \ + "in_port(2),eth(),eth_type(0x0800),ipv4(src=3D172.31.110.20,proto=3D1),ic= mp()" "sample(sample=3D100%,actions(emit_sample(group=3D2,cookie=3Deeff0c),= userspace(pid=3D${nlpid},userdata=3Deeff0c))),1" + + # Record emit_sample data. + ovs_spawn_daemon "test_emit_sample" python3 $ovs_base/ovs-dpctl.py psample + + # Send a single ping. + sleep 1 + ovs_sbx "test_emit_sample" 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 a3c26ddac42f..24e696d7371b 100644 --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py @@ -27,8 +27,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 =20 except ModuleNotFoundError: @@ -2211,10 +2213,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 Psample(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()= ): @@ -2274,7 +2336,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( @@ -2331,6 +2393,8 @@ def main(argv): delfscmd =3D subparsers.add_parser("del-flows") delfscmd.add_argument("flsbr", help=3D"Datapath name") =20 + subparsers.add_parser("psample") + args =3D parser.parse_args() =20 if args.verbose > 0: @@ -2345,6 +2409,9 @@ def main(argv): =20 sys.setrecursionlimit(100000) =20 + if args.subcommand =3D=3D "psample": + Psample().read_samples() + if hasattr(args, "showdp"): found =3D False for iface in ndb.interfaces: --=20 2.45.1