Received-SPF: pass (google.com: domain of linux-kernel+bounces-159231-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240424135109.3524355-1-amorenoz@redhat.com> <20240424135109.3524355-6-amorenoz@redhat.com>
In-Reply-To: <20240424135109.3524355-6-amorenoz@redhat.com>
From: Jamal Hadi Salim <jhs@mojatatu.com>
Date: Thu, 25 Apr 2024 17:43:52 -0400
Message-ID: <CAM0EoMm_deiQpaJts6=AKZ_0DtYk5EnRVSrfhJEJCpYnaw09Bg@mail.gmail.com>
Subject: Re: [PATCH net-next 5/8] net: sched: act_sample: add action cookie to sample
To: Adrian Moreno <amorenoz@redhat.com>
Cc: netdev@vger.kernel.org, aconole@redhat.com, echaudro@redhat.com, 
	horms@kernel.org, i.maximets@ovn.org, Cong Wang <xiyou.wangcong@gmail.com>, 
	Jiri Pirko <jiri@resnulli.us>, "David S. Miller" <davem@davemloft.net>, 
	Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Wed, Apr 24, 2024 at 9:54=E2=80=AFAM Adrian Moreno <amorenoz@redhat.com>=
 wrote:
>
> If the action has a user_cookie, pass it along to the sample so it can
> be easily identified.
>
> Signed-off-by: Adrian Moreno <amorenoz@redhat.com>
Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>

cheers,
jamal

> ---
>  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..5c3f86ec964a 100644
> --- a/net/sched/act_sample.c
> +++ b/net/sched/act_sample.c
> @@ -165,9 +165,11 @@ TC_INDIRECT_SCOPE int tcf_sample_act(struct sk_buff =
*skb,
>                                      const struct tc_action *a,
>                                      struct tcf_result *res)
>  {
> +       u8 cookie_data[TC_COOKIE_MAX_SIZE] =3D {};
>         struct tcf_sample *s =3D to_sample(a);
>         struct psample_group *psample_group;
>         struct psample_metadata md =3D {};
> +       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 =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);
>
> --
> 2.44.0
>