Commit 093b0f36 authored by Adrian Moreno's avatar Adrian Moreno Committed by Jakub Kicinski
Browse files

net: psample: add user cookie 



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: default avatarMichal Kubiak <michal.kubiak@intel.com>
Acked-by: default avatarEelco Chaudron <echaudro@redhat.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarAdrian Moreno <amorenoz@redhat.com>
Link: https://patch.msgid.link/20240704085710.353845-2-amorenoz@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 064fbc4e

include/net/psample.h

+2 −0
Original line number Diff line number Diff line
@@ -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;

};



struct psample_group *psample_group_get(struct net *net, u32 group_num);

include/uapi/linux/psample.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */



	__PSAMPLE_ATTR_MAX

};

net/psample/psample.c

+8 −1
Original line number Diff line number Diff line
@@ -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 */



#ifdef CONFIG_INET

	tun_info = skb_tunnel_info(skb);
@@ -486,6 +488,11 @@ void psample_sample_packet(struct psample_group *group, struct sk_buff *skb, 
	}

#endif



	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);