| Message ID | 20220406192956.3291614-2-vladimir.oltean@nxp.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | SOF_TIMESTAMPING_OPT_ID backport to 4.14 and 4.19 | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply, async |
On Wed, Apr 6, 2022 at 3:30 PM Vladimir Oltean <vladimir.oltean@nxp.com> wrote: > > From: Willem de Bruijn <willemb@google.com> > > [ Upstream commit fbfb2321e950918b430e7225546296b2dcadf725 ] > > Raw sockets support tx timestamping, but one case is missing. > > IPPROTO_RAW takes a separate packet construction path. raw_send_hdrinc > has an explicit call to sock_tx_timestamp, but rawv6_send_hdrinc does > not. Add it. > > Fixes: 11878b40ed5c ("net-timestamp: SOCK_RAW and PING timestamping") > Signed-off-by: Willem de Bruijn <willemb@google.com> > Acked-by: Soheil Hassas Yeganeh <soheil@google.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> For 4.14.y cherry-pick: Acked-by: Willem de Bruijn <willemb@google.com> Might be good to point out that this is not only a clean cherry-pick of the one-line patch, but has to include part of commit a818f75e311c ("net: ipv6: Hook into time based transmission") to plumb the sockcm_cookie. The rest of that patch is not a candidate for stable, so LGTM.
On Wed, Apr 06, 2022 at 03:45:14PM -0400, Willem de Bruijn wrote: > On Wed, Apr 6, 2022 at 3:30 PM Vladimir Oltean <vladimir.oltean@nxp.com> wrote: > > > > From: Willem de Bruijn <willemb@google.com> > > > > [ Upstream commit fbfb2321e950918b430e7225546296b2dcadf725 ] > > > > Raw sockets support tx timestamping, but one case is missing. > > > > IPPROTO_RAW takes a separate packet construction path. raw_send_hdrinc > > has an explicit call to sock_tx_timestamp, but rawv6_send_hdrinc does > > not. Add it. > > > > Fixes: 11878b40ed5c ("net-timestamp: SOCK_RAW and PING timestamping") > > Signed-off-by: Willem de Bruijn <willemb@google.com> > > Acked-by: Soheil Hassas Yeganeh <soheil@google.com> > > Signed-off-by: David S. Miller <davem@davemloft.net> > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> > > For 4.14.y cherry-pick: > > Acked-by: Willem de Bruijn <willemb@google.com> Thanks. > Might be good to point out that this is not only a clean cherry-pick > of the one-line patch, but has to include part of commit a818f75e311c > ("net: ipv6: Hook into time based transmission") to plumb the > sockcm_cookie. The rest of that patch is not a candidate for stable, > so LGTM. Point out how?
On Wed, Apr 6, 2022 at 5:15 PM Vladimir Oltean <vladimir.oltean@nxp.com> wrote: > > On Wed, Apr 06, 2022 at 03:45:14PM -0400, Willem de Bruijn wrote: > > On Wed, Apr 6, 2022 at 3:30 PM Vladimir Oltean <vladimir.oltean@nxp.com> wrote: > > > > > > From: Willem de Bruijn <willemb@google.com> > > > > > > [ Upstream commit fbfb2321e950918b430e7225546296b2dcadf725 ] > > > > > > Raw sockets support tx timestamping, but one case is missing. > > > > > > IPPROTO_RAW takes a separate packet construction path. raw_send_hdrinc > > > has an explicit call to sock_tx_timestamp, but rawv6_send_hdrinc does > > > not. Add it. > > > > > > Fixes: 11878b40ed5c ("net-timestamp: SOCK_RAW and PING timestamping") > > > Signed-off-by: Willem de Bruijn <willemb@google.com> > > > Acked-by: Soheil Hassas Yeganeh <soheil@google.com> > > > Signed-off-by: David S. Miller <davem@davemloft.net> > > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> > > > > For 4.14.y cherry-pick: > > > > Acked-by: Willem de Bruijn <willemb@google.com> > > Thanks. > > > Might be good to point out that this is not only a clean cherry-pick > > of the one-line patch, but has to include part of commit a818f75e311c > > ("net: ipv6: Hook into time based transmission") to plumb the > > sockcm_cookie. The rest of that patch is not a candidate for stable, > > so LGTM. > > Point out how? In this case I did, so we're good. In general, perhaps it's fine to add such comments below the original Signed-off-by/Acked-by/.. block? Not sure what the common approach is, if any.
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 3d9d20074203..f0d8b7e9a685 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -622,7 +622,7 @@ static int rawv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6, static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length, struct flowi6 *fl6, struct dst_entry **dstp, - unsigned int flags) + unsigned int flags, const struct sockcm_cookie *sockc) { struct ipv6_pinfo *np = inet6_sk(sk); struct net *net = sock_net(sk); @@ -659,6 +659,8 @@ static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length, skb->ip_summed = CHECKSUM_NONE; + sock_tx_timestamp(sk, sockc->tsflags, &skb_shinfo(skb)->tx_flags); + if (flags & MSG_CONFIRM) skb_set_dst_pending_confirm(skb, 1); @@ -945,7 +947,8 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) back_from_confirm: if (hdrincl) - err = rawv6_send_hdrinc(sk, msg, len, &fl6, &dst, msg->msg_flags); + err = rawv6_send_hdrinc(sk, msg, len, &fl6, &dst, + msg->msg_flags, &sockc); else { ipc6.opt = opt; lock_sock(sk);