From: Eelco Chaudron <echaudro@redhat.com>
To: "Adrián Moreno" <amorenoz@redhat.com>
Cc: netdev@vger.kernel.org, aconole@redhat.com, horms@kernel.org,
i.maximets@ovn.org, dev@openvswitch.org,
Jamal Hadi Salim <jhs@mojatatu.com>,
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
Subject: Re: [PATCH net-next v5 02/10] net: sched: act_sample: add action cookie to sample
Date: Thu, 27 Jun 2024 09:13:57 +0200 [thread overview]
Message-ID: <99A14DCC-2F9B-4770-927F-075978141D8E@redhat.com> (raw)
In-Reply-To: <CAG=2xmNjY8gRwLyoVzSHiU2yOotP7rguOuf4hdTicnCbw=38XA@mail.gmail.com>
On 26 Jun 2024, at 22:06, Adrián Moreno wrote:
> On Wed, Jun 26, 2024 at 04:28:01PM GMT, Eelco Chaudron wrote:
>>
>>
>> On 25 Jun 2024, at 22:51, Adrian Moreno 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>
>>> ---
>>> 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 *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);
>>
>> Maybe I’m over paranoid, but can we assume user_cookie->len, will not be larger than TC_COOKIE_MAX_SIZE?
>> Or should we do something like min(user_cookie->len, sizeof(cookie_data))
>>
>
> I think it's good to be paranoid with this kind of things. I do,
> however, think it should be safe to use. The cookie is extracted from
> the netlink attribute directly and its length is verified with the
> nla_policy [1]. So nothing that comes into the kernel should be larger
> than TC_COOKIE_MAX_SIZE.
ACK, confirmed that [1] seems to be the only way to set the cookie. So this patch seems fine to me too.
Acked-by: Eelco Chaudron <echaudro@redhat.com>
> I guess if there is some previous bug that allows for the size to get
> corrupted, then this might happen but doing those kind of checks in the
> fast path seems a bit excessive. For example, Ilya argued in v2 [2] that
> we should avoid zeroing "u8 cookie_data[TC_COOKIE_MAX_SIZE]" to safe the
> unneeded cycles.
>
> [1] https://github.com/torvalds/linux/blob/55027e689933ba2e64f3d245fb1ff185b3e7fc81/net/sched/act_api.c#L1299
> [2] https://patchwork.kernel.org/project/netdevbpf/patch/20240603185647.2310748-3-amorenoz@redhat.com/
>
> Thanks.
> Adrián
>
>>> + 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);
>>>
>>> --
>>> 2.45.1
>>
next prev parent reply other threads:[~2024-06-27 7:14 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-25 20:51 [PATCH net-next v5 00/10] net: openvswitch: Add sample multicasting Adrian Moreno
2024-06-25 20:51 ` [PATCH net-next v5 01/10] net: psample: add user cookie Adrian Moreno
2024-06-26 7:15 ` Ido Schimmel
2024-06-26 14:27 ` Eelco Chaudron
2024-06-25 20:51 ` [PATCH net-next v5 02/10] net: sched: act_sample: add action cookie to sample Adrian Moreno
2024-06-26 7:17 ` Ido Schimmel
2024-06-26 14:28 ` Eelco Chaudron
2024-06-26 20:06 ` Adrián Moreno
2024-06-27 7:13 ` Eelco Chaudron [this message]
2024-06-25 20:51 ` [PATCH net-next v5 03/10] net: psample: skip packet copy if no listeners Adrian Moreno
2024-06-26 7:18 ` Ido Schimmel
2024-06-26 14:28 ` Eelco Chaudron
2024-06-25 20:51 ` [PATCH net-next v5 04/10] net: psample: allow using rate as probability Adrian Moreno
2024-06-26 7:26 ` Ido Schimmel
2024-06-26 14:28 ` Eelco Chaudron
2024-06-25 20:51 ` [PATCH net-next v5 05/10] net: openvswitch: add emit_sample action Adrian Moreno
2024-06-26 10:51 ` Ilya Maximets
2024-06-26 20:07 ` Adrián Moreno
2024-06-27 7:44 ` Ilya Maximets
2024-06-26 14:28 ` Eelco Chaudron
2024-06-26 20:34 ` Adrián Moreno
2024-06-27 7:06 ` Eelco Chaudron
2024-06-25 20:51 ` [PATCH net-next v5 06/10] net: openvswitch: store sampling probability in cb Adrian Moreno
2024-06-26 10:52 ` Ilya Maximets
2024-06-26 14:28 ` Eelco Chaudron
2024-06-25 20:51 ` [PATCH net-next v5 07/10] selftests: openvswitch: add emit_sample action Adrian Moreno
2024-06-26 14:31 ` Aaron Conole
2024-06-25 20:51 ` [PATCH net-next v5 08/10] selftests: openvswitch: add userspace parsing Adrian Moreno
2024-06-26 14:32 ` Aaron Conole
2024-06-25 20:51 ` [PATCH net-next v5 09/10] selftests: openvswitch: parse trunc action Adrian Moreno
2024-06-26 14:21 ` Aaron Conole
2024-06-25 20:51 ` [PATCH net-next v5 10/10] selftests: openvswitch: add emit_sample test Adrian Moreno
2024-06-26 11:15 ` Ilya Maximets
2024-06-27 7:58 ` Adrián Moreno
2024-06-26 14:27 ` [PATCH net-next v5 00/10] net: openvswitch: Add sample multicasting Eelco Chaudron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=99A14DCC-2F9B-4770-927F-075978141D8E@redhat.com \
--to=echaudro@redhat.com \
--cc=aconole@redhat.com \
--cc=amorenoz@redhat.com \
--cc=davem@davemloft.net \
--cc=dev@openvswitch.org \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=i.maximets@ovn.org \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®