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

net: sched: act_sample: add action cookie to sample 



If the action has a user_cookie, pass it along to the sample so it can
be easily identified.

Reviewed-by: default avatarMichal Kubiak <michal.kubiak@intel.com>
Reviewed-by: default avatarAaron Conole <aconole@redhat.com>
Acked-by: default avatarEelco Chaudron <echaudro@redhat.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarAdrian Moreno <amorenoz@redhat.com>
Link: https://patch.msgid.link/20240704085710.353845-3-amorenoz@redhat.com


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

net/sched/act_sample.c

+12 −0
Original line number Diff line number Diff line
@@ -167,7 +167,9 @@ TC_INDIRECT_SCOPE int tcf_sample_act(struct sk_buff *skb, 
{

	struct tcf_sample *s = to_sample(a);

	struct psample_group *psample_group;

	u8 cookie_data[TC_COOKIE_MAX_SIZE];

	struct psample_metadata md = {};

	struct tc_cookie *user_cookie;

	int retval;



	tcf_lastuse_update(&s->tcf_tm);
@@ -189,6 +191,16 @@ TC_INDIRECT_SCOPE int tcf_sample_act(struct sk_buff *skb, 
		if (skb_at_tc_ingress(skb) && tcf_sample_dev_ok_push(skb->dev))

			skb_push(skb, skb->mac_len);



		rcu_read_lock();

		user_cookie = rcu_dereference(a->user_cookie);

		if (user_cookie) {

			memcpy(cookie_data, user_cookie->data,

			       user_cookie->len);

			md.user_cookie = cookie_data;

			md.user_cookie_len = user_cookie->len;

		}

		rcu_read_unlock();



		md.trunc_size = s->truncate ? s->trunc_size : skb->len;

		psample_sample_packet(psample_group, skb, s->rate, &md);