| Message ID | 20240630195740.1469727-2-amorenoz@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: openvswitch: Add sample multicasting. | expand |
On Sun, Jun 30, 2024 at 09:57:22PM +0200, Adrian Moreno wrote: > 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. > > Acked-by: Eelco Chaudron <echaudro@redhat.com> > Reviewed-by: Simon Horman <horms@kernel.org> > Reviewed-by: Ido Schimmel <idosch@nvidia.com> > Signed-off-by: Adrian Moreno <amorenoz@redhat.com> > --- > Reviewed-by: Michal Kubiak <michal.kubiak@intel.com>
Adrian Moreno <amorenoz@redhat.com> writes: > 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. > > Acked-by: Eelco Chaudron <echaudro@redhat.com> > Reviewed-by: Simon Horman <horms@kernel.org> > Reviewed-by: Ido Schimmel <idosch@nvidia.com> > Signed-off-by: Adrian Moreno <amorenoz@redhat.com> > --- Reviewed-by: Aaron Conole <aconole@redhat.com> > 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; > }; > > 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 */ > > __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 */ > > #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);
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; }; 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 */ __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 */ #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);