Abhishek Chauhan wrote: > tstamp_type can be real, mono or userspace timestamp. > > This commit adds userspace timestamp and sets it if there is > valid transmit_time available in socket coming from userspace. Comment is outdated: we now set the actual clockid_t (compressed into fewer bits), rather than an abstract "go see sk_clockid". > To make the design scalable for future needs this commit bring in > the change to extend the tstamp_type:1 to tstamp_type:2 to support > userspace timestamp. > > Link: https://lore.kernel.org/netdev/bc037db4-58bb-4861-ac31-a361a93841d3@xxxxxxxxx/ > Signed-off-by: Abhishek Chauhan <quic_abchauha@xxxxxxxxxxx> > --- > Changes since v2 > - Minor changes to commit subject > > Changes since v1 > - identified additional changes in BPF framework. > - Bit shift in SKB_MONO_DELIVERY_TIME_MASK and TC_AT_INGRESS_MASK. > - Made changes in skb_set_delivery_time to keep changes similar to > previous code for mono_delivery_time and just setting tstamp_type > bit 1 for userspace timestamp. > > > include/linux/skbuff.h | 19 +++++++++++++++---- > net/ipv4/ip_output.c | 2 +- > net/ipv4/raw.c | 2 +- > net/ipv6/ip6_output.c | 2 +- > net/ipv6/raw.c | 2 +- > net/packet/af_packet.c | 7 +++---- > .../selftests/bpf/prog_tests/ctx_rewrite.c | 8 ++++---- > 7 files changed, 26 insertions(+), 16 deletions(-) > > diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h > index a83a2120b57f..b6346c21c3d4 100644 > --- a/include/linux/skbuff.h > +++ b/include/linux/skbuff.h > @@ -827,7 +827,8 @@ enum skb_tstamp_type { > * @tstamp_type: When set, skb->tstamp has the > * delivery_time in mono clock base (i.e. EDT). Otherwise, the > * skb->tstamp has the (rcv) timestamp at ingress and > - * delivery_time at egress. > + * delivery_time at egress or skb->tstamp defined by skb->sk->sk_clockid > + * coming from userspace > * @napi_id: id of the NAPI struct this skb came from > * @sender_cpu: (aka @napi_id) source CPU in XPS > * @alloc_cpu: CPU which did the skb allocation. > @@ -955,7 +956,7 @@ struct sk_buff { > /* private: */ > __u8 __mono_tc_offset[0]; > /* public: */ > - __u8 tstamp_type:1; /* See SKB_MONO_DELIVERY_TIME_MASK */ > + __u8 tstamp_type:2; /* See SKB_MONO_DELIVERY_TIME_MASK */ > #ifdef CONFIG_NET_XGRESS > __u8 tc_at_ingress:1; /* See TC_AT_INGRESS_MASK */ > __u8 tc_skip_classify:1; A quick pahole for a fairly standard .config that I had laying around shows a hole after this list of bits, so no huge concerns there from adding a bit: __u8 slow_gro:1; /* 3: 4 1 */ __u8 csum_not_inet:1; /* 3: 5 1 */ /* XXX 2 bits hole, try to pack */ __u16 tc_index; /* 4 2 */ > @@ -1090,10 +1091,10 @@ struct sk_buff { > */ > #ifdef __BIG_ENDIAN_BITFIELD > #define SKB_MONO_DELIVERY_TIME_MASK (1 << 7) > -#define TC_AT_INGRESS_MASK (1 << 6) > +#define TC_AT_INGRESS_MASK (1 << 5) Have to be careful when adding a new 2 bit tstamp_type with both bits set, that this does not incorrectly get interpreted as MONO. I haven't looked closely at the BPF API, but hopefully it can be extensible to return the specific type. If it is hardcoded to return either MONO or not, then only 0x1 should match, not 0x3. > #else > #define SKB_MONO_DELIVERY_TIME_MASK (1 << 0) > -#define TC_AT_INGRESS_MASK (1 << 1) > +#define TC_AT_INGRESS_MASK (1 << 2) > #endif > #define SKB_BF_MONO_TC_OFFSET offsetof(struct sk_buff, __mono_tc_offset) > > @@ -4262,6 +4263,16 @@ static inline void skb_set_delivery_time(struct sk_buff *skb, ktime_t kt, > case CLOCK_MONO: Come to think of it, these CLOCK_* names are too generic and shadow existing ones like CLOCK_MONOTONIC. Instead, define SKB_CLOCK_. > skb->tstamp_type = kt && tstamp_type; > break; > + /* if any other time base, must be from userspace > + * so set userspace tstamp_type bit > + * See skbuff tstamp_type:2 > + * 0x0 => real timestamp_type > + * 0x1 => mono timestamp_type > + * 0x2 => timestamp_type set from userspace > + */ > + default: > + if (kt && tstamp_type) > + skb->tstamp_type = 0x2; Needs a constant. Plan is to add SKB_CLOCK_TAI, rather than SKB_CLOCK_USER that requires a further lookup to sk_clockid. > } > } > > diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c > index 62e457f7c02c..c9317d4addce 100644 > --- a/net/ipv4/ip_output.c > +++ b/net/ipv4/ip_output.c > @@ -1457,7 +1457,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk, > > skb->priority = (cork->tos != -1) ? cork->priority: READ_ONCE(sk->sk_priority); > skb->mark = cork->mark; > - skb->tstamp = cork->transmit_time; > + skb_set_delivery_time(skb, cork->transmit_time, sk->sk_clockid); If adding 1 or 2 specific clock types, like SKB_CLOCK_TAI, then skb_set_delivery_time will have to detect unsupported sk_clockid values and fail for those. The function does not return an error, so just fail to set the delivery time and WARN_ONCE.
